From df99a1a4b954b33d0c87eaa7846fef87e1b3f0bd Mon Sep 17 00:00:00 2001
From: Packit <packit>
Date: Sep 03 2020 13:52:54 +0000
Subject: djvulibre-3.5.27 base


---

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/AUTHORS
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..eeb586b
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..3266bba
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,60 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+
+
+
+
+
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ChangeLog
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..2099840
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..1b7d76e
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,21 @@
+ACLOCAL_AMFLAGS = -I config
+
+SUBDIRS = libdjvu tools share
+
+if WANT_XMLTOOLS
+SUBDIRS += xmltools
+endif
+
+if WANT_DESKTOPFILES
+SUBDIRS += desktopfiles
+endif
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status libtool
+
+EXTRA_DIST = COPYRIGHT autogen.sh djvulibre.spec
+
+# Distribute some entire subdirectories.
+# No trailing slashes, as they put foo/* in foo/foo/*.
+
+EXTRA_DIST += doc debian macosx win32
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..c15990e
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,833 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@WANT_XMLTOOLS_TRUE@am__append_1 = xmltools
+@WANT_DESKTOPFILES_TRUE@am__append_2 = desktopfiles
+subdir = .
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(top_srcdir)/config/config.h.in COPYING config/ar-lib \
+	config/compile config/config.guess config/config.sub \
+	config/install-sh config/missing config/ltmain.sh \
+	$(top_srcdir)/config/ar-lib $(top_srcdir)/config/compile \
+	$(top_srcdir)/config/config.guess \
+	$(top_srcdir)/config/config.sub \
+	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
+	$(top_srcdir)/config/missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = libdjvu tools share xmltools desktopfiles
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz
+GZIP_ENV = --best
+DIST_TARGETS = dist-xz dist-bzip2 dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INKSCAPE = @INKSCAPE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JPEG_CFLAGS = @JPEG_CFLAGS@
+JPEG_LIBS = @JPEG_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RM = @RM@
+RSVG = @RSVG@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TIFF_CFLAGS = @TIFF_CFLAGS@
+TIFF_LIBS = @TIFF_LIBS@
+TOUCH = @TOUCH@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+version_info = @version_info@
+ACLOCAL_AMFLAGS = -I config
+SUBDIRS = libdjvu tools share $(am__append_1) $(am__append_2)
+
+# Distribute some entire subdirectories.
+# No trailing slashes, as they put foo/* in foo/foo/*.
+EXTRA_DIST = COPYRIGHT autogen.sh djvulibre.spec doc debian macosx \
+	win32
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(top_srcdir)/config/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status libtool
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..0d2c98d
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,214 @@
+NEW IN VERSION 3.5.27
+------------------------
+- simplified configuration scripts
+- deadlock fixes
+- miniexp under win32 uses tlsalloc instead of _thread vars (pb under xp)
+
+NEW IN VERSION 3.5.26
+------------------------
+- Thread safe miniexp
+- Now using the standard autotools approach (thanks to Vincent Torri).
+- New windows installer (thanks to Konstantin Kravtsov).
+- Fixed Russian code page issues in windows.
+- General speedup thanks to lock-free smart pointers.
+- ddjvu can produce one file per page.
+- djvused can now set the default page orientation.
+- Bug fixes all around.
+
+
+NEW IN VERSION 3.5.25
+---------------------
+- Removed the deprecated djview3 code.
+- Removed the deprecated cothreads code.
+- Removed the unmaintained japanese man pages.
+- Added ddjvu option to skip corrupted pages.
+- Miniexp API is now reentrant.
+- Bug fixes all around.
+
+
+NEW IN VERSION 3.5.24
+---------------------
+- Set ddjvuapi_version to 20.
+- Added ddjvuapi support for changing the white point.
+- Added option "-u" in djvused.
+- Added option "-o djvufile" in djvuxmlparser.
+- Added support for <CHARACTER> tag in djvuxmlparser.
+- Added print-xmp, set-xmp, remove-smp in djvused.
+
+
+NEW IN VERSION 3.5.23
+---------------------
+- Djview3 has been deprecated by djview4 whose source comes in 
+  its own tarball. Use configure option --enable-djview to force
+  the compilation of djview3.
+- Set ddjvuapi_version to 19.
+- Added ddjvu_document_create_by_filename_utf8
+- Generate icons with rsvg rather than imagemagick.
+- djvused: correctly outputs escape characters.
+- djvumake: added options to generate foreground colors.
+- Various bug fixes.
+
+NEW IN VERSION 3.5.22
+---------------------
+- Probably the last release before djvulibre-4
+- Backported djview4 version of nsdejavu.so 
+- Various bug fixes
+
+NEW IN VERSION 3.5.21
+---------------------
+- Speed improvement on multicore platforms
+- Ddjvu now can produce pdf output.
+- Various bug fixes
+
+NEW IN VERSION 3.5.20
+---------------------
+- Csepdjvu handle gsdjvu hyperlink comments.
+- Djvudigital therefore handles hyperlinks.
+
+NEW IN VERSION 3.5.19
+---------------------
+- License change. Starting with version 3.5.19, 
+  DjVuLibre is distributed under either version 2 of the GPL
+  or (at your option) any later version.
+  Previous versions were released strictly under 
+  the GPL version 2.
+
+NEW IN VERSION 3.5.18
+---------------------
+- Renamed djview as djview3.
+- Various enhancement of DDJVUAPI.
+- Partial support for page titles instead of page numbers.
+- Clarification of metadata information.
+- Fixed djvumake mask separation feature.
+- Complain when given a so-called "secure" djvu file.
+- Fixed handling of urls with cgi arguments
+- Fixed bug related to caching and ddjvuapi
+- Reorganized ${datadir}/djvu
+- Provide scripts in ${datadir}/djvu/*/desktop to register
+  the djvu mime types and the djview menu entries.
+
+NEW IN VERSION 3.5.17
+---------------------
+- Various enhancement of DDJVUAPI
+- Compiles with GCC-4.1.
+- Compiles with the SunCC compiler.
+- Command line utilities compile under WIN32 
+  using MSVC using the provided project files.
+- Minor bug fixes in csepdjvu text extraction.
+- Fixed leak in csepdjvu, cpaldjvu and cjb2.
+
+NEW IN VERSION 3.5.16
+---------------------
+- Shared library build system updates.
+
+NEW IN VERSION 3.5.15
+---------------------
+- Fixes for compilation with GCC-4.0.
+
+NEW IN VERSION 3.5.14
+---------------------
+- Fixes for compilation with GCC-3.4.
+- Cjb2 lossy mode vastly improved (thanks to Ilya Mezhirov)
+- Revamped install for desktop information files
+- Compilation uses libtool and makes shared libs on more platforms.
+- Uniform decoding api ddjvuapi.h.
+- Enhanced ddjvu based on ddjvuapi.
+- ddjvu can produce tiff files.
+
+NEW IN VERSION 3.5.13
+---------------------
+- Navigation history in djview.
+- New option -fullscreen in djview.
+- Silently processes files up to version 25.
+- Only produces files with version 24.
+- French and Japanese localization.
+- Japanese man pages.
+- Fixes for MacOS.
+- Compilation of XMLTools enabled by default.
+- KDE and GNOME integration
+- CJB2 now handles tiff files.
+
+NEW IN VERSION 3.5.12
+---------------------
+- Improved color quantization (fix cpaldjvu artifacts)
+- Fixed handling of non latin characters.
+- Worked around problems with gcc-3.3.1.
+
+NEW IN VERSION 3.5.11
+---------------------
+- All private symbols in DJVU namespace
+- Fixed keyboard focus in kde-3.1.1
+- Fixed toolbar control arguments.
+- Incremented djvuversion to 24 (LT again)
+- Fixed djvm.
+
+NEW IN VERSION 3.5.10
+---------------------
+- Added support for mouse wheel.
+- Added support for LT toolbar control args.
+- Added DESTDIR in Makefiles.
+- Incremented djvuversion to 23.
+- Djview key space now does continuous reading
+- Fixed thumbnail generation on empty pages.
+- Improved csepdjvu option -bgwhite.
+- Djview and djvups now can print booklets.
+- Djview main dialogs have a help button.
+- Annotation strings now recognize C escape sequences.
+
+NEW IN VERSION 3.5.9
+--------------------
+- Fix for gcc-3.2.
+- Fix for broken command ddjvu.
+- Modified IW44 for ARM processors.
+- Modified RPM spec file for Mozilla-1.1+.
+
+NEW IN VERSION 3.5.8
+--------------------
+- Fixed printing of b&w documents (broken since 3.5.6)
+- Fixed menu problem on rh7.3
+- Included fixes for gcc-3.1.
+
+NEW IN VERSION 3.5.7
+--------------------
+- Fixes for cygwin
+- Fixes for configuration script
+- Updated copyright notices with clarified
+  patent statement from Lizardtech.
+
+NEW IN VERSION 3.5.6
+--------------------
+- Fixes for gcc-3.1 and qt3
+- Fixes for macosx compilation
+- Added option -bgwhite in cpaldjvu
+
+NEW IN VERSION 3.5.5
+--------------------
+- Removed annoying flicker with djview/Qt3.
+- Simplified the use of djvuserve.
+- Fixes to the tools build with CYGWIN.
+- Added the lizardtech XML tools (use --enable-xmltools to compile).
+- Fixed show stopper in djvused.
+
+NEW IN VERSION 3.5.4
+--------------------
+- Fixed bug in djview print dialog.
+- Fixed bug in djvused.
+- Added CGI program djvuserve.
+
+NEW IN VERSION 3.5.3
+--------------------
+- Support for QT2 and QT3
+- Removed lots of QT1 specific hacks.
+- Added command djvups.
+
+NEW IN VERSION 3.5.2
+--------------------
+- Added support for image/vnd.djvu mime type.
+- Configure changes for FreeBSD.
+- Bug fixes in djvused.
+
+NEW IN VERSION 3.5.1
+--------------------
+- Initial release with:
+  man pages, bug fixes, autoconf based build system,
+  more portable browser plugin, djvused, etc.
diff --git a/README b/README
new file mode 100644
index 0000000..833046e
--- /dev/null
+++ b/README
@@ -0,0 +1,281 @@
+
+1- WHAT IS DJVU.
+================
+
+DjVu (pronounced "déjà vu") a set of compression technologies, a file format,
+and a software platform for the delivery over the Web of digital documents,
+scanned documents, and high resolution images.
+
+DjVu documents download and display extremely quickly, and look exactly the
+same on all platforms. DjVu can be seen as superior alternative to PDF and
+Postscript for digital documents, to TIFF (and PDF) for scanned documents, to
+JPEG for photographs and pictures, and to GIF for large palettized
+images. DjVu is the only Web format that is practical for distributing
+high-resolution scanned documents in color. No other format comes close.
+
+Typical DjVu file sizes are as follows: 
+
+- Bitonal scanned documents: 
+        5 to 30KB per page at 300dpi, 
+        3 to 10 times smaller than PDF or TIFF.
+
+- Color scanned documents: 
+           30 to 100KB per page at 300dpi,
+           5 to 10 times smaller than JPEG.
+
+- Photos:
+        2 times smaller than JPEG, 
+        about the same as JPEG-2000. 
+
+- Palettized images: 
+        2 times smaller than GIF,
+        up to 10 times if there is text.
+
+DjVu is used by hundreds of commercial, governmental, and non-commercial web
+sites around the world to distribute scanned documents, digital documents, and
+high-resolution photos.
+
+Demos, and general information about DjVu can be found at 
+http://www.djvuzone.org, or at http://www.lizardtech.com. 
+
+DjVu was originally developed at AT&T Labs-Research. AT&T sold DjVu to
+LizardTech Inc. in March 2000.
+
+
+
+2- WHAT IS DJVULIBRE? 
+=====================
+
+In an effort to promote DjVu as a Web standard, LizardTech's management was
+enlightened enough to release the reference implementation of DjVu under the
+GNU GPL in October 2000. DjVuLibre (pronounced like the French "déjà vu
+libre"), is an enhanced version of that code maintained by the original
+inventors of DjVu. It is compatible with LizardTech's DjVu software v3.5.
+
+This package includes: 
+
+- An up-to-date version of the C++ DjVu Reference Library 
+- A full-fledged wavelet-based compressor for pictures. 
+- A simple compressor for bitonal (black and white) scanned pages. 
+- A compressor for palettized images (a la GIF). 
+- A full set of utilities to manipulate and assemble DjVu images and documents. 
+- A set of decoders to convert DjVu to a number of other formats. 
+
+The full-fledged DjVu file viewer and browser plugin DjView4
+is available as a separate package.
+
+
+
+3- BUILDING DJVULIBRE
+=====================
+
+3.1- PREREQUISITES
+------------------
+
+DjVuLibre-3.5 relies on various components available from the web.  
+Most recent Linux distribution already come with these.  
+You can also download and compile them if you wish.
+Be sure to read the system specific notes 
+at the end of this file.
+
+COMPILER --
+Development is done with the GCC g++ compiler, which is therefore
+recommended for all platforms.  The CLANG compiler has been tried and
+seems to work, but its output has not been seriously tested.
+
+LIBJPEG/LIBTIFF --
+A small number of DjVu files internally use JPEG encoding instead 
+of IW44 wavelet encoding.  These files are processed using either 
+version 6a or 6b of the IJG libjpeg library <http://www.ijg.org>.  
+Some utility programs are able to read TIFF files. These programs
+rely on the LIBTIFF library <http://libtiff.org>.
+You can also compile DjVuLibre with neither JPEG nor TIFF support.  
+You might never notice the difference.
+
+THREADS --
+The DjVu viewer makes heavy use of multiple threads of execution.  
+Modern  Unix operating systems come with the standardized Posix threads.  
+DjVuLibre-3.5 fully supports detecting and using Posix threads.
+
+
+3.2 - CONFIGURE
+---------------
+
+Chances are that everything will work by simply running 
+commands "./configure", "make" and "make install". 
+
+Various options and environment variables affect the execution of the
+configuration script.  A complete list can be obtained by typing 
+"configure --help".  Also see the INSTALL file for further details.
+Here are the most important ones.
+
+* Option "--prefix=PREFIXDIR"
+  This option specifies where the DjVuLibre software will be installed.
+  The default prefix is /usr/local.  
+
+* Option "--enable-desktopfiles[=(yes|no)]"
+  Installs icon and mime type files in the customary xdg directories.
+  The default is "yes".
+
+* Option "--with-jpeg=JPEGDIR"
+  This option specifies a directory where the JPEG library has been
+  compiled. This directory contains both the include files and the 
+  library.  Without this option, the configuration script will search 
+  the JPEG library in standard places.
+  When everything else fails, you can simply define the environment
+  variables JPEG_CFLAGS and JPEG_LIBS.
+
+* Option "--with-tiff=TIFFDIR"
+  This option specifies a directory where the LIBTIFF library has been
+  compiled. This directory contains both the include files and the 
+  library.  Without this option, the configuration script will search 
+  the LIBTIFF library in standard places.
+  When everything else fails, you can simply define the environment
+  variables TIFF_CFLAGS and TIFF_LIBS.
+
+Always check the output of the configuration script for warnings and errors.
+In particular, the configuration script might disable the compilation of
+djview if it cannot locate the required libraries and utilities.  The warning
+messages are the only way to know.
+
+3.3 - MAKE
+----------
+
+You can then perform the compilation by typing 
+
+        $ make
+
+The compilation can last a few minutes.  Again check the output for warnings
+and errors.  Finally a brief message lets you know that the compilation was
+successful.  You can then proceed with the installation.
+
+3.4 - INSTALL
+------------
+
+Typing:
+
+        $ make install
+
+or if necessary:
+
+        $ sudo make install
+
+should:
+
+- install the executable programs into "${prefix}/bin/".
+- possibly install the shared library into "${prefix}/lib/".
+- install the man pages under "${prefix}/man or ${prefix}/share/man/".
+- install various ancillary files under "${prefix}/share/djvu/".
+- install "${prefix}/share/pkgconfig.pc".
+- optionally install the icon and mime type information files
+
+Where ${prefix} refers to the directory specified by the prefix option
+of the configuration script, which defaults to "/usr/local", and the
+paths above can be fine-tuned using appropriate arguments to
+./configure and make.
+
+
+4 - BUILDING FOR MAC OS X
+=========================
+
+(note: these instructions are slightly outdated.)
+
+The Mac OS X version of djvulibre can be built in one of two ways:
+
+- the Unix way
+- the Xcode way
+
+These instructions are to help setup and build djvulibre for a
+multi-architecture binary (ppc, i386).  Your milage with the following
+configure options (note: libjpeg.a and libtiff.a are installed
+universal on the machine this was tested with.)
+
+We recommend that you first install macports with the 
+libraries zlib, libpng, jpeg and tiff with option +universal.
+The commands to install these libraries are
+  $ sudo port install zlib +universal
+  $ sudo port install libpng +universal
+  $ sudo port install jpeg +universal
+  $ sudo port install tiff +universal
+
+Then you can run configure
+
+./configure \
+   --enable-static=yes \
+   --disable-desktopfiles \
+   --with-extra-includes=/usr/include \
+   --with-extra-libraries=/usr/lib \
+   CFLAGS="-arch ppc -arch i386" \
+   CXXFLAGS="-arch ppc -arch i386" \
+   LDFLAGS="-arch ppc -arch i386"
+
+The --with-extra-include and --with-extra-libraries are here
+to favor system libraries (in /usr) over those that come with macports.
+Then you can compile with 
+
+$ make
+
+Running "make install" will install djvulibre in directory /usr/local.
+Note that the produced libraries will depend on the macports jpeg and tiff
+libraries.  You can change that using the command "install_name_tool"
+and other macosx tricks...
+
+Alternatively you can just open the macosx/DjVuLibre/DjVuLibre.xcodeproj 
+and build everything using Xcode. This can be painful if you do not have
+the same version of Xcode as the one we used to generate that file.
+In Leon's opinion, this is hell.  Jeff agrees, those dyld dependancies 
+trap us forever in the eighth circle.
+
+Note that the macosx directory contains a few useful tools
+that are not compiled using the main makefile:
+
+The djvu.mdimporter program is a spotlight importer for djvu metadata.
+The djvu.qlgenerator program generates quicklook data (leopard only).
+
+
+5 - BUILDING FOR WINDOWS
+========================
+
+5.1- Using Microsoft Visual C++ 2012
+------------------------------------
+
+   See the directory win32.
+   Populate the zlib, jpeg and tiff directories with
+   the open source code suggested in the README files.
+   Check win32/djvulibre/dirs.props to see
+   how to name the directories.
+   Then open win32/djvulibre/djvulibre.sln and compile.
+
+   Next step would then be to follow the instructions
+   in the djview package to create a djview project and
+   add it to this solution. Finally you can use the script
+   djvulibre-install.sh and djvulibre.nsi to prepare
+   the djvulibre+djview installer.
+
+
+5.2- Using Mingw
+----------------
+
+   You must first install the mingw compiler and the msys environment.
+   See www.mingw.org for more information.
+   From the msys shell, run the usual commands 
+     $ configure
+     $ make
+   Then collect the djvulibre dll from directory libdjvu/.libs
+   and the executables from directory tools/.libs 
+   Please refer to the file INSTALL for information
+   about the arguments of the script 'configure'.
+
+
+5.3- Using Cygwin 
+-----------------
+
+   Simply run the usual commands 
+     $ configure
+     $ make
+     $ make install
+   Please refer to the file INSTALL for information
+   about the arguments of the script 'configure'.
+ 
+
+
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..a5cdae5
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,1253 @@
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.14'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.14.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed.  If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+  [AC_LANG_PUSH([C])
+   am_cv_ar_interface=ar
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([am_ar_try])
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+        AC_TRY_EVAL([am_ar_try])
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+     ])
+   AC_LANG_POP([C])])
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  m4_default([$1],
+             [AC_MSG_ERROR([could not determine $AR interface])])
+  ;;
+esac
+AC_SUBST([AR])dnl
+])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_COND_IF                                            -*- Autoconf -*-
+
+# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_COND_IF
+# _AM_COND_ELSE
+# _AM_COND_ENDIF
+# --------------
+# These macros are only used for tracing.
+m4_define([_AM_COND_IF])
+m4_define([_AM_COND_ELSE])
+m4_define([_AM_COND_ENDIF])
+
+# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
+# ---------------------------------------
+# If the shell condition COND is true, execute IF-TRUE, otherwise execute
+# IF-FALSE.  Allow automake to learn about conditional instantiating macros
+# (the AC_CONFIG_FOOS).
+AC_DEFUN([AM_COND_IF],
+[m4_ifndef([_AM_COND_VALUE_$1],
+	   [m4_fatal([$0: no such condition "$1"])])dnl
+_AM_COND_IF([$1])dnl
+if test -z "$$1_TRUE"; then :
+  m4_n([$2])[]dnl
+m4_ifval([$3],
+[_AM_COND_ELSE([$1])dnl
+else
+  $3
+])dnl
+_AM_COND_ENDIF([$1])dnl
+fi[]dnl
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([config/acinclude.m4])
+m4_include([config/libtool.m4])
+m4_include([config/ltoptions.m4])
+m4_include([config/ltsugar.m4])
+m4_include([config/ltversion.m4])
+m4_include([config/lt~obsolete.m4])
+m4_include([config/pkg.m4])
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e76c3a2
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+autoreconf -f -i -v --warnings=all || exit 1
+
+if [ -z "$NOCONFIGURE" ]; then
+	./configure "$@"
+fi
diff --git a/config/acinclude.m4 b/config/acinclude.m4
new file mode 100644
index 0000000..1ec50d4
--- /dev/null
+++ b/config/acinclude.m4
@@ -0,0 +1,713 @@
+dnl Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+dnl Copyright (c) 2001  AT&T
+dnl
+dnl Most of these macros are derived from macros listed
+dnl at the GNU Autoconf Macro Archive
+dnl http://www.gnu.org/software/ac-archive/
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111 USA
+dnl
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CHECK_CXX_OPT(OPTION,
+dnl               ACTION-IF-OKAY,ACTION-IF-NOT-OKAY)
+dnl Check if compiler accepts option OPTION.
+dnl Default action is to add option to CXXFLAGS.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CHECK_CXX_OPT],[
+ opt="$1"
+ AC_MSG_CHECKING([if $CXX accepts $opt])
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    AC_MSG_RESULT(yes)
+    rm conftest.* 
+    ifelse($2,,[CXXFLAGS="$CXXFLAGS $opt"],$2)
+ else
+    AC_MSG_RESULT(no)
+    rm conftest.*
+    ifelse($3,,:,$3)
+ fi
+])
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CHECK_CC_OPT(OPTION,
+dnl               ACTION-IF-OKAY,ACTION-IF-NOT-OKAY)
+dnl Check if compiler accepts option OPTION.
+dnl Default action is to add option to CFLAGS.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CHECK_CC_OPT],[
+ opt="$1"
+ AC_MSG_CHECKING([if $CXX accepts $opt])
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC} ${CFLAGS} $opt -c conftest.c 2>&1`"; then
+    AC_MSG_RESULT(yes)
+    rm conftest.* 
+    ifelse($2,,[CFLAGS="$CFLAGS $opt"],$2)
+ else
+    AC_MSG_RESULT(no)
+    rm conftest.*
+    ifelse($3,,:,$3)
+ fi
+])
+
+dnl ------------------------------------------------------
+dnl @synopsis AC_REMOVE_OPTIONS(VAR,PATTERN)
+dnl ------------------------------------------------------
+AC_DEFUN([AC_REMOVE_OPTIONS],[
+   saved_var=${$1}
+   $1=
+   for opt in ${saved_var} ; do
+     case "$opt" in 
+      $2) ;;
+      *) $1="${$1} $opt" ;;
+     esac
+   done
+])
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_OPTIMIZE
+dnl Setup option --enable-debug
+dnl Determine optimization options
+dnl Add them to CFLAGS and CXXFLAGS
+dnl -------------------------------------------------------
+AC_DEFUN([AC_OPTIMIZE],[
+   AC_REQUIRE([AC_CANONICAL_HOST])
+   AC_ARG_ENABLE(debug,
+        AS_HELP_STRING([--enable-debug],
+                       [Compile with debugging options (default: no)]),
+        [ac_debug=$enableval],[ac_debug=no])
+   defines=
+   if test x$ac_debug = xno ; then
+     AC_REMOVE_OPTIONS([CFLAGS],[-O*])
+     AC_REMOVE_OPTIONS([CXXFLAGS],[-O*])
+     if test x$GCC != xyes ; then
+       AC_REMOVE_OPTIONS([CFLAGS],[-g*])
+       AC_REMOVE_OPTIONS([CXXFLAGS],[-g*])
+     fi
+     defines="-DNDEBUG"
+     AC_CHECK_CC_OPT([-O3],,[AC_CHECK_CC_OPT([-O2])])
+     AC_CHECK_CXX_OPT([-O3],,[AC_CHECK_CXX_OPT([-O2])])
+     cpu=`uname -m 2>/dev/null`
+     test -z "$cpu" && cpu=${host_cpu}
+     case "${host_cpu}" in
+        i?86)
+           opt="-mtune=${host_cpu}"
+           AC_CHECK_CXX_OPT([-mtune=${host_cpu}],,
+                [AC_CHECK_CXX_OPT([-mcpu=${host_cpu}])])
+           AC_CHECK_CC_OPT([-mtune=${host_cpu}],,
+                [AC_CHECK_CC_OPT([-mcpu=${host_cpu}])])
+           ;;
+      esac
+   else
+     AC_REMOVE_OPTIONS([CFLAGS],[-O*|-g*])
+     AC_REMOVE_OPTIONS([CXXFLAGS],[-O*|-g*])
+     AC_CHECK_CC_OPT([-g])
+     AC_CHECK_CXX_OPT([-g])
+     AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor])
+   fi
+   AC_CHECK_CC_OPT([-Wall])
+   AC_CHECK_CXX_OPT([-Wall])
+   case x"$ac_debug" in
+changequote(<<, >>)dnl
+     x[0-9]) defines="-DDEBUGLVL=$ac_debug" ;;
+     xr*)    defines="-DRUNTIME_DEBUG_ONLY" ;;
+changequote([, ])dnl 
+   esac
+   CFLAGS="$CFLAGS $defines"
+   CXXFLAGS="$CXXFLAGS $defines"
+])
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_INTEL_ATOMIC_BUILTINS
+dnl If the compiler supports intel atomic builtins.
+dnl define HAVE_INTEL_ATOMIC_BUILTINS
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_INTEL_ATOMIC_BUILTINS],
+[AC_CACHE_CHECK(whether the compiler supports intel atomic builtins,
+ac_cv_cxx_intel_atomic_builtins,
+[AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+  [[
+static int volatile l;
+  ]],
+  [
+__sync_lock_test_and_set(&l,1);
+__sync_lock_release(&l);
+__sync_add_and_fetch(&l,1);
+__sync_bool_compare_and_swap(&l,&l,1);
+__sync_synchronize();
+return 0;
+  ])],
+ [ac_cv_cxx_intel_atomic_builtins=yes],
+ [ac_cv_cxx_intel_atomic_builtins=no])
+ AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_intel_atomic_builtins" = yes; then
+  AC_DEFINE(HAVE_INTEL_ATOMIC_BUILTINS,1,
+        [define if the compiler supports intel atomic builtins])
+fi
+])
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_MEMBER_TEMPLATES
+dnl If the compiler supports member templates, 
+dnl define HAVE_MEMBER_TEMPLATES.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_MEMBER_TEMPLATES],
+[AC_CACHE_CHECK(whether the compiler supports member templates,
+ac_cv_cxx_member_templates,
+[AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+  [[
+template<class T, int N> class A
+{ public:
+  template<int N2> A<T,N> operator=(const A<T,N2>& z) { return A<T,N>(); }
+};
+  ]],
+  [[
+A<double,4> x; A<double,7> y;
+x = y;
+return 0;
+  ]])],
+ [ac_cv_cxx_member_templates=yes],
+ [ac_cv_cxx_member_templates=no])
+ AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_member_templates" = yes; then
+  AC_DEFINE(HAVE_MEMBER_TEMPLATES,1,
+        [define if the compiler supports member templates])
+fi
+])
+
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_NAMESPACES
+dnl Define HAVE_NAMESPACES if the compiler supports
+dnl namespaces.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_NAMESPACES],
+[AC_CACHE_CHECK(whether the compiler implements namespaces,
+ac_cv_cxx_namespaces,
+[ AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
+   [[
+namespace Outer { namespace Inner { int i = 0; }}
+   ]],
+   [[
+using namespace Outer::Inner;
+return i;
+   ]])],
+  [ac_cv_cxx_namespaces=yes],
+  [ac_cv_cxx_namespaces=no])
+  AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_namespaces" = yes && test "$ac_debug" = no; then
+  AC_DEFINE(HAVE_NAMESPACES,1,
+             [define if the compiler implements namespaces])
+fi
+])
+
+
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_TYPENAME
+dnl Define HAVE_TYPENAME if the compiler recognizes 
+dnl keyword typename.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_TYPENAME],
+[AC_CACHE_CHECK(whether the compiler recognizes typename,
+ac_cv_cxx_typename,
+[AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+  [[
+template<typename T>class X {public:X(){}};
+  ]],
+  [[
+X<float> z;
+return 0;
+  ]])],
+ [ac_cv_cxx_typename=yes],
+ [ac_cv_cxx_typename=no])
+ AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_typename" = yes; then
+  AC_DEFINE(HAVE_TYPENAME,1,[define if the compiler recognizes typename])
+fi
+])
+
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_STDINCLUDES
+dnl Define HAVE_STDINCLUDES if the compiler has the
+dnl new style include files (without the .h)
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_STDINCLUDES],
+[AC_CACHE_CHECK(whether the compiler comes with standard includes,
+ac_cv_cxx_stdincludes,
+[AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+  [[
+#include <new>
+struct X { int a; X(int a):a(a){} };
+X* foo(void *x) { return new(x) X(2); }
+  ]],
+  [[
+  ]])],
+ [ac_cv_cxx_stdincludes=yes],
+ [ac_cv_cxx_stdincludes=no])
+ AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_stdincludes" = yes; then
+  AC_DEFINE(HAVE_STDINCLUDES,1,
+    [define if the compiler comes with standard includes])
+fi
+])
+
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_BOOL
+dnl If the compiler recognizes bool as a separate built-in type,
+dnl define HAVE_BOOL. Note that a typedef is not a separate
+dnl type since you cannot overload a function such that it 
+dnl accepts either the basic type or the typedef.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_BOOL],
+[AC_CACHE_CHECK(whether the compiler recognizes bool as a built-in type,
+ac_cv_cxx_bool,
+[AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+  [[
+int f(int  x){return 1;}
+int f(char x){return 1;}
+int f(bool x){return 1;}
+  ]],
+  [[
+bool b = true;
+return f(b);
+  ]])],
+ [ac_cv_cxx_bool=yes],
+ [ac_cv_cxx_bool=no])
+ AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_bool" = yes; then
+  AC_DEFINE(HAVE_BOOL,1,[define if bool is a built-in type])
+fi
+])
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_EXCEPTIONS
+dnl If the C++ compiler supports exceptions handling (try,
+dnl throw and catch), define HAVE_EXCEPTIONS.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_EXCEPTIONS],
+[AC_CACHE_CHECK(whether the compiler supports exceptions,
+ac_cv_cxx_exceptions,
+[AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+  [[
+  ]],
+  [[
+try { throw  1; } catch (int i) { return i; }
+  ]])],
+ [ac_cv_cxx_exceptions=yes],
+ [ac_cv_cxx_exceptions=no])
+ AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_exceptions" = yes; then
+  AC_DEFINE(HAVE_EXCEPTIONS,1,[define if the compiler supports exceptions])
+fi
+])
+
+
+dnl -------------------------------------------------------
+dnl @synopsis AC_CXX_GCCTLS
+dnl Define HAVE_GCCTLS if the compiler recognizes 
+dnl keyword __thread for TLS variables.
+dnl -------------------------------------------------------
+AC_DEFUN([AC_CXX_GCCTLS],
+[AC_CACHE_CHECK(whether the compiler supports keyword __thread,
+ac_cv_cxx_gcctls,
+[AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+  [[
+__thread int i;
+  ]],
+  [[
+return i;
+  ]])],
+ [ac_cv_cxx_gcctls=yes],
+ [ac_cv_cxx_gcctls=no])
+ AC_LANG_POP([C++])
+])
+if test "$ac_cv_cxx_gcctls" = yes; then
+  AC_DEFINE(HAVE_GCCTLS,1,[define if the compiler supports keyword __thread])
+fi
+])
+
+
+dnl ------------------------------------------------------------------
+dnl @synopsis AC_PATH_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl This macro figures out how to build C programs using POSIX
+dnl threads.  It sets the PTHREAD_LIBS output variable to the threads
+dnl library and linker flags, and the PTHREAD_CFLAGS output variable
+dnl to any special C compiler flags that are needed.  (The user can also
+dnl force certain compiler flags/libs to be tested by setting these
+dnl environment variables.).  
+dnl ------------------------------------------------------------------
+AC_DEFUN([AC_PATH_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+acx_pthread_ok=no
+# First, check if the POSIX threads header, pthread.h, is available.
+# If it isn't, don't bother looking for the threads libraries.
+AC_CHECK_HEADER(pthread.h, , acx_pthread_ok=noheader)
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works.
+if test x${PTHREAD_LIBS+set} = xset ||
+   test x${PTHREAD_CFLAGS+set} = xset ; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_CXXFLAGS="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([provided PTHREAD_LIBS/PTHREAD_CFLAGS.])
+        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test x"$acx_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+        CXXFLAGS="$save_CXXFLAGS"
+fi
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all. Also, combinations
+# of items (for instance, both a compiler flag and a library name) can be 
+# specified using a colon separator.
+acx_pthread_flags="pthreads none -Kthread -kthread lthread 
+                   -pthread -pthreads -mt -mthreads pthread
+                   --thread-safe"
+# The ordering *is* (sometimes) important.  
+# Some notes on the individual items follow:
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mt: HP aCC (check before -mthreads)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+case "${host_cpu}-${host_os}" in
+        *solaris*)
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthread or
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+        acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+        ;;
+esac
+case "${host_os}-${GCC}" in
+        *linux*-yes | *kfreebsd*-yes )
+        # On Linux/GCC, libtool uses -nostdlib for linking, which cancel part
+        # of the -pthread flag effect (libpthread is not automatically linked).
+        # So we'll try to link with both -pthread and -lpthread first:
+        acx_pthread_flags="-pthread:pthread $acx_pthread_flags"
+        ;;
+esac
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+                *:*)
+                PTHREAD_CFLAGS=""
+                PTHREAD_LIBS=""
+                message="whether pthreads work with"
+                while test x"$flag" != x; do
+                        subflag=`echo $flag | cut -d: -f1`
+                        case $subflag in
+                                -*)
+                                PTHREAD_CFLAGS="$PTHREAD_CFLAGS $subflag"
+                                message="$message $subflag"
+                                ;;
+                                *)
+                                PTHREAD_LIBS="$PTHREAD_LIBS -l$subflag"
+                                message="$message -l$subflag"
+                                ;;
+                        esac
+                        flag=`echo $flag | cut -s -d: -f2-`
+                done
+                AC_MSG_CHECKING([$message])
+                ;;
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        save_CXXFLAGS="$CXXFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+         [[
+#include <pthread.h>
+         ]],
+         [
+pthread_t th; pthread_join(th, 0);
+pthread_attr_init(0); pthread_cleanup_push(0, 0);
+pthread_create(0,0,0,0); pthread_cleanup_pop(0);
+         ])],
+         [acx_pthread_ok=yes],
+         [acx_pthread_ok=no])
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+        CXXFLAGS="$save_CXXFLAGS"
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test "x$acx_pthread_ok" = xyes; then
+                break;
+        fi
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_CXXFLAGS="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case "${host_cpu}-${host_os}" in
+                *-aix* | *-freebsd*)     flag="-D_THREAD_SAFE";;
+                *solaris* | alpha*-osf*) flag="-D_REENTRANT";;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+                PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+        CXXFLAGS="$save_CXXFLAGS"
+fi
+AC_ARG_VAR(PTHREAD_LIBS, [Flags for linking pthread programs.])
+AC_ARG_VAR(PTHREAD_CFLAGS, [Flags for compiling pthread programs.])
+# execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+        AC_DEFINE(HAVE_PTHREAD,1,[Define if pthreads are available])
+        ifelse([$1],,:,[$1])
+else
+        ifelse([$2],,:,[$2])
+fi
+])
+
+dnl ------------------------------------------------------------------
+dnl @synopsis AC_PATH_JPEG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl Process option --with-jpeg.
+dnl Search JPEG. Define HAVE_JPEG.
+dnl Set output variable JPEG_CFLAGS and JPEG_LIBS
+dnl ------------------------------------------------------------------
+
+AC_DEFUN([AC_PATH_JPEG],
+[
+  AC_ARG_VAR(JPEG_LIBS)
+  AC_ARG_VAR(JPEG_CFLAGS)
+  ac_jpeg=no
+  AC_ARG_WITH(jpeg,
+     AS_HELP_STRING([--with-jpeg=DIR],
+                    [where the IJG jpeg library is located]),
+     [ac_jpeg=$withval], [ac_jpeg=yes] )
+  # Process specification
+  if test x$ac_jpeg = xyes ; then
+     test x${JPEG_LIBS+set} != xset && JPEG_LIBS="-ljpeg"
+  elif test x$ac_jpeg != xno ; then
+     test x${JPEG_LIBS+set} != xset && JPEG_LIBS="-L$ac_jpeg/lib -ljpeg"
+     test x${JPEG_CFLAGS+set} != xset && JPEG_CFLAGS="-I$ac_jpeg/include"
+  fi
+  # Try linking
+  if test x$ac_jpeg != xno ; then
+     AC_MSG_CHECKING([for jpeg library])
+     save_CFLAGS="$CFLAGS"
+     save_CXXFLAGS="$CXXFLAGS"
+     save_LIBS="$LIBS"
+     CFLAGS="$CFLAGS $JPEG_CFLAGS"
+     CXXFLAGS="$CXXFLAGS $JPEG_CFLAGS"
+     LIBS="$LIBS $JPEG_LIBS"
+     AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM(
+      [[
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <stdio.h>
+#include <jpeglib.h>
+#ifdef __cplusplus
+}
+#endif
+      ]],
+      [
+jpeg_CreateDecompress(0,0,0);
+      ])],
+      [ac_jpeg=yes],
+      [ac_jpeg=no])
+     CFLAGS="$save_CFLAGS"
+     CXXFLAGS="$save_CXXFLAGS"
+     LIBS="$save_LIBS"
+     AC_MSG_RESULT($ac_jpeg)
+   fi
+   # Finish
+   if test x$ac_jpeg = xno; then
+      JPEG_CFLAGS= ; JPEG_LIBS=
+      ifelse([$2],,:,[$2])
+   else
+      AC_DEFINE(HAVE_JPEG,1,[Define if you have the IJG JPEG library.])
+      dnl AC_MSG_RESULT([setting JPEG_CFLAGS=$JPEG_CFLAGS])
+      dnl AC_MSG_RESULT([setting JPEG_LIBS=$JPEG_LIBS])
+      ifelse([$1],,:,[$1])
+   fi
+])
+
+dnl ------------------------------------------------------------------
+dnl @synopsis AC_PATH_TIFF([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl Process option --with-tiff
+dnl Search LIBTIFF. Define HAVE_TIFF.
+dnl Set output variable TIFF_CFLAGS and TIFF_LIBS
+dnl ------------------------------------------------------------------
+
+AC_DEFUN([AC_PATH_TIFF],
+[
+  AC_ARG_VAR(TIFF_LIBS)
+  AC_ARG_VAR(TIFF_CFLAGS)
+  ac_tiff=no
+  AC_ARG_WITH(tiff,
+     AS_HELP_STRING([--with-tiff=DIR],
+                    [where libtiff is located]),
+     [ac_tiff=$withval], [ac_tiff=yes] )
+  # Process specification
+  if test x$ac_tiff = xyes ; then
+     test x${TIFF_LIBS+set} != xset && TIFF_LIBS="-ltiff"
+  elif test x$ac_tiff != xno ; then
+     test x${TIFF_LIBS+set} != xset && TIFF_LIBS="-L$ac_tiff/lib -ltiff"
+     test x${TIFF_CFLAGS+set} != xset && TIFF_CFLAGS="-I$ac_tiff/include"
+  fi
+  # Try linking
+  if test x$ac_tiff != xno ; then
+     AC_MSG_CHECKING([for the libtiff library])
+     save_CFLAGS="$CFLAGS"
+     save_CXXFLAGS="$CXXFLAGS"
+     save_LIBS="$LIBS"
+     CFLAGS="$CFLAGS $TIFF_CFLAGS"
+     CXXFLAGS="$CXXFLAGS $TIFF_CFLAGS"
+     LIBS="$LIBS $TIFF_LIBS"
+     AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM(
+      [[
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <stdio.h>
+#include <tiffio.h>
+#ifdef __cplusplus
+}
+#endif
+      ]],
+      [
+TIFFOpen(0,0);
+      ])],
+      [ac_tiff=yes],
+      [ac_tiff=no])
+     CFLAGS="$save_CFLAGS"
+     CXXFLAGS="$save_CXXFLAGS"
+     LIBS="$save_LIBS"
+     AC_MSG_RESULT($ac_tiff)
+   fi
+   # Finish
+   if test x$ac_tiff = xno; then
+      TIFF_CFLAGS= ; TIFF_LIBS=
+      ifelse([$2],,:,[$2])
+   else
+      AC_DEFINE(HAVE_TIFF,1,[Define if you have libtiff.])
+      dnl AC_MSG_RESULT([setting TIFF_CFLAGS=$TIFF_CFLAGS])
+      dnl AC_MSG_RESULT([setting TIFF_LIBS=$TIFF_LIBS])
+      ifelse([$1],,:,[$1])
+   fi
+])
+
+
+dnl ------------------------------------------------------------------
+dnl @synopsis AC_PROG_PKG_CONFIG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl Sets output variables PKG_CONFIG
+dnl ------------------------------------------------------------------
+
+
+AC_DEFUN([AC_PROG_PKG_CONFIG], 
+[
+  AC_ARG_VAR(PKG_CONFIG,[Location of the pkg-config program.])
+  AC_ARG_VAR(PKG_CONFIG_PATH, [Path for pkg-config descriptors.])
+  AC_PATH_PROG(PKG_CONFIG, pkg-config)
+  if test -z "$PKG_CONFIG" ; then
+      ifelse([$2],,:,[$2])
+  else
+      ifelse([$1],,:,[$1])
+  fi
+])
+
+
+
+
+
diff --git a/config/ar-lib b/config/ar-lib
new file mode 100755
index 0000000..fe2301e
--- /dev/null
+++ b/config/ar-lib
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Written by Peter Rosin <peda@lysator.liu.se>.
+#
+# 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, 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+     func_error "no command.  Try '$0 --help' for more information."
+     ;;
+  -h | --h*)
+    cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "$me, version $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test $# -lt 3; then
+  func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+  case $action in
+    d*) delete=yes  ;;
+    x*) extract=yes ;;
+    t*) list=yes    ;;
+    q*) quick=yes   ;;
+    r*) replace=yes ;;
+    s*) index=yes   ;;
+    S*)             ;; # the index is always updated implicitly
+    c*) create=yes  ;;
+    u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
+    *)
+      func_error "unknown action specified"
+      ;;
+  esac
+  action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+  yes,* | ,yes)
+    ;;
+  yesyes*)
+    func_error "more than one action specified"
+    ;;
+  *)
+    func_error "no action specified"
+    ;;
+esac
+
+if test -n "$delete"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  for member
+  do
+    case $1 in
+      @*)
+        func_at_file "${1#@}" -REMOVE "$archive"
+        ;;
+      *)
+        func_file_conv "$1"
+        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+        ;;
+    esac
+  done
+
+elif test -n "$extract"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  if test $# -gt 0; then
+    for member
+    do
+      case $1 in
+        @*)
+          func_at_file "${1#@}" -EXTRACT "$archive"
+          ;;
+        *)
+          func_file_conv "$1"
+          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+          ;;
+      esac
+    done
+  else
+    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
+    do
+      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+    done
+  fi
+
+elif test -n "$quick$replace"; then
+  if test ! -f "$orig_archive"; then
+    if test -z "$create"; then
+      echo "$me: creating $orig_archive"
+    fi
+    orig_archive=
+  else
+    orig_archive=$archive
+  fi
+
+  for member
+  do
+    case $1 in
+    @*)
+      func_file_conv "${1#@}"
+      set x "$@" "@$file"
+      ;;
+    *)
+      func_file_conv "$1"
+      set x "$@" "$file"
+      ;;
+    esac
+    shift
+    shift
+  done
+
+  if test -n "$orig_archive"; then
+    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+  else
+    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+  fi
+
+elif test -n "$list"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  $AR -NOLOGO -LIST "$archive" || exit $?
+fi
diff --git a/config/compile b/config/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/config/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# 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, 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/config.guess b/config/config.guess
new file mode 100755
index 0000000..b79252d
--- /dev/null
+++ b/config/config.guess
@@ -0,0 +1,1558 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-06-10'
+
+# This file 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/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config/config.h.in b/config/config.h.in
new file mode 100644
index 0000000..1497a89
--- /dev/null
+++ b/config/config.h.in
@@ -0,0 +1,339 @@
+/* config/config.h.in.  Generated from configure.ac by autoheader.  */
+
+
+#ifndef CONFIG_H
+#define CONFIG_H
+/* config.h: begin */
+
+
+/* version string */
+#undef DJVULIBRE_VERSION
+
+/* define if bool is a built-in type */
+#undef HAVE_BOOL
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* define if the compiler supports exceptions */
+#undef HAVE_EXCEPTIONS
+
+/* Define to 1 if you have the `fork' function. */
+#undef HAVE_FORK
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#undef HAVE_FSEEKO
+
+/* define if the compiler supports keyword __thread */
+#undef HAVE_GCCTLS
+
+/* Define to 1 if you have the `gethostname' function. */
+#undef HAVE_GETHOSTNAME
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getpwuid' function. */
+#undef HAVE_GETPWUID
+
+/* Define to 1 if you have the iconv function. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the <iconv.h> header file. */
+#undef HAVE_ICONV_H
+
+/* define if the compiler supports intel atomic builtins */
+#undef HAVE_INTEL_ATOMIC_BUILTINS
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `iswspace' function. */
+#undef HAVE_ISWSPACE
+
+/* Define if you have the IJG JPEG library. */
+#undef HAVE_JPEG
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
+
+/* Define to 1 if the system has the type `mbstate_t'. */
+#undef HAVE_MBSTATE_T
+
+/* define if the compiler supports member templates */
+#undef HAVE_MEMBER_TEMPLATES
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* define if the compiler implements namespaces */
+#undef HAVE_NAMESPACES
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <new.h> header file. */
+#undef HAVE_NEW_H
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
+/* Define if pthreads are available */
+#undef HAVE_PTHREAD
+
+/* Define to 1 if you have the `putc_unlocked' function. */
+#undef HAVE_PUTC_UNLOCKED
+
+/* Define to 1 if you have the <sched.h> header file. */
+#undef HAVE_SCHED_H
+
+/* Define to 1 if you have the `sched_yield' function. */
+#undef HAVE_SCHED_YIELD
+
+/* Define to 1 if you have the `setenv' function. */
+#undef HAVE_SETENV
+
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* define if the compiler comes with standard includes */
+#undef HAVE_STDINCLUDES
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the `strftime' function. */
+#undef HAVE_STRFTIME
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ipc.h> header file. */
+#undef HAVE_SYS_IPC_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/shm.h> header file. */
+#undef HAVE_SYS_SHM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if you have libtiff. */
+#undef HAVE_TIFF
+
+/* define if the compiler recognizes typename */
+#undef HAVE_TYPENAME
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
+/* Define to 1 if the system has the type `wchar_t'. */
+#undef HAVE_WCHAR_T
+
+/* Define to 1 if you have the `wcrtomb' function. */
+#undef HAVE_WCRTOMB
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#undef HAVE_WCTYPE_H
+
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT32_T
+
+/* Define to the type of a signed integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+#undef int16_t
+
+/* Define to the type of a signed integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef int32_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint16_t
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint32_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
+
+
+
+/* - Miscellaneous */
+#define AUTOCONF 1
+#if defined(__CYGWIN32__) || !defined(_WIN32)
+# define UNIX 1
+#endif
+
+/* - BOOL */
+#if !defined(HAVE_BOOL) && !defined(bool)
+#define bool  char
+#define true  1
+#define false 0
+#endif
+
+/* - WCHAR etc.*/
+#if ! defined(HAVE_WCHAR_T)
+#define HAS_WCHAR 0
+#define HAS_WCTYPE 0
+#define HAS_MBSTATE 0
+#else
+#define HAS_WCHAR 1
+#if defined(HAVE_WCTYPE_H) && defined(HAVE_ISWSPACE)
+#define HAS_WCTYPE 1
+#endif
+#if defined(HAVE_MBSTATE_T) && defined(HAVE_WCRTOMB)
+#define HAS_MBSTATE 1
+#endif
+#endif
+#if defined(HAVE_ICONV_H) && defined(HAVE_ICONV)
+#define HAS_ICONV 1
+#else
+#define HAS_ICONV 0
+#endif
+
+/* - I18N MESSAGES HELL */
+#define HAS_CTRL_C_IN_ERR_MSG 1
+
+/* - CONTAINERS */
+#ifndef HAVE_MEMBER_TEMPLATES
+#define GCONTAINER_NO_MEMBER_TEMPLATES 1
+#endif
+#ifndef HAVE_TYPENAME
+#define GCONTAINER_NO_TYPENAME 1
+#endif
+
+/* - JPEG */
+#ifdef HAVE_JPEG
+#define NEED_JPEG_DECODER 1
+#endif
+
+/* - MMAP */
+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)
+#define HAS_MEMMAP 1
+#else
+#define HAS_MEMMAP 0
+#endif
+
+/* config.h: end */
+#endif
+
diff --git a/config/config.sub b/config/config.sub
new file mode 100755
index 0000000..9633db7
--- /dev/null
+++ b/config/config.sub
@@ -0,0 +1,1791 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-08-10'
+
+# This file 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/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 \
+	| or1k | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or1k-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config/depcomp b/config/depcomp
new file mode 100755
index 0000000..4ebd5b3
--- /dev/null
+++ b/config/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+
+# 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, 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/install-sh b/config/install-sh
new file mode 100755
index 0000000..377bb86
--- /dev/null
+++ b/config/install-sh
@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-11-20.07; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test X"$d" = X && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/libtool.m4 b/config/libtool.m4
new file mode 100644
index 0000000..d7c043f
--- /dev/null
+++ b/config/libtool.m4
@@ -0,0 +1,7997 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/config/ltmain.sh b/config/ltmain.sh
new file mode 100644
index 0000000..a356aca
--- /dev/null
+++ b/config/ltmain.sh
@@ -0,0 +1,9661 @@
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
+TIMESTAMP=""
+package_revision=1.3337
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
+
+# The name of this program:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "$my_tmpdir"
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "$1" | $SED \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    echo
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
+func_help ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	p
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $opt_debug
+
+    func_error "missing argument for $1."
+    exit_cmd=exit
+}
+
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
+
+
+
+
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+nonopt=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
+    opt="$1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug='set -x'
+			func_echo "enabling shell trace mode"
+			$opt_debug
+			;;
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
+			;;
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
+			shift
+			;;
+      --preserve-dup-deps)
+			opt_preserve_dup_deps=:
+			;;
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
+			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
+			shift
+			;;
+
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+    esac
+  done
+
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
+
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
+
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
+
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
+
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+
+
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try \`$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+volatile const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps ; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      else
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_preserve_dup_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+		esac
+	      fi
+	      func_append tmp_libs " $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    echo
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$absdir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|qnx|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_append libobjs " $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$opt_mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS="$save_ifs"
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$opt_mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$opt_mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    func_append oldobjs " $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	odir="$objdir"
+      else
+	odir="$dir/$objdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$opt_mode" = uninstall && odir="$dir"
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case "$opt_mode" in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$opt_mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$opt_mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+
diff --git a/config/ltoptions.m4 b/config/ltoptions.m4
new file mode 100644
index 0000000..5d9acd8
--- /dev/null
+++ b/config/ltoptions.m4
@@ -0,0 +1,384 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/config/ltsugar.m4 b/config/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/config/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/config/ltversion.m4 b/config/ltversion.m4
new file mode 100644
index 0000000..07a8602
--- /dev/null
+++ b/config/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/config/lt~obsolete.m4 b/config/lt~obsolete.m4
new file mode 100644
index 0000000..c573da9
--- /dev/null
+++ b/config/lt~obsolete.m4
@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/config/missing b/config/missing
new file mode 100755
index 0000000..db98974
--- /dev/null
+++ b/config/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2013-10-28.13; # UTC
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# 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, 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/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config/pkg.m4 b/config/pkg.m4
new file mode 100644
index 0000000..c5b26b5
--- /dev/null
+++ b/config/pkg.m4
@@ -0,0 +1,214 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
diff --git a/configure b/configure
new file mode 100755
index 0000000..df2eabc
--- /dev/null
+++ b/configure
@@ -0,0 +1,22381 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for djvulibre 3.5.27.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='djvulibre'
+PACKAGE_TARNAME='djvulibre'
+PACKAGE_VERSION='3.5.27'
+PACKAGE_STRING='djvulibre 3.5.27'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+ac_unique_file="libdjvu/ddjvuapi.cpp"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_header_list=
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+pkgconfigdir
+WANT_DESKTOPFILES_FALSE
+WANT_DESKTOPFILES_TRUE
+WANT_XMLTOOLS_FALSE
+WANT_XMLTOOLS_TRUE
+TIFF_CFLAGS
+TIFF_LIBS
+JPEG_CFLAGS
+JPEG_LIBS
+PTHREAD_CFLAGS
+PTHREAD_LIBS
+CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+RM
+HAVE_CONVERSION_TOOL_FALSE
+HAVE_CONVERSION_TOOL_TRUE
+HAVE_CONVERSION_CONVERT_FALSE
+HAVE_CONVERSION_CONVERT_TRUE
+HAVE_CONVERSION_INKSCAPE_FALSE
+HAVE_CONVERSION_INKSCAPE_TRUE
+HAVE_CONVERSION_RSVG_FALSE
+HAVE_CONVERSION_RSVG_TRUE
+CONVERT
+INKSCAPE
+RSVG
+TOUCH
+HAVE_OS_WIN32_FALSE
+HAVE_OS_WIN32_TRUE
+version_info
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+ac_ct_AR
+AR
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+enable_static
+enable_shared
+with_pic
+enable_fast_install
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+with_extra_includes
+with_extra_libraries
+enable_debug
+enable_largefile
+with_jpeg
+with_tiff
+enable_xmltools
+enable_desktopfiles
+with_pkgconfigdir
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+PTHREAD_LIBS
+PTHREAD_CFLAGS
+JPEG_LIBS
+JPEG_CFLAGS
+TIFF_LIBS
+TIFF_CFLAGS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures djvulibre 3.5.27 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/djvulibre]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of djvulibre 3.5.27:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-static[=PKGS]  build static libraries [default=no]
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-debug          Compile with debugging options (default: no)
+  --disable-largefile     omit support for large files
+  --disable-xmltools      Disable djvu xml tools. [default=enabled]
+  --disable-desktopfiles  Do not install icons and mime types.
+                          [default=enabled]
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
+  --with-extra-includes=DIR
+                          Define an additional directory for include files
+  --with-extra-libraries=DIR
+                          Define an additional directory for library files
+  --with-jpeg=DIR         where the IJG jpeg library is located
+  --with-tiff=DIR         where libtiff is located
+  --with-pkgconfigdir     pkg-config installation directory
+                          ['${libdir}/pkgconfig']
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+  PTHREAD_LIBS
+              Flags for linking pthread programs.
+  PTHREAD_CFLAGS
+              Flags for compiling pthread programs.
+  JPEG_LIBS
+  JPEG_CFLAGS
+  TIFF_LIBS
+  TIFF_CFLAGS
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+djvulibre configure 3.5.27
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_cxx_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_header_mongrel
+
+# ac_fn_c_find_intX_t LINENO BITS VAR
+# -----------------------------------
+# Finds a signed integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_intX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
+$as_echo_n "checking for int$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in int$2_t 'int' 'long int' \
+	 'long long int' 'short int' 'signed char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+	     enum { N = $2 / 2 - 1 };
+int
+main ()
+{
+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+	        enum { N = $2 / 2 - 1 };
+int
+main ()
+{
+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  case $ac_type in #(
+  int$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+  break
+fi
+     done
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_intX_t
+
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  case $ac_type in #(
+  uint$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+  break
+fi
+     done
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_find_uintX_t
+
+# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
+# ---------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_cxx_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_type
+
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_cxx_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_header_compile
+
+# ac_fn_cxx_check_func LINENO FUNC VAR
+# ------------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_cxx_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_func
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by djvulibre $as_me 3.5.27, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/param.h"
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_aux_dir=
+for ac_dir in config "$srcdir"/config; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+
+ac_config_headers="$ac_config_headers config.h:config/config.h.in"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+am__api_version='1.14'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='djvulibre'
+ VERSION='3.5.27'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar lib "link -lib"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar lib "link -lib"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
+if ${am_cv_ar_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+   am_cv_ar_interface=ar
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+$as_echo "$am_cv_ar_interface" >&6; }
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+  ;;
+esac
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=no
+fi
+
+
+
+
+
+
+
+
+
+
+        enable_dlopen=no
+
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+	link_all_deplibs=no
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC="$lt_save_CC"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# Library version
+version_info="27:0:6"
+
+
+# Additional libraries
+
+# Check whether --with-extra-includes was given.
+if test "${with_extra_includes+set}" = set; then :
+  withval=$with_extra_includes;  if test -d "$withval" ; then
+            CPPFLAGS="$CPPFLAGS -I$withval"
+          else
+            as_fn_error $? "Cannot stat directory $withval" "$LINENO" 5
+          fi
+fi
+
+
+
+# Check whether --with-extra-libraries was given.
+if test "${with_extra_libraries+set}" = set; then :
+  withval=$with_extra_libraries;  if test -d "$withval" ; then
+           LDFLAGS="$LDFLAGS -L$withval"
+          else
+            as_fn_error $? "Cannot stat directory $withval" "$LINENO" 5
+          fi
+fi
+
+
+# Always look into a "gnu" directory.
+curwd=`pwd`
+if test -d $curwd/gnu/include ; then
+   CPPFLAGS="$CPPFLAGS -I$curwd/gnu/include"
+fi
+if test -d $curwd/gnu/lib ; then
+   LDFLAGS="$LDFLAGS -L$curwd/gnu/lib"
+fi
+
+# Special cases
+
+ac_fn_c_check_decl "$LINENO" "_WIN32" "ac_cv_have_decl__WIN32" "$ac_includes_default"
+if test "x$ac_cv_have_decl__WIN32" = xyes; then :
+  have_os_win32=yes
+else
+  have_os_win32=no
+fi
+
+ if test "x${have_os_win32}" = "xyes"; then
+  HAVE_OS_WIN32_TRUE=
+  HAVE_OS_WIN32_FALSE='#'
+else
+  HAVE_OS_WIN32_TRUE='#'
+  HAVE_OS_WIN32_FALSE=
+fi
+
+
+ac_fn_c_check_decl "$LINENO" "__APPLE__" "ac_cv_have_decl___APPLE__" "$ac_includes_default"
+if test "x$ac_cv_have_decl___APPLE__" = xyes; then :
+  have_os_apple=yes
+else
+  have_os_apple=no
+fi
+
+if test x$have_os_apple = xyes && test -d /opt/local ; then
+    CPPFLAGS="$CPPFLAGS -I/opt/local/include"
+    LDFLAGS="$LDFLAGS -L/opt/local/lib"
+elif test x$have_os_apple = xyes && test -d /sw ; then
+    CPPFLAGS="$CPPFLAGS -I/sw/include"
+    LDFLAGS="$LDFLAGS -L/sw/lib"
+fi
+
+
+
+# ----------------------------------------
+# Programs
+# ----------------------------------------
+
+# Does make set variable $(MAKE)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+# Programs
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+# Extract the first word of "touch", so it can be a program name with args.
+set dummy touch; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TOUCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $TOUCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+TOUCH=$ac_cv_path_TOUCH
+if test -n "$TOUCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOUCH" >&5
+$as_echo "$TOUCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "rsvg-convert", so it can be a program name with args.
+set dummy rsvg-convert; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_RSVG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $RSVG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RSVG="$RSVG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_RSVG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_RSVG" && ac_cv_path_RSVG="false"
+  ;;
+esac
+fi
+RSVG=$ac_cv_path_RSVG
+if test -n "$RSVG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RSVG" >&5
+$as_echo "$RSVG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "inkscape", so it can be a program name with args.
+set dummy inkscape; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INKSCAPE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INKSCAPE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INKSCAPE="$INKSCAPE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_INKSCAPE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_INKSCAPE" && ac_cv_path_INKSCAPE="false"
+  ;;
+esac
+fi
+INKSCAPE=$ac_cv_path_INKSCAPE
+if test -n "$INKSCAPE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INKSCAPE" >&5
+$as_echo "$INKSCAPE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "convert", so it can be a program name with args.
+set dummy convert; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CONVERT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CONVERT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CONVERT="$CONVERT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONVERT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_CONVERT" && ac_cv_path_CONVERT="false"
+  ;;
+esac
+fi
+CONVERT=$ac_cv_path_CONVERT
+if test -n "$CONVERT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONVERT" >&5
+$as_echo "$CONVERT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+conversion_tool=no
+if test "x${RSVG}" != xfalse ; then
+  conversion_tool=rsvg
+elif test "x${INKSCAPE}" != xfalse ; then
+  conversion_tool=inkscape
+elif test "x${CONVERT}" != xfalse ; then
+  ( ${CONVERT} --version 2>&1 | grep -q ImageMagick ) && conversion_tool=convert
+fi
+ if test x${conversion_tool} = xrsvg; then
+  HAVE_CONVERSION_RSVG_TRUE=
+  HAVE_CONVERSION_RSVG_FALSE='#'
+else
+  HAVE_CONVERSION_RSVG_TRUE='#'
+  HAVE_CONVERSION_RSVG_FALSE=
+fi
+
+ if test x${conversion_tool} = xinkscape; then
+  HAVE_CONVERSION_INKSCAPE_TRUE=
+  HAVE_CONVERSION_INKSCAPE_FALSE='#'
+else
+  HAVE_CONVERSION_INKSCAPE_TRUE='#'
+  HAVE_CONVERSION_INKSCAPE_FALSE=
+fi
+
+ if test x${conversion_tool} = xconvert; then
+  HAVE_CONVERSION_CONVERT_TRUE=
+  HAVE_CONVERSION_CONVERT_FALSE='#'
+else
+  HAVE_CONVERSION_CONVERT_TRUE='#'
+  HAVE_CONVERSION_CONVERT_FALSE=
+fi
+
+ if test x${conversion_tool} != xno; then
+  HAVE_CONVERSION_TOOL_TRUE=
+  HAVE_CONVERSION_TOOL_FALSE='#'
+else
+  HAVE_CONVERSION_TOOL_TRUE='#'
+  HAVE_CONVERSION_TOOL_FALSE=
+fi
+
+
+# tweak rm to make libtool happy
+# Extract the first word of "rm", so it can be a program name with args.
+set dummy rm; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_RM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $RM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RM="$RM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+RM=$ac_cv_path_RM
+if test -n "$RM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
+$as_echo "$RM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+RM="$RM -f"
+
+# Libtool & Compilers
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
+
+
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+
+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' ${wl}-bernotok'
+	    allow_undefined_flag_CXX=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
+	    archive_cmds_need_lc_CXX=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	ld_shlibs_CXX=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='${wl}-E'
+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='${wl}-z,text'
+	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+	      '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+	      '"$reload_cmds_CXX"
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs_CXX=no
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+   # Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug; ac_debug=$enableval
+else
+  ac_debug=no
+fi
+
+   defines=
+   if test x$ac_debug = xno ; then
+
+   saved_var=${CFLAGS}
+   CFLAGS=
+   for opt in ${saved_var} ; do
+     case "$opt" in
+      -O*) ;;
+      *) CFLAGS="${CFLAGS} $opt" ;;
+     esac
+   done
+
+
+   saved_var=${CXXFLAGS}
+   CXXFLAGS=
+   for opt in ${saved_var} ; do
+     case "$opt" in
+      -O*) ;;
+      *) CXXFLAGS="${CXXFLAGS} $opt" ;;
+     esac
+   done
+
+     if test x$GCC != xyes ; then
+
+   saved_var=${CFLAGS}
+   CFLAGS=
+   for opt in ${saved_var} ; do
+     case "$opt" in
+      -g*) ;;
+      *) CFLAGS="${CFLAGS} $opt" ;;
+     esac
+   done
+
+
+   saved_var=${CXXFLAGS}
+   CXXFLAGS=
+   for opt in ${saved_var} ; do
+     case "$opt" in
+      -g*) ;;
+      *) CXXFLAGS="${CXXFLAGS} $opt" ;;
+     esac
+   done
+
+     fi
+     defines="-DNDEBUG"
+
+ opt="-O3"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC} ${CFLAGS} $opt -c conftest.c 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CFLAGS="$CFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+
+ opt="-O2"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC} ${CFLAGS} $opt -c conftest.c 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CFLAGS="$CFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+ fi
+
+
+ opt="-O3"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CXXFLAGS="$CXXFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+
+ opt="-O2"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CXXFLAGS="$CXXFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+ fi
+
+     cpu=`uname -m 2>/dev/null`
+     test -z "$cpu" && cpu=${host_cpu}
+     case "${host_cpu}" in
+        i?86)
+           opt="-mtune=${host_cpu}"
+
+ opt="-mtune=${host_cpu}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CXXFLAGS="$CXXFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+
+ opt="-mcpu=${host_cpu}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CXXFLAGS="$CXXFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+ fi
+
+
+ opt="-mtune=${host_cpu}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC} ${CFLAGS} $opt -c conftest.c 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CFLAGS="$CFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+
+ opt="-mcpu=${host_cpu}"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC} ${CFLAGS} $opt -c conftest.c 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CFLAGS="$CFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+ fi
+
+           ;;
+      esac
+   else
+
+   saved_var=${CFLAGS}
+   CFLAGS=
+   for opt in ${saved_var} ; do
+     case "$opt" in
+      -O*|-g*) ;;
+      *) CFLAGS="${CFLAGS} $opt" ;;
+     esac
+   done
+
+
+   saved_var=${CXXFLAGS}
+   CXXFLAGS=
+   for opt in ${saved_var} ; do
+     case "$opt" in
+      -O*|-g*) ;;
+      *) CXXFLAGS="${CXXFLAGS} $opt" ;;
+     esac
+   done
+
+
+ opt="-g"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC} ${CFLAGS} $opt -c conftest.c 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CFLAGS="$CFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+
+ opt="-g"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CXXFLAGS="$CXXFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+
+ opt="-Wno-non-virtual-dtor"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CXXFLAGS="$CXXFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+   fi
+
+ opt="-Wall"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.c
+ if test -z "`${CC} ${CFLAGS} $opt -c conftest.c 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CFLAGS="$CFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+
+ opt="-Wall"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5
+$as_echo_n "checking if $CXX accepts $opt... " >&6; }
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX} ${CXXFLAGS} $opt -c conftest.cc 2>&1`"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    rm conftest.*
+    CXXFLAGS="$CXXFLAGS $opt"
+ else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    rm conftest.*
+    :
+ fi
+
+   case x"$ac_debug" in
+     x[0-9]) defines="-DDEBUGLVL=$ac_debug" ;;
+     xr*)    defines="-DRUNTIME_DEBUG_ONLY" ;;
+   esac
+   CFLAGS="$CFLAGS $defines"
+   CXXFLAGS="$CXXFLAGS $defines"
+
+
+# C++
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler recognizes bool as a built-in type" >&5
+$as_echo_n "checking whether the compiler recognizes bool as a built-in type... " >&6; }
+if ${ac_cv_cxx_bool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int f(int  x){return 1;}
+int f(char x){return 1;}
+int f(bool x){return 1;}
+
+int
+main ()
+{
+
+bool b = true;
+return f(b);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_bool=yes
+else
+  ac_cv_cxx_bool=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_bool" >&5
+$as_echo "$ac_cv_cxx_bool" >&6; }
+if test "$ac_cv_cxx_bool" = yes; then
+
+$as_echo "#define HAVE_BOOL 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports exceptions" >&5
+$as_echo_n "checking whether the compiler supports exceptions... " >&6; }
+if ${ac_cv_cxx_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+
+try { throw  1; } catch (int i) { return i; }
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_exceptions=yes
+else
+  ac_cv_cxx_exceptions=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_exceptions" >&5
+$as_echo "$ac_cv_cxx_exceptions" >&6; }
+if test "$ac_cv_cxx_exceptions" = yes; then
+
+$as_echo "#define HAVE_EXCEPTIONS 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler recognizes typename" >&5
+$as_echo_n "checking whether the compiler recognizes typename... " >&6; }
+if ${ac_cv_cxx_typename+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+template<typename T>class X {public:X(){}};
+
+int
+main ()
+{
+
+X<float> z;
+return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_typename=yes
+else
+  ac_cv_cxx_typename=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_typename" >&5
+$as_echo "$ac_cv_cxx_typename" >&6; }
+if test "$ac_cv_cxx_typename" = yes; then
+
+$as_echo "#define HAVE_TYPENAME 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler comes with standard includes" >&5
+$as_echo_n "checking whether the compiler comes with standard includes... " >&6; }
+if ${ac_cv_cxx_stdincludes+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <new>
+struct X { int a; X(int a):a(a){} };
+X* foo(void *x) { return new(x) X(2); }
+
+int
+main ()
+{
+
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_stdincludes=yes
+else
+  ac_cv_cxx_stdincludes=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_stdincludes" >&5
+$as_echo "$ac_cv_cxx_stdincludes" >&6; }
+if test "$ac_cv_cxx_stdincludes" = yes; then
+
+$as_echo "#define HAVE_STDINCLUDES 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler implements namespaces" >&5
+$as_echo_n "checking whether the compiler implements namespaces... " >&6; }
+if ${ac_cv_cxx_namespaces+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+   ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+namespace Outer { namespace Inner { int i = 0; }}
+
+int
+main ()
+{
+
+using namespace Outer::Inner;
+return i;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_namespaces=yes
+else
+  ac_cv_cxx_namespaces=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_namespaces" >&5
+$as_echo "$ac_cv_cxx_namespaces" >&6; }
+if test "$ac_cv_cxx_namespaces" = yes && test "$ac_debug" = no; then
+
+$as_echo "#define HAVE_NAMESPACES 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports member templates" >&5
+$as_echo_n "checking whether the compiler supports member templates... " >&6; }
+if ${ac_cv_cxx_member_templates+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+template<class T, int N> class A
+{ public:
+  template<int N2> A<T,N> operator=(const A<T,N2>& z) { return A<T,N>(); }
+};
+
+int
+main ()
+{
+
+A<double,4> x; A<double,7> y;
+x = y;
+return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_member_templates=yes
+else
+  ac_cv_cxx_member_templates=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_member_templates" >&5
+$as_echo "$ac_cv_cxx_member_templates" >&6; }
+if test "$ac_cv_cxx_member_templates" = yes; then
+
+$as_echo "#define HAVE_MEMBER_TEMPLATES 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports intel atomic builtins" >&5
+$as_echo_n "checking whether the compiler supports intel atomic builtins... " >&6; }
+if ${ac_cv_cxx_intel_atomic_builtins+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+static int volatile l;
+
+int
+main ()
+{
+
+__sync_lock_test_and_set(&l,1);
+__sync_lock_release(&l);
+__sync_add_and_fetch(&l,1);
+__sync_bool_compare_and_swap(&l,&l,1);
+__sync_synchronize();
+return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_cxx_intel_atomic_builtins=yes
+else
+  ac_cv_cxx_intel_atomic_builtins=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_intel_atomic_builtins" >&5
+$as_echo "$ac_cv_cxx_intel_atomic_builtins" >&6; }
+if test "$ac_cv_cxx_intel_atomic_builtins" = yes; then
+
+$as_echo "#define HAVE_INTEL_ATOMIC_BUILTINS 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports keyword __thread" >&5
+$as_echo_n "checking whether the compiler supports keyword __thread... " >&6; }
+if ${ac_cv_cxx_gcctls+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+__thread int i;
+
+int
+main ()
+{
+
+return i;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxx_gcctls=yes
+else
+  ac_cv_cxx_gcctls=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_gcctls" >&5
+$as_echo "$ac_cv_cxx_gcctls" >&6; }
+if test "$ac_cv_cxx_gcctls" = yes; then
+
+$as_echo "#define HAVE_GCCTLS 1" >>confdefs.h
+
+fi
+
+
+# ----------------------------------------
+# Libraries
+# ----------------------------------------
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
+$as_echo_n "checking for sqrt in -lm... " >&6; }
+if ${ac_cv_lib_m_sqrt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqrt ();
+int
+main ()
+{
+return sqrt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_m_sqrt=yes
+else
+  ac_cv_lib_m_sqrt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
+$as_echo "$ac_cv_lib_m_sqrt" >&6; }
+if test "x$ac_cv_lib_m_sqrt" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+
+
+# AC_CHECK_LIB(iconv,libiconv_open) # not really used.
+
+
+# ----------------------------------------
+# Header Files
+# ----------------------------------------
+
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+if eval \${$as_ac_Header+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <$ac_hdr>
+
+int
+main ()
+{
+if ((DIR *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval "$as_ac_Header=yes"
+else
+  eval "$as_ac_Header=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+_ACEOF
+
+ac_header_dirent=$ac_hdr; break
+fi
+
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dir; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opendir+:} false; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if ${ac_cv_search_opendir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opendir ();
+int
+main ()
+{
+return opendir ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' x; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opendir+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opendir+:} false; then :
+
+else
+  ac_cv_search_opendir=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_header_time=yes
+else
+  ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
+
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if ${ac_cv_header_sys_wait_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+
+int
+main ()
+{
+  int s;
+  wait (&s);
+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_header_sys_wait_h=yes
+else
+  ac_cv_header_sys_wait_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
+if test $ac_cv_header_sys_wait_h = yes; then
+
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+
+
+for ac_header in wchar.h wctype.h sys/mman.h iconv.h getopt.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in langinfo.h sched.h new.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in stdint.h inttypes.h sys/ipc.h sys/shm.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# ----------------------------------------
+# Types
+# ----------------------------------------
+
+ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t"
+case $ac_cv_c_int16_t in #(
+  no|yes) ;; #(
+  *)
+
+cat >>confdefs.h <<_ACEOF
+#define int16_t $ac_cv_c_int16_t
+_ACEOF
+;;
+esac
+
+ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
+case $ac_cv_c_int32_t in #(
+  no|yes) ;; #(
+  *)
+
+cat >>confdefs.h <<_ACEOF
+#define int32_t $ac_cv_c_int32_t
+_ACEOF
+;;
+esac
+
+ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
+case $ac_cv_c_uint16_t in #(
+  no|yes) ;; #(
+  *)
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint16_t $ac_cv_c_uint16_t
+_ACEOF
+;;
+  esac
+
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+  no|yes) ;; #(
+  *)
+
+$as_echo "#define _UINT32_T 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
+_ACEOF
+;;
+  esac
+
+ac_fn_cxx_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
+if test "x$ac_cv_type_wchar_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WCHAR_T 1
+_ACEOF
+
+
+fi
+
+ac_fn_cxx_check_type "$LINENO" "long long int" "ac_cv_type_long_long_int" "$ac_includes_default"
+if test "x$ac_cv_type_long_long_int" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LONG_LONG_INT 1
+_ACEOF
+
+
+fi
+
+ac_fn_cxx_check_type "$LINENO" "mbstate_t" "ac_cv_type_mbstate_t" "#include \"wchar.h\"
+"
+if test "x$ac_cv_type_mbstate_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_MBSTATE_T 1
+_ACEOF
+
+
+fi
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_cxx_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+
+
+fi
+
+
+# ----------------------------------------
+# Functions
+# ----------------------------------------
+
+
+
+
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+
+
+
+for ac_func in getpagesize
+do :
+  ac_fn_cxx_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_mmap_fixed_mapped=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
+#endif
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+int
+main ()
+{
+  char *data, *data2, *data3;
+  const char *cdata2;
+  int i, pagesize;
+  int fd, fd2;
+
+  pagesize = getpagesize ();
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 2;
+  if (write (fd, data, pagesize) != pagesize)
+    return 3;
+  close (fd);
+
+  /* Next, check that the tail of a page is zero-filled.  File must have
+     non-zero length, otherwise we risk SIGBUS for entire page.  */
+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+  if (fd2 < 0)
+    return 4;
+  cdata2 = "";
+  if (write (fd2, cdata2, 1) != 1)
+    return 5;
+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  if (data2 == MAP_FAILED)
+    return 6;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data2 + i))
+      return 7;
+  close (fd2);
+  if (munmap (data2, pagesize))
+    return 8;
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 9;
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 10;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 11;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 12;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 13;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 14;
+  close (fd);
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+  ac_cv_func_mmap_fixed_mapped=yes
+else
+  ac_cv_func_mmap_fixed_mapped=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
+
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+
+fi
+rm -f conftest.mmap conftest.txt
+
+ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+for ac_header in vfork.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VFORK_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_func in fork vfork
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+if test "x$ac_cv_func_fork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if ${ac_cv_func_fork_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_fork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	  /* By Ruediger Kuhlmann. */
+	  return fork () < 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+  ac_cv_func_fork_works=yes
+else
+  ac_cv_func_fork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
+
+else
+  ac_cv_func_fork_works=$ac_cv_func_fork
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+  case $host in
+    *-*-amigaos* | *-*-msdosdjgpp*)
+      # Override, as these systems have only a dummy fork() stub
+      ac_cv_func_fork_works=no
+      ;;
+    *)
+      ac_cv_func_fork_works=yes
+      ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+fi
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if ${ac_cv_func_vfork_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_vfork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Thanks to Paul Eggert for this test.  */
+$ac_includes_default
+#include <sys/wait.h>
+#ifdef HAVE_VFORK_H
+# include <vfork.h>
+#endif
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.  The compiler
+   is told about this with #include <vfork.h>, but some compilers
+   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
+   static variable whose address is put into a register that is
+   clobbered by the vfork.  */
+static void
+#ifdef __cplusplus
+sparc_address_test (int arg)
+# else
+sparc_address_test (arg) int arg;
+#endif
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
+
+int
+main ()
+{
+  pid_t parent = getpid ();
+  pid_t child;
+
+  sparc_address_test (0);
+
+  child = vfork ();
+
+  if (child == 0) {
+    /* Here is another test for sparc vfork register problems.  This
+       test uses lots of local variables, at least as many local
+       variables as main has allocated so far including compiler
+       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
+       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
+       reuse the register of parent for one of the local variables,
+       since it will think that parent can't possibly be used any more
+       in this routine.  Assigning to the local variable will thus
+       munge parent in the parent process.  */
+    pid_t
+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+    /* Convince the compiler that p..p7 are live; otherwise, it might
+       use the same hardware register for all 8 local variables.  */
+    if (p != p1 || p != p2 || p != p3 || p != p4
+	|| p != p5 || p != p6 || p != p7)
+      _exit(1);
+
+    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
+       from child file descriptors.  If the child closes a descriptor
+       before it execs or exits, this munges the parent's descriptor
+       as well.  Test for this by closing stdout in the child.  */
+    _exit(close(fileno(stdout)) != 0);
+  } else {
+    int status;
+    struct stat st;
+
+    while (wait(&status) != child)
+      ;
+    return (
+	 /* Was there some problem with vforking?  */
+	 child < 0
+
+	 /* Did the child fail?  (This shouldn't happen.)  */
+	 || status
+
+	 /* Did the vfork/compiler bug occur?  */
+	 || parent != getpid()
+
+	 /* Did the file descriptor bug occur?  */
+	 || fstat(fileno(stdout), &st) != 0
+	 );
+  }
+}
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+  ac_cv_func_vfork_works=yes
+else
+  ac_cv_func_vfork_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
+
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+  ac_cv_func_vfork_works=$ac_cv_func_vfork
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+fi
+
+if test "x$ac_cv_func_vfork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+
+else
+
+$as_echo "#define vfork fork" >>confdefs.h
+
+fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_source+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  ac_cv_sys_largefile_source=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+;;
+esac
+rm -rf conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
+
+$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
+
+fi
+
+for ac_func in wcrtomb iswspace setenv nl_langinfo
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in putc_unlocked strerror vsnprintf
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in gethostname strftime getpwuid
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+for ac_func in sigaction mkstemp sched_yield
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+# iconv function might be defined as libiconv in iconv.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+ac_has_iconv=no
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "iconv.h"
+int
+main ()
+{
+iconv((iconv_t)0, (char**)0, (size_t*)0, (char**)0, (size_t*)0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_has_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_has_iconv" >&5
+$as_echo "$ac_has_iconv" >&6; }
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+if test x$ac_has_iconv = xyes ; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+fi
+
+
+# ----------------------------------------
+# Test auxilliary packages
+# ----------------------------------------
+
+# Search for PTHREADS (when not on windows)
+have_pthread=no
+if test -z "$HAVE_OS_WIN32_TRUE"; then :
+  else
+
+
+acx_pthread_ok=no
+# First, check if the POSIX threads header, pthread.h, is available.
+# If it isn't, don't bother looking for the threads libraries.
+ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+
+else
+  acx_pthread_ok=noheader
+fi
+
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works.
+if test x${PTHREAD_LIBS+set} = xset ||
+   test x${PTHREAD_CFLAGS+set} = xset ; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_CXXFLAGS="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking provided PTHREAD_LIBS/PTHREAD_CFLAGS." >&5
+$as_echo_n "checking provided PTHREAD_LIBS/PTHREAD_CFLAGS.... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_join ();
+int
+main ()
+{
+return pthread_join ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  acx_pthread_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
+        if test x"$acx_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+        CXXFLAGS="$save_CXXFLAGS"
+fi
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all. Also, combinations
+# of items (for instance, both a compiler flag and a library name) can be
+# specified using a colon separator.
+acx_pthread_flags="pthreads none -Kthread -kthread lthread
+                   -pthread -pthreads -mt -mthreads pthread
+                   --thread-safe"
+# The ordering *is* (sometimes) important.
+# Some notes on the individual items follow:
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mt: HP aCC (check before -mthreads)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+case "${host_cpu}-${host_os}" in
+        *solaris*)
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthread or
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+        acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+        ;;
+esac
+case "${host_os}-${GCC}" in
+        *linux*-yes | *kfreebsd*-yes )
+        # On Linux/GCC, libtool uses -nostdlib for linking, which cancel part
+        # of the -pthread flag effect (libpthread is not automatically linked).
+        # So we'll try to link with both -pthread and -lpthread first:
+        acx_pthread_flags="-pthread:pthread $acx_pthread_flags"
+        ;;
+esac
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+        case $flag in
+                none)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+$as_echo_n "checking whether pthreads work without any flags... " >&6; }
+                ;;
+                *:*)
+                PTHREAD_CFLAGS=""
+                PTHREAD_LIBS=""
+                message="whether pthreads work with"
+                while test x"$flag" != x; do
+                        subflag=`echo $flag | cut -d: -f1`
+                        case $subflag in
+                                -*)
+                                PTHREAD_CFLAGS="$PTHREAD_CFLAGS $subflag"
+                                message="$message $subflag"
+                                ;;
+                                *)
+                                PTHREAD_LIBS="$PTHREAD_LIBS -l$subflag"
+                                message="$message -l$subflag"
+                                ;;
+                        esac
+                        flag=`echo $flag | cut -s -d: -f2-`
+                done
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking $message" >&5
+$as_echo_n "checking $message... " >&6; }
+                ;;
+                -*)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5
+$as_echo_n "checking whether pthreads work with $flag... " >&6; }
+                PTHREAD_CFLAGS="$flag"
+                ;;
+                *)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5
+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        save_CXXFLAGS="$CXXFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <pthread.h>
+
+int
+main ()
+{
+
+pthread_t th; pthread_join(th, 0);
+pthread_attr_init(0); pthread_cleanup_push(0, 0);
+pthread_create(0,0,0,0); pthread_cleanup_pop(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  acx_pthread_ok=yes
+else
+  acx_pthread_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+        CXXFLAGS="$save_CXXFLAGS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
+$as_echo "$acx_pthread_ok" >&6; }
+        if test "x$acx_pthread_ok" = xyes; then
+                break;
+        fi
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_CXXFLAGS="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
+        flag=no
+        case "${host_cpu}-${host_os}" in
+                *-aix* | *-freebsd*)     flag="-D_THREAD_SAFE";;
+                *solaris* | alpha*-osf*) flag="-D_REENTRANT";;
+        esac
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
+$as_echo "${flag}" >&6; }
+        if test "x$flag" != xno; then
+                PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+        CXXFLAGS="$save_CXXFLAGS"
+fi
+
+
+# execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+
+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
+        have_pthread=yes
+else
+        :
+fi
+
+fi
+
+# Search JPEG library
+
+
+
+  ac_jpeg=no
+
+# Check whether --with-jpeg was given.
+if test "${with_jpeg+set}" = set; then :
+  withval=$with_jpeg; ac_jpeg=$withval
+else
+  ac_jpeg=yes
+fi
+
+  # Process specification
+  if test x$ac_jpeg = xyes ; then
+     test x${JPEG_LIBS+set} != xset && JPEG_LIBS="-ljpeg"
+  elif test x$ac_jpeg != xno ; then
+     test x${JPEG_LIBS+set} != xset && JPEG_LIBS="-L$ac_jpeg/lib -ljpeg"
+     test x${JPEG_CFLAGS+set} != xset && JPEG_CFLAGS="-I$ac_jpeg/include"
+  fi
+  # Try linking
+  if test x$ac_jpeg != xno ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg library" >&5
+$as_echo_n "checking for jpeg library... " >&6; }
+     save_CFLAGS="$CFLAGS"
+     save_CXXFLAGS="$CXXFLAGS"
+     save_LIBS="$LIBS"
+     CFLAGS="$CFLAGS $JPEG_CFLAGS"
+     CXXFLAGS="$CXXFLAGS $JPEG_CFLAGS"
+     LIBS="$LIBS $JPEG_LIBS"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <stdio.h>
+#include <jpeglib.h>
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+
+jpeg_CreateDecompress(0,0,0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_jpeg=yes
+else
+  ac_jpeg=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     CFLAGS="$save_CFLAGS"
+     CXXFLAGS="$save_CXXFLAGS"
+     LIBS="$save_LIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_jpeg" >&5
+$as_echo "$ac_jpeg" >&6; }
+   fi
+   # Finish
+   if test x$ac_jpeg = xno; then
+      JPEG_CFLAGS= ; JPEG_LIBS=
+      have_jpeg="no"
+   else
+
+$as_echo "#define HAVE_JPEG 1" >>confdefs.h
+
+                  have_jpeg="yes"
+   fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_jpeg}" >&5
+$as_echo "${have_jpeg}" >&6; }
+
+# Search TIFF library
+
+
+
+  ac_tiff=no
+
+# Check whether --with-tiff was given.
+if test "${with_tiff+set}" = set; then :
+  withval=$with_tiff; ac_tiff=$withval
+else
+  ac_tiff=yes
+fi
+
+  # Process specification
+  if test x$ac_tiff = xyes ; then
+     test x${TIFF_LIBS+set} != xset && TIFF_LIBS="-ltiff"
+  elif test x$ac_tiff != xno ; then
+     test x${TIFF_LIBS+set} != xset && TIFF_LIBS="-L$ac_tiff/lib -ltiff"
+     test x${TIFF_CFLAGS+set} != xset && TIFF_CFLAGS="-I$ac_tiff/include"
+  fi
+  # Try linking
+  if test x$ac_tiff != xno ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the libtiff library" >&5
+$as_echo_n "checking for the libtiff library... " >&6; }
+     save_CFLAGS="$CFLAGS"
+     save_CXXFLAGS="$CXXFLAGS"
+     save_LIBS="$LIBS"
+     CFLAGS="$CFLAGS $TIFF_CFLAGS"
+     CXXFLAGS="$CXXFLAGS $TIFF_CFLAGS"
+     LIBS="$LIBS $TIFF_LIBS"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <stdio.h>
+#include <tiffio.h>
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+
+TIFFOpen(0,0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_tiff=yes
+else
+  ac_tiff=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     CFLAGS="$save_CFLAGS"
+     CXXFLAGS="$save_CXXFLAGS"
+     LIBS="$save_LIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_tiff" >&5
+$as_echo "$ac_tiff" >&6; }
+   fi
+   # Finish
+   if test x$ac_tiff = xno; then
+      TIFF_CFLAGS= ; TIFF_LIBS=
+      have_tiff="no"
+   else
+
+$as_echo "#define HAVE_TIFF 1" >>confdefs.h
+
+                  have_tiff="yes"
+   fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtiff" >&5
+$as_echo_n "checking for libtiff... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_tiff}" >&5
+$as_echo "${have_tiff}" >&6; }
+
+
+# ----------------------------------------
+# What to compile
+# ----------------------------------------
+
+# Check compilation of xmltools
+want_xmltools="yes"
+# Check whether --enable-xmltools was given.
+if test "${enable_xmltools+set}" = set; then :
+  enableval=$enable_xmltools; want_xmltools=${enableval}
+fi
+
+
+ if test "x${want_xmltools}" = "xyes"; then
+  WANT_XMLTOOLS_TRUE=
+  WANT_XMLTOOLS_FALSE='#'
+else
+  WANT_XMLTOOLS_TRUE='#'
+  WANT_XMLTOOLS_FALSE=
+fi
+
+
+# ----------------------------------------
+# Desktop files
+# ----------------------------------------
+
+ac_desktopfiles="yes"
+# Check whether --enable-desktopfiles was given.
+if test "${enable_desktopfiles+set}" = set; then :
+  enableval=$enable_desktopfiles; ac_desktopfiles=$enableval
+fi
+
+
+ if test "x${ac_desktopfiles}" = "xyes"; then
+  WANT_DESKTOPFILES_TRUE=
+  WANT_DESKTOPFILES_FALSE='#'
+else
+  WANT_DESKTOPFILES_TRUE='#'
+  WANT_DESKTOPFILES_FALSE=
+fi
+
+
+# ----------------------------------------
+# End
+# ----------------------------------------
+
+# Define installation path for .pc files
+
+
+
+# Check whether --with-pkgconfigdir was given.
+if test "${with_pkgconfigdir+set}" = set; then :
+  withval=$with_pkgconfigdir;
+else
+  with_pkgconfigdir='${libdir}/pkgconfig'
+fi
+
+pkgconfigdir=$with_pkgconfigdir
+
+
+
+
+
+# Define installation paths and version string
+
+cat >>confdefs.h <<_ACEOF
+#define DJVULIBRE_VERSION "${PACKAGE_VERSION}"
+_ACEOF
+
+
+# Output files
+ac_config_files="$ac_config_files Makefile libdjvu/Makefile tools/Makefile xmltools/Makefile share/Makefile desktopfiles/Makefile"
+
+
+# Go
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_OS_WIN32_TRUE}" && test -z "${HAVE_OS_WIN32_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_OS_WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_CONVERSION_RSVG_TRUE}" && test -z "${HAVE_CONVERSION_RSVG_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CONVERSION_RSVG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_CONVERSION_INKSCAPE_TRUE}" && test -z "${HAVE_CONVERSION_INKSCAPE_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CONVERSION_INKSCAPE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_CONVERSION_CONVERT_TRUE}" && test -z "${HAVE_CONVERSION_CONVERT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CONVERSION_CONVERT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_CONVERSION_TOOL_TRUE}" && test -z "${HAVE_CONVERSION_TOOL_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CONVERSION_TOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WANT_XMLTOOLS_TRUE}" && test -z "${WANT_XMLTOOLS_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_XMLTOOLS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WANT_DESKTOPFILES_TRUE}" && test -z "${WANT_DESKTOPFILES_FALSE}"; then
+  as_fn_error $? "conditional \"WANT_DESKTOPFILES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by djvulibre $as_me 3.5.27, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+djvulibre config.status 3.5.27
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+nm_file_list_spec \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config/config.h.in" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "libdjvu/Makefile") CONFIG_FILES="$CONFIG_FILES libdjvu/Makefile" ;;
+    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+    "xmltools/Makefile") CONFIG_FILES="$CONFIG_FILES xmltools/Makefile" ;;
+    "share/Makefile") CONFIG_FILES="$CONFIG_FILES share/Makefile" ;;
+    "desktopfiles/Makefile") CONFIG_FILES="$CONFIG_FILES desktopfiles/Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named 'Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+# Final message
+
+echo
+echo "$PACKAGE $VERSION"
+echo
+echo "Configuration Options Summary:"
+echo
+echo "  OS.................: ${host_os}"
+echo "  Win32 support......: ${have_os_win32}"
+echo "  Pthread support....: ${have_pthread}"
+echo "  Iconv support......: ${ac_has_iconv}"
+echo "  JPEG support.......: ${have_jpeg}"
+echo "  TIFF support.......: ${have_tiff}"
+echo "  XML tools..........: ${want_xmltools}"
+echo "  Desktop files......: ${ac_desktopfiles}"
+echo "  Icon generation....: ${conversion_tool}"
+echo
+echo "Compilation..........: make (or gmake)"
+echo "  CPPFLAGS...........: $CPPFLAGS"
+echo "  CFLAGS.............: $CFLAGS"
+echo "  CXXFLAGS...........: $CXXFLAGS"
+echo "  LDFLAGS............: $LDFLAGS"
+echo
+echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
+echo "  prefix...............: $prefix"
+echo
+
+# ----------------------------------------
+# Stuff added to config.h
+# ----------------------------------------
+
+# Fence
+
+
+# L18N Macros
+
diff --git a/configure.ac b/configure.ac
new file mode 100755
index 0000000..b5411b8
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,371 @@
+# -*-Shell-script-*-
+#
+# DjVuLibre-3.5
+# Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+# Copyright (c) 2001  AT&T
+#
+# This software is subject to, and may be distributed under, the
+# GNU General Public License, either Version 2 of the license,
+# or (at your option) any later version. The license should have
+# accompanied the software or you may obtain a copy of the license
+# from the Free Software Foundation at http://www.fsf.org .
+#
+# 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.
+# 
+# DjVuLibre-3.5 is derived from the DjVu(r) Reference Library
+# distribued by Lizardtech Software.
+#
+# ----------------------------------------
+# Initialization
+# ----------------------------------------
+
+m4_define([v_maj], [3])
+m4_define([v_min], [5])
+m4_define([v_mic], [27])
+m4_define([v_ver], [v_maj.v_min.v_mic])
+
+m4_define([lt_compat], [21])
+m4_define([lt_cur], [v_mic])
+m4_define([lt_rev], [0])
+m4_define([lt_age], [m4_eval(v_mic - lt_compat)])
+
+AC_PREREQ([2.65])
+AC_INIT([djvulibre],[v_ver])
+
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR(config)
+AC_CONFIG_SRCDIR(libdjvu/ddjvuapi.cpp)
+AC_CONFIG_HEADER(config.h:config/config.h.in)
+AC_CANONICAL_HOST
+
+AM_INIT_AUTOMAKE([1.6 subdir-objects dist-bzip2 dist-xz])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
+LT_INIT([win32-dll disable-static])
+
+# Library version
+version_info="lt_cur:lt_rev:lt_age"
+AC_SUBST([version_info])
+
+# Additional libraries
+AC_ARG_WITH(extra-includes,
+            AS_HELP_STRING([--with-extra-includes=DIR],[Define an additional directory for include files]),
+        [ if test -d "$withval" ; then
+            CPPFLAGS="$CPPFLAGS -I$withval" 
+          else
+            AC_MSG_ERROR([Cannot stat directory $withval])
+          fi ] )
+
+AC_ARG_WITH(extra-libraries,
+            AS_HELP_STRING([--with-extra-libraries=DIR],[Define an additional directory for library files]),
+        [ if test -d "$withval" ; then
+           LDFLAGS="$LDFLAGS -L$withval"
+          else
+            AC_MSG_ERROR([Cannot stat directory $withval])
+          fi ] )
+
+# Always look into a "gnu" directory.
+curwd=`pwd`
+if test -d $curwd/gnu/include ; then
+   CPPFLAGS="$CPPFLAGS -I$curwd/gnu/include"
+fi
+if test -d $curwd/gnu/lib ; then
+   LDFLAGS="$LDFLAGS -L$curwd/gnu/lib"
+fi
+
+# Special cases
+
+AC_CHECK_DECL([_WIN32],[have_os_win32=yes],[have_os_win32=no])
+AM_CONDITIONAL([HAVE_OS_WIN32], [test "x${have_os_win32}" = "xyes"])
+
+AC_CHECK_DECL([__APPLE__],[have_os_apple=yes],[have_os_apple=no])
+if test x$have_os_apple = xyes && test -d /opt/local ; then
+    CPPFLAGS="$CPPFLAGS -I/opt/local/include"
+    LDFLAGS="$LDFLAGS -L/opt/local/lib"
+elif test x$have_os_apple = xyes && test -d /sw ; then
+    CPPFLAGS="$CPPFLAGS -I/sw/include"
+    LDFLAGS="$LDFLAGS -L/sw/lib"
+fi
+
+
+
+# ----------------------------------------
+# Programs
+# ----------------------------------------
+
+# Does make set variable $(MAKE)
+AC_PROG_MAKE_SET
+
+# Programs
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
+AC_PROG_SED
+AC_PATH_PROG([TOUCH], [touch])
+AC_PATH_PROG([RSVG], [rsvg-convert], [false])
+AC_PATH_PROG([INKSCAPE], [inkscape], [false])
+AC_PATH_PROG([CONVERT], [convert], [false])
+conversion_tool=no
+if test "x${RSVG}" != xfalse ; then
+  conversion_tool=rsvg
+elif test "x${INKSCAPE}" != xfalse ; then
+  conversion_tool=inkscape
+elif test "x${CONVERT}" != xfalse ; then
+  ( ${CONVERT} --version 2>&1 | grep -q ImageMagick ) && conversion_tool=convert
+fi
+AM_CONDITIONAL([HAVE_CONVERSION_RSVG], [test x${conversion_tool} = xrsvg])
+AM_CONDITIONAL([HAVE_CONVERSION_INKSCAPE], [test x${conversion_tool} = xinkscape])
+AM_CONDITIONAL([HAVE_CONVERSION_CONVERT], [test x${conversion_tool} = xconvert])
+AM_CONDITIONAL([HAVE_CONVERSION_TOOL], [test x${conversion_tool} != xno])
+
+# tweak rm to make libtool happy
+AC_PATH_PROG(RM, rm) 
+RM="$RM -f"
+
+# Libtool & Compilers
+AC_PROG_CC
+AC_PROG_CXX
+AC_OPTIMIZE
+
+# C++
+AC_LANG(C++)
+AC_CXX_BOOL
+AC_CXX_EXCEPTIONS
+AC_CXX_TYPENAME
+AC_CXX_STDINCLUDES
+AC_CXX_NAMESPACES
+AC_CXX_MEMBER_TEMPLATES
+AC_CXX_INTEL_ATOMIC_BUILTINS
+AC_CXX_GCCTLS
+
+# ----------------------------------------
+# Libraries
+# ----------------------------------------
+
+AC_CHECK_LIB(m,sqrt)
+
+# AC_CHECK_LIB(iconv,libiconv_open) # not really used.
+
+
+# ----------------------------------------
+# Header Files
+# ----------------------------------------
+
+AC_HEADER_DIRENT
+AC_HEADER_TIME
+AC_HEADER_SYS_WAIT     
+AC_CHECK_HEADERS(wchar.h wctype.h sys/mman.h iconv.h getopt.h)
+AC_CHECK_HEADERS(langinfo.h sched.h new.h)
+AC_CHECK_HEADERS(stdint.h inttypes.h sys/ipc.h sys/shm.h)
+
+# ----------------------------------------
+# Types
+# ----------------------------------------
+
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_CHECK_TYPES(wchar_t)
+AC_CHECK_TYPES(long long int)
+AC_CHECK_TYPES(mbstate_t,,,[#include "wchar.h"])
+AC_SYS_LARGEFILE
+
+# ----------------------------------------
+# Functions
+# ----------------------------------------
+
+AC_FUNC_MMAP
+AC_FUNC_FORK
+AC_FUNC_FSEEKO
+AC_CHECK_FUNCS(wcrtomb iswspace setenv nl_langinfo)
+AC_CHECK_FUNCS(putc_unlocked strerror vsnprintf)
+AC_CHECK_FUNCS(gethostname strftime getpwuid)
+AC_CHECK_FUNCS(sigaction mkstemp sched_yield)
+
+# iconv function might be defined as libiconv in iconv.h
+AC_MSG_CHECKING([for iconv])
+ac_has_iconv=no
+AC_LANG_PUSH(C)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "iconv.h"]], 
+  [[iconv((iconv_t)0, (char**)0, (size_t*)0, (char**)0, (size_t*)0);]])],
+  [ac_has_iconv=yes],[])
+AC_MSG_RESULT($ac_has_iconv)
+AC_LANG_POP(C)
+if test x$ac_has_iconv = xyes ; then
+    AC_DEFINE(HAVE_ICONV,1,
+        [Define to 1 if you have the iconv function.])
+fi
+
+
+# ----------------------------------------
+# Test auxilliary packages
+# ----------------------------------------
+
+# Search for PTHREADS (when not on windows)
+have_pthread=no
+AM_COND_IF([HAVE_OS_WIN32],,[AC_PATH_PTHREAD([have_pthread=yes])])
+
+# Search JPEG library
+AC_PATH_JPEG([have_jpeg="yes"], [have_jpeg="no"])
+AC_MSG_CHECKING([for libjpeg])
+AC_MSG_RESULT([${have_jpeg}])
+
+# Search TIFF library
+AC_PATH_TIFF([have_tiff="yes"], [have_tiff="no"])
+AC_MSG_CHECKING([for libtiff])
+AC_MSG_RESULT([${have_tiff}])
+
+
+# ----------------------------------------
+# What to compile
+# ----------------------------------------
+
+# Check compilation of xmltools
+want_xmltools="yes"
+AC_ARG_ENABLE([xmltools],
+   [AS_HELP_STRING([--disable-xmltools],
+           [Disable djvu xml tools. @<:@default=enabled@:>@])],
+   [want_xmltools=${enableval}])
+
+AM_CONDITIONAL([WANT_XMLTOOLS], [test "x${want_xmltools}" = "xyes"])
+
+# ----------------------------------------
+# Desktop files
+# ----------------------------------------
+
+ac_desktopfiles="yes"
+AC_ARG_ENABLE(desktopfiles,
+    AS_HELP_STRING([--disable-desktopfiles], 
+        [Do not install icons and mime types. @<:@default=enabled@:>@]),
+    [ac_desktopfiles=$enableval])
+
+AM_CONDITIONAL([WANT_DESKTOPFILES], [test "x${ac_desktopfiles}" = "xyes"])
+
+# ----------------------------------------
+# End
+# ----------------------------------------
+
+# Define installation path for .pc files
+PKG_INSTALLDIR
+
+# Define installation paths and version string
+AC_DEFINE_UNQUOTED(DJVULIBRE_VERSION,["${PACKAGE_VERSION}"],[version string])
+
+# Output files
+AC_CONFIG_FILES([
+Makefile
+libdjvu/Makefile
+tools/Makefile
+xmltools/Makefile
+share/Makefile
+desktopfiles/Makefile
+])
+
+# Go
+AC_OUTPUT
+
+# Final message
+
+echo
+echo "$PACKAGE $VERSION"
+echo
+echo "Configuration Options Summary:"
+echo
+echo "  OS.................: ${host_os}"
+echo "  Win32 support......: ${have_os_win32}"
+echo "  Pthread support....: ${have_pthread}"
+echo "  Iconv support......: ${ac_has_iconv}"
+echo "  JPEG support.......: ${have_jpeg}"
+echo "  TIFF support.......: ${have_tiff}"
+echo "  XML tools..........: ${want_xmltools}"
+echo "  Desktop files......: ${ac_desktopfiles}"
+echo "  Icon generation....: ${conversion_tool}"
+echo
+echo "Compilation..........: make (or gmake)"
+echo "  CPPFLAGS...........: $CPPFLAGS"
+echo "  CFLAGS.............: $CFLAGS"
+echo "  CXXFLAGS...........: $CXXFLAGS"
+echo "  LDFLAGS............: $LDFLAGS"
+echo
+echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
+echo "  prefix...............: $prefix"
+echo
+
+# ----------------------------------------
+# Stuff added to config.h
+# ----------------------------------------
+
+# Fence
+AH_TOP([
+#ifndef CONFIG_H
+#define CONFIG_H
+/* config.h: begin */
+])
+
+# L18N Macros
+AH_BOTTOM([
+
+/* - Miscellaneous */
+#define AUTOCONF 1
+#if defined(__CYGWIN32__) || !defined(_WIN32)
+# define UNIX 1
+#endif
+
+/* - BOOL */
+#if !defined(HAVE_BOOL) && !defined(bool)
+#define bool  char
+#define true  1
+#define false 0
+#endif
+
+/* - WCHAR etc.*/
+#if ! defined(HAVE_WCHAR_T)
+#define HAS_WCHAR 0
+#define HAS_WCTYPE 0
+#define HAS_MBSTATE 0
+#else
+#define HAS_WCHAR 1
+#if defined(HAVE_WCTYPE_H) && defined(HAVE_ISWSPACE)
+#define HAS_WCTYPE 1
+#endif
+#if defined(HAVE_MBSTATE_T) && defined(HAVE_WCRTOMB)
+#define HAS_MBSTATE 1
+#endif
+#endif
+#if defined(HAVE_ICONV_H) && defined(HAVE_ICONV)
+#define HAS_ICONV 1
+#else
+#define HAS_ICONV 0
+#endif
+
+/* - I18N MESSAGES HELL */
+#define HAS_CTRL_C_IN_ERR_MSG 1
+
+/* - CONTAINERS */
+#ifndef HAVE_MEMBER_TEMPLATES
+#define GCONTAINER_NO_MEMBER_TEMPLATES 1
+#endif
+#ifndef HAVE_TYPENAME
+#define GCONTAINER_NO_TYPENAME 1
+#endif
+
+/* - JPEG */
+#ifdef HAVE_JPEG
+#define NEED_JPEG_DECODER 1
+#endif
+
+/* - MMAP */
+#if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H)
+#define HAS_MEMMAP 1
+#else
+#define HAS_MEMMAP 0
+#endif
+
+/* config.h: end */
+#endif
+])
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..b8e46c2
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,16 @@
+/*.debhelper
+/*.log
+/*.substvars
+/autoreconf.after
+/autoreconf.before
+/djview/
+/djview3/
+/djvulibre-bin/
+/djvulibre-dbg/
+/djvulibre-desktop/
+/djvuserve/
+/files
+/libdjvulibre-dev/
+/libdjvulibre-text/
+/libdjvulibre21/
+/tmp/
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..153840d
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,18 @@
+djvulibre for Debian
+--------------------
+
+Packaged with the cooperation of the upstream authors Yann LeCun and
+Leon Bottou.
+
+ WARNING: OTHERS MAY BE ABLE TO ACCESS FILES PROCESSED BY ANY2DJVU.
+ The any2djvu program uploads files to a server for conversion,
+ compression, and OCR.  Others (aside from the uploader) can
+ theoretically access the compressed files.  This has been known to
+ happen.
+
+If someone else wants to take over this package I'm willing (eager) to
+give it up.  Just ask.  (In fact, that goes for all my packages!)  If
+someone does take it over, I'm happy to serve as an interface to the
+upstream authors as I am in contact with them professionally anyway.
+
+ -- Barak A. Pearlmutter <bap@debian.org>, Sat, 12 Feb 2011 13:23:34 +0000
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..02a623d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,862 @@
+djvulibre (3.5.27-0pre1) UNRELEASED; urgency=medium
+
+  * Prepare rev 3.5.27
+
+ -- Leon Bottou <leonb@users.sourceforge.net>  Sun, 08 Feb 2015 14:20:46 -0500
+
+djvulibre (3.5.26-1) experimental; urgency=medium
+
+  * upstream reworked build system, uses automake and pkg-config
+  * move debian vs upstream library version check into dh_testdir
+  * add --list-missing option to dh_install
+  * update upstream git URL
+  * new upstream release
+  * merge upstream patches
+    - afdbb99 acquire global lock while destroying gctls_t
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 06 Jan 2015 05:57:36 -0500
+
+djvulibre (3.5.25.4-4) unstable; urgency=medium
+
+  * merge upstream patches
+   - f794f2d meta-data --> metadata.
+   - 6262fcc Update config/libtool.m4 to support ppc64le.
+   - 9e32594 Regenerate autotools files with new config/libtool.m4
+   - 4e62915 Fix to djvutoxml by "Imperatore" (bug 227)
+   - 93a13dd csepdjvu handles utf16 outlines
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 20 Mar 2014 14:23:32 +0000
+
+djvulibre (3.5.25.4-3) unstable; urgency=low
+
+  * remove build alts libtiff{5,4,3}-dev (closes: #735997)
+  * bump standards version
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 21 Jan 2014 15:27:16 +0000
+
+djvulibre (3.5.25.4-2) unstable; urgency=low
+
+  * merge upstream patches, including autotools refresh (closes: #722525)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 12 Sep 2013 09:40:49 +0100
+
+djvulibre (3.5.25.4-1) unstable; urgency=low
+
+  * new upstream release
+  * merge upstream changes for crash report, see
+    http://lists.debian.org/debian-devel/2013/06/msg00720.html
+    http://www.forallsecure.com/bug-reports/df37d30856756929f929ec8e508af1a574109c0d/
+  * flush dh-exec overkill
+  * enable full multiarch support
+  * bump standard version
+  * canonicalize development repo urls
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 27 Jun 2013 16:23:00 +0100
+
+djvulibre (3.5.25.3-3) unstable; urgency=low
+
+  * multiarch fix via dh-exec lossage
+  * merge upstream fixes
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 12 Nov 2012 11:06:39 +0000
+
+djvulibre (3.5.25.3-2) unstable; urgency=low
+
+  * remove more X11-related build dependencies
+  * prefer libtiff5-dev (closes: #681914)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 17 Jul 2012 23:23:27 +0200
+
+djvulibre (3.5.25.3-1) unstable; urgency=low
+
+  * new upstream release
+  * remove X11-related build dependencies
+  * keep debugging symbols
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 17 Jun 2012 20:37:22 +0100
+
+djvulibre (3.5.25.2-4) unstable; urgency=low
+
+  * generalize pre-dependency
+  * remove unused override from debian/rules (closes: #664292)
+  * lower djvudigital default resolution from 600 to 300 dpi (closes: #507539)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 08 Apr 2012 23:45:27 +0100
+
+djvulibre (3.5.25.2-3) unstable; urgency=low
+
+  * rsvg-convert not completely plug-compatible replacement (closes: #666475)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sat, 07 Apr 2012 09:10:35 +0100
+
+djvulibre (3.5.25.2-2) unstable; urgency=low
+
+  * switch deprecated rsvg to plug-compatible rsvg-convert (closes: #666475)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sat, 31 Mar 2012 21:51:15 +0100
+
+djvulibre (3.5.25.2-1) unstable; urgency=low
+
+  [ Leon Bottou ]
+  * new upstream version
+
+  [ Barak A. Pearlmutter ]
+  * upstream fix for diezechar issue (closes: #664280)
+  * upstream fix for minilisp I/O problem (closes: #664442)
+  * include upstream patch completing man page djvused(1) (closes: #551517)
+  * allow dh_install to work on non-multiarch build
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 18 Mar 2012 23:09:59 +0000
+
+djvulibre (3.5.25-1) unstable; urgency=low
+
+  [ Leon Bottou ]
+  * new upstream version
+
+  [ Barak A. Pearlmutter ]
+  * bump debian standards version
+  * bump to dh 9
+  * add Leon Bottou as co-maintainer
+  * updates for multiarch
+    - update debian/*.install for multiarch: /usr/lib/ to /usr/lib/ARCH/
+    - ibid for pkgconfig
+    - debian/control shared library Pre-Depends: multiarch-support
+  * use NEWS file as upstream changelog
+  * minor lintian-suggested tweaks to debian/control
+  * merge minor upstream changes
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 16 Mar 2012 16:54:05 +0000
+
+djvulibre (3.5.24-9) unstable; urgency=low
+
+  * single debian patch source option (closes: #643094)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 28 Sep 2011 16:57:18 +0100
+
+djvulibre (3.5.24-8) unstable; urgency=low
+
+  * ddjvu_anno_get_xmp consistent prototype vs implementation (closes: #613547)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 22 Jun 2011 11:48:22 +0100
+
+djvulibre (3.5.24-7) unstable; urgency=low
+
+  * upstream fix to page extraction bug (closes: #629941)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 09 Jun 2011 23:06:30 +0100
+
+djvulibre (3.5.24-6) unstable; urgency=low
+
+  * upstream GCC 4.6 fixes
+  * upstream MMX fix addresses 32-bit MMX issue (closes: #629235)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 05 Jun 2011 08:08:01 +0100
+
+djvulibre (3.5.24-5) unstable; urgency=low
+
+  * fix kbsd pthreads linkage more gently
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 02 Jun 2011 12:32:53 +0100
+
+djvulibre (3.5.24-4) unstable; urgency=low
+
+  * merge upstream kbsd pthreads linkage mod (closes: #628800)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 01 Jun 2011 15:21:23 +0100
+
+djvulibre (3.5.24-3) unstable; urgency=low
+
+  * merge upstream change with promiscuous inclusions (closes: #625073)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 05 May 2011 08:04:13 +0100
+
+djvulibre (3.5.24-2) unstable; urgency=low
+
+  * do not include .la files per new policy (closes: #621306)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 20 Apr 2011 15:34:38 +0100
+
+djvulibre (3.5.24-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 07 Mar 2011 10:17:06 +0000
+
+djvulibre (3.5.23-6) unstable; urgency=low
+
+  * tiny patch to libdjvu/miniexp.cpp from  Jacob Wilk (closes: #613549)
+  
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 02 Mar 2011 08:47:43 +0000
+
+djvulibre (3.5.23-5) unstable; urgency=low
+
+  * changes to debian/rules
+    - honor DEB_BUILD_OPTIONS=noopt (closes: #613521) and debug
+    - remove unused/inappropriate/old variables
+    - let upstream ./configure choose optimisation flags; remove all special
+      cases for particular broken versions of GCC on particular architectures
+    - use dh_auto_make instead of invoking $(MAKE) directly
+    - no need for "chmod +x ..." since git maintains that bit
+    - remove "INSTALL_PROGRAM = $(INSTALL) --strip", as dh handles it
+  * djvulibre-bin depends: same version of libdjvulibre21 (closes: #613530)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 16 Feb 2011 13:37:56 +0000
+
+djvulibre (3.5.23-4) unstable; urgency=low
+
+  * bump to debhelper 8
+  * flush djview3, generate djview4 transition package (closes: #604347)
+  * flush djvulibre-plugin, to be generated by djview4
+  * dh --parallel
+  * include phrase "dummy" in package descriptions to silence lintian
+  * dpkg source format 3.0 (quilt)
+  * upstream has switched to git (debian/README.Debian, debian/copyright)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sat, 12 Feb 2011 13:26:14 +0000
+
+djvulibre (3.5.23-3) unstable; urgency=low
+
+  * revert switch to dpkg-source 3.0 (quilt) format
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 12 Sep 2010 00:29:16 +0100
+
+djvulibre (3.5.23-2) unstable; urgency=low
+
+  * make any2djvu script not fail to notice assent (closes: #515310)
+  * upstream changes fix many bugs
+    - djvumake no longer fails with these tiny images (closes: #539272)
+    - locale set internally as appropriate, e.g., PDF output (closes: #562156)
+      also fixes https://bugs.launchpad.net/ubuntu/+source/djvulibre/+bug/499324
+    - thread-related crash addressed, slightly post 3.5.23 (closes: #582961)
+  
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 07 Sep 2010 17:47:42 +0100
+
+djvulibre (3.5.23-1) unstable; urgency=low
+
+  * new upstream release
+  * bump policy (debian/control)
+  * Ubuntu patch from Benjamin Drung (closes: #592964)
+    - use autotools-dev to update config.* files to unclutter debdiffs
+    - change recommendation from mozilla-firefox to firefox
+  * modernise debian/rules with dh7 overrides, also thanks to Benjamin Drung
+  * switch to dpkg-source 3.0 (quilt) format
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 17 Aug 2010 13:35:37 +0200
+
+djvulibre (3.5.22-9) unstable; urgency=low
+
+  * fix typo in debian/copyright
+  * include upstream changes including nsdejavu XtShellStrings fix
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 15 Mar 2010 16:56:46 +0000
+
+djvulibre (3.5.22-8) unstable; urgency=low
+
+  * upstream patch escapes fields in djvused output-* (closes: #564684)
+  * ditch libjpeg62-dev dependencies in favour of libjpeg-dev (closes: #569233)
+  * rev deb policy
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 10 Feb 2010 23:47:32 +0000
+
+djvulibre (3.5.22-7) unstable; urgency=low
+
+  * patch typos (closes: #551398)
+  * man page install (closes: #561350), note dh_installman would botch i18n
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 16 Dec 2009 14:02:49 -0500
+
+djvulibre (3.5.22-6) unstable; urgency=low
+
+  * patch for typos, thanks Jakub Wilk <ubanus@users.sf.net> (closes: #551109)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sat, 17 Oct 2009 18:16:19 +0100
+
+djvulibre (3.5.22-5) unstable; urgency=low
+
+  * dh ${misc:Depends} for straggler binary packages
+  * sh4 patch from Nobuhiro Iwamatsu <iwamatsu@nigauri.org> (closes: #550172)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 08 Oct 2009 13:56:34 +0100
+
+djvulibre (3.5.22-4) unstable; urgency=low
+
+  * Clean lintian issues:
+    - rev deb std
+    - cease ignoring errors in installation scripts
+    - debug package into section: debug
+    - dh ${misc:Depends} for all packages
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 25 Sep 2009 22:43:51 -0400
+
+djvulibre (3.5.22-3) unstable; urgency=low
+
+  * Compensate for change in dh_install {,} handling (closes: #538394)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 31 Jul 2009 15:02:11 +0100
+
+djvulibre (3.5.22-2) unstable; urgency=low
+
+  * Invoke Elder Gods Horror to skirt libtool issue (closes: #512252), see
+    debian/rules "Cthulhu"
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 21 Jul 2009 13:09:57 +0200
+
+djvulibre (3.5.22-1) unstable; urgency=low
+
+  [ Leon Bottou ]
+  * Upstream release candidate
+  
+  [ Barak A. Pearlmutter ]
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 23 Jun 2009 22:53:13 +0200
+
+djvulibre (3.5.21-3) unstable; urgency=low
+
+  * Upstream browser plugin fix to gui/nsdejavu/nsdejavu.c (closes: #504340)
+  * Upstream fix for djvups -text=yes non-ASCII crash (closes: #469122)
+  
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 10 Dec 2008 21:32:00 +0000
+
+djvulibre (3.5.21-2) unstable; urgency=low
+
+  * Remove bashism ...{.,*}... from debian/rules (closes: #505644)
+  * Put djvulibre-dbg in section libdevel (closes: #498456)
+  * Formatting patch for c44.1 from Ubuntu (closes: #505643)
+  * Don't integrate 3.5.20-8+lenny0 (do no reopen #495979, #507503)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 14 Nov 2008 10:34:44 +0000
+
+djvulibre (3.5.21-1) unstable; urgency=medium
+
+  * Upstream release
+  * Remove path from command-with-path in djview3.prerm
+  * Partially dh7-ianize
+  * Include bin/djvudigital, useful if gsdjvu installed (closes: #495979)
+  * Include /usr/lib/libdjvulibre.a in libdjvulibre-dev
+  * Build depend on imagemagick and include upstream change to regenerate
+    icon files from SVG sources during build process
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 07 Sep 2008 15:21:53 +0100
+
+djvulibre (3.5.20-11) unstable; urgency=low
+
+  * Upstream mods for man and GCC 4.x warnings
+  * Conflict with old library to avoid (closes: #472503)
+  * Tiny HURD MAXPATHLEN patch from Samuel Thibault (closes: #487342)
+  * Existence update-alternative existence check from installation scripts
+  * Integrate 3.5.20-10.1 NMU by Philipp Kern (thanks!) with Conflicts:
+    changed to Replaces: where appropriate
+  * Rev to dh 7
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 19 Aug 2008 16:07:05 +0100
+
+djvulibre (3.5.20-10.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * libdjvulibre-text: add a conflicts against libdjvulibre15 to fix
+    upgrades from Etch (Closes: #494303)
+
+ -- Philipp Kern <pkern@debian.org>  Thu, 14 Aug 2008 11:30:37 -0300
+
+djvulibre (3.5.20-10) unstable; urgency=low
+
+  * Put djview3 support files in djview3 package, leaving only generic
+    library support files in libdjvulibre-text (closes: #493854)
+  * Include more upstream translated text
+  * Flush a bunch of minor compiler warnings
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 05 Aug 2008 17:23:17 +0100
+
+djvulibre (3.5.20-9) unstable; urgency=low
+
+  * Add djvulibre-dbg package with debug symbols (closes: #493351)
+    thanks to Pino Toscano <pino@kde.org> for the patch
+  * Provide virtual package djvu-viewer (closes: #491012)
+  * Flush update-alternatives from djview scripts (closes: #491123)
+  * Minor updates to debian packaging info
+  * Split libdjvulibre-text out of djvulibre-desktop, so
+    (a) libdjvulibreXX can depend on just -text not -desktop, and
+    (b) libdjvulibreXX for various XX>=21 can coexist
+    (closes: #472347, #474702, #474993, #475630)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 04 Aug 2008 14:16:12 +0100
+
+djvulibre (3.5.20-8) unstable; urgency=low
+
+  * Raise djvudigital default resolution from 300 to 600 (closes: #478607)
+  * Have lib suggest rather than recommend reader (closes: #476682)
+  * Utilities package now recommends pdf2djvu package, coming soon
+  * Fix update-alternatives in installation scripts (closes: #476444)
+  * Rev deb policy
+  
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 02 May 2008 01:12:15 -0700
+
+djvulibre (3.5.20-7) unstable; urgency=low
+
+  * Generate djview transition package (closes: #473341)
+  * Postscript generation issue (four-color image into cpaldjvu into
+    djvups without -mode=bw) seems to be resolved (closes: #278945)
+  * Remove djvudigital from djvulibre-bin (closes: #461226)
+  * Rewrite desktop package description (closes: #474689, #474700)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 07 Apr 2008 09:58:58 -0700
+
+djvulibre (3.5.20-6) unstable; urgency=low
+
+  * split djvulibre-desktop out of shared library proper
+  * desktop xdg-utils dependency out of shared library proper (closes: #472347)
+  * library version coexistence (closes: #471650, #471915, #472097, #472265, #472503)
+  * rename package djview to djview3
+  * include some upstream change logs and such in djvulibre-bin (closes: #455607)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 25 Mar 2008 08:56:12 +0000
+
+djvulibre (3.5.20-5) unstable; urgency=low
+
+  * Upstream fix (closes: #471149)
+  * Upstream fix for __sync_... build error in libdjvu/atomic.cpp on
+    sparc, mips, arm, hppa, mipsel, armel.
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 17 Mar 2008 09:28:38 +0000
+
+djvulibre (3.5.20-4) unstable; urgency=low
+
+  * Upstream fix: locking issues on dual-core machines (as of 3.5.20-2)
+  * Avoid writing mime type conflicting with default freedesktop mime database
+  * Upstream fix for info fetch (closes: #463691)
+  * Upstream fix for document saving (closes: #467282)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 14 Mar 2008 11:13:59 +0000
+
+djvulibre (3.5.20-3) unstable; urgency=low
+
+  * As in djview4, disable stripping of binaries by Makefile.in unless
+    INSTALL_PROGRAM="install -s" is used (closes: #436788)
+  * upstream fix for djvused(1) type (closes: #458241)
+  * upstream fix for djvused set-outline indirect bug (closes: #458086)
+  * upstream fix for c44 small file encoding bug (closes: #455331)
+  * patch (via upstream) for csepdjvu subsample ratio bug (closes: #458211)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 30 Jan 2008 11:56:45 +0000
+
+djvulibre (3.5.20-2) unstable; urgency=low
+
+  * Fix innocuous double-build cleaning issue (closes: #424180, #442552)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu,  6 Dec 2007 17:21:06 +0000
+
+djvulibre (3.5.20-1) unstable; urgency=low
+
+  * New upstream release
+  * Integrate dh_icons ubuntu-patch (closes: #452109)
+  * Add vcs-cvs and homepage fields to debian/control
+  * Policy 3.7.3
+  * Upstream fix for filename-with-colon crash (closes: #452947)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu,  6 Dec 2007 14:30:14 +0000
+
+djvulibre (3.5.19-3) unstable; urgency=low
+
+  * Make any2djvu script handle filenames with spaces correctly (closes: #435355)
+  * Print enormous security warning when any2djvu script is used (closes: #435356)
+  * Plugin recommended brower list now includes iceweasel (closes: #427161)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 10 Aug 2007 09:06:13 +0100
+
+djvulibre (3.5.19-2) unstable; urgency=low
+
+  * License clarification of mozilla plugin code.
+  * Fix upgrade issue by making plugin package conflict with older
+    binaries package (closes: #419666)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 24 Apr 2007 09:36:48 +0100
+
+djvulibre (3.5.19-1) unstable; urgency=low
+
+  * Track upstream changes (closes: #412316)
+  * Move stuff in /usr/share/djvu/.
+  * Cleanup desktop menu and mimetype files.
+  * Manually install mime types, icons, and menu entries.
+  * Renaming program djview to djview3, register with update-alternatives.
+  * Debian standards rev.
+  * License change (GPL either v2 or any later version).
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 25 Mar 2007 22:46:43 +0000
+
+djvulibre (3.5.17-3) unstable; urgency=medium
+
+  * Generate non-eroneous, and reasonably loose, shlibs (closes: #389382)
+  * Use very tight version dependencies between generated packages
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 25 Sep 2006 22:27:09 +0100
+
+djvulibre (3.5.17-2) unstable; urgency=medium
+
+  * Include minor upstream mods
+  * Raise debhelper dependency verion (closes: #374051)
+  * Silence bashism detector with debian/rules SHELL=bash (closes: #374265)
+  * Hotwire debian/rules to use -O0 on alpha (closes: #387291, #386032)
+  * Tiny debian build simplifications/fixes, eg remove debian/shlibs.local
+  * Use soul-rotting roff hyphenation manipulation commands to fix problem
+    underlying "cannot adjust line" warning for long URL in
+    xmltools/djvuxml.1.in thus curing the cause but not the symptom
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 21 Sep 2006 02:42:46 +0100
+
+djvulibre (3.5.17-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * On alpha, build GString.cpp with -O0 to work around a bug in GCC 4.1/4.2.
+    Fixes FTBFS. (Closes: #386032)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 13 Sep 2006 14:24:52 +0200
+
+djvulibre (3.5.17-1) unstable; urgency=low
+
+  * New upstream release
+  * Upstream GCC-4.1 fixes (closes: #358206)
+  * Upstream "djvudigital --words" fix (closes: #364316)
+  * Many NMUs merged earlier, still fixed (closes: #320582, #320621)
+      (closes: #320656, #320794, #321244, #321406, #321509, #321652)
+      (closes: #322600, #322882, #321107, #322773)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 27 Apr 2006 18:11:37 -0400
+
+djvulibre (3.5.16-2) unstable; urgency=low
+
+  * update to newly broken debian X libraries ... broken apart, that is
+  * have -dev package depend on lib and libjpeg62-dev (closes: #343720)
+    (thanks to Sebastien Bacher <seb128@canonical.com> via Ubuntu)
+  * page numbers 1-based in djvm -l, like -i/-d (closes: #340361)
+  * don't include KDE desktop file x-djvu.desktop in lib (closes: #339638)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 26 Dec 2005 19:42:43 +0000
+
+djvulibre (3.5.16-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 14 Nov 2005 19:03:18 -0700
+
+djvulibre (3.5.15-2) unstable; urgency=low
+
+  * Unversioned conflict/replace libdjvulibre1
+    (closes: #326414, #327190, #327836, #335363)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 25 Oct 2005 00:15:50 +0100
+
+djvulibre (3.5.15-1) unstable; urgency=low
+
+  * New upstream release
+  * Upstream man page clarification (closes: #323307, #323085)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 22 Aug 2005 20:50:04 +0100
+
+djvulibre (3.5.14-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium-urgency upload for RC bugfix.
+  * The library soname has changed without changing the package name;
+    reconcile the package name with the library name by changing
+    libdjvulibre1 to libdjvulibre15 (closes: #320582).  This
+    conveniently also addresses the C++ ABI change in the process.
+  * Build-depend only on libqt3-mt-dev (>= 3:3.3.4-4) without any
+    alternatives, for the C++ ABI transition; we don't want djview to be
+    accidentally linked against libqt3 instead of libqt3-mt anyway, since
+    that would give unpredictable results if any other libraries require
+    threading.  With this rebuild, any possible issues caused by
+    mismatched C++ ABIs are also resolved (closes: #322773).
+  * Use -O2 optimization when building on m68k to work around bug
+    #317475 in gcc-4.0, since this is the optimization level recommended
+    by policy anyway (closes: #321107).
+  * Re-libtoolize the package using the current Debian libtool, to
+    support trimming unnecessary library dependencies.  This cuts the
+    dependency tree of djview by better than 50%.
+
+ -- Steve Langasek <vorlon@debian.org>  Sun, 14 Aug 2005 04:10:36 -0700
+
+djvulibre (3.5.14-6) unstable; urgency=low
+
+  * minor upstream updates, eg for GCC 4.0 (closes: #319436)
+  * fix typos in cjb2.1 (closes: #311755), ddjvu.1 (closes: #311756),
+    djvu.1 (closes: #311757), djvudigital.1 (closes: #311759),
+    djvups.1 (closes: #311760), djvuxml.1.in (closes: #311763),
+    nsdejavu.1.in (closes: #311765)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 29 Jul 2005 11:35:30 +0100
+
+djvulibre (3.5.14-5) unstable; urgency=low
+
+  * libdjvulibre-dev needs to depend upon libdjvulibre1
+  * fix #include <mdjvucfg.h> problem (closes: #306266)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 25 Apr 2005 02:03:26 +0100
+
+djvulibre (3.5.14-4) unstable; urgency=low
+
+  * generate -dev package again, like pre 3.5.9-5 (closes: #305790)
+  * strip down decriptions a little (closes: #164391)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sat, 23 Apr 2005 20:47:56 +0100
+
+djvulibre (3.5.14-3) unstable; urgency=low
+
+  * Incorporate Loic Minier <lool@dooz.org> documentation of plugin URL
+    alignment options, (closes: #257384)
+  * minor upstream updates
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 23 Feb 2005 00:14:55 +0000
+
+djvulibre (3.5.14-2) unstable; urgency=low
+
+  * versioned build dependency on debhelper (for debian pedants)
+  * tighten version dependencies (closes: #278946)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon,  1 Nov 2004 16:49:49 +0000
+
+djvulibre (3.5.14-1) unstable; urgency=high
+
+  * New upstream release, with no real changes from last upload
+  * Account for name change firebird to firefox (closes: #267247)
+  * disable sleazy debian/rules hack (see 3.5.13.pre14-5)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sat, 21 Aug 2004 06:19:01 -0600
+
+djvulibre (3.5.13.pre14-5) unstable; urgency=medium
+
+  * debnonmoduluarstupidity: rebuild with libtiff4 (closes: #262848)
+  * resolve mime types image/x-djvu vs image/x.djvu vs image/vnd.djvu:
+    handle all, serve image/vnd.djvu, request other germane packages to
+    switch, document in djvu(1) and nsdejavu(1) (closes: #257020)
+  * upstream CVS fix for djview "find text" bug (closes: #257662)
+  * flush private CVS repository; share with upstream on djvu.sourceforge.net
+  * sleazy debian/rules hack to avoid modified binary source file build issue
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu,  8 Jul 2004 23:12:34 +0100
+
+djvulibre (3.5.13.pre14-4) unstable; urgency=low
+
+  * thumbnails in djview no longer all black (closes: #251647)
+  * add quotes to menu file more violently
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 11 Jun 2004 22:06:03 +0100
+
+djvulibre (3.5.13.pre14-3) unstable; urgency=low
+
+  * incorporate new upstream materials in appropriate packages
+  * force installation of desktop stuff even when dirs are missing
+  * add some quotes to menu file
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 18 May 2004 01:50:31 -0600
+
+djvulibre (3.5.13.pre14-2) unstable; urgency=low
+
+  * back out patch in djvuserve; upstream patch buggy
+  * add any2djvu security warnings
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 16 May 2004 14:35:49 -0600
+
+djvulibre (3.5.13.pre14-1) unstable; urgency=low
+
+  * upstream release; see NEWS file for new features
+  * any2djvu option -q for quiet, instead of older -s
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 16 May 2004 08:11:32 -0600
+
+djvulibre (3.5.13-1) unstable; urgency=low
+
+  * upstream release
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun, 25 Apr 2004 05:03:23 -0600
+
+djvulibre (3.5.12-5) unstable; urgency=low
+
+  * sleazy workaround in fprintdate (closes: #241017)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 30 Mar 2004 16:05:44 +0100
+
+djvulibre (3.5.12-4) unstable; urgency=low
+
+  * add image/vnd.djvu as mime type handled by djview (closes: #234913)
+  * rev config.{guess,sub}
+  * upstream man page fix, rev djvused.1 to CVS 1.9 (closes: #231612)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 27 Feb 2004 00:06:27 +0000
+
+djvulibre (3.5.12-3) unstable; urgency=low
+
+  * add more options to any2djvu.sh script; fix man page
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 21 Jan 2004 08:09:04 -0700
+
+djvulibre (3.5.12-2) unstable; urgency=low
+
+  * update any2djvu.sh to work with new CGI script; add option processing
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 19 Jan 2004 17:04:53 -0700
+
+djvulibre (3.5.12-1) unstable; urgency=low
+
+  * New upstream version
+  * Fix mozilla-firebird plugin symlink typo (closes: #217744)
+  * Remove -Wl,-rpath,${libdir} from Makefiles.in instead of post-processing
+    chrpath --delete bin/*, for political correctness (closes: #221780)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 20 Nov 2003 08:14:59 -0700
+
+djvulibre (3.5.11.2003.06.04-6) unstable; urgency=low
+
+  * rev deb policy
+  * add enhances: field, fiddle with recommends: field
+  * fix secondary build dependency (closes: #206130)
+  * make chrpath optional to avoid autobuild problem on the hurd
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Mon, 25 Aug 2003 20:10:22 +0100
+
+djvulibre (3.5.11.2003.06.04-5) unstable; urgency=low
+
+  * work around more ANSI C++ asymmetric horror
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Fri, 11 Jul 2003 20:40:50 +0100
+
+djvulibre (3.5.11.2003.06.04-4) unstable; urgency=low
+
+  * work around enforcement of C++ horribleness by GCC 3.3.1 (closes #199766)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue,  8 Jul 2003 07:57:23 -0600
+
+djvulibre (3.5.11.2003.06.04-3) unstable; urgency=low
+
+  * handle mozilla-firebird (closes: 197054) thanks Emil Soleyman-Zomalan
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed,  2 Jul 2003 21:08:14 +0100
+
+djvulibre (3.5.11.2003.06.04-2) unstable; urgency=low
+
+  * solve 64-bit compilation issue in the worst possible way (closes: #196720)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 10 Jun 2003 22:51:21 +0100
+
+djvulibre (3.5.11.2003.06.04-1) unstable; urgency=low
+
+  * CVS snapshot, fixes GCC 3.3 issues (closes: #195341)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue,  3 Jun 2003 19:39:56 -0600
+
+djvulibre (3.5.11-1) unstable; urgency=low
+
+  * New upstream version
+  * upstream fixes djview menu in UTF-8 encoded directories (closes: #186167)
+  * UTF8-endectomy for bin2cpp failure under GCC 3.2/3.3 (closes: #193507)
+  * djview libs need GCC 3.2/3.3 recompile (closes: #193233)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu, 29 May 2003 23:46:08 +0100
+
+djvulibre (3.5.10-5) unstable; urgency=low
+
+  * modify compiler options in package config scripts
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun,  9 Mar 2003 18:38:34 +0000
+
+djvulibre (3.5.10-4) unstable; urgency=low
+
+  * hotwire compilation options for GCC 3.2 in debian/rules (closes: #183561)
+    DONT FORGET: remove when gcc bug is fixed.
+    Un-hotwired default is "-O3 -funroll-loops", tested behavior of
+    i386 gcc version 3.2.3 20030228 (Debian prerelease):
+    flags                   djview lizard2002.djvu
+    -O3 -funroll-loops      FAILS
+    -O2 -funroll-loops      FAILS
+    -O1 -funroll-loops      works
+    -funroll-loops          works
+    -O3                     works
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Sun,  9 Mar 2003 02:04:19 +0000
+
+djvulibre (3.5.10-3) unstable; urgency=low
+
+  * simplify qt version check !hic!
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Thu,  6 Mar 2003 00:19:49 +0000
+
+djvulibre (3.5.10-2.1) unstable; urgency=low
+
+  * remove workaround for old chrpath bug
+  * trick for -lqt vs -lqt-mt !blech! (closes: #181588)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Wed, 19 Feb 2003 12:16:56 -0700
+
+djvulibre (3.5.10-2) unstable; urgency=low
+
+  * use either /usr/include/qt3 or /usr/include/qt as available (closes: #181351)
+
+ -- Barak A. Pearlmutter <bap@cs.unm.edu>  Mon, 17 Feb 2003 19:48:29 +0000
+
+djvulibre (3.5.10-1) unstable; urgency=low
+
+  * new upstream version
+  * (closes: #180598) see below
+  * upstream fixed menu key (closes: #173483)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Wed, 12 Feb 2003 06:55:04 -0700
+
+djvulibre (3.5.9-5) unstable; urgency=low
+
+  * build-depend libqt3c102-mt for simplicity (closes: #180598)
+  * stop generating unnecessary binary package libdjvulibre1-dev
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Wed, 12 Feb 2003 03:47:04 -0700
+
+djvulibre (3.5.9-4) unstable; urgency=low
+
+  * capitalize descriptions (closes: #164709)
+  * add script any2djvu
+  * mime entry remains (closes: #172465)
+  * just a compiler bug maybe maybe I hope (closes: #159590)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Mon,  3 Feb 2003 17:04:54 -0700
+
+djvulibre (3.5.9-3) unstable; urgency=low
+
+  * set up mime entry for djview
+  * break out djvuserve cgi script into its own package
+  * capitalize one-line descriptions (closes: #164709)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Sun, 13 Oct 2002 12:51:01 -0600
+
+djvulibre (3.5.9-2) unstable; urgency=low
+
+  * Flush debian mods.  Leave Makefile.in -rpath, use chrpath --delete.
+  * Break out djview binary into separate package.
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Tue,  8 Oct 2002 12:34:03 -0600
+
+djvulibre (3.5.9-1) unstable; urgency=low
+
+  * New upstream release, fixes ddjvu (closes: #163081) and MMX with GCC 3.2
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Tue,  8 Oct 2002 09:54:30 -0600
+
+djvulibre (3.5.8-1) unstable; urgency=low
+
+  * New upstream release (fixes for: print b&w docs, menu problem, gcc-3.1)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Tue, 17 Sep 2002 12:12:10 -0600
+
+djvulibre (3.5.7-2) unstable; urgency=low
+
+  * bin package to section graphics and plugin to section web
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Mon, 29 Jul 2002 16:04:00 -0600
+
+djvulibre (3.5.7-1) unstable; urgency=low
+
+  * New upstream release, with copyright fix.  (closes: #94442)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Mon, 22 Jul 2002 16:55:55 -0600
+
+djvulibre (3.5.5-1) unstable; urgency=low
+
+  * Initial Release.  (closes: #94442)
+
+ -- Barak Pearlmutter <bap@cs.unm.edu>  Wed, 29 May 2002 15:43:15 -0600
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..e821904
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+xmltools/.libs/djvutoxml
+xmltools/.libs/djvuxmlparser
+gui/djview/.libs/djview
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..05c4d56
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,107 @@
+Source: djvulibre
+Section: libs
+Priority: optional
+Maintainer: Barak A. Pearlmutter <bap@debian.org>
+Uploaders: Leon Bottou <leonb@bottou.org>
+Build-Depends: dh-autoreconf,
+	       pkg-config,
+	       debhelper (>= 9),
+	       libjpeg-dev,
+	       libtiff-dev,
+	       librsvg2-bin | imagemagick
+Vcs-Git: git://anonscm.debian.org/collab-maint/djvulibre.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/djvulibre.git
+Homepage: http://djvu.sourceforge.net/
+Standards-Version: 3.9.6
+
+Package: libdjvulibre-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends},
+	 libdjvulibre21 (= ${binary:Version}), libjpeg-dev
+Description: Development files for the DjVu image format
+ DjVu image format static library and development files.
+ .
+ DjVu is a set of compression technologies, a file format, and a
+ software platform for the delivery over the Web of digital documents,
+ scanned documents, and high resolution images.
+ .
+ DjVu documents download and display extremely quickly, and look
+ exactly the same on all platforms.  DjVu can be seen as a superior
+ alternative to PDF and Postscript for digital documents, to TIFF (and
+ PDF) for scanned documents, to JPEG for photographs and pictures, and
+ to GIF for large palettized images.  DjVu is the only Web format that
+ is practical for distributing high-resolution scanned documents in
+ color.
+
+Package: libdjvulibre21
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdjvulibre-text (>= ${source:Version})
+Conflicts: libdjvulibre1
+Replaces: libdjvulibre1, libdjvulibre15
+Description: Runtime support for the DjVu image format
+ DjVu runtime library.
+
+Package: libdjvulibre-text
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Replaces: libdjvulibre15, djview3 (= 3.5.20-9), djvulibre-desktop (<< 3.5.20-9)
+Description: Linguistic support files for libdjvulibre
+ Runtime linguistic support files for the libdjvulibre library.
+
+Package: djvulibre-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdjvulibre21 (= ${binary:Version})
+Description: Debug symbols for the DjVu image format
+ DjVu runtime debug symbols.
+
+Package: djvulibre-desktop
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: djview4 | djvu-viewer | evince
+Conflicts: libdjvulibre1, libdjvulibre21 (<= 3.5.20-5)
+Replaces: libdjvulibre15 (<= 3.5.20-5)
+Description: Desktop support for the DjVu image format
+ Miscellaneous files to support the DjVu image format on the desktop.
+
+Package: djview
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, djview4 | djview3
+Description: Transition package, djview3 to djview4
+ Ease transition from djview3 to djview4 with this dummy package.
+
+Package: djview3
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, djview4
+Description: Transition package, djview3 to djview4
+ Ease transition from djview3 to djview4 with this dummy package.
+
+Package: djvuserve
+Section: web
+Recommends: apache | httpd-cgi | httpd
+Conflicts: djvulibre-bin (<< 3.5.9-3)
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: CGI program for unbundling DjVu files on the fly
+ CGI program to convert a bundled multi-page DjVu document into an
+ indirect DjVu document on the fly.  This provides for efficiently
+ browsing large DjVu documents without transferring unnecessary pages.
+
+Package: djvulibre-bin
+Section: graphics
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, curl, libdjvulibre21 (= ${binary:Version})
+Recommends: pdf2djvu
+Suggests: djvulibre-desktop, djview4 | djvu-viewer | evince
+Description: Utilities for the DjVu image format
+ Executables including utilities for conversion between DjVu and other
+ formats.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..89c3090
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,143 @@
+This package was debianized by Barak Pearlmutter <bap@debian.org> on
+Wed, 29 May 2002 15:43:15 -0600.
+
+It was downloaded from http://djvu.sourceforge.net/
+ git://git.code.sf.net/p/djvu/djvulibre-git
+
+Upstream Authors:
+
+ DjVuLibre Credits, from http://djvu.sourceforge.net/credits.html
+
+    Concept: Yann LeCun, Leon Bottou.
+    Compression Science: Leon Bottou, Paul Howard, Yann LeCun,
+	Yoshua Bengio, Patrick Haffner, Pascal Vincent, Steven Pigeon.
+    Software Architecture: Leon Bottou, Bill C Riemers, Yann LeCun,
+	Joseph M Orost.
+    Codec Libraries, File Format Design: Leon Bottou, Patrick Haffner,
+	Andrew Erofeev, Bill C Riemers, Pascal Vincent, Yann LeCun.
+    Plugins, Viewers: Leon Bottou, Andrew Erofeev, Ming Chen,
+	Bill C Riemers, Liang Chen, Praveen Guduru.
+    Command Line Programs: Leon Bottou, Bill C Riemers, Mike Houser.
+    Internationalization Fred Crary, Bill C Riemers.
+    Website Development: Jeffery Triggs, Yann LeCun
+
+ It gives me particular pleasure to thank Leon Bottou and Yann LeCun
+ for their heroic yet successful efforts to get LizardTech to handle
+ the patent situation in a way that addresses the concerns of the free
+ software community regarding the distribution and use of djvulibre.
+
+The script tools/any2djvu.sh was downloaded from
+ URL: http://www.inference.phy.cam.ac.uk/mackay/any2djvu.sh
+ Author: David Kreil <kreil@ebi.ac.uk>
+ Released (via statement in email) under the GNU GPL v2.
+
+Copyright:
+
+   This package 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; version 2 dated June, 1991.
+
+   This package 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License version 2 can be found in
+`/usr/share/common-licenses/GPL-2'.
+
+As of upstream VERSION 3.5.19, the "GPL v2" has been broadened to
+"GPL v2 or any later version".
+
+The following appears in the file COPYRIGHT at the top level of the
+upstream source code.
+
+ DjVuLibre-3.5
+ Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+ Copyright (c) 2001  AT&T
+
+ This software is subject to, and may be distributed under, the
+ GNU General Public License, either Version 2 of the license,
+ or (at your option) any later version. The license should have
+ accompanied the software or you may obtain a copy of the license
+ from the Free Software Foundation at http://www.fsf.org .
+
+ 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.
+
+ DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+ Lizardtech Software.  Lizardtech Software has authorized us to
+ replace the original DjVu(r) Reference Library notice by the following
+ text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+
+  ------------------------------------------------------------------
+ | DjVu (r) Reference Library (v. 3.5)
+ | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ | The DjVu Reference Library is protected by U.S. Pat. No.
+ | 6,058,214 and patents pending.
+ |
+ | This software is subject to, and may be distributed under, the
+ | GNU General Public License, either Version 2 of the license,
+ | or (at your option) any later version. The license should have
+ | accompanied the software or you may obtain a copy of the license
+ | from the Free Software Foundation at http://www.fsf.org .
+ |
+ | The computer code originally released by LizardTech under this
+ | license and unmodified by other parties is deemed "the LIZARDTECH
+ | ORIGINAL CODE."  Subject to any third party intellectual property
+ | claims, LizardTech grants recipient a worldwide, royalty-free,
+ | non-exclusive license to make, use, sell, or otherwise dispose of
+ | the LIZARDTECH ORIGINAL CODE or of programs derived from the
+ | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU
+ | General Public License.   This grant only confers the right to
+ | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to
+ | the extent such infringement is reasonably necessary to enable
+ | recipient to make, have made, practice, sell, or otherwise dispose
+ | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to
+ | any greater extent that may be necessary to utilize further
+ | modifications or combinations.
+ |
+ | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ +------------------------------------------------------------------
+
+The file tools/tiff2pdf.c is derived from the program tiff2pdf which 
+comes with the following notice:
+
+  | Copyright (c) 2003 Ross Finlayson
+  |
+  | Permission to use, copy, modify, distribute, and sell this software and 
+  | its documentation for any purpose is hereby granted without fee, provided
+  | that (i) the above copyright notices and this permission notice appear in
+  | all copies of the software and related documentation, and (ii) the name of
+  | Ross Finlayson may not be used in any advertising or
+  | publicity relating to the software without the specific, prior written
+  | permission of Ross Finlayson.
+  | 
+  | THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+  | EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+  | WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+  | 
+  | IN NO EVENT SHALL ROSS FINLAYSON BE LIABLE FOR
+  | ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+  | OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+  | WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+  | LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+  | OF THIS SOFTWARE.
+
+The files doc/djvu{2,3}spec.djvu are documentation for the DjVu
+format.  The original LaTeX sources for these documents has been lost.
+It would be great if someone were to recreate it, rendering the
+documents more tractibly modified and reformatted.
+
+The files doc/lizard200{2,7}.{djvu,pdf} are legal documents related
+to the freedom of this package itself, and hence need not themselves
+be covered by a free license.
diff --git a/debian/djvulibre-bin.docs b/debian/djvulibre-bin.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/djvulibre-bin.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/djvulibre-bin.install b/debian/djvulibre-bin.install
new file mode 100644
index 0000000..4b4f308
--- /dev/null
+++ b/debian/djvulibre-bin.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/share/man/man*/*
diff --git a/debian/djvulibre-desktop.install b/debian/djvulibre-desktop.install
new file mode 100644
index 0000000..eccbfcc
--- /dev/null
+++ b/debian/djvulibre-desktop.install
@@ -0,0 +1,2 @@
+usr/share/mime/packages
+usr/share/icons/hicolor/*/mimetypes
diff --git a/debian/djvuserve.install b/debian/djvuserve.install
new file mode 100644
index 0000000..0932f40
--- /dev/null
+++ b/debian/djvuserve.install
@@ -0,0 +1,3 @@
+usr/bin/djvuserve
+usr/lib/cgi-bin/djvuserve
+usr/share/man/man*/djvuserve.*
diff --git a/debian/djvuserve.sh b/debian/djvuserve.sh
new file mode 100755
index 0000000..06437dc
--- /dev/null
+++ b/debian/djvuserve.sh
@@ -0,0 +1,2 @@
+#! /bin/sh -f
+exec /usr/bin/djvuserve
diff --git a/debian/libdjvulibre-dev.docs b/debian/libdjvulibre-dev.docs
new file mode 100644
index 0000000..d6e2c45
--- /dev/null
+++ b/debian/libdjvulibre-dev.docs
@@ -0,0 +1,6 @@
+README
+doc/*.djvu
+doc/*.txt
+doc/DjVmNav*
+doc/GMapAreas*
+debian/tmp/usr/share/djvu/pubtext
diff --git a/debian/libdjvulibre-dev.install b/debian/libdjvulibre-dev.install
new file mode 100644
index 0000000..b973af4
--- /dev/null
+++ b/debian/libdjvulibre-dev.install
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/pkgconfig/*
diff --git a/debian/libdjvulibre-text.install b/debian/libdjvulibre-text.install
new file mode 100644
index 0000000..8132c43
--- /dev/null
+++ b/debian/libdjvulibre-text.install
@@ -0,0 +1,2 @@
+usr/share/djvu/pubtext
+usr/share/djvu/osi
diff --git a/debian/libdjvulibre21.install b/debian/libdjvulibre21.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libdjvulibre21.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..7eb9f31
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,63 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with autoreconf --parallel
+
+# extract library major version from source build system
+libver0 := $(shell \
+	egrep 'm4_define..lt_compat.,' configure.ac \
+	 | head -1 \
+	 | sed 's:m4_define::' \
+	 | tr --delete --complement '[:digit:]')
+
+# extract library major version expected by debian packaging
+libver := $(shell egrep '^Package: libdjvulibre[0-9]+$$' debian/control \
+		  | head -1 \
+		  | sed 's/Package: libdjvulibre//')
+
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+configure_options += --enable-static
+configure_options += --enable-shared
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+configure_options += --enable-debug
+else ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+# consider modifying the autoconf scripts to accept a --disable-optimization flag
+configure_options += --enable-debug
+endif
+
+override_dh_testdir:
+	@echo "library major version: upstream $(libver0), debian $(libver)"
+ifneq ($(libver0),$(libver))
+	echo "error: inconsistent upstream and debian/control library major version"
+	exit 1
+endif
+	dh_testdir
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(configure_options)
+
+override_dh_auto_install:
+	dh_auto_install
+	mkdir --parents debian/tmp/usr/lib/cgi-bin
+	cp --preserve=mode,timestamps debian/djvuserve.sh \
+		debian/tmp/usr/lib/cgi-bin/djvuserve
+
+override_dh_install:
+	dh_install --list-missing
+	@echo remove from djvulibre-bin, already in djvuserve
+	find debian/djvulibre-bin -name djvuserve\* -print -delete
+# 	@echo "remove from djvulibre-bin, not in Debian: needs gsdjvu, direct complaints to AT&T"
+# 	find debian/djvulibre-bin -name djvudigital\* -print -delete
+
+override_dh_installchangelogs:
+	dh_installchangelogs --keep NEWS
+
+override_dh_compress:
+	dh_compress --exclude=.djvu
+
+override_dh_strip:
+	dh_strip --dbg-package=djvulibre-dbg
+
+override_dh_makeshlibs:
+	dh_makeshlibs --version-info --exclude=/plugins
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..7423a2d
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+single-debian-patch
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0c805e7
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/djvu/djvulibre-([0-9]+\.[0-9]+\.[0-9]+)\.tar\.gz
diff --git a/desktopfiles/Makefile.am b/desktopfiles/Makefile.am
new file mode 100644
index 0000000..1b16c4e
--- /dev/null
+++ b/desktopfiles/Makefile.am
@@ -0,0 +1,117 @@
+all: icons
+
+#icons
+
+SVGICONS = \
+scalable/mimetypes/djvu.svgz
+
+PNGICONS = \
+16x16/mimetypes/djvu.png \
+20x20/mimetypes/djvu.png \
+22x22/mimetypes/djvu.png \
+24x24/mimetypes/djvu.png \
+32x32/mimetypes/djvu.png \
+48x48/mimetypes/djvu.png \
+64x64/mimetypes/djvu.png \
+72x72/mimetypes/djvu.png \
+96x96/mimetypes/djvu.png \
+128x128/mimetypes/djvu.png \
+256x256/mimetypes/djvu.png 
+
+icons: $(PNGICONS) $(SVGICONS)
+
+if HAVE_CONVERSION_RSVG
+convert_icons_process = \
+s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+${RSVG} \
+-w $${s} \
+-h $${s} -o $@ $<
+endif
+
+if HAVE_CONVERSION_INKSCAPE
+convert_icons_process = \
+s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+${INKSCAPE} \
+--without-gui \
+--export-width=$${s} \
+--export-height=$${s} \
+--export-png=$@ $<
+endif
+
+if HAVE_CONVERSION_CONVERT
+convert_icons_process = \
+s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+${CONVERT} \
+-geometry $${s}x$${s} \
+-depth 8 \
+-background none $< $@
+endif
+
+png_verbose = $(png_verbose_@AM_V@)
+png_verbose_ = $(png_verbose_@AM_DEFAULT_V@)
+png_verbose_0 = @echo "  PNG     " $@;
+
+${PNGICONS}: djvu.svg Makefile
+	$(AM_V_at)$(MKDIR_P) `dirname $@`
+if HAVE_CONVERSION_TOOL
+	$(png_verbose)$(convert_icons_process)
+else
+	$(AM_V_at)s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+	  cp ${top_srcdir}/desktopfiles/prebuilt-hi$${s}-djvu.png $@
+endif
+
+svg_process =\
+cat $< | gzip >$@
+
+svg_verbose = $(svg_verbose_@AM_V@)
+svg_verbose_ = $(svg_verbose_@AM_DEFAULT_V@)
+svg_verbose_0 = @echo "  SVG     " $@;
+
+$(SVGICONS): djvu.svg Makefile
+	$(AM_V_at)$(MKDIR_P) `dirname $@`
+	$(AM_V_at)rm -f $@
+	$(svg_verbose)$(svg_process)
+
+iconsdir = $(datadir)/icons/hicolor
+nobase_icons_DATA = $(PNGICONS) $(SVGICONS)
+
+# mime
+
+mimedir = $(datadir)/mime/packages
+dist_mime_DATA = djvulibre-mime.xml
+
+# hooks
+
+install-data-hook: update-mime
+uninstall-hook: update-mime
+
+update-mime:
+	echo "*** You must still update various caches with:" ; \
+	echo "*** # update-mime-database $(datadir)/mime" ; \
+	echo "*** # update-icon-caches $(iconsdir)" 
+
+# extra
+
+EXTRA_DIST = \
+djvu.svg \
+prebuilt-hi128-djvu.png \
+prebuilt-hi16-djvu.png \
+prebuilt-hi20-djvu.png \
+prebuilt-hi22-djvu.png \
+prebuilt-hi24-djvu.png \
+prebuilt-hi256-djvu.png \
+prebuilt-hi32-djvu.png \
+prebuilt-hi48-djvu.png \
+prebuilt-hi64-djvu.png \
+prebuilt-hi72-djvu.png \
+prebuilt-hi96-djvu.png
+
+# clean
+
+MOSTLYCLEANFILES = $(PNGICONS) $(SVGICONS) 
+
+mostlyclean-local:
+	$(AM_V_at)for n in $(PNGICONS) $(SVGICONS) ; do m=`dirname "$$n"` ; \
+	    while test "$$m" != "." ; do rmdir $$m ; m=`dirname "$$m"` ; done ; \
+	done
+
diff --git a/desktopfiles/Makefile.in b/desktopfiles/Makefile.in
new file mode 100644
index 0000000..4b0caad
--- /dev/null
+++ b/desktopfiles/Makefile.in
@@ -0,0 +1,631 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = desktopfiles
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_mime_DATA)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(iconsdir)"
+DATA = $(dist_mime_DATA) $(nobase_icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INKSCAPE = @INKSCAPE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JPEG_CFLAGS = @JPEG_CFLAGS@
+JPEG_LIBS = @JPEG_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RM = @RM@
+RSVG = @RSVG@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TIFF_CFLAGS = @TIFF_CFLAGS@
+TIFF_LIBS = @TIFF_LIBS@
+TOUCH = @TOUCH@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+version_info = @version_info@
+
+#icons
+SVGICONS = \
+scalable/mimetypes/djvu.svgz
+
+PNGICONS = \
+16x16/mimetypes/djvu.png \
+20x20/mimetypes/djvu.png \
+22x22/mimetypes/djvu.png \
+24x24/mimetypes/djvu.png \
+32x32/mimetypes/djvu.png \
+48x48/mimetypes/djvu.png \
+64x64/mimetypes/djvu.png \
+72x72/mimetypes/djvu.png \
+96x96/mimetypes/djvu.png \
+128x128/mimetypes/djvu.png \
+256x256/mimetypes/djvu.png 
+
+@HAVE_CONVERSION_CONVERT_TRUE@convert_icons_process = \
+@HAVE_CONVERSION_CONVERT_TRUE@s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+@HAVE_CONVERSION_CONVERT_TRUE@${CONVERT} \
+@HAVE_CONVERSION_CONVERT_TRUE@-geometry $${s}x$${s} \
+@HAVE_CONVERSION_CONVERT_TRUE@-depth 8 \
+@HAVE_CONVERSION_CONVERT_TRUE@-background none $< $@
+
+@HAVE_CONVERSION_INKSCAPE_TRUE@convert_icons_process = \
+@HAVE_CONVERSION_INKSCAPE_TRUE@s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+@HAVE_CONVERSION_INKSCAPE_TRUE@${INKSCAPE} \
+@HAVE_CONVERSION_INKSCAPE_TRUE@--without-gui \
+@HAVE_CONVERSION_INKSCAPE_TRUE@--export-width=$${s} \
+@HAVE_CONVERSION_INKSCAPE_TRUE@--export-height=$${s} \
+@HAVE_CONVERSION_INKSCAPE_TRUE@--export-png=$@ $<
+
+@HAVE_CONVERSION_RSVG_TRUE@convert_icons_process = \
+@HAVE_CONVERSION_RSVG_TRUE@s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+@HAVE_CONVERSION_RSVG_TRUE@${RSVG} \
+@HAVE_CONVERSION_RSVG_TRUE@-w $${s} \
+@HAVE_CONVERSION_RSVG_TRUE@-h $${s} -o $@ $<
+
+png_verbose = $(png_verbose_@AM_V@)
+png_verbose_ = $(png_verbose_@AM_DEFAULT_V@)
+png_verbose_0 = @echo "  PNG     " $@;
+svg_process = \
+cat $< | gzip >$@
+
+svg_verbose = $(svg_verbose_@AM_V@)
+svg_verbose_ = $(svg_verbose_@AM_DEFAULT_V@)
+svg_verbose_0 = @echo "  SVG     " $@;
+iconsdir = $(datadir)/icons/hicolor
+nobase_icons_DATA = $(PNGICONS) $(SVGICONS)
+
+# mime
+mimedir = $(datadir)/mime/packages
+dist_mime_DATA = djvulibre-mime.xml
+
+# extra
+EXTRA_DIST = \
+djvu.svg \
+prebuilt-hi128-djvu.png \
+prebuilt-hi16-djvu.png \
+prebuilt-hi20-djvu.png \
+prebuilt-hi22-djvu.png \
+prebuilt-hi24-djvu.png \
+prebuilt-hi256-djvu.png \
+prebuilt-hi32-djvu.png \
+prebuilt-hi48-djvu.png \
+prebuilt-hi64-djvu.png \
+prebuilt-hi72-djvu.png \
+prebuilt-hi96-djvu.png
+
+
+# clean
+MOSTLYCLEANFILES = $(PNGICONS) $(SVGICONS) 
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu desktopfiles/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu desktopfiles/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_mimeDATA: $(dist_mime_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_mime_DATA)'; test -n "$(mimedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(mimedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(mimedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \
+	done
+
+uninstall-dist_mimeDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_mime_DATA)'; test -n "$(mimedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(mimedir)'; $(am__uninstall_files_from_dir)
+install-nobase_iconsDATA: $(nobase_icons_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(nobase_icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \
+	fi; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(iconsdir)/$$dir"; }; \
+	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(iconsdir)/$$dir'"; \
+	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(iconsdir)/$$dir" || exit $$?; }; \
+	done
+
+uninstall-nobase_iconsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nobase_icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(iconsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_mimeDATA install-nobase_iconsDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_mimeDATA uninstall-nobase_iconsDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dist_mimeDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-nobase_iconsDATA install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dist_mimeDATA uninstall-hook \
+	uninstall-nobase_iconsDATA
+
+all: icons
+
+icons: $(PNGICONS) $(SVGICONS)
+
+${PNGICONS}: djvu.svg Makefile
+	$(AM_V_at)$(MKDIR_P) `dirname $@`
+@HAVE_CONVERSION_TOOL_TRUE@	$(png_verbose)$(convert_icons_process)
+@HAVE_CONVERSION_TOOL_FALSE@	$(AM_V_at)s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+@HAVE_CONVERSION_TOOL_FALSE@	  cp ${top_srcdir}/desktopfiles/prebuilt-hi$${s}-djvu.png $@
+
+$(SVGICONS): djvu.svg Makefile
+	$(AM_V_at)$(MKDIR_P) `dirname $@`
+	$(AM_V_at)rm -f $@
+	$(svg_verbose)$(svg_process)
+
+# hooks
+
+install-data-hook: update-mime
+uninstall-hook: update-mime
+
+update-mime:
+	echo "*** You must still update various caches with:" ; \
+	echo "*** # update-mime-database $(datadir)/mime" ; \
+	echo "*** # update-icon-caches $(iconsdir)" 
+
+mostlyclean-local:
+	$(AM_V_at)for n in $(PNGICONS) $(SVGICONS) ; do m=`dirname "$$n"` ; \
+	    while test "$$m" != "." ; do rmdir $$m ; m=`dirname "$$m"` ; done ; \
+	done
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/desktopfiles/djvu.svg b/desktopfiles/djvu.svg
new file mode 100644
index 0000000..4814b14
--- /dev/null
+++ b/desktopfiles/djvu.svg
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   viewBox="0 0 48 48"
+   id="svg2524"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="djvu.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/leonb/djvulibre-djview/src/images/djvu48.png"
+   inkscape:export-xdpi="89.999985"
+   inkscape:export-ydpi="89.999985">
+  <defs
+     id="defs2526">
+    <linearGradient
+       id="linearGradient11663">
+      <stop
+         style="stop-color:#342679;stop-opacity:1;"
+         offset="0"
+         id="stop11665" />
+      <stop
+         style="stop-color:#dacfe4;stop-opacity:1;"
+         offset="1"
+         id="stop11667" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11663"
+       id="linearGradient2518"
+       gradientUnits="userSpaceOnUse"
+       x1="40.864098"
+       y1="40.518246"
+       x2="33.136433"
+       y2="32.651588" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11545"
+       id="linearGradient2525"
+       gradientUnits="userSpaceOnUse"
+       x1="25.553648"
+       y1="34.006008"
+       x2="0"
+       y2="34.153435" />
+    <clipPath
+       id="clip48">
+      <path
+         d="M 10.84375,39.414062 L 0,39.414062 L 0,28.460938 L 10.84375,28.460938 L 10.84375,0.00390625 L 46.386719,0.00390625 L 46.386719,32.738281 L 33.328125,45.796875 L 10.84375,45.796875 L 10.84375,39.414062"
+         id="path148" />
+    </clipPath>
+    <clipPath
+       id="clip32">
+      <path
+         d="M 10.84375,39.414062 L 0,39.414062 L 0,28.460938 L 10.84375,28.460938 L 10.84375,0.00390625 L 46.386719,0.00390625 L 46.386719,32.738281 L 33.328125,45.796875 L 10.84375,45.796875 L 10.84375,39.414062"
+         id="path100" />
+    </clipPath>
+    <clipPath
+       id="clip7">
+      <path
+         d="M 10.84375,39.414062 L 0,39.414062 L 0,28.460938 L 10.84375,28.460938 L 10.84375,0.00390625 L 46.386719,0.00390625 L 46.386719,32.738281 L 33.328125,45.796875 L 10.84375,45.796875 L 10.84375,39.414062"
+         id="path25" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11545">
+      <stop
+         style="stop-color:#f89c11;stop-opacity:1;"
+         offset="0"
+         id="stop11547" />
+      <stop
+         style="stop-color:#fabf60;stop-opacity:1"
+         offset="1"
+         id="stop11549" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11545"
+       id="linearGradient11653"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4601868,0,0,0.9728475,2.2307835,28.622031)"
+       x1="25.553648"
+       y1="34.006008"
+       x2="0"
+       y2="34.153435" />
+    <linearGradient
+       id="linearGradient2545">
+      <stop
+         id="stop2547"
+         offset="0"
+         style="stop-color:#342679;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7b51ae;stop-opacity:0.96862745;"
+         offset="0.72235626"
+         id="stop2553" />
+      <stop
+         id="stop2549"
+         offset="1"
+         style="stop-color:#d9cce8;stop-opacity:0.96862745;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2545"
+       id="linearGradient2543"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9880039,0,0,0.9757112,0.5252674,7.9045507e-2)"
+       x1="45.033901"
+       y1="44.966038"
+       x2="11.675456"
+       y2="1.4610662" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2532" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11663"
+       id="linearGradient2749"
+       gradientUnits="userSpaceOnUse"
+       x1="40.864098"
+       y1="40.518246"
+       x2="33.136433"
+       y2="32.651588"
+       gradientTransform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11545"
+       id="linearGradient2756"
+       gradientUnits="userSpaceOnUse"
+       x1="25.553648"
+       y1="34.006008"
+       x2="0"
+       y2="34.153435"
+       gradientTransform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2545"
+       id="linearGradient2774"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0115079,0,0,1.0161106,5.5234761,9.1336546)"
+       x1="45.033901"
+       y1="44.966038"
+       x2="11.675456"
+       y2="1.4610662" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11663"
+       id="linearGradient2426"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)"
+       x1="40.864098"
+       y1="40.518246"
+       x2="33.136433"
+       y2="32.651588" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11545"
+       id="linearGradient2433"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)"
+       x1="25.553648"
+       y1="34.006008"
+       x2="0"
+       y2="34.153435" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2545"
+       id="linearGradient2451"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0115079,0,0,1.0161106,5.5234761,9.1336546)"
+       x1="45.033901"
+       y1="44.966038"
+       x2="11.675456"
+       y2="1.4610662" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="26.06094"
+     inkscape:cy="64.449612"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:showpageshadow="true"
+     inkscape:window-width="800"
+     inkscape:window-height="654"
+     inkscape:window-x="558"
+     inkscape:window-y="83"
+     inkscape:snap-guide="true" />
+  <metadata
+     id="metadata2529">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-4.9857129,-9.2639696)">
+    <g
+       id="g2454"
+       transform="matrix(1.000026,0,0,0.9968473,-1.2968723e-4,0.405534)">
+      <path
+         id="path11621"
+         d="M 16.627139,9.7708624 L 16.627139,56.236444 L 39.543803,56.236444 L 52.478362,43.243028 L 52.478362,9.7708624 L 16.627139,9.7708624 z"
+         style="fill:url(#linearGradient2451);fill-opacity:1;fill-rule:evenodd;stroke:#3a2b87;stroke-width:1.01380634px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <g
+         transform="matrix(1.0237894,0,0,1.0414051,9.6816161,-27.57005)"
+         id="g11649">
+        <rect
+           style="fill:#000000;fill-opacity:1"
+           id="rect11645"
+           width="11.895136"
+           height="11.569371"
+           x="3.1296141"
+           y="57.056187"
+           ry="2.7001941e-17"
+           transform="matrix(0.9396926,-0.3420201,0.3420201,0.9396926,0,0)" />
+        <rect
+           style="fill:url(#linearGradient11653);fill-opacity:1"
+           id="rect11641"
+           width="11.895135"
+           height="11.56937"
+           x="2.2307839"
+           y="56.063431"
+           ry="2.7001941e-17"
+           transform="matrix(0.9396926,-0.3420201,0.3420201,0.9396926,0,0)" />
+      </g>
+      <g
+         transform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)"
+         clip-path="url(#clip7)"
+         clip-rule="nonzero"
+         id="g1139">
+        <path
+           style="fill:#0f0c0c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           d="M 10.921875,40.667969 L 26.40625,40.667969 L 26.40625,28.707031 L 10.921875,28.707031 L 10.921875,40.667969 z"
+           id="path1141" />
+      </g>
+      <g
+         style="fill:#816392;fill-opacity:0.86179516"
+         transform="matrix(1.0237894,0,0,1.0414051,0.779179,8.770206)"
+         id="g11677">
+        <g
+           style="fill:#816392;fill-opacity:0.86179516"
+           id="g11679"
+           clip-rule="nonzero"
+           clip-path="url(#clip32)"
+           transform="translate(4.2261802,1.3274155)">
+          <path
+             id="path11681"
+             d="M 26.128906,23.296875 C 28.144531,24.539062 30.609375,25.078125 32.652344,23.492188 C 34.226562,22.28125 34.496094,20.15625 33.976562,18.078125 C 33.058594,14.492188 29.414062,10.550781 29.414062,10.550781 L 18.972656,-2.15625 C 18.972656,-2.15625 18.835938,-2.328125 18.539062,-2.417969 C 18.125,-2.535156 17.503906,-2.15625 17.855469,-1.390625 L 28.765625,12.054688 C 28.765625,12.054688 32.03125,15.359375 32.652344,18.527344 C 32.949219,20.011719 32.867188,21.488281 31.734375,22.398438 C 30.214844,23.621094 28.289062,22.9375 26.605469,21.863281 C 24.34375,20.417969 22.429688,18.09375 22.429688,18.09375 L 7.777344,0.679688 L 7.613281,2.613281 L 21.472656,19.136719 C 21.472656,19.136719 23.554688,21.703125 26.128906,23.296875"
+             style="fill:#816392;fill-opacity:0.86179516;fill-rule:nonzero;stroke:none" />
+        </g>
+        <g
+           style="fill:#816392;fill-opacity:0.86179516"
+           id="g11683"
+           clip-rule="nonzero"
+           clip-path="url(#clip48)"
+           transform="translate(4.2261807,1.4535628)">
+          <path
+             id="path11685"
+             d="M 28.304688,15.984375 C 30.308594,18.535156 28.464844,19.691406 27.179688,19.011719 C 25.304688,18.011719 22.753906,14.625 22.753906,14.625 L 15.613281,6.003906 C 15.070312,5.257812 14.429688,5.644531 14.296875,6.09375 C 14.199219,6.441406 14.535156,6.777344 14.535156,6.777344 L 21.726562,15.480469 C 21.726562,15.480469 23.933594,18.082031 25.125,19.21875 C 28.625,22.585938 32.886719,19.371094 29.175781,14.660156 C 27.074219,12 23.867188,8.175781 23.867188,8.175781 L 13.371094,-4.707031 L 11.859375,-4.839844 L 11.789062,-4.050781 L 22.511719,8.71875 C 22.511719,8.71875 26.148438,13.242188 28.304688,15.984375"
+             style="fill:#816392;fill-opacity:0.86179516;fill-rule:nonzero;stroke:none" />
+        </g>
+      </g>
+      <g
+         transform="matrix(1.0237894,0,0,1.0414051,0.659598,7.725718)"
+         id="g11671">
+        <g
+           id="g3875"
+           clip-rule="nonzero"
+           clip-path="url(#clip32)"
+           transform="translate(4.2261802,1.3274155)">
+          <path
+             id="path3877"
+             d="M 26.128906,23.296875 C 28.144531,24.539062 30.609375,25.078125 32.652344,23.492188 C 34.226562,22.28125 34.496094,20.15625 33.976562,18.078125 C 33.058594,14.492188 29.414062,10.550781 29.414062,10.550781 L 18.972656,-2.15625 C 18.972656,-2.15625 18.835938,-2.328125 18.539062,-2.417969 C 18.125,-2.535156 17.503906,-2.15625 17.855469,-1.390625 L 28.765625,12.054688 C 28.765625,12.054688 32.03125,15.359375 32.652344,18.527344 C 32.949219,20.011719 32.867188,21.488281 31.734375,22.398438 C 30.214844,23.621094 28.289062,22.9375 26.605469,21.863281 C 24.34375,20.417969 22.429688,18.09375 22.429688,18.09375 L 7.777344,0.679688 L 7.613281,2.613281 L 21.472656,19.136719 C 21.472656,19.136719 23.554688,21.703125 26.128906,23.296875"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        </g>
+        <g
+           id="g6171"
+           clip-rule="nonzero"
+           clip-path="url(#clip48)"
+           transform="translate(4.2261807,1.4535628)">
+          <path
+             id="path6173"
+             d="M 28.304688,15.984375 C 30.308594,18.535156 28.464844,19.691406 27.179688,19.011719 C 25.304688,18.011719 22.753906,14.625 22.753906,14.625 L 15.613281,6.003906 C 15.070312,5.257812 14.429688,5.644531 14.296875,6.09375 C 14.199219,6.441406 14.535156,6.777344 14.535156,6.777344 L 21.726562,15.480469 C 21.726562,15.480469 23.933594,18.082031 25.125,19.21875 C 28.625,22.585938 32.886719,19.371094 29.175781,14.660156 C 27.074219,12 23.867188,8.175781 23.867188,8.175781 L 13.371094,-4.707031 L 11.859375,-4.839844 L 11.789062,-4.050781 L 22.511719,8.71875 C 22.511719,8.71875 26.148438,13.242188 28.304688,15.984375"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        </g>
+      </g>
+      <rect
+         ry="2.8904797e-17"
+         y="38.426559"
+         x="4.985713"
+         height="12.384676"
+         width="26.463417"
+         id="rect11543"
+         style="fill:url(#linearGradient2433);fill-opacity:1" />
+      <text
+         transform="scale(0.9915063,1.0085665)"
+         id="text11553"
+         y="40.434292"
+         x="6.855123"
+         style="font-size:41.30238724px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           id="tspan11555"
+           sodipodi:role="line"
+           x="6.855123"
+           y="40.434292" /></text>
+      <path
+         id="text11559"
+         d="M 6.5953489,40.138055 L 9.8527523,40.138055 C 10.494871,40.138062 11.012764,40.225184 11.406432,40.399422 C 11.803316,40.573673 12.130831,40.823746 12.388977,41.149641 C 12.64711,41.475549 12.834262,41.854691 12.950432,42.28707 C 13.066587,42.719459 13.124669,43.177657 13.124676,43.661665 C 13.124669,44.419954 13.037547,45.008836 12.863309,45.428311 C 12.692285,45.844563 12.453506,46.194665 12.146971,46.478618 C 11.840424,46.759345 11.511296,46.946497 11.159586,47.040072 C 10.678795,47.169142 10.243185,47.233677 9.8527523,47.233677 L 6.5953489,47.233677 L 6.5953489,40.138055 M 8.7879251,41.744976 L 8.7879251,45.621916 L 9.3251788,45.621916 C 9.7833733,45.621917 10.109275,45.571903 10.302884,45.471872 C 10.496484,45.368618 10.648141,45.191147 10.757856,44.939458 C 10.86756,44.684548 10.922415,44.273137 10.92242,43.705227 C 10.922415,42.953398 10.799798,42.438732 10.55457,42.161227 C 10.309333,41.883732 9.9027629,41.744982 9.3348591,41.744976 L 8.7879251,41.744976 M 14.218544,40.138055 L 16.193315,40.138055 L 16.193315,41.49329 L 14.218544,41.49329 L 14.218544,40.138055 M 14.218544,42.093465 L 16.193315,42.093465 L 16.193315,47.078793 C 16.193312,47.714462 16.146524,48.164593 16.052951,48.429188 C 15.9626,48.69378 15.793195,48.908358 15.544738,49.072924 C 15.296277,49.237486 14.941335,49.319768 14.479911,49.31977 C 14.099154,49.319768 13.626435,49.2633 13.061754,49.150366 L 13.357002,47.717689 C 13.515113,47.749956 13.631276,47.76609 13.705491,47.766091 C 13.873282,47.76609 14.000738,47.708009 14.087861,47.591846 C 14.174982,47.47891 14.218543,47.251424 14.218544,46.909389 L 14.218544,42.093465 M 16.880612,40.138055 L 19.174831,40.138055 L 20.772072,45.244386 L 22.345112,40.138055 L 24.571569,40.138055 L 21.938542,47.233677 L 19.562041,47.233677 L 16.880612,40.138055 M 30.244195,47.233677 L 28.404948,47.233677 L 28.404948,46.401176 C 28.13067,46.743212 27.85317,46.986831 27.572446,47.132034 C 27.294943,47.277238 26.952908,47.34984 26.54634,47.34984 C 26.004244,47.34984 25.578314,47.188502 25.268547,46.865827 C 24.962006,46.539927 24.808735,46.039781 24.808736,45.365389 L 24.808736,42.093465 L 26.788346,42.093465 L 26.788346,44.920098 C 26.788344,45.242775 26.848039,45.471874 26.967431,45.607395 C 27.086818,45.74292 27.254609,45.810682 27.470804,45.81068 C 27.706353,45.810682 27.898344,45.720333 28.046779,45.539634 C 28.198432,45.358937 28.27426,45.034649 28.274264,44.566769 L 28.274264,42.093465 L 30.244195,42.093465 L 30.244195,47.233677"
+         style="font-size:9.91257381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:Arial Black"
+         transform="scale(0.9915063,1.0085665)" />
+      <path
+         id="path11661"
+         d="M 39.422336,56.74769 L 39.422336,43.575571 L 52.371645,43.575571"
+         style="fill:url(#linearGradient2426);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.03255963px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/desktopfiles/djvulibre-mime.xml b/desktopfiles/djvulibre-mime.xml
new file mode 100644
index 0000000..4563d13
--- /dev/null
+++ b/desktopfiles/djvulibre-mime.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="image/vnd.djvu">
+   <alias type="image/x.djvu"/>
+   <alias type="image/x-djvu"/>
+   <glob pattern="*.djvu"/>
+   <glob pattern="*.djv"/>
+   <icon name="djvu"/>
+   <generic-icon name="djvu"/>
+   <magic priority="50">
+     <match type="string" offset="0" value="AT&amp;TFORM">
+       <match type="string" offset="12" value="DJVM"/>
+       <match type="string" offset="12" value="DJVU"/>
+     </match>
+     <match type="string" offset="0" value="FORM">
+       <match type="string" offset="8" value="DJVM"/>
+       <match type="string" offset="8" value="DJVU"/>
+     </match>
+   </magic>
+   <comment>DjVu Document</comment>
+   <comment xml:lang="af">DjVu Dokument</comment>
+   <comment xml:lang="ast">documentu DjVu</comment>
+   <comment xml:lang="ar">مستند DjVu</comment>
+   <comment xml:lang="az">DjVu Sənədi</comment>
+   <comment xml:lang="be">Дакумэнт DjVu</comment>
+   <comment xml:lang="be@latin">Dakument DjVu</comment>
+   <comment xml:lang="bg">Документ DjVu</comment>
+   <comment xml:lang="bn">পি-ডি-এফ নথী</comment>
+   <comment xml:lang="bo">DjVu ཡིག་ཆ</comment>
+   <comment xml:lang="br">Teul DjVu</comment>
+   <comment xml:lang="bs">DjVu dokument</comment>
+   <comment xml:lang="ca">Document DjVu</comment>
+   <comment xml:lang="cs">DjVu dokument</comment>
+   <comment xml:lang="cy">Dogfen DjVu</comment>
+   <comment xml:lang="da">DjVu-dokument</comment>
+   <comment xml:lang="de">DjVu-Dokument</comment>
+   <comment xml:lang="el">Έγγραφο DjVu</comment>
+   <comment xml:lang="en_AU">DjVu document</comment>
+   <comment xml:lang="en_GB">DjVu document</comment>
+   <comment xml:lang="eo">DjVu-dokumento</comment>
+   <comment xml:lang="es">Documento DjVu</comment>
+   <comment xml:lang="et">DjVu-dokument</comment>
+   <comment xml:lang="eu">DjVu dokumentua</comment>
+   <comment xml:lang="fa">سند DjVu</comment>
+   <comment xml:lang="fi">DjVu-asiakirja</comment>
+   <comment xml:lang="fr">Document DjVu</comment>
+   <comment xml:lang="fy">DjVu-dokumint</comment>
+   <comment xml:lang="ga">Cáipéis DjVu</comment>
+   <comment xml:lang="gl">Documento DjVu</comment>
+   <comment xml:lang="he">מסמך DjVu</comment>
+   <comment xml:lang="hr">DjVu dokument</comment>
+   <comment xml:lang="hu">DjVu-dokumentum</comment>
+   <comment xml:lang="is">DjVu skjal</comment>
+   <comment xml:lang="it">Documento DjVu</comment>
+   <comment xml:lang="ja">DjVu ドキュメント</comment>
+   <comment xml:lang="km">ឯកសារ DjVu</comment>
+   <comment xml:lang="kk">DjVu құжаты</comment>
+   <comment xml:lang="ko">DjVu 문서</comment>
+   <comment xml:lang="lb">DjVu-Dokument</comment>
+   <comment xml:lang="lt">DjVu dokumentas</comment>
+   <comment xml:lang="lv">DjVu dokuments</comment>
+   <comment xml:lang="mk">DjVu документ</comment>
+   <comment xml:lang="mn">DjVu-Баримт</comment>
+   <comment xml:lang="ms">Dokumen DjVu</comment>
+   <comment xml:lang="mt">Dokument DjVu</comment>
+   <comment xml:lang="nb">DjVu-dokument</comment>
+   <comment xml:lang="nds">DjVu-Dokment</comment>
+   <comment xml:lang="nl">DjVu-document</comment>
+   <comment xml:lang="nn">DjVu-dokument</comment>
+   <comment xml:lang="nso">Tokomane ya DjVu</comment>
+   <comment xml:lang="oc">Document DjVu</comment>
+   <comment xml:lang="pa">DjVu ਦਸਤਾਵੇਜ਼</comment>
+   <comment xml:lang="pl">Dokument DjVu</comment>
+   <comment xml:lang="pt">Documento DjVu</comment>
+   <comment xml:lang="pt_BR">Documento DjVu</comment>
+   <comment xml:lang="ro">Document DjVu</comment>
+   <comment xml:lang="ru">Документ DjVu</comment>
+   <comment xml:lang="rw">DjVu Inyandiko</comment>
+   <comment xml:lang="se">DjVu-dokumeanta</comment>
+   <comment xml:lang="sk">DjVu dokument</comment>
+   <comment xml:lang="sl">Dokument DjVu</comment>
+   <comment xml:lang="sq">Dokument nga DjVu</comment>
+   <comment xml:lang="sr">DjVu документ</comment>
+   <comment xml:lang="sr@Latn">DjVu dokument</comment>
+   <comment xml:lang="sv">DjVu-dokument</comment>
+   <comment xml:lang="ta">DjVu ஆவணம்</comment>
+   <comment xml:lang="tg">Хуҷҷати DjVu </comment>
+   <comment xml:lang="th">เอกสาร DjVu</comment>
+   <comment xml:lang="tr">DjVu Belgesi</comment>
+   <comment xml:lang="tt">DjVu İstälek</comment>
+   <comment xml:lang="ug">DjVu پۈتۈكى</comment>
+   <comment xml:lang="uk">Документ DjVu</comment>
+   <comment xml:lang="uz">DjVu ҳужжати</comment>
+   <comment xml:lang="ven">Manwalwa a DjVu</comment>
+   <comment xml:lang="vi">Tài liệu DjVu</comment>
+   <comment xml:lang="wa">Documint DjVu</comment>
+   <comment xml:lang="xh">Uxwebhu lwe DjVu</comment>
+   <comment xml:lang="zh_CN">DjVu 文档</comment>
+   <comment xml:lang="zh_HK">DjVu 文件</comment>
+   <comment xml:lang="zh_TW">DjVu 文件</comment>
+   <comment xml:lang="zu">Uhlu lwamafayela e-DjVu</comment>
+ </mime-type>
+</mime-info>
diff --git a/desktopfiles/prebuilt-hi128-djvu.png b/desktopfiles/prebuilt-hi128-djvu.png
new file mode 100644
index 0000000..9b3f4da
Binary files /dev/null and b/desktopfiles/prebuilt-hi128-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi16-djvu.png b/desktopfiles/prebuilt-hi16-djvu.png
new file mode 100644
index 0000000..d8da881
Binary files /dev/null and b/desktopfiles/prebuilt-hi16-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi20-djvu.png b/desktopfiles/prebuilt-hi20-djvu.png
new file mode 100644
index 0000000..16de271
Binary files /dev/null and b/desktopfiles/prebuilt-hi20-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi22-djvu.png b/desktopfiles/prebuilt-hi22-djvu.png
new file mode 100644
index 0000000..45ac980
Binary files /dev/null and b/desktopfiles/prebuilt-hi22-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi24-djvu.png b/desktopfiles/prebuilt-hi24-djvu.png
new file mode 100644
index 0000000..3fa1221
Binary files /dev/null and b/desktopfiles/prebuilt-hi24-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi256-djvu.png b/desktopfiles/prebuilt-hi256-djvu.png
new file mode 100644
index 0000000..09d835a
Binary files /dev/null and b/desktopfiles/prebuilt-hi256-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi32-djvu.png b/desktopfiles/prebuilt-hi32-djvu.png
new file mode 100644
index 0000000..9952b92
Binary files /dev/null and b/desktopfiles/prebuilt-hi32-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi48-djvu.png b/desktopfiles/prebuilt-hi48-djvu.png
new file mode 100644
index 0000000..65537ad
Binary files /dev/null and b/desktopfiles/prebuilt-hi48-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi64-djvu.png b/desktopfiles/prebuilt-hi64-djvu.png
new file mode 100644
index 0000000..1bba94e
Binary files /dev/null and b/desktopfiles/prebuilt-hi64-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi72-djvu.png b/desktopfiles/prebuilt-hi72-djvu.png
new file mode 100644
index 0000000..dac2ff5
Binary files /dev/null and b/desktopfiles/prebuilt-hi72-djvu.png differ
diff --git a/desktopfiles/prebuilt-hi96-djvu.png b/desktopfiles/prebuilt-hi96-djvu.png
new file mode 100644
index 0000000..368e88f
Binary files /dev/null and b/desktopfiles/prebuilt-hi96-djvu.png differ
diff --git a/djvulibre.spec b/djvulibre.spec
new file mode 100755
index 0000000..09fea3d
--- /dev/null
+++ b/djvulibre.spec
@@ -0,0 +1,88 @@
+%define release 1
+%define version 3.5.27
+
+Summary: DjVu viewers, encoders and utilities.
+Name: djvulibre
+Version: %{version}
+Release: %{release}
+License: GPL
+Group: Applications/Publishing
+Source: djvulibre-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-root
+URL: http://djvu.sourceforge.net
+
+# BuildRequires: qt-devel
+# BuildRequires: qt-designer
+# BuildRequires: libjpeg-devel
+# BuildRequires: libtiff-devel
+# BuildRequires: glibc-devel
+# BuildRequires: gcc-c++
+
+%description 
+
+DjVu is a web-centric format and software platform for distributing documents
+and images.  DjVu content downloads faster, displays and renders faster, looks
+nicer on a screen, and consume less client resources than competing formats.
+DjVu was originally developed at AT&T Labs-Research by Leon Bottou, Yann
+LeCun, Patrick Haffner, and many others.  In March 2000, AT&T sold DjVu to
+LizardTech Inc. who now distributes Windows/Mac plug-ins, and commercial
+encoders (mostly on Windows)
+
+In an effort to promote DjVu as a Web standard, the LizardTech management was
+enlightened enough to release the reference implementation of DjVu under the
+GNU GPL in October 2000.  DjVuLibre (which means free DjVu), is an enhanced
+version of that code maintained by the original inventors of DjVu. It is
+compatible with version 3.5 of the LizardTech DjVu software suite.
+
+DjVulibre-3.5 contains:
+- An up-to-date version of the C++ DjVu Reference Library.
+- A full-fledged wavelet-based compressor for pictures. 
+- A simple compressor for bitonal (black and white) scanned pages. 
+- A compressor for palettized images (a la GIF/PNG). 
+- A set of utilities to manipulate and assemble DjVu images and documents. 
+- A set of decoders to convert DjVu to a number of other formats. 
+
+%prep
+%setup -q
+
+%build
+%configure
+make depend
+make
+
+%install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+
+# Quick fix to stop ldconfig from complaining
+find %{buildroot}%{_libdir} -name "*.so*" -exec chmod 755 {} \;
+
+# Quick cleanup of the docs
+rm -rf doc/CVS 2>/dev/null || :
+
+%clean
+rm -rf %{buildroot}
+
+%post 
+# LIBS: Run ldconfig
+/sbin/ldconfig
+exit 0
+
+%postun
+# LIBS: Run ldconfig
+/sbin/ldconfig
+exit 0
+
+
+%files
+%defattr(-, root, root)
+%doc README COPYRIGHT COPYING NEWS doc
+%{_bindir}
+%{_libdir}
+%{_includedir}/libdjvu
+%{_datadir}
+%{_mandir}
+
+%changelog
+* Sun Feb 08 2015 Leon Bottou <leon@bottou.org> 3.5.27-1
+- new release
diff --git a/doc/djvu2spec.djvu b/doc/djvu2spec.djvu
new file mode 100644
index 0000000..1163c7e
Binary files /dev/null and b/doc/djvu2spec.djvu differ
diff --git a/doc/djvu3spec.djvu b/doc/djvu3spec.djvu
new file mode 100644
index 0000000..f2fdb27
Binary files /dev/null and b/doc/djvu3spec.djvu differ
diff --git a/doc/djvuchanges.txt b/doc/djvuchanges.txt
new file mode 100644
index 0000000..66bf295
--- /dev/null
+++ b/doc/djvuchanges.txt
@@ -0,0 +1,260 @@
+
+
+
+0- INTRODUCTION.
+
+This document describes actual and proposed changes to the djvu
+format since the release of the DjVu3 specification by Lizardtech in
+november 2005.
+
+
+
+1- AMBIGUOUS PARTS IN THE SPECIFICATION
+
+1.1- BACKGROUND REDUCTION RATIO
+
+The relation between the size (W,H) of the foreground image and the
+size (w,h) of the background image is described in page 33 of the
+specification.  The requirement ceil(W/w)=ceil(H/h) does not
+completely capture the fact that the same reduction factor should be
+applied to both dimensions.  The requirements should be read as:
+
+<<There is a single integer reduction factor 1 <= k <= 12 such 
+  that w=ceil(W/k) and h=ceil(H/k).  Should there be several
+  such integers, the smallest one shall be considered
+  to rescale the background image to the foreground resolution.>>
+
+1.2- ENCODING OF URLS IN ANNOTATIONS
+
+Page 16 omits to specify that URLs in annotations should be percent encoded. 
+However, consistent with the encoding of strings in the annotation chunk, 
+UTF-8 characters in URL strings will be interpreted properly as if
+they were percent encoded.
+
+1.3- FLAGS IN DJVUINFO CHUNKS
+
+Page 24 specifies that {1,6,2,5} are the only four allowed 
+values of the "flags" field in the INFO chunk.
+To maximize compatibility with earlier versions of the standard,
+values different from {1,6,2,5} should be ignored
+and interpreted as 1 : rightside up orientation.
+
+
+
+2- ESCAPE SEQUENCES IN ANNOTATION CHUNK STRINGS.
+
+The treatment of escape sequence in annotation chunk strings has
+historically been slightly different in Lizardtech DjVu and
+DjVuLibre.  We are expecting that the DjVuLibre solution will
+eventually become the standard.
+
+Lizardtech DjVu uses the "old" rule described in section 8.3.4.2.
+The sequence of characters BACKSLASH DOUBLEQUOTE represents a
+DOUBLEQUOTE character without terminating the string.  There are no
+other escape sequences. All other utf8 characters are written
+directly. The main drawback of this approach is the inability to
+write a string containing the sequence of characters BACKSLASH
+DOUBLEQUOTE since there is no way to escape the first BACKSLASH
+character.
+
+DjVuLibre has introduced a more flexible scheme a few years ago.
+Annotation strings are similar to strings in the C language.
+Character sequences starting with a backslash have special meaning.
+A BACKSLASH followed by "a", "b", "t", "n", "v", "f", "r", or "\"
+stands for the ascii character BEL, BS, HT, LF, VT, FF, CR,
+BACKSLASH or DOUBLEQUOTE.  A BACKSLASH followed by one to three
+digits stands for the byte whose octal code is expressed by the
+digits.  All other backslash sequences are illegal.  Non printable
+ascii characters must be escaped. Multibyte characters should either
+be entered directly, or represented using octal sequences.
+
+DjVuLibre minimizes the compatibility problems by searching illegal
+escape sequences in the annotation chunk.  If any illegal sequence
+is found, the Lizardtech rule is used instead of the DjVuLibre rule.
+It is expected that Lizardtech will at some point adopt the improved
+DjVuLibre rules. We will then be able to state that all DjVu files
+with version greater than some constant use the new convention.
+
+
+
+3- PAGE TITLES.
+
+Each page in a DjVu document is identified by three strings named
+the ID, the NAME, and the TITLE. The semantic distinction between
+these three strings is no longer very clear. DjVu libraries
+does not work consistently when these strings are different.  See
+the comment in the table, section 8.3.2.2 of the specification.
+
+Recent versions of DjVuLibre still require that the ID and NAME
+string are equal. The TITLE string however can be different and
+should be used to display friendly page names. The djvused program
+now features a command 'set-page-title' to install a TITLE different
+from the ID string. The djview program then displays and recognizes
+these page titles in lieu of the sequential page numbers.
+
+Things get complicated when some page titles are purely numerical.
+For instance, the page titled "4" might not be the fourth page of 
+the document, and there might be many pages titled "4".
+The djview4 viewer uses the following rules:
+
+3.1- DJVU CGI ARGUMENT "PAGE=".
+
+The djvu cgi argument "page=X" is interpreted as follows:
+- It first searches a page whose ID matches X.
+- Otherwise, if X has the form +N or -N where N is a number,
+  this indicates a displacement relative to the current page.
+- Otherwise, it searches a page with TITLE X starting
+  from the current page and wrapping around.
+- Otherwise, if X is numerical and in range, this is the page number.
+- Otherwise, it searches a page whose NAME matches X.
+ 
+3.2- PAGE REFERENCES IN MAPAREA AND OUTLINE LINKS
+
+Page references in hyperlink annotations always have the form "#X".
+These references are interpretes as follows.
+- It first searches a page whose ID matches X.
+- Otherwise, if X has the form +N or -N where N is a number,
+  this indicates a displacement relative to the page containing the link.
+- Otherwise, it searches a page with TITLE X starting
+  from the current page and wrapping around.
+- Otherwise, if X is numerical and in range, this is the page number.
+- Otherwise, it searches a page whose NAME matches X.
+
+
+
+4- METADATA
+
+4.1- DJVULIBRE METADATA
+
+DjVuLibre has introduced metadata annotations a few years ago.
+Metadata entries for each page are represent by key/value pairs
+located in a metadata directive in the annotation chunk.
+Metadata entries for the document are represented similarly
+using the methods described in the next section.
+
+The metadata directive has the form
+
+  (metadata ... (key "value") ... )
+
+Each entry is identified by a symbol <key> 
+representing the nature of the metadata entry.
+The string <"value"> represents
+the value associated with the corresponding key.
+
+Several sets of keys are noteworthy.
+
+* Keys borrowed from the BibTex bibliography system. 
+  These key names are always expressed 
+  in lowercase, such as 'year', 'booktitle', 'editor', 
+  'author', etc.  
+
+* Keys borrowed from the PDF DocInfo.
+  These key names start with an uppercase letter:
+  'Title', 'Author', 'Subject', 'Keywords', 'Creator', 
+  'Producer', 'Trapped', 'CreationDate', and 'ModDate'.
+  The values associated with the last two keys
+  should be dates expressed according to RFC 3339.
+
+4.2- XMP METADATA
+
+The XMP specification describes a general purpose RDF/XML format for
+metadata. Just like DjVuLibre metadata, XMP metadata is embedded in
+an annotation chunk at the page or document level using the following
+annotation directive
+
+   (xmp "<rdf:RDF xmlns:rdf=... [escaped XMP here] ...</rdf:RDF>")
+
+The sole argument of the xmp directive is the serialized XMP data
+without the "xpacket" wrapper. The "x:xmpmeta" element may also be
+dropped. Only elements from "rdf:RDF" inwards are needed.
+Since the XMP data is represented as a string, doublequotes and
+backslashes must be escaped.  Other characters may be escaped as well
+(see section 2 above).
+
+The full XMP specification is available from Adobe:
+
+   http://www.adobe.com/devnet/xmp/
+
+To maximize interoperability with current viewers, it is recommended
+that XMP manipulation programs keep the DjVuLibre metadata in sync.
+This is facilitated by synchronizing the PDF DocInfo keys with XMP
+properties as follows:
+
+   DocInfo key    XMP property
+   ------------   ---------------
+   Title          dc:title
+   Author         dc:creator
+   Subject        dc:description
+   Keywords       pdf:Keywords
+   Producer       pdf:Producer
+   Trapped        pdf:Trapped
+   Creator        xmp:CreatorTool
+   CreationDate   xmp:CreateDate
+   ModDate        xmp:ModifyDate
+
+4.3- DOCUMENT ANNOTATIONS AND METADATA
+
+The above schemes provide ways to specify metadata for each page.
+But it is often useful to provide metadata that applies to the whole
+document. Document wide metadata are represented using one or
+several metadata directives in the shared annotations chunk.
+
+This scheme has a potential drawback. Since the shared annotations
+is included by all pages, the document wide metadata also appears as
+page metadata for all pages. This might not be adequate for some
+uses. As a workaround, the djview4 viewer only displays 
+page metadata that differ from the document metadata.
+A more definitive answer would be the definition of a document
+annotation chunk located after the DIRM chunk and before any
+component file. This space is already used by the NAVM chunk.  
+This is being considered.
+
+
+
+5- CGI STYLE OPTIONS IN MAPAREA AND OUTLINE LINKS
+
+Outline and maparea annotation are
+UTF-8 encoded strings that can be 
+interpreted as page specification (see section 3.1)
+or as percent-encoded URLs (see section 1.3.)
+
+In addition, strings starting with a question mark '?' are 
+interpreted as CGI style options separated by the 
+ampersand character '&'.  These options are ignored
+when the maparea link target is another window.
+Otherwise these options are passed verbatim to the viewer.
+This can cause portability problems because different djvu 
+viewers support different sets of CGI style options.
+
+
+
+6- THE "SECURE DJVU" FORMAT.
+
+Recently Lizardtech introduced an incompatible "Secure DJVU" format.
+This format encrypt djvu data in the hope of controlling
+whether users can use, copy or print djvu documents.
+A recent specification describes the container format
+but does not provide enough information to decode the content.
+Providing such an information would obviously provide
+a means to avoid the usage restrictions. In fact there is no durable 
+way to enforce such constraints besides "security through obscurity".
+
+The current djvulibre library simply emits an 
+error message when encountering such files.
+
+Some observations regarding these files:
+
+- They use the same IFF85 structure as djvu files.
+  Chunk "SINF" contains a scrambled version of the decryption 
+  key and describes which actions are authorized or denied.
+  Chunks "CELX" encapsulate the regular DjVu chunks.  
+  
+- Each CELX chunk starts with four bytes for the original chunk 
+  name, and four bytes for the original chunk length.
+  This is followed encrypted data, composed of enough
+  blocks of 8 bytes to covert the initial chunk length.
+
+- Lizardtech claims encryption is 32 bit blowfish.
+  It appears to be in fact composed of 64 bits block
+  as you would expect with blowfish.
+
diff --git a/doc/djvulibre-book-en.djvu b/doc/djvulibre-book-en.djvu
new file mode 100644
index 0000000..f54b9b0
Binary files /dev/null and b/doc/djvulibre-book-en.djvu differ
diff --git a/doc/djvulibre-book-ru.djvu b/doc/djvulibre-book-ru.djvu
new file mode 100644
index 0000000..7b7b107
Binary files /dev/null and b/doc/djvulibre-book-ru.djvu differ
diff --git a/doc/lizard2002.djvu b/doc/lizard2002.djvu
new file mode 100644
index 0000000..0911cb2
Binary files /dev/null and b/doc/lizard2002.djvu differ
diff --git a/doc/lizard2002.pdf b/doc/lizard2002.pdf
new file mode 100644
index 0000000..77c61c1
Binary files /dev/null and b/doc/lizard2002.pdf differ
diff --git a/doc/lizard2007.djvu b/doc/lizard2007.djvu
new file mode 100644
index 0000000..bed0498
Binary files /dev/null and b/doc/lizard2007.djvu differ
diff --git a/doc/lizard2007.pdf b/doc/lizard2007.pdf
new file mode 100644
index 0000000..6e7cd03
Binary files /dev/null and b/doc/lizard2007.pdf differ
diff --git a/doc/make-djvulibre-book-en.sh b/doc/make-djvulibre-book-en.sh
new file mode 100755
index 0000000..bc56e53
--- /dev/null
+++ b/doc/make-djvulibre-book-en.sh
@@ -0,0 +1,61 @@
+#!/bin/bash -x
+
+djvulibredir=..
+tmpdir=./tmp$$
+book=djvulibre-book-en.djvu
+
+mkdir $tmpdir
+trap "rm -rf $tmpdir" 0
+
+## collect man pages
+
+nnn=1
+addpage()
+{
+  nn=$(printf "%03d" $nnn)
+  man -t $1 > $tmpdir/$nn-$1.ps
+  nnn=$(($nnn + 1))
+}
+
+
+## add man pages
+
+addpage djvu
+
+addpage djview
+addpage nsdejavu
+
+for f in $djvulibredir/tools/*.1 
+do
+  b=$(basename $f .1)
+  [ $b == djvu ] || addpage $b
+done
+
+addpage djvutoxml
+addpage djvuxml
+
+## call djvudigital
+
+cat $tmpdir/0*.ps > $tmpdir/book.ps
+djvudigital --dpi=400 --words $tmpdir/book.ps $book
+
+## prepare outline
+
+echo "(bookmarks" > $tmpdir/outline.txt
+
+p=1
+for f in $tmpdir/0*.ps
+do
+   b=$(basename $f .ps | sed -e 's/^[-0-9]*//')
+   c=$(grep '^%%Page:' $f | wc -l)
+   echo '  ("'"$b"'" "#'"$p"'")' >> $tmpdir/outline.txt
+   p=$(($p + $c))
+done
+
+echo ")" >> $tmpdir/outline.txt
+
+## plug outline
+
+djvused $book -e "set-outline $tmpdir/outline.txt" -s
+
+
diff --git a/doc/minilisp/README b/doc/minilisp/README
new file mode 100644
index 0000000..80c2269
--- /dev/null
+++ b/doc/minilisp/README
@@ -0,0 +1,34 @@
+
+MINIEXP/MINILISP
+----------------
+
+Files <miniexp.h> and <miniexp.cpp> in directory
+<djvulibre-3.5/libdjvu/miniexp.h> implement the basic data
+structure of a lisp interpreter: s-expressions.
+
+S-expressions can be viewed as a simple and powerful
+alternative to XML.  They are used in DjVu to handle
+annotations.  Both the decoding api <ddjvuapi.h> and program
+<djvused> use s-expressions to describe the hidden text
+information and the navigation information (bookmarks.)
+
+Comments in file <miniexp.h> describe which s-expressions
+are supported, how they are represented in text files, and
+which functions are available to handle them.
+
+
+During the development of <miniexp.h> and <miniexp.cpp> it
+appeared that the best way to test s-expressions was to make
+the last step and program a complete lisp interpreter.  
+This also makes a perfect example of using <miniexp.h>.
+
+The core interpreter is in file <minilisp.cpp>.
+Startup definitions are in file <minilisp.in>.
+Just type <make> to compile it.
+
+Exercise: speed up the interpreter by
+accelerating the function lookup().
+
+- Leon Bottou, 
+  September 2005
+
diff --git a/doc/minilisp/makefile b/doc/minilisp/makefile
new file mode 100644
index 0000000..322a12a
--- /dev/null
+++ b/doc/minilisp/makefile
@@ -0,0 +1,18 @@
+
+MINIEXPDIR=../../libdjvu
+MINIEXPC=${MINIEXPDIR}/miniexp.cpp
+MINIEXPH=${MINIEXPDIR}/miniexp.h
+
+
+minilisp: minilisp.o miniexp.o
+	${CXX} ${CXXFLAGS} -o minilisp  minilisp.o miniexp.o -lm
+
+minilisp.o: minilisp.cpp ${MINIEXPH}
+	${CXX} ${CXXFLAGS} -I${MINIEXPDIR} -o minilisp.o -c minilisp.cpp
+
+miniexp.o: ${MINIEXPC} ${MINIEXPH}
+	${CXX} ${CXXFLAGS} -I${MINIEXPDIR} -o miniexp.o -c ${MINIEXPC}
+
+distclean clean: 
+	-rm minilisp minilisp.o miniexp.o 2>/dev/null
+
diff --git a/doc/minilisp/minilisp.cpp b/doc/minilisp/minilisp.cpp
new file mode 100644
index 0000000..3947fe5
--- /dev/null
+++ b/doc/minilisp/minilisp.cpp
@@ -0,0 +1,1113 @@
+/* -*- C++ -*-
+// -------------------------------------------------------------------
+// MiniLisp - Very small lisp interpreter to demonstrate MiniExp.
+// Copyright (c) 2005  Leon Bottou
+//
+// This software is subject to, and may be distributed under, the
+// GNU General Public License, either Version 2 of the license,
+// or (at your option) any later version. The license should have
+// accompanied the software or you may obtain a copy of the license
+// from the Free Software Foundation at http://www.fsf.org .
+//
+// 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.
+// -------------------------------------------------------------------
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <signal.h>
+#include <ctype.h>
+#include <math.h>
+
+#include "miniexp.h"
+
+#define CAT(a,b) __CAT(a,b)
+#define __CAT(a,b) a ## b
+
+miniexp_t s_quote = miniexp_symbol("quote");
+miniexp_t s_true = miniexp_symbol("t");
+
+/* ------------ error */
+
+#ifdef __GNUC__
+void error(const char *msg, miniexp_t v=0) __attribute__ ((noreturn));
+#else
+void error(const char *msg, miniexp_t v=0);
+#endif
+
+void
+error(const char *msg, miniexp_t v)
+{
+  if (msg)
+    printf("ERROR: %s", msg);
+  else
+    printf("BREAK");
+  if (v)
+    {
+      printf(": ");
+      miniexp_prin(v);
+    }
+  printf("\n");
+  throw 0;
+}
+
+
+
+/* ------------ environment */
+
+miniexp_t
+lookup(miniexp_t var, miniexp_t env)
+{
+  while (miniexp_consp(env))
+    {
+      miniexp_t a = miniexp_car(env);
+      if (miniexp_car(a) == var)
+	return a;
+      env = miniexp_cdr(env);
+    }
+  return 0;
+}
+
+minivar_t globalenv;
+
+void
+defvar(miniexp_t s, miniexp_t w = 0)
+{
+  minivar_t v;
+  if (! globalenv)
+    {
+      minivar_t a = miniexp_cons(s_true, s_true);
+      globalenv = miniexp_cons(a, 0);
+    }
+  if (! miniexp_symbolp(s))
+    error("defvar: not a symbol", s);
+  miniexp_t a = lookup(s, globalenv);
+  if (a && w)
+    {
+      printf("WARNING: redefining '%s\n", miniexp_to_name(s));
+      miniexp_rplacd(a, w);
+    }
+  else
+    {
+      v = miniexp_cons(s, w);
+      v = miniexp_cons(v, miniexp_cdr(globalenv));
+      miniexp_rplacd(globalenv, v);
+    }
+}
+
+
+/* ------------ evaluate */
+
+static bool break_request = false;
+
+struct callable_t : public miniobj_t
+{
+  MINIOBJ_DECLARE(callable_t,miniobj_t,"callable");
+  virtual miniexp_t call(miniexp_t args, miniexp_t env,
+			 bool apply=false) = 0;
+};
+
+MINIOBJ_IMPLEMENT(callable_t,miniobj_t,"callable");
+
+miniexp_t
+evaluate(miniexp_t expr, miniexp_t env)
+{
+  if (miniexp_symbolp(expr))
+    {
+      miniexp_t a = lookup(expr,env);
+      if (! a)
+	error ("eval: undefined variable", expr);
+      return miniexp_cdr(a);
+    }
+  else if (miniexp_consp(expr))
+    {
+      miniexp_t s = miniexp_car(expr);
+      minivar_t xs = evaluate(s, env);
+      miniobj_t *obj = miniexp_to_obj(xs);
+      if (break_request)
+	error(0);
+      if (obj && obj->isa(callable_t::classname))
+	return ((callable_t*)obj)->call(miniexp_cdr(expr), env);
+      error("apply: cannot apply this object", xs);
+    }
+  else
+    return expr;
+}
+
+miniexp_t
+evaluate_progn(miniexp_t exprs, miniexp_t env)
+{
+  minivar_t v;
+  while (miniexp_consp(exprs))
+    {
+      v = evaluate(miniexp_car(exprs),env);
+      exprs = miniexp_cdr(exprs);
+    }
+  if (exprs)
+    v = evaluate(exprs,env);
+  return v;
+}
+
+miniexp_t
+evaluate_list(miniexp_t l, miniexp_t env)
+{
+  minivar_t v;
+  minivar_t ll = 0;
+  miniexp_t lp = ll;
+  if (miniexp_consp(l))
+    {
+      v = evaluate(miniexp_car(l), env);
+      lp = ll = miniexp_cons(v, 0);
+      l = miniexp_cdr(l);
+    }
+  while (miniexp_consp(l))
+    {
+      v = evaluate(miniexp_car(l), env);
+      miniexp_rplacd(lp, miniexp_cons(v, 0));
+      lp = miniexp_cdr(lp);
+      l = miniexp_cdr(l);
+    }
+  if (l)
+    {
+      v = evaluate(l, env);
+      if (lp)
+	miniexp_rplacd(lp, v);
+      else
+	ll = v;
+    }
+  return ll;
+}
+
+
+/* ------------ special forms */
+
+class specialform_t : public callable_t
+{
+  typedef miniexp_t (*fptr_t)(miniexp_t, miniexp_t);
+  fptr_t fptr;
+public:
+  specialform_t(const char *name, fptr_t fptr);
+  MINIOBJ_DECLARE(specialform_t,callable_t,"specialform");
+  virtual miniexp_t call(miniexp_t args, miniexp_t env, bool);
+};
+
+MINIOBJ_IMPLEMENT(specialform_t,callable_t,"specialform");
+
+specialform_t::specialform_t(const char *name, fptr_t fptr)
+  : fptr(fptr)
+{
+  miniexp_t s = miniexp_symbol(name);
+  minivar_t v = miniexp_object(this);
+  defvar(s, v);
+}
+
+miniexp_t
+specialform_t::call(miniexp_t args, miniexp_t env, bool)
+{
+  return (*fptr)(args, env);
+}
+
+#define DEFSPECIAL(s, n) \
+miniexp_t CAT(f_,n)(miniexp_t, miniexp_t);\
+specialform_t *CAT(p_,n) = new specialform_t(s, CAT(f_,n));\
+miniexp_t CAT(f_,n)(miniexp_t expr, miniexp_t env)
+
+
+
+
+/* ------------ primitives */
+
+class primitive_t : public callable_t
+{
+  typedef miniexp_t (*fptr_t)(int, miniexp_t*, miniexp_t);
+  fptr_t fptr;
+  const int args;
+  const int optargs;
+public:
+  primitive_t(const char *name, fptr_t fptr, int a, int o);
+  MINIOBJ_DECLARE(primitive_t,callable_t,"primitive");
+  virtual miniexp_t call(miniexp_t args, miniexp_t env, bool);
+};
+
+MINIOBJ_IMPLEMENT(primitive_t,callable_t,"primitive");
+
+primitive_t::primitive_t(const char *n, fptr_t f, int a, int o)
+  : fptr(f), args(a), optargs(o)
+{
+  miniexp_t s = miniexp_symbol(n);
+  minivar_t v = miniexp_object(this);
+  defvar(s, v);
+}
+
+miniexp_t
+primitive_t::call(miniexp_t args, miniexp_t env, bool apply)
+{
+  int argc = miniexp_length(args);
+  if (argc < this->args)
+    error("apply(primitive): not enough arguments");
+  if (argc > this->args + this->optargs)
+    error("apply(primitive): too many arguments");
+  minivar_t xargs = apply ? args : evaluate_list(args, env);
+  miniexp_t *argv = new miniexp_t[argc];
+  miniexp_t a = xargs;
+  argc = 0;
+  while (miniexp_consp(a))
+    {
+      argv[argc++] = miniexp_car(a);
+      a = miniexp_cdr(a);
+    }
+  minivar_t v;
+  try
+    { v = (*fptr)(argc, argv, env); }
+  catch(...)
+    { delete [] argv; throw; }
+  delete [] argv;
+  return v;
+}
+
+#define DEFUN(s, n,a,o) \
+miniexp_t CAT(f_,n)(int argc, miniexp_t *argv, miniexp_t env);\
+primitive_t *CAT(p_,n) = new primitive_t(s, CAT(f_,n), a, o);\
+miniexp_t CAT(f_,n)(int argc, miniexp_t *argv, miniexp_t env)
+
+
+/* ------- functions */
+
+class function_t : public callable_t
+{
+protected:
+  miniexp_t args;
+  miniexp_t body;
+  miniexp_t env;
+  static void check_args(miniexp_t a);
+  static void match_args(miniexp_t a, miniexp_t v, miniexp_t &env);
+public:
+  function_t(miniexp_t, miniexp_t, miniexp_t);
+  MINIOBJ_DECLARE(function_t,callable_t,"function");
+  virtual miniexp_t call(miniexp_t args, miniexp_t env, bool);
+  virtual void mark(minilisp_mark_t action);
+  virtual miniexp_t funcdef(miniexp_t name=0);
+};
+
+MINIOBJ_IMPLEMENT(function_t,callable_t,"function");
+
+void
+function_t::check_args(miniexp_t a)
+{
+ again:
+  if (miniexp_symbolp(a) || !a)
+    return;
+  if (miniexp_listp(a))
+    {
+      check_args(miniexp_car(a));
+      a = miniexp_cdr(a);
+      goto again;
+    }
+  error("lambda: illegal formal arguments");
+}
+
+void
+function_t::match_args(miniexp_t a, miniexp_t v, miniexp_t &env)
+{
+ again:
+  if (miniexp_symbolp(a))
+    {
+      minivar_t x = miniexp_cons(a,v);
+      env = miniexp_cons(x, env);
+      return;
+    }
+  if (miniexp_consp(a))
+    {
+      if (! miniexp_consp(v))
+	error("apply: not enough arguments", a);
+      match_args(miniexp_car(a), miniexp_car(v), env);
+      a = miniexp_cdr(a);
+      v = miniexp_cdr(v);
+      goto again;
+    }
+  if (v)
+    error("apply: too many arguments", v);
+}
+
+function_t::function_t(miniexp_t a, miniexp_t b, miniexp_t e)
+  : args(a), body(b), env(e)
+{
+  check_args(a);
+}
+
+miniexp_t
+function_t::call(miniexp_t args, miniexp_t env, bool apply)
+{
+  minivar_t xargs = apply ? args : evaluate_list(args, env);
+  minivar_t nenv = this->env;
+  match_args(this->args, xargs, nenv);
+  return evaluate_progn(body, nenv);
+}
+
+void
+function_t::mark(minilisp_mark_t action)
+{
+  action(&args);
+  action(&body);
+  action(&env);
+}
+
+miniexp_t
+function_t::funcdef(miniexp_t name)
+{
+  if (name)
+    {
+      miniexp_t d = miniexp_symbol("defun");
+      miniexp_t a = miniexp_cons(name, args);
+      return miniexp_cons(d, miniexp_cons(a, body));
+    }
+  else
+    {
+      miniexp_t d = miniexp_symbol("lambda");
+      return miniexp_cons(d,miniexp_cons(args,body));
+    }
+}
+
+
+/* ------- macros */
+
+class macrofunction_t : public function_t
+{
+public:
+  macrofunction_t(miniexp_t a, miniexp_t b, miniexp_t e);
+  MINIOBJ_DECLARE(macrofunction_t,function_t,"macrofunction");
+  virtual miniexp_t call(miniexp_t args, miniexp_t env, bool);
+  virtual miniexp_t funcdef(miniexp_t name=0);
+};
+
+MINIOBJ_IMPLEMENT(macrofunction_t,function_t,"macrofunction");
+
+macrofunction_t::macrofunction_t(miniexp_t a, miniexp_t b, miniexp_t e)
+  : function_t(a,b,e)
+{
+}
+
+miniexp_t
+macrofunction_t::call(miniexp_t args, miniexp_t env, bool)
+{
+  minivar_t nenv = this->env;
+  match_args(this->args, args, nenv);
+  minivar_t e = evaluate_progn(body, nenv);
+  return evaluate(e, env);
+}
+
+miniexp_t
+macrofunction_t::funcdef(miniexp_t name)
+{
+  if (name)
+    {
+      miniexp_t d = miniexp_symbol("defmacro");
+      miniexp_t a = miniexp_cons(name, args);
+      return miniexp_cons(d, miniexp_cons(a, body));
+    }
+  else
+    {
+      miniexp_t d = miniexp_symbol("mlambda");
+      return miniexp_cons(d, miniexp_cons(args, body));
+    }
+}
+
+/* ------------ define special forms */
+
+DEFSPECIAL("progn",progn)
+{
+  return evaluate_progn(expr, env);
+}
+
+DEFSPECIAL("list",list)
+{
+  return evaluate_list(expr, env);
+}
+
+DEFSPECIAL("if",if)
+{
+  if (evaluate(miniexp_car(expr), env))
+    return evaluate(miniexp_cadr(expr), env);
+  return evaluate_progn(miniexp_cddr(expr), env);
+}
+
+DEFSPECIAL("setq",setq)
+{
+  if (miniexp_cddr(expr) || !miniexp_consp(miniexp_cdr(expr)))
+    error("setq: syntax error");
+  miniexp_t a = lookup(miniexp_car(expr),env);
+  if (! a)
+    error ("setq: undefined variable", miniexp_car(expr));
+  minivar_t v = evaluate(miniexp_cadr(expr), env);
+  miniexp_rplacd(a,v);
+  return v;
+}
+
+DEFSPECIAL("defvar",defvar)
+{
+  if (miniexp_cddr(expr))
+    error("defvar: syntax error");
+  minivar_t v = evaluate(miniexp_cadr(expr), env);
+  defvar(miniexp_car(expr), v);
+  return miniexp_car(expr);
+}
+
+DEFSPECIAL("let",let)
+{
+  miniexp_t v = miniexp_car(expr);
+  minivar_t nenv = env;
+  minivar_t p, w;
+  while (miniexp_consp(v))
+    {
+      miniexp_t a = miniexp_car(v);
+      v = miniexp_cdr(v);
+      if (! (miniexp_consp(a) &&
+	     miniexp_symbolp(miniexp_car(a)) &&
+	     !miniexp_cddr(a)))
+	error("let: syntax error");
+      w = evaluate(miniexp_cadr(a), env);
+      p = miniexp_cons(miniexp_car(a), w);
+      nenv = miniexp_cons(p, nenv);
+    }
+  return evaluate_progn(miniexp_cdr(expr), nenv);
+}
+
+DEFSPECIAL("letrec",letrec)
+{
+  miniexp_t v = miniexp_car(expr);
+  minivar_t nenv = env;
+  minivar_t p, w;
+  while (miniexp_consp(v))
+    {
+      miniexp_t a = miniexp_car(v);
+      v = miniexp_cdr(v);
+      if (! (miniexp_consp(a) &&
+	     miniexp_symbolp(miniexp_car(a)) &&
+	     !miniexp_cddr(a)))
+	error("let: syntax error");
+      minivar_t p = miniexp_cons(miniexp_car(a), 0);
+      nenv = miniexp_cons(p, nenv);
+    }
+  v = miniexp_car(expr);
+  while (miniexp_consp(v))
+    {
+      miniexp_t a = miniexp_car(v);
+      v = miniexp_cdr(v);
+      w = evaluate(miniexp_cadr(a), nenv);
+      p = lookup(miniexp_car(a), nenv);
+      miniexp_rplacd(p,w);
+    }
+  return evaluate_progn(miniexp_cdr(expr), nenv);
+}
+
+DEFSPECIAL("lambda",lambda)
+{
+  miniexp_t args = miniexp_car(expr);
+  miniexp_t body = miniexp_cdr(expr);
+  function_t *f = new function_t(args, body, env);
+  return miniexp_object(f);
+}
+
+DEFSPECIAL("mlambda",mlambda)
+{
+  miniexp_t args = miniexp_car(expr);
+  miniexp_t body = miniexp_cdr(expr);
+  function_t *f = new macrofunction_t(args, body, env);
+  return miniexp_object(f);
+}
+
+DEFSPECIAL("quote",quote)
+{
+  if (miniexp_cdr(expr))
+    error("quote: syntax error");
+  return miniexp_car(expr);
+}
+
+DEFSPECIAL("while",while)
+{
+  if (! miniexp_consp(expr))
+    error("while: syntax error");
+  minivar_t v;
+  while (evaluate(miniexp_car(expr), env))
+    v = evaluate_progn(miniexp_cdr(expr), env);
+  return v;
+}
+
+/* ------------ define primitive */
+
+DEFUN("nullp",nullp,1,0) {
+  return (!argv[0]) ? s_true : 0;
+}
+
+DEFUN("listp",listp,1,0) {
+  return miniexp_listp(argv[0]) ? s_true : 0;
+}
+
+DEFUN("consp",consp,1,0) {
+  return miniexp_consp(argv[0]) ? s_true : 0;
+}
+
+DEFUN("numberp",numberp,1,0) {
+  return miniexp_numberp(argv[0]) ? s_true : 0;
+}
+
+DEFUN("doublep",doublep,1,0) {
+  return miniexp_doublep(argv[0]) ? s_true : 0;
+}
+
+DEFUN("objectp",objectp,1,0) {
+  return miniexp_objectp(argv[0]) ? s_true : 0;
+}
+
+DEFUN("symbolp",symbolp,1,0) {
+  return miniexp_symbolp(argv[0]) ? s_true : 0;
+}
+
+DEFUN("stringp",stringp,1,0) {
+  return miniexp_stringp(argv[0]) ? s_true : 0;
+}
+
+DEFUN("classof",classof,1,0) {
+  return miniexp_classof(argv[0]);
+}
+
+DEFUN("car",car,1,0) {
+  return miniexp_car(argv[0]);
+}
+
+DEFUN("cdr",cdr,1,0) {
+  return miniexp_cdr(argv[0]);
+}
+
+DEFUN("caar",caar,1,0) {
+  return miniexp_caar(argv[0]);
+}
+
+DEFUN("cadr",cadr,1,0) {
+  return miniexp_cadr(argv[0]);
+}
+
+DEFUN("cdar",cdar,1,0) {
+  return miniexp_cdar(argv[0]);
+}
+
+DEFUN("cddr",cddr,1,0) {
+  return miniexp_cddr(argv[0]);
+}
+
+DEFUN("length",length,1,0) {
+  return miniexp_number(miniexp_length(argv[0]));
+}
+
+DEFUN("reverse",reverse,1,0) {
+  return miniexp_reverse(argv[0]);
+}
+
+DEFUN("cons",cons,2,0) {
+  return miniexp_cons(argv[0],argv[1]);
+}
+
+DEFUN("nth",nth,2,0) {
+  if (! miniexp_numberp(argv[0]))
+    error("nth: integer number expected");
+  return miniexp_nth(miniexp_to_int(argv[0]), argv[1]);
+}
+
+DEFUN("rplaca",rplaca,2,0) {
+  return miniexp_rplaca(argv[0],argv[1]);
+}
+
+DEFUN("rplacd",rplacd,2,0) {
+  return miniexp_rplacd(argv[0],argv[1]);
+}
+
+DEFUN("abs",abs,1,0) {
+  return miniexp_double(fabs(miniexp_to_double(argv[0])));
+}
+
+DEFUN("+",plus,0,9999) {
+  double s = 0;
+  for (int i=0; i<argc; i++)
+    {
+      if (!miniexp_doublep(argv[i]))
+	error("+: number expected");
+      s += miniexp_to_double(argv[i]);
+    }
+  return miniexp_double(s);
+}
+
+DEFUN("*",times,0,9999) {
+  double s = 1;
+  for (int i=0; i<argc; i++)
+    {
+      if (!miniexp_doublep(argv[i]))
+	error("*: number expected");
+      s *= miniexp_to_double(argv[i]);
+    }
+  return miniexp_double(s);
+}
+
+DEFUN("-",minus,1,9999) {
+  if (! miniexp_doublep(argv[0]))
+    error("-: number expected");
+  int i = 0;
+  double s = 0;
+  if (argc>1 && miniexp_doublep(argv[0]))
+    s = miniexp_to_double(argv[i++]);
+  while (i<argc && miniexp_doublep(argv[i]))
+    s -= miniexp_to_double(argv[i++]);
+  if (i < argc)
+    error("-: number expected", argv[i]);
+  return miniexp_double(s);
+}
+
+DEFUN("/",div,1,9999) {
+  if (! miniexp_doublep(argv[0]))
+    error("/: number expected");
+  int i = 0;
+  double s = 1;
+  if (argc>1 && miniexp_doublep(argv[0]))
+    s = miniexp_to_double(argv[i++]);
+  while (i<argc && miniexp_doublep(argv[i]) && miniexp_to_double(argv[i]))
+    s /= miniexp_to_double(argv[i++]);
+  if (i < argc)
+    if (miniexp_doublep(argv[i]))
+      error("/: division by zero", argv[i]);
+    else
+      error("/: number expected", argv[i]);
+  return miniexp_double(s);
+}
+
+DEFUN("==",equalequal,2,0) {
+  return (argv[0]==argv[1]) ? s_true : 0;
+}
+
+static bool
+equal(miniexp_t a, miniexp_t b)
+{
+  if (a == b)
+    return true;
+  else if (miniexp_consp(a) && miniexp_consp(b))
+    return equal(miniexp_car(a),miniexp_car(b))
+      &&   equal(miniexp_cdr(a),miniexp_cdr(b));
+  else if (miniexp_stringp(a) && miniexp_stringp(b))
+    return !strcmp(miniexp_to_str(a), miniexp_to_str(b));
+  else if (miniexp_doublep(a) && miniexp_doublep(b))
+    return miniexp_to_double(a) == miniexp_to_double(b);
+  return false;
+}
+
+DEFUN("=",equal,2,0) {
+  return equal(argv[0],argv[1]) ? s_true : 0;
+}
+
+DEFUN("<>",notequal,2,0) {
+  return !equal(argv[0],argv[1]) ? s_true : 0;
+}
+
+static int
+compare(miniexp_t a, miniexp_t b)
+{
+  if (miniexp_doublep(a) && miniexp_doublep(b))
+    {
+      double na = miniexp_to_double(a);
+      double nb = miniexp_to_double(b);
+      if (na < nb)
+	return -1;
+      else if (na > nb)
+	return 1;
+      return 0;
+    }
+  else if (miniexp_stringp(a) && miniexp_stringp(b))
+    {
+      const char *sa = miniexp_to_str(a);
+      const char *sb = miniexp_to_str(b);
+      return strcmp(sa, sb);
+    }
+  else
+    error("compare: cannot rank these arguments");
+}
+
+DEFUN("<=",cmple,2,0) {
+  return (compare(argv[0],argv[1])<=0) ? s_true : 0;
+}
+
+DEFUN("<",cmplt,2,0) {
+  return (compare(argv[0],argv[1])<0) ? s_true : 0;
+}
+
+DEFUN(">=",cmpge,2,0) {
+  return (compare(argv[0],argv[1])>=0) ? s_true : 0;
+}
+
+DEFUN(">",cmpgt,2,0) {
+  return (compare(argv[0],argv[1])>0) ? s_true : 0;
+}
+
+DEFUN("floor",floor,1,0) {
+  if (! miniexp_doublep(argv[0]))
+    error("-: number expected");
+  return miniexp_double(floor(miniexp_to_double(argv[0])));
+}
+
+DEFUN("ceil",ceil,1,0) {
+  if (! miniexp_doublep(argv[0]))
+    error("-: number expected");
+  return miniexp_double(ceil(miniexp_to_double(argv[0])));
+}
+
+DEFUN("strlen",strlen,1,1) {
+  if (! miniexp_stringp(argv[0]))
+    error("strlen: string expected", argv[0]);
+  const char *s = miniexp_to_str(argv[0]);
+  return miniexp_number(strlen(s));
+}
+
+DEFUN("substr",substr,2,1) {
+  if (! miniexp_stringp(argv[0]))
+    error("substr: string expected", argv[0]);
+  const char *s = miniexp_to_str(argv[0]);
+  int l = strlen(s);
+  if (! miniexp_numberp(argv[1]))
+    error("substr: integer number expected", argv[1]);
+  int f = miniexp_to_double(argv[1]);
+  f = (l < f) ? l : (f < 0) ? l : f;
+  s += f;
+  l -= f;
+  if (argc>2)
+    {
+      if (! miniexp_numberp(argv[2]))
+	error("substr: integer number expected", argv[2]);
+      f = miniexp_to_double(argv[2]);
+      l = (f > l) ? l : (f < 0) ? 0 : f;
+    }
+  return miniexp_substring(s,l);
+}
+
+DEFUN("concat",concat,0,9999) {
+  minivar_t l = 0;
+  for (int i=0; i<argc; i++)
+    if (miniexp_stringp(argv[i]))
+      l = miniexp_cons(argv[i],l);
+    else
+      error("concat: string expected", argv[i]);
+  l = miniexp_reverse(l);
+  return miniexp_concat(l);
+}
+
+DEFUN("prin",prin,1,9999) {
+  minivar_t v;
+  v = miniexp_prin(argv[0]);
+  for (int i=1; i<argc; i++)
+    {
+      minilisp_puts(" ");
+      v = miniexp_prin(argv[i]);
+    }
+  return v;
+}
+
+DEFUN("print",print,1,9999) {
+  minivar_t v;
+  v = miniexp_prin(argv[0]);
+  for (int i=1; i<argc; i++)
+    {
+      minilisp_puts(" ");
+      v = miniexp_prin(argv[i]);
+    }
+  minilisp_puts("\n");
+  return v;
+}
+
+DEFUN("pprint",pprint,1,1) {
+  int w = 72;
+  if (argc>1)
+    {
+      if (! miniexp_numberp(argv[1]))
+	error("pprint: second argument must be number");
+      w = miniexp_to_int(argv[1]);
+    }
+  return miniexp_pprint(argv[0], w);
+}
+
+DEFUN("pname",pname,1,1) {
+  int w = 0;
+  if (argc > 1)
+    {
+      if (! miniexp_numberp(argv[1]))
+	error("pprint: second argument must be number");
+      w = miniexp_to_int(argv[1]);
+    }
+  return miniexp_pname(argv[0],w);
+}
+
+DEFUN("gc",gc,0,0) {
+  minilisp_gc();
+  minilisp_info();
+  return 0;
+}
+
+DEFUN("info",info,0,0) {
+  minilisp_info();
+  return 0;
+}
+
+DEFUN("funcdef",funcdef,1,1) {
+  if (! miniexp_isa(argv[0], function_t::classname))
+    error("funcdef: expecting function", argv[0]);
+  if (argc>1 && ! miniexp_symbolp(argv[1]))
+    error("funcdef: expecting symbol", argv[1]);
+  function_t *f = (function_t*)miniexp_to_obj(argv[0]);
+  return f->funcdef(argc>1 ? argv[1] : 0);
+}
+
+DEFUN("vardef",vardef,1,0) {
+  miniexp_t a = lookup(argv[0],globalenv);
+  if (! a)
+    error("vardef: undefined global variable");
+  return miniexp_cdr(a);
+}
+
+DEFUN("eval",eval,1,0) {
+  return evaluate(argv[0],env);
+}
+
+DEFUN("apply",apply,2,0) {
+  miniobj_t *obj = miniexp_to_obj(argv[0]);
+  if (obj && obj->isa(callable_t::classname))
+    return ((callable_t*)obj)->call(argv[1], env, true);
+  error("apply: cannot apply this object", argv[0]);
+}
+
+DEFUN("error",error,1,1) {
+  if (!miniexp_stringp(argv[0]))
+    error("error: string expected", argv[0]);
+  error(miniexp_to_str(argv[0]), (argc>1) ? argv[1] : 0);
+}
+
+DEFUN("display",display,0,9999) {
+  for (int i=0; i<argc; i++)
+    {
+      minivar_t v = argv[i];
+      if (! miniexp_stringp(v)) 
+        v = miniexp_pname(v, 0);
+      minilisp_puts(miniexp_to_str(v));
+    }
+  return 0;
+}
+
+DEFUN("string->symbol",string2symbol,1,0) {
+  if (! miniexp_stringp(argv[0]))
+    error("string->symbol: string expected",argv[0]);
+  return miniexp_symbol(miniexp_to_str(argv[0]));
+}
+
+DEFUN("symbol->string",symbol2string,1,0) {
+  if (! miniexp_symbolp(argv[0]))
+    error("symbol->string: symbol expected",argv[0]);
+  return miniexp_string(miniexp_to_name(argv[0]));
+}
+
+DEFUN("printflags",printflags,1,0) {
+  if (! miniexp_numberp(argv[0]))
+    error("printflags: integer number expected");
+  minilisp_print_7bits = miniexp_to_int(argv[0]);
+  return argv[0];
+}
+
+/* ------------ special */
+
+#if defined(_WIN32) || defined(__WIN64)
+# include <process.h>
+
+class thread_t : public miniobj_t
+{
+  MINIOBJ_DECLARE(thread_t, miniobj_t, "thread");
+private:
+  uintptr_t thr;
+  miniexp_t exp, env, res, run;
+  static void start(void *arg) {
+    thread_t *pth = (thread_t*) arg;
+    try { 
+      pth->res = evaluate(pth->exp, pth->env); 
+      pth->run = miniexp_symbol("finished");
+    } catch(...) { 
+      pth->run = miniexp_symbol("error");
+    } }
+public:
+  thread_t(miniexp_t exp, miniexp_t env) : exp(exp), env(env), res(0), run(0) { 
+    thr = _beginthread(thread_t::start, 0, (void*)this); }
+  void mark(minilisp_mark_t action) {
+    action(&exp); action(&env), action(&res); }
+  miniexp_t join() {
+    return (run) ? res : miniexp_dummy; }
+  miniexp_t status() { return run; }
+  ~thread_t() { if (!run) abort(); join(); }
+};
+
+MINIOBJ_IMPLEMENT(thread_t, miniobj_t, "thread");
+
+DEFUN("thread",threadstart,1,0) {
+  return miniexp_object(new thread_t(argv[0],env));
+}
+DEFUN("threadp", threadtest,1,0) {
+  if (! miniexp_isa(argv[0], thread_t::classname)) return 0;
+  miniexp_t run = ((thread_t*)miniexp_to_obj(argv[0]))->status();
+  return (run) ? run : miniexp_symbol("running");
+}
+DEFUN("join",threadjoin,1,0) {
+  if (! miniexp_isa(argv[0], thread_t::classname))
+    error("join: thread expected");
+  return ((thread_t*)miniexp_to_obj(argv[0]))->join();
+}
+#endif
+
+#ifdef HAVE_PTHREAD
+# include <pthread.h>
+
+class thread_t : public miniobj_t
+{
+  MINIOBJ_DECLARE(thread_t, miniobj_t, "thread");
+private:
+  pthread_t thr;
+  miniexp_t exp, env, res, run;
+  bool joined;
+  static void* start(void *arg) {
+    thread_t *pth = (thread_t*) arg;
+    try { 
+      pth->res = evaluate(pth->exp, pth->env); 
+      pth->run = miniexp_symbol("finished");
+      return 0; } 
+    catch(...) { 
+      pth->run = miniexp_symbol("error");
+      return (void*)1; } }
+public:
+  thread_t(miniexp_t exp, miniexp_t env) 
+    : exp(exp), env(env), res(0), run(0), joined(false) { 
+    pthread_create(&this->thr, 0, thread_t::start, (void*)this); }
+  void mark(minilisp_mark_t action) {
+    action(&exp); action(&env), action(&res); }
+  miniexp_t join() {
+    if (! joined) pthread_join(thr, 0); joined=true;
+    return (run) ? res : miniexp_dummy; }
+  miniexp_t status() { return run; }
+  ~thread_t() { if (!run) abort(); join(); }
+};
+
+MINIOBJ_IMPLEMENT(thread_t, miniobj_t, "thread");
+
+DEFUN("thread",threadstart,1,0) {
+  return miniexp_object(new thread_t(argv[0],env));
+}
+DEFUN("threadp", threadtest,1,0) {
+  if (! miniexp_isa(argv[0], thread_t::classname)) return 0;
+  miniexp_t run = ((thread_t*)miniexp_to_obj(argv[0]))->status();
+  return (run) ? run : miniexp_symbol("running");
+}
+DEFUN("join",threadjoin,1,0) {
+  if (! miniexp_isa(argv[0], thread_t::classname))
+    error("join: thread expected");
+  return ((thread_t*)miniexp_to_obj(argv[0]))->join();
+}
+
+#endif
+
+
+/* ------------ toplevel */
+
+void
+toplevel(FILE *inp, FILE *out, bool print)
+{
+  miniexp_io_t saved_io = miniexp_io;
+  minilisp_set_output(out);
+  minilisp_set_input(inp);
+  for(;;)
+    {
+      minivar_t s = miniexp_read();
+      if (s == miniexp_dummy)
+	{
+          if (feof(inp)) break;
+          printf("ERROR: while parsing\n");
+	  break;
+	}
+      try
+	{
+	  break_request = false;
+	  minivar_t v = evaluate(s, globalenv);
+	  if (print)
+	    {
+	      printf("= ");
+	      miniexp_print(v);
+	    }
+	}
+      catch(...)
+	{
+	}
+    }
+  miniexp_io = saved_io;
+}
+
+miniexp_t
+parse_comment(void)
+{
+  int c = minilisp_getc();
+  while (c != EOF && c != '\n')
+    c = minilisp_getc();
+  return miniexp_nil;
+}
+
+miniexp_t
+parse_quote(void)
+{
+  minivar_t l = miniexp_read();
+  if (l == miniexp_dummy)
+    return miniexp_dummy;
+  l = miniexp_cons(s_quote, miniexp_cons(l, miniexp_nil));
+  return miniexp_cons(l,miniexp_nil);
+}
+
+static void
+sighandler(int signo)
+{
+  break_request = true;
+  signal(signo, sighandler);
+}
+
+DEFUN("load",xload,1,0) {
+  if (! miniexp_stringp(argv[0]))
+    error("load: string expected");
+  FILE *f = fopen(miniexp_to_str(argv[0]), "r");
+  if (! f)
+    error("load: cannot open file");
+  toplevel(f, stdout, false);
+  fclose(f);
+  return miniexp_nil;
+}
+
+
+/* ------------ toplevel */
+
+int
+main()
+{
+#ifdef DEBUG
+  minilisp_debug(1);
+#endif
+  minilisp_macrochar_parser[(int)';'] = parse_comment;
+  minilisp_macrochar_parser[(int)'\''] = parse_quote;
+  FILE *f = fopen("minilisp.in","r");
+  if (f) {
+    toplevel(f, stdout, false);
+    fclose(f);
+  } else
+    printf("WARNING: cannot find 'minilisp.in'\n");
+  signal(SIGINT, sighandler);
+  while (! feof(stdin))
+    toplevel(stdin, stdout, true);
+  break_request = true;
+  minilisp_finish();
+  return 0;
+}
diff --git a/doc/minilisp/minilisp.in b/doc/minilisp/minilisp.in
new file mode 100644
index 0000000..e217390
--- /dev/null
+++ b/doc/minilisp/minilisp.in
@@ -0,0 +1,143 @@
+;; -*- Lisp -*-
+;; ---------------------------------------------------------------
+;; MiniLisp - Very small lisp interpreter to demonstrate MiniExp.
+;; Copyright (c) 2005  Leon Bottou
+;;
+;; This software is subject to, and may be distributed under, the
+;; GNU General Public License, either Version 2 of the license,
+;; or (at your option) any later version. The license should have
+;; accompanied the software or you may obtain a copy of the license
+;; from the Free Software Foundation at http://www.fsf.org .
+;;
+;; 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.
+;; ---------------------------------------------------------------
+
+;;   Executable <minilisp> loads this file on startup.
+;;   It contains a few helpful minilisp functions and macros.
+
+(defvar defun
+  (mlambda((name . args) . body)
+     (list 'defvar name (list 'lambda args . body)) ) )
+
+(defvar defmacro
+  (mlambda((name . args) . body)
+     (list 'defvar name (list 'mlambda args . body)) ) )
+
+(defmacro (pretty f)
+  (let ((s (if (symbolp f) (list (list quote f)))))
+    (list 'let
+      (list (list 's (list 'funcdef f . s)))
+      (list 'pprint 's 72)
+      () ) ) )
+
+(defun (copyrev l)
+   (let ((r ()))
+     (while l
+       (setq r (cons (car l) r))
+       (setq l (cdr l)) )
+     r ) )
+
+(defun (copy l)
+   (reverse (copyrev l)) )
+
+(defun (append . l)
+  (setq l (copyrev l))
+  (let ((r (car l)))
+    (while (consp (setq l (cdr l)))
+      (let ((x (copyrev (car l))))
+        (while (consp x)
+          (let ((y (cdr x)))
+            (setq r (rplacd x r))
+            (setq x y) ) ) ) )
+    r ) )
+
+(defmacro (when cond . body)
+   (list 'if cond (list 'progn . body)) )
+
+(let ((sym-to  '|S 0001|)
+      (sym-res '|S 0002|) )
+  (defmacro (for (v from to) . body)
+    (list 'let (list (list v from)
+                     (list sym-to to)
+                     (list sym-res ()) )
+          (list 'while (list <= v sym-to)
+                (list 'setq sym-res (list 'progn . body))
+                (list 'setq v (list '+ v 1)) )
+          sym-res ) ) )
+
+(let ((sym-to  '|S 0001|)
+      (sym-res '|S 0002|) )
+  (defmacro (mapfor (v from to) . body)
+    (list 'let (list (list v from)
+                     (list sym-to to)
+                     (list sym-res ()) )
+          (list 'while (list <= v sym-to)
+                (list 'setq sym-res (list 'cons (list 'progn . body) sym-res))
+                (list 'setq v (list '+ v 1)) )
+          (list 'reverse sym-res) ) ) )
+
+(defmacro (cond . args)
+   (let ((a (copyrev args))
+         (r ()))
+     (while (consp a)
+       (setq r (cons 'if (cons (caar a)
+           (if (= (length (cdar a)) 1)
+              (list (car (cdar a)) r)
+              (list (cons 'progn (cdar a)) r) ) )))
+       (setq a (cdr a)) )
+     r ) )
+
+(defmacro (not n)
+  (list 'nullp n) )
+
+(defmacro (and . args)
+   (let ((r 't)
+         (a (copyrev args)) )
+      (while a
+        (setq r (list 'if (car a) r))
+        (setq a (cdr a)) )
+      r ) )
+
+(defmacro (or . args)
+   (let ((r ())
+         (a (copyrev args))
+         (f (mlambda(x . b)
+              (list 'let (list (list 's x))
+                 (list 'if 's 's . b) ) )) )
+     (while a
+        (setq r (list f (car a) r))
+        (setq a (cdr a)) )
+     r ) )
+
+(defun (mapcar f l)
+  (let ((r ()))
+    (while l
+       (setq r (cons (f (car l)) r))
+       (setq l (cdr l)) )
+    (reverse r) ) )
+
+(defun (1+ x) (+ x 1))
+
+(defun (1- x) (- x 1))
+
+(defun (2* x) (* x 2))
+
+(defun (2/ x) (/ x 2))
+
+(defun (div n d)
+  (floor (/ n d)) )
+
+(defun (mod n d)
+   (- n (* d (div n d))) )
+
+(defvar set! setq)
+
+(defvar set-car! rplaca)
+
+(defvar set-cdr! rplacd)
+
+(display "MiniLisp, (C) 2005, Leon Bottou.\n"
+         "Available under the GNU General Public Licence.\n\n")
diff --git a/doc/old/djvu3changes.txt b/doc/old/djvu3changes.txt
new file mode 100644
index 0000000..b005ae1
--- /dev/null
+++ b/doc/old/djvu3changes.txt
@@ -0,0 +1,691 @@
+
+
+
+<WARNING: THIS DOCUMENT HAS BEEN MADE OBSOLETE 
+ BY THE LIZARDTECH SPECIFICATION "DJVU3SPEC.DJVU".>
+
+
+
+    This file summarizes the file format changes 
+    between DjVu2 and DjVu3.
+
+
+
+
+------------------------------------------------------------
+1 - DJVU3 FILE STRUCTURE OVERVIEW
+------------------------------------------------------------
+
+    DjVu files are organized according to the ``EA IFF 85'' layout.  Pointers to
+    the appropriate reference document are provided in section
+    \Ref{IFFByteStream.h}.  IFF files are logically composed of a sequence of
+    data \emph{chunks}.  Each chunk comes with a four character \emph{chunk
+    identifier} describing the type of the data stored in the chunk.  A few
+    special chunk identifiers, for instance #"FORM"#, are reserved for so
+    called \emph{composite chunks} containing a sequence of data chunks.  This
+    convention effectively provides IFF files with a hierarchical structure.
+    Composite chunks are further identified by a \emph{secondary chunk
+    identifier}.  For convenience, both identifiers are gathered as an
+    extended chunk identifier such as #"FORM:DJVU"#.
+
+    The four octets #0x41,0x54,0x26,0x54# may be inserted in front of the IFF 
+    compliant byte stream.  The decoder simply ignores these four octets when
+    they are present.  These four octets are not part of the IFF format and
+    are not required components of a valid DjVu file.  Certain versions of MSIE
+    incorrectly recognize any IFF file as a Microsoft AIFF sound file.  The
+    presence of these four octets prevents this incorrect identification.
+
+    The DjVu specification mandates that the decoder should silently
+    skip chunks whose identifier is not recognized.  This mechanism
+    provides a backward compatible way to extend the initial format by
+    allocating new chunk identifiers. 
+
+------------------------------------------------------------
+1.1 - DJVU3 IMAGE FILES
+------------------------------------------------------------
+
+    \textbf{Photo DjVu Image} --- 
+
+    Photo DjVu Image files are best used for
+    encoding photographic images in colors or in shades of gray.  The data
+    compression model relies on the IW44 wavelet representation.  This format
+    is designed such that the IW44 decoder is able to quickly perform
+    progressive rendering of any image segment using only a small amount of
+    memory.  Photo DjVu files are composed of a single #"FORM:DJVU"# composite
+    chunk.  This composite chunk always begins with one #"INFO"# chunk
+    describing the image size and resolution (see \Ref{DjVuInfo.h}).  One or
+    more additional #"BG44"# chunks contains the image data encoded with the
+    IW44 representation (see \Ref{IW44Image.h}).  The image size specified in
+    the #"INFO"# chunk and the image size specified in the IW44 data must be
+    equal.
+
+    \textbf{Bilevel DjVu Image} --- 
+
+    Bilevel DjVu Image files are used to compress
+    black and white images representing text and simple drawings.   The
+    JB2 data compression model uses the soft pattern matching technique, which
+    essentially consists of encoding each character by describing how it
+    differs from a well chosen already encoded character.  Bilevel DjVu Files
+    are composed of a single #"FORM:DJVU"# composite chunk.  This composite
+    chunk always begins with one #"INFO"# chunk describing the image size and
+    resolution (see \Ref{DjVuInfo.h}).  An additional #"Sjbz"# chunk contains
+    the bilevel data encoded with the JB2 representation (see
+    \Ref{JB2Image.h}).  The image size specified in the #"INFO"# chunk and the
+    image size specified in the JB2 data must be equal.
+
+    \textbf{Compound DjVu Image} --- 
+
+    Compound DjVu Files are an extremely
+    efficient way to compress high resolution Compound document images
+    containing both pictures and text, such as a page of a magazine.  Compound
+    DjVu Files represent the document images using two layers.  The
+    \emph{background layer} is used for encoding the pictures and the
+    paper texture.
+    The \emph{foreground layer} is used for encoding the text and the drawings.
+    Compound DjVu Files are composed of a single #"FORM:DJVU"# composite
+    chunk.  This composite chunk always begins with one #"INFO"# chunk
+    describing the size and the resolution of the image (see \Ref{DjVuInfo}).
+    Additional chunks hold the components of either the foreground or the
+    background layers.
+
+    The main component of the foreground layer is a bilevel image named the
+    \emph{foreground mask}. The pixel size of the foreground mask is equal to
+    the size of the DjVu image.  It contains a black-on-white representation
+    of the text and the drawings.  This image is encoded by a #"Sjbz"# chunk
+    using the JB2 representation.  There may also be a companion chunk
+    #"Djbz"# containing a \emph{shape dictionary} that defines bilevel shapes
+    referenced by the #"Sjbz"# chunk.
+
+    The \emph{foreground colors} can be encoded according to two models:
+    \begin{itemize}
+    \item 
+      The foreground colors may be encoded using a small color image,
+      the \emph{foreground color image}, encoded as a single #"FG44"#
+      chunk using the
+      IW44 representation (see \Ref{IW44Image.h}).  Such compound DjVu images
+      are rendered by painting the foreground color image on top of the
+      background color image using the foreground mask as a stencil.  The
+      pixel size of the foreground color image is computed by rounding up the
+      quotient of the mask size by an integer sub-sampling factor ranging from
+      1 to 12.  Most Compound DjVu Images use a foreground color sub-sampling
+      factor of 12.  Smaller sub-sampling factors produce very slightly better
+      images.
+    \item
+      The foreground colors may be encoded by specifying one solid color per
+      object described by the JB2 encoded mask. These \emph{JB2 colors} are
+      color-quantized and stored in a single #"FGbz"# chunk (see.
+      \Ref{DjVuPalette.h}).  Such compound DjVu images are rendered by
+      painting each foreground object on top of the background color image
+      using the solid color specified by the #"FGbz"# chunk.
+    \end{itemize}
+
+    The background layer is a color image, \Ref{the background color image}
+    ncoded by an arbitrary number of #"BG44"# chunks containing successive
+    IW44 refinements (see \Ref{IW44Image.h}).  The size of this image is
+    computed by rounding up the quotient of the mask size by an integer
+    sub-sampling factor ranging from 1 to 12.  Most Compound DjVu Images use a
+    background sub-sampling factor equal to 3.  Smaller sub-sampling factors
+    are adequate for images with a very rich paper texture.  Larger
+    sub-sampling factors are adequate for images containing no pictures.
+
+    There are no ordering or interleaving constraints on these chunks except
+    that (a) the #"INFO"# chunk must appear first, and (b) the successive
+    #"BG44"# refinements must appear with their natural order.  The chunk
+    order simply affects the progressive rendering of DjVu images on a web
+    browser.  
+
+    \textbf{IW44 Image Files} --
+
+    The IW44 Image file format is the native format for the IW44 wavelet
+    representation.  These files are deprecated in favor of Photo DjVu
+    Images.
+
+    \textbf{Alternative encodings} --- 
+
+    Besides the JB2 and IW44 encoding schemes,
+    the DjVu format supports alternative encoding methods for its components.  
+
+    \begin{itemize}
+    \item
+       The foreground mask may be represented by a single #"Smmr"# chunk
+       instead of #"Sjbz"#.  The #"Smmr"# chunk contains a bilevel image
+       encoded with the Fax-G4/MMR method.  Although the resulting files
+       are typically six times larger, this capability can be useful when
+       DjVu is used as a front-end for fax machines and scanners with 
+       embedded Fax-G4/MMR capabilities. 
+    \item
+       The background color image may be represented by a single #"BGjp"#
+       chunk instead of several #"BG44"# chunks.  The #"BGjp"# chunk contains
+       a JPEG encoded color image.  The resulting files are significantly
+       larger and lack the progressivity of the usual DjVu files.  
+       This is useful because some scanners have embedded JPEG capabilities.
+    \item
+       The foreground color image may be represented by a single #"FGjp"#
+       chunk instead of a single #"FG44"# chunk.  This is useful because 
+       some scanners have embedded JPEG capabilities.
+    \end{itemize}
+
+    In addition, the chunk names #"BG2k"# and #"FG2k"# have been reserved for
+    encoding the background color image and the foreground color image using
+    the forthcoming JPEG-2000 standard.  This capability is not implemented at
+    the moment.  The JPEG-2000 standard may even become the preferred encoding
+    method for color images in DjVu.  */
+
+    \textbf{Annotations and Textual Information } --
+
+    All types of DjVu images may contain
+    annotation chunks.  Annotation chunks are currently used to describe
+    hyperlinks, to specify more closely the behavior of the viewers,
+    and to hold metadata information.  Annotations are contained in #"ANTa"# 
+    or #"ANTz"# chunks.  The #"ANTa"# chunks contain the annotation in 
+    plain text. The #"ANTz"# chunks contain the same information compressed 
+    with the BZZ encoder (cf. \Ref{BSByteStream.h}).
+
+    All types of DjVu image files may also contain a
+    computer readable description of the text appearing on the page.  This
+    information is contained by either a #"TXTa"# chunk or #"TXTz"# chunk.
+    The #"TXTa"# chunk contains uncompressed data.  The #"TXTz"# chunk
+    contains the same data compressed with the \Ref{bzz} compressor
+    (cf. \Ref{BSByteStream.h}).  The #"TXTa"# chunks begins by a 24 bit
+    integer (most significant byte first) describing the length of the text in
+    bytes.  Then come the ISO10646/UTF8 text.  Additional information
+    indicates the position of each column/region/paragraph/line/word in the
+    document.  More information about the capabilities of the chunk can be
+    found in section \Ref{DjVuTXT}.  More information about the encoding of
+    textual information can be found in file #"DjVuAnno.cpp"#.  */
+
+
+------------------------------------------------------------
+1.2 - DJVU3 MULTIPAGE DOCUMENTS
+------------------------------------------------------------
+
+    The DjVu3 system supports two models for multi-page documents:
+    \emph{bundled} multi-page documents and \emph{indirect} multi-page documents.
+    
+    \textbf{Bundled multi-page documents} --- 
+
+    A \emph{bundled} multi-page DjVu
+    document uses a single file to represent the entire document.  This single
+    file contains all the pages as well as ancillary information (e.g. the
+    page directory, data shared by several pages, thumbnails, etc.).  Using a
+    single file format is very convenient for storing documents or for sending
+    email attachments.
+
+    A bundled multi-page document is composed of a single #"FORM:DJVM"#
+    composite chunk.  This composite chunk always begins with a #"DIRM"# chunk
+    containing the document directory (see. \Ref{DjVmDir.h}) which represents
+    the list of the \emph{component files} that compose the document.  The
+    component files themselves are then encoded as IFF85 composite chunks
+    following the #"DIRM"# chunk.
+
+    \begin{itemize}
+    \item  
+       Component files may be any valid DjVu image (see \Ref{DjVu Image Files})
+       or IW44 image (see \Ref{IW44 Image Files}.)  These component files 
+       always represent a page of a document.  The corresponding IFF85 chunk ids are 
+       #"FORM:DJVU"#, #"FORM:PM44"#, or #"FORM:BM44"#.
+    \item 
+       Component files may contain shared information indirectly referenced by
+       some document pages.  These \emph{shared component files} are always composed
+       of a single #"FORM:DJVI"# chunk containing an arbitrary collection of
+       chunks. 
+    \item
+       Thumbnail files contain optional thumbnail images for a few consecutive
+       pages of the document.  Thumbnail files consist of a single
+       #"FORM:THUM"# composite chunk containing several #"TH44"# chunks
+       containing IW44 encoded thumbnail images (see \Ref{IW44Image.h}).  These
+       thumbnails always pertain the first few page files following the
+       thumbnail file in the document directory.
+    \end{itemize}
+
+    \textbf{Including shared information} --- 
+
+    Any DjVu image file contained in a multipage file may contain an #"INCL"#
+    chunk containing the ID of a shared component file.  The decoder processes
+    the chunks contained in the shared component file as if they were
+    contained by the DjVu image file.
+
+    A shared component file is composed of a single #"FORM:DJVI"# potentially
+    containing any information otherwise allowed in a DjVu image file (except
+    for the #"INFO"# chunk of course).
+
+    There are many benefits associated with storing such shared information in
+    separate files.  A well designed browser may keep pre-decoded copies of
+    these files in a cache.  This procedure would reduce the size of the data
+    transferred over the Internet and also increase the display speed.  The
+    multipage DjVu compressor, for instance, identifies similar object shapes
+    occuring in several pages.  These shapes are encoded in a shape dictionary
+    (chunk #"Djbz"#) placed in a shared component file.  All relevant pages
+    include this shared component file.  Although they appear in several
+    pages, these shared shapes are encoded only once in the document.
+
+    \textbf{Browsing a multi-page document} --- 
+
+    You can view the pages using the DjVu plugin and a web browser.  When you
+    type the URL of a multi-page document, the browser starts downloading the
+    whole file, but displays the first page as soon as it is available.  You
+    can immediately navigate to other pages using the DjVu toolbar.  Suppose
+    however that the document is stored on a remote web server.  You can
+    easily access the first page and see that this is not the document you
+    wanted.  Although you will never display the other pages the browser is
+    transferring data for these pages and is wasting the bandwith of your
+    server (and the bandwith of the Internet too).  You could also see the
+    summary of the document on the first page and jump to page 100.  But page
+    100 cannot be displayed until data for pages 1 to 99 has been received.
+    You may have to wait for the transmission of unnecessary page data.  This
+    second problem (the unnecessary wait) can be solved using the ``byte
+    serving'' options of the HTTP/1.1 protocol.  This option has to be
+    supported by the web server, the proxies, the caches and the browser.  We
+    are coming there but not quite yet.  Byte serving however does not solve
+    the first problem (the waste of bandwith).
+
+    \textbf{Indirect multi-page documents} --- 
+
+    DjVu solves both problem using a
+    special multi-page format named the \emph{indirect} model.  An indirect
+    multi-page DjVu document is composed of several files.  The main file is
+    named the \emph{index file}.  You can browse a document using the URL of
+    the index file, just like you do with a bundled multi-page document.  The
+    index file however is very small.  It simply contains the document
+    directory and the URLs of secondary files containing the page data.  When
+    you browse an indirect multi-page document, the browser only accesses data
+    for the pages you are viewing.  This can be done at a reasonable speed
+    because the browser maintains a cache of pages and sometimes pre-fetches a
+    few pages ahead of the current page.  This model uses the web serving
+    bandwith much more effectively.  It also eliminates unnecessary delays
+    when jumping ahead to pages located anywhere in a long document.
+
+    \textbf{Obsolete Formats} --- 
+
+    The library also supports two other multipage
+    formats which are now obsolete.  These formats are technologically
+    inferior and should no longer be used. */
+
+
+
+
+
+------------------------------------------------------------
+2 - CHUNK ENCODING
+------------------------------------------------------------
+
+    This section describes 
+    - the encoding of new chunks introduces with DjVu3
+    - the encoding changes of chunks already present in DjVu2
+
+
+
+------------------------------------------------------------
+2.1 - CHANGES TO JB2 ( "Sjbz" AND "Djbz" CHUNKS )
+------------------------------------------------------------
+
+    Two extensions of the JB2 encoding format have been introduced
+    with DjVu files version 21.  Both extensions maintain significant
+    backward compatibility with previous version of the JB2 format.
+    These extensions are described below by reference to the DjVu2 spec
+    dated August 1999.  Both extension make use of the unused record 
+    type value #9# (cf. ICFDD page 24) which has been renamed
+    #REQUIRED_DICT_OR_RESET#.
+
+    \textbf{Shared Shape Dictionaries} --- This extension provides
+    support for sharing symbol definitions between the pages of a
+    document.  To achieve this objective, the JB2 image data chunk
+    must be able to address symbols defined elsewhere by a JB2
+    dictionary data chunk shared by all the pages of a document.
+
+    The arithmetically encoded JB2 image data logically consist of a
+    sequence of records. The decoder processes these records in
+    sequence and maintains a library of symbols which can be addressed
+    by the following records.  The first record usually is a ``Start
+    Of Image'' record describing the size of the image.
+
+    Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record
+    type can appear \emph{before} the #START_OF_DATA# (0) record.  The
+    record type field is followed by a single number arithmetically
+    encoded (cf. ICFDD page 26) using a sixteenth context (cf. ICFDD
+    page 25).  This record appears when the JB2 data chunk requires
+    symbols encoded in a separate JB2 dictionary data chunk.  The
+    number (the \textbf{dictionary size}) indicates how many symbols
+    should have been defined by the JB2 dictionary data chunk.  The
+    decoder should simply load these symbols in the symbol library and
+    proceed as usual.  New symbols potentially defined by the
+    subsequent JB2 image data records will therefore be numbered with
+    integers greater or equal than the dictionary size.
+
+    The JB2 dictionary data format is a pure subset of the JB2 image
+    data format.  The #START_OF_DATA# (0) record always specifies an
+    image width of zero and an image height of zero.  The only allowed
+    record types are those defining library symbols only
+    (#NEW_SYMBOL_LIBRARY_ONLY# (2) and #MATCHED_REFINE_LIBRARY_ONLY#
+    (5) cf. ICFDD page 24) followed by a final #END_OF_DATA# (11)
+    record.
+
+    The JB2 dictionary data is usually located in an \textbf{Djbz} chunk.
+    Each page \textbf{FORM:DJVU} may directly contain a \textbf{Djbz} chunk,
+    or may indirectly point to such a chunk using an \textbf{INCL} chunk
+    (cf. \Ref{Multipage DjVu documents.}).
+
+    \textbf{Numcoder Reset} --- This extension addresses a problem for
+    hardware implementations.  The encoding of numbers (cf. ICFDD page
+    26) potentially uses an unbounded number of binary coding
+    contexts. These contexts are normally allocated when they are used
+    for the first time (cf. ICFDD informative note, page 27).
+
+    Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record
+    type can appear \emph{after} the #START_OF_DATA# (0) record.  The
+    decoder should proceed with the next record after \emph{clearing
+    all binary contexts used for coding numbers}.  This operation
+    implies that all binary contexts previously allocated for coding
+    numbers can be deallocated.
+  
+    Starting with version 21, the JB2 encoder should insert a
+    #REQUIRED_DICT_OR_RESET# record type whenever the number of these
+    allocated binary contexts exceeds #20000#.  Only very large
+    documents ever reach such a large number of allocated binary
+    contexts (e.g large maps).  Hardware implementation however can
+    benefit greatly from a hard bound on the total number of binary
+    coding contexts.  Old JB2 decoders will treat this record type as
+    an #END_OF_DATA# record and cleanly stop decoding (cf. ICFDD page
+    30, Image refinement data).
+
+
+
+
+------------------------------------------------------------
+2.2 - JB2 COLORS ( "FGbz" CHUNK )
+------------------------------------------------------------
+
+    To be documented.
+
+    The #"FGbz"# contains BZZ compressed data 
+    (cf. \Ref{BSByteStream.h}).
+
+    The uncompressed data can be decoded using function
+    #DjVuPalette::decode# defined in file #"DjVuPalette.cpp"#.
+
+
+
+
+------------------------------------------------------------
+2.3 - ANNOTATIONS ( "ANTa" AND "ANTz" CHUNKS )
+------------------------------------------------------------
+
+[MAY 19TH, 2005: 
+ New annotation types have been defined by Lizardtech.
+ The authoritative documentation is now the djvused man page.]
+
+
+    Annotations are contained in #"ANTa"# 
+    or #"ANTz"# chunks.  The #"ANTa"# chunks contain the annotation in 
+    plain text. The #"ANTz"# chunks contain the same information compressed 
+    with the BZZ encoder (cf. \Ref{BSByteStream.h}).
+
+    The complete annotation text is obtained by concatenating all annotation 
+    chunks present in the page.  Pages can share annotations using an INCL
+    chunk as explained in section \Ref{Including shared information}.
+    A restriction of the current reference library implementation
+    limits the number of shared annotation files to one.
+
+    The syntax of the annotation text uses a simple
+    parenthesized notation. Erroneous and unrecognized constructs are silently
+    ignored.  The following constructs are recognized:
+
+    \begin{description}
+    \item[(background <color>)]
+       Sets the color of the viewer area surrounding the DjVu image.
+       The color argument #color# are always represented using X11 
+       syntax \##RRGGBB#. For instance \##000000# is black 
+       and \##FFFFFF# is white.
+
+    \item[(zoom <zoom-value>)]
+       Sets the initial zoom factor of the image.  Argument #zoom-value# may
+       be #stretch#, #one2one#, #width#, #page#, or composed of the letter
+       #"d"# followed by a number between #1# and #999# (such as in #d300# for
+       instance.)
+
+    \item[(mode <mode-value>)]
+       Sets the display mode for the image.  Argument #mode-value# may
+       be #color#, #bw#, #fore# or #back#.
+
+    \item[(align <horz-align> <vert-align>)]
+       Specifies how the image should be aligned on the viewer surface.
+       By default the image is located in the center.  Argument #horz-align#
+       may be #left#, #center#, or #right#.  Argument #vert-align# may be
+       #top#, #center#, or #bottom#.
+
+    \item[(maparea <url> <comment> <area> <...options...>]
+       Defines an hyperlink for the URL specified by argument #url#.
+
+       Argument #url# may have one of the following two forms:
+       \begin{verbatim}
+            "<href>"
+            (url "<href>" "<target>")
+       \end{verbatim}
+       where #href# is a string representing the URL and #target# is a string
+       representing the target frame for the hyperlink (cf. Documentation for
+       the HTML tag #<A>#).  Both strings are surrounded with double quotes.
+       Argument #comment# is a string surrounded by double quotes.
+       This string may be displayed as a tooltip when the user
+       moves the mouse over the hyperlink.
+       Argument #area# defines the shape of the hyperlink.
+       The following options are supported for representing
+       rectangle, circle, or polygons.
+       \begin{verbatim}
+            (rect <xmin> <ymin> <width> <height>)
+            (oval <xmin> <ymin> <width> <height>)
+            (polygon <x0> <y0> <x1> <y1> ....)
+       \end{verbatim}
+       All parameters are numbers representing coordinates measured in image
+       pixels with the origin set at the bottom left corner of the image.  The
+       remaining arguments describe options regarding the hyperlink borders.
+       A first set of option define the type of the borders:
+       \begin{verbatim}
+            (xor)
+            (border <color>
+            (shadow_in [<thickness>])
+            (shadow_out [<thickness>])
+            (shadow_ein [<thickness>])
+            (shadow_eout [<thickness>])
+       \end{verbatim}
+       where parameter #color# has syntax \##RRGGBB# (as above) and parameter
+       #thickness# is a number from 1 to 32.  The last four border modes are
+       only supported with rectangular areas. The border becomes visible when
+       the user moves the mouse over the hyperlink.  The border may be made
+       always visible by using the following option:
+       \begin{verbatim}
+            (border-avis)
+       \end{verbatim}
+       Finally the following option may be used with rectangular areas only.
+       The complete area will be hilited using the specified color (specified
+       with syntax \##RRGGBB# as usual).
+       \begin{verbatim}
+            (hilite <color>)
+       \end{verbatim}
+       This is often used with an empty URL for simply emphasizing a specific
+       segment of an image.
+
+    \item[(metadata <...entries...>)]
+       Defines multiple metadata entries.
+
+       Each metadata entry has the form
+       \begin{verbatim}
+          (<key> "<value>")
+       \end{verbatim}
+       parameter #<key># is a symbolic attribute name such as #year#,
+       #booktitle#, #editor#, #author#, and parameter #<value>#
+       is a UTF-8 encoded string representing the attribute value.  
+       Common C escape sequences are recognized.
+       It is suggested to use the same key names as 
+       the BibTeX bibliography system.
+
+       Metadata pertaining to the entire document should be placed
+       in a shared annotation file (and therefore are seen in all pages).
+       Metadata pertaining to a particular page are usually places
+       inside an #"ANTz"# chunk in this particular page.
+
+    \end{description}
+
+    
+
+
+
+------------------------------------------------------------
+2.4 - HIDDEN TEXT ( "TXTa" AND "TXTz" CHUNKS )
+------------------------------------------------------------
+
+    To be documented.
+
+    The #"TXTa"# chunk contains uncompressed data.  
+    The #"TXTz"# chunk contains BZZ compressed data (cf. \Ref{BSByteStream.h}).
+
+    The uncompressed data can be decoded using function #DjVuText::decode#
+    defined in file #"DjVuText.cpp"# Program #djvused# can display the content
+    of the text chunk using a lisp syntax, and can create a text chunk from
+    this lisp syntax.
+
+
+------------------------------------------------------------
+2.5 - MULTIPAGE DIRECTORY CHUNK ( "DIRM" CHUNK )
+------------------------------------------------------------
+
+    Multipage DjVu documents follow the EA
+    IFF85 format (cf. \Ref{IFFByteStream.h}.)  A document is composed of a
+    #"FORM:DJVM"# whose first chunk is a #"DIRM"# chunk containing the
+    \emph{document directory}.  This directory lists all component
+    files composing
+    the given document, helps to access every component file and identify the
+    pages of the document.
+
+    \begin{itemize} 
+    \item
+         In a \emph{bundled} multipage file, the component files 
+         are stored immediately after the #"DIRM"# chunk,
+         within the #"FORM:DJVM"# composite chunk.  
+    \item
+         In an \emph{indirect} multipage file, the component files are 
+         stored in different files whose URLs are composed using information 
+         stored in the #"DIRM"# chunk.
+    \end{itemize} 
+
+    Most of the component files represent pages of a document.  Some files
+    however represent data shared by several pages.  The pages refer to these
+    supporting files by means of an inclusion chunk (#"INCL"# chunks)
+    identifying the supporting file.  Every directory record describes a 
+    component file.  Each component file is identified by a small string 
+    named the identifier (ID). Each component file also contains a 
+    file name and a title.
+
+    Theoretically, IDs are used to uniquely identify each component file in
+    #"INCL"# chunks, names are used to compose the the URLs of the component
+    files in an indirect multipage DjVu file, and titles are cosmetic names
+    possibly displayed when viewing a page of a document.  There are however
+    many problems with this scheme, and we \emph{strongly suggest}, with the
+    current implementation to always make the file ID, the file name and the
+    file title identical.
+
+    \textbf{Variants} --- There are two versions of the #"DIRM"# chunk format.
+    The version number is identified by the seven low bits of the first byte
+    of the chunk.  Version \textbf{0} is obsolete and should never be used.  This
+    section describes version \textbf{1}.  There are two major multipage DjVu
+    formats supported: \emph{bundled} and \emph{indirect}.  The #"DIRM"# chunk
+    indicates which format is used in the most significant bit of the first
+    byte of the chunk.  The document is bundled when this bit is set.
+    Otherwise the document is indirect.
+
+    \textbf{Unencoded data} --- 
+
+    The #"DIRM"# chunk is composed some unencoded
+    data followed by \Ref{bzz} encoded data.  The unencoded data starts with
+    the version byte and a 16 bit integer representing the number of component
+    files.  All integers are encoded with the most significant byte first.
+    \begin{verbatim}
+          BYTE:             Flags/Version:  0x<bundled>0000011
+          INT16:            Number of component files.
+    \end{verbatim}
+    When the document is a bundled document (i.e. the flag #bundled# is set),
+    this header is followed by the offsets of each of the component files within
+    the #"FORM:DJVM"#.  These offsets allow for random component file access.
+    \begin{verbatim}
+          INT32:            Offset of first component file.
+          INT32:            Offset of second component file.
+          ...
+          INT32:            Offset of last component file.
+    \end{verbatim}
+
+    \textbf{BZZ encoded data} ---
+
+     The rest of the chunk is entirely compressed
+    with the BZZ general purpose compressor.  We describe now the data fed
+    into (or retrieved from) the BZZ codec (cf. \Ref{BSByteStream}.)  First
+    come the sizes and the flags associated with each component file.
+    \begin{verbatim}
+          INT24:             Size of the first component file.
+          INT24:             Size of the second component file.
+          ...
+          INT24:             Size of the last component file.
+          BYTE:              Flag byte for the first component file.
+          BYTE:              Flag byte for the second component file.
+          ...
+          BYTE:              Flag byte for the last component file.
+    \end{verbatim}
+    The flag bytes have the following format:
+    \begin{verbatim}
+          0b<hasname><hastitle>000000     for a file included by other files.
+          0b<hasname><hastitle>000001     for a file representing a page.
+          0b<hasname><hastitle>000010     for a file containing thumbnails.
+    \end{verbatim}
+    Flag #hasname# is set when the name of the file is different from the file
+    ID.  Flag #hastitle# is set when the title of the file is different from
+    the file ID.  These flags are used to avoid encoding the same string three
+    times.  Then come a sequence of zero terminated strings.  There are one to
+    three such strings per component file.  The first string contains the ID
+    of the component file.  The second string contains the name of the
+    component file.  It is only present when the flag #hasname# is set. The third
+    one contains the title of the component file. It is only present when the
+    flag #hastitle# is set. The \Ref{bzz} encoding system makes sure that 
+    all these strings will be encoded efficiently despite their possible
+    redundancies.
+    \begin{verbatim}
+          ZSTR:     ID of the first component file.
+          ZSTR:     Name of the first component file (only if #hasname# is set.)
+          ZSTR:     Title of the first component file (only if #hastitle# is set.)
+          ... 
+          ZSTR:     ID of the last component file.
+          ZSTR:     Name of the last component file (only if #hasname# is set.)
+          ZSTR:     Title of the last component file (only if #hastitle# is set.)
+    \end{verbatim}
+
+
+
+------------------------------------------------------------
+2.6 - INCLUDES ( "INCL" CHUNK )
+------------------------------------------------------------
+
+    The chunks simply contains the ascii encoded ID
+    of the included component file.
+
+
+
+------------------------------------------------------------
+2.7 - THUMBNAILS
+------------------------------------------------------------
+
+
+    Multipage document file optionally can contain thumbnails for some or all
+    pages.  These thumbnails are stored into special component files
+    containing thumbnails for a number of consecutive pages.
+
+    The thumbnail component file is composed of a single #"FORM:THUM"#
+    containing one or more #"TH44"# chunk.  Each #"TH44"# chunk contains one
+    IW44 encoded thumbnail image for one page (cf. \Ref{IW44Image.h}).
+
+
+------------------------------------------------------------
+2.8 - OUTLINES/BOOKMARKS
+------------------------------------------------------------
+
+[MAY 19th, 2005
+ Multipage files (FORM:DJVM) can contain an 
+ additional chunk "NAVM" located after the "DIRM" chunk.
+ The NAVM chunk contains outlines and bookmarks.
+ See the files libdjvu/DjVmNav.h and libdjvu.DjVmNav.cpp]
diff --git a/doc/old/lizard2003-navm.djvu b/doc/old/lizard2003-navm.djvu
new file mode 100644
index 0000000..6ceaa11
Binary files /dev/null and b/doc/old/lizard2003-navm.djvu differ
diff --git a/doc/old/lizard2005-antz.djvu b/doc/old/lizard2005-antz.djvu
new file mode 100644
index 0000000..f29744e
Binary files /dev/null and b/doc/old/lizard2005-antz.djvu differ
diff --git a/libdjvu/Arrays.cpp b/libdjvu/Arrays.cpp
new file mode 100644
index 0000000..6c7f23a
--- /dev/null
+++ b/libdjvu/Arrays.cpp
@@ -0,0 +1,302 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "Arrays.h"
+#include "GException.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+ArrayRep::ArrayRep(int xelsize,
+		   void (* xdestroy)(void *, int, int),
+		   void (* xinit1)(void *, int, int),
+		   void (* xinit2)(void *, int, int, const void *, int, int),
+		   void (* xcopy)(void *, int, int, const void *, int, int),
+		   void (* xinsert)(void *, int, int, const void *, int)) :
+      data(0), minlo(0), maxhi(-1), lobound(0), hibound(-1),
+      elsize(xelsize), destroy(xdestroy), init1(xinit1),
+      init2(xinit2), copy(xcopy), insert(xinsert)
+{
+}
+
+ArrayRep::ArrayRep(int xelsize,
+		   void (* xdestroy)(void *, int, int),
+		   void (* xinit1)(void *, int, int),
+		   void (* xinit2)(void *, int, int, const void *, int, int),
+		   void (* xcopy)(void *, int, int, const void *, int, int),
+		   void (* xinsert)(void *, int, int, const void *, int),
+		   int hi) : data(0), minlo(0), maxhi(-1),
+   lobound(0), hibound(-1), elsize(xelsize), destroy(xdestroy), init1(xinit1),
+   init2(xinit2), copy(xcopy), insert(xinsert)
+{
+   resize(0, hi);
+}
+
+ArrayRep::ArrayRep(int xelsize,
+		   void (* xdestroy)(void *, int, int),
+		   void (* xinit1)(void *, int, int),
+		   void (* xinit2)(void *, int, int, const void *, int, int),
+		   void (* xcopy)(void *, int, int, const void *, int, int),
+		   void (* xinsert)(void *, int, int, const void *, int),
+		   int lo, int hi) : data(0), minlo(0), maxhi(-1),
+   lobound(0), hibound(-1), elsize(xelsize), destroy(xdestroy), init1(xinit1),
+   init2(xinit2), copy(xcopy), insert(xinsert)
+{
+   resize(lo,hi);
+}
+
+ArrayRep::ArrayRep(const ArrayRep & arr) : data(0), minlo(0), maxhi(-1),
+   lobound(0), hibound(-1), elsize(arr.elsize), destroy(arr.destroy),
+   init1(arr.init1), init2(arr.init2), copy(arr.copy), insert(arr.insert)
+{
+   resize(arr.lobound, arr.hibound);
+   arr.copy(data, lobound-minlo, hibound-minlo,
+	    arr.data, arr.lobound-arr.minlo, arr.hibound-arr.minlo);
+}
+
+ArrayRep::~ArrayRep()
+{
+   destroy(data, lobound-minlo, hibound-minlo);
+   operator delete(data);
+   data=0;
+}
+
+ArrayRep & 
+ArrayRep::operator= (const ArrayRep & rep)
+{
+   if (&rep == this) return *this;
+   empty();
+   resize(rep.lobound, rep.hibound);
+   copy(data, lobound-minlo, hibound-minlo,
+	rep.data, rep.lobound-rep.minlo, rep.hibound-rep.minlo);
+   return *this;
+}
+
+void
+ArrayRep::resize(int lo, int hi)
+{
+  int nsize = hi - lo + 1;
+  // Validation
+  if (nsize < 0)
+    G_THROW( ERR_MSG("arrays.resize") );
+  // Destruction
+  if (nsize == 0)
+    {
+      destroy(data, lobound-minlo, hibound-minlo);
+      operator delete(data);
+      data = 0;
+      lobound = minlo = lo; 
+      hibound = maxhi = hi; 
+      return;
+    }
+  // Simple extension
+  if (lo >= minlo && hi <= maxhi)
+    {
+      init1(data, lo-minlo, lobound-1-minlo);
+      destroy(data, lobound-minlo, lo-1-minlo);
+      init1(data, hibound+1-minlo, hi-minlo);
+      destroy(data, hi+1-minlo, hibound-minlo);
+      lobound = lo;
+      hibound = hi;
+      return;
+    }
+  // General case
+  int nminlo = minlo;
+  int nmaxhi = maxhi;
+  if (nminlo > nmaxhi)
+    nminlo = nmaxhi = lo;
+  while (nminlo > lo) {
+    int incr = nmaxhi - nminlo;
+    nminlo -= (incr < 8 ? 8 : (incr > 32768 ? 32768 : incr));
+  }
+  while (nmaxhi < hi) {
+    int incr = nmaxhi - nminlo;
+    nmaxhi += (incr < 8 ? 8 : (incr > 32768 ? 32768 : incr));
+  }
+  // allocate
+  int bytesize=elsize*(nmaxhi-nminlo+1);
+  void * ndata;
+  GPBufferBase gndata(ndata,bytesize,1);
+  memset(ndata, 0, bytesize);
+  // initialize
+  init1(ndata, lo-nminlo, lobound-1-nminlo);
+  init2(ndata, lobound-nminlo, hibound-nminlo,
+        data, lobound-minlo, hibound-minlo);
+  init1(ndata, hibound+1-nminlo, hi-nminlo);
+  destroy(data, lobound-minlo, hibound-minlo);
+
+  // free and replace
+  void *tmp=data;
+  data = ndata;
+  ndata=tmp;
+
+  minlo = nminlo;
+  maxhi = nmaxhi;
+  lobound = lo;
+  hibound = hi;
+}
+
+void
+ArrayRep::shift(int disp)
+{
+   lobound += disp;
+   hibound += disp;
+   minlo += disp;
+   maxhi += disp;
+}
+
+void
+ArrayRep::del(int n, unsigned int howmany)
+{
+   if (howmany == 0)
+      return;
+   if ((int)(n + howmany) > hibound +1)
+      G_THROW( ERR_MSG("arrays.ill_arg") );
+   copy(data, n-minlo, hibound-howmany-minlo,
+	data, n+howmany-minlo, hibound-minlo);
+   destroy(data, hibound+1-howmany-minlo, hibound-minlo);
+   hibound = hibound - howmany;
+}
+
+void
+ArrayRep::ins(int n, const void * what, unsigned int howmany)
+{
+   int nhi = hibound + howmany;
+   if (howmany == 0) return;
+   if (maxhi < nhi)
+   {
+      int nmaxhi = maxhi;
+      while (nmaxhi < nhi)
+	 nmaxhi += (nmaxhi < 8 ? 8 : (nmaxhi > 32768 ? 32768 : nmaxhi));
+      int bytesize = elsize*(nmaxhi-minlo+1);
+      void *ndata;
+      GPBufferBase gndata(ndata,bytesize,1);
+      memset(ndata, 0, bytesize);
+      copy(ndata, lobound-minlo, hibound-minlo,
+	   data, lobound-minlo, hibound-minlo);
+      destroy(data, lobound-minlo, hibound-minlo);
+      data=ndata;
+      maxhi = nmaxhi;
+   }
+
+   insert(data, hibound+1-minlo, n-minlo, what, howmany);
+   hibound=nhi;
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+
+// ---------------------------------------
+// BEGIN HACK
+// ---------------------------------------
+// Included here to avoid dependency
+// from ByteStream.o to Arrays.o
+
+#ifndef DO_NOT_MOVE_GET_DATA_TO_ARRAYS_CPP
+#include "ByteStream.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+TArray<char>
+ByteStream::get_data(void)
+{
+   const int s=size();
+   if(s > 0)
+   {
+     TArray<char> data(0, s-1);
+     readat((char*)data, s, 0);
+     return data;
+   }else
+   {
+     TArray<char> data(0, -1);
+     return data;
+   }
+}
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
+// ---------------------------------------
+// END HACK
+// ---------------------------------------
+
diff --git a/libdjvu/Arrays.h b/libdjvu/Arrays.h
new file mode 100644
index 0000000..422ff22
--- /dev/null
+++ b/libdjvu/Arrays.h
@@ -0,0 +1,983 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _ARRAYS_H_
+#define _ARRAYS_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#include "GException.h"
+#include "GSmartPointer.h"
+#include <string.h>
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+/** @name Arrays.h
+
+    Files #"Arrays.h"# and #"Arrays.cpp"# implement three array template classes.
+    Class \Ref{TArray} implements an array of objects of trivial types
+    such as #char#, #int#, #float#, etc. It is faster than general implementation
+    for any type done in \Ref{DArray} because it does not cope with
+    element's constructors, destructors and copy operators. Although
+    implemented as a template, which makes it possible to incorrectly use
+    \Ref{TArray} with non-trivial classes, it should not be done.
+
+    A lot of things is shared by these three arrays. That is why there are
+    more base classes:
+    \begin{itemize}
+       \item \Ref{ArrayBase} defines functions independent of the elements type
+       \item \Ref{ArrayBaseT} template class defining functions shared by
+             \Ref{DArray} and \Ref{TArray}
+    \end{itemize}
+
+    The main difference between \Ref{GArray} (now obsolete) and these ones
+    is the copy-on-demand strategy, which allows you to copy array objects
+    without copying the real data. It's the same thing, which has been
+    implemented in \Ref{GString} long ago: as long as you don't try to modify
+    the underlying data, it may be shared between several copies of array
+    objects. As soon as you attempt to make any changes, a private copy
+    is created automatically and transparently for you - the procedure, that
+    we call "copy-on-demand".
+
+    Also, please note that now there is no separate class, which does fast
+    sorting. Both \Ref{TArray} (dynamic array for trivial types) and
+    \Ref{DArray} (dynamic array for arbitrary types) can sort their elements.
+    
+    {\bf Historical comments} --- Leon chose to implement his own arrays because
+    the STL classes were not universally available and the compilers were
+    rarely able to deal with such a template galore. Later it became clear
+    that there is no really good reason why arrays should be derived from
+    containers. It was also suggested to create separate arrays implementation
+    for simple classes and do the copy-on-demand strategy, which would allow
+    to assign array objects without immediate copying of their elements. 
+
+    At this point \Ref{DArray} and \Ref{TArray} should only be used when
+    it is critical to have the copy-on-demand feature.  The \Ref{GArray}
+    implementation is a lot more efficient.
+    
+    @memo Template array classes.
+    @author 
+    Andrei Erofeev <eaf@geocities.com> -- Copy-on-demand implementation.
+*/
+//@{
+
+// Auxiliary classes: Will be used in place of GPBase and GPEnabled objects
+class _ArrayRep
+{
+   friend class	_ArrayBase;
+public:
+   _ArrayRep(void) : count(0) {}
+   _ArrayRep(const _ArrayRep &) {}
+   virtual ~_ArrayRep(void) {}
+
+   _ArrayRep & operator=(const _ArrayRep &) { return *this; }
+
+   int		get_count(void) const { return count; }
+private:
+   int		count;
+
+   void		ref(void) { count++; }
+   void		unref(void) { if (--count==0) delete this; }
+};
+
+class _ArrayBase
+{
+public:
+   _ArrayBase(void) : rep(0) {}
+   _ArrayBase(const _ArrayBase & ab) : rep(0)
+   {
+      if (ab.rep) ab.rep->ref();
+      rep=ab.rep;
+   }
+   _ArrayBase(_ArrayRep * ar) : rep(0)
+   {
+      if (ar) ar->ref();
+      rep=ar;
+   }
+   virtual ~_ArrayBase(void)
+   {
+      if (rep) { rep->unref(); rep=0; }
+   }
+
+   _ArrayRep *	get(void) const { return rep; }
+   _ArrayBase & assign(_ArrayRep * ar)
+   {
+      if (ar) ar->ref();
+      if (rep) rep->unref();
+      rep=ar;
+      return *this;
+   }
+   _ArrayBase &	operator=(const _ArrayBase & ab) { return assign(ab.rep); }
+   bool		operator==(const _ArrayBase & ab) { return rep==ab.rep; }
+private:
+   _ArrayRep	* rep;
+};
+
+// Internal "Array repository" holding the pointer to the actual data,
+// data bounds, etc. It copes with data elements with the help of five
+// static functions which pointers are supposed to be passed to the
+// constructor.
+class DJVUAPI ArrayRep : public _ArrayRep
+{
+public:
+   ArrayRep(int elsize,
+	    void (* xdestroy)(void *, int, int),
+	    void (* xinit1)(void *, int, int),
+	    void (* xinit2)(void *, int, int, const void *, int, int),
+	    void (* xcopy)(void *, int, int, const void *, int, int),
+	    void (* xinsert)(void *, int, int, const void *, int));
+   ArrayRep(int elsize,
+	    void (* xdestroy)(void *, int, int),
+	    void (* xinit1)(void *, int, int),
+	    void (* xinit2)(void *, int, int, const void *, int, int),
+	    void (* xcopy)(void *, int, int, const void *, int, int),
+	    void (* xinsert)(void *, int, int, const void *, int),
+	    int hibound);
+   ArrayRep(int elsize,
+	    void (* xdestroy)(void *, int, int),
+	    void (* xinit1)(void *, int, int),
+	    void (* xinit2)(void *, int, int, const void *, int, int),
+	    void (* xcopy)(void *, int, int, const void *, int, int),
+	    void (* xinsert)(void *, int, int, const void *, int),
+	    int lobound, int hibound);
+   ArrayRep(const ArrayRep & rep);
+   
+   virtual ~ArrayRep();
+   
+      // Following is the standard interface to DArray. DArray will call these
+      // functions to access data.
+   int		size() const;
+   int		lbound() const;
+   int		hbound() const;
+
+   void		empty();
+   void		touch(int n);
+   void		resize(int lobound, int hibound);
+   void		shift(int disp);
+   void		del(int n, unsigned int howmany=1);
+
+      // ins() is an exception. It does it job only partially.
+      // The derived class is supposed to finish insertion.
+   void		ins(int n, const void * what, unsigned int howmany);
+
+   ArrayRep &	operator=(const ArrayRep & rep);
+
+      // All data is public because DArray... classes will need access to it
+   void		*data;
+   int		minlo;
+   int		maxhi;
+   int		lobound;
+   int		hibound;
+   int		elsize;
+private:
+      // These functions can't be virtual as they're called from
+      // constructors and destructors :((
+      // destroy(): should destroy elements in data[] array from 'lo' to 'hi'
+   void		(* destroy)(void * data, int lo, int hi);
+      // init1(): should initialize elements in data[] from 'lo' to 'hi'
+      // using default constructors
+   void		(* init1)(void * data, int lo, int hi);
+      // init2(): should initialize elements in data[] from 'lo' to 'hi'
+      // using corresponding elements from src[] (copy constructor)
+   void		(* init2)(void * data, int lo, int hi,
+			  const void * src, int src_lo, int src_hi);
+      // copy(): should copy elements from src[] to dst[] (copy operator)
+   void		(* copy)(void * dst, int dst_lo, int dst_hi,
+			 const void * src, int src_lo, int src_hi);
+      // insert(): should insert '*what' at position 'where' 'howmany' times
+      // into array data[] having 'els' initialized elements
+   void		(* insert)(void * data, int els, int where, const void * what,
+			   int howmany);
+};
+
+inline int
+ArrayRep::size() const
+{
+   return hibound - lobound + 1;
+}
+
+inline int
+ArrayRep::lbound() const
+{
+  return lobound;
+}
+
+inline int
+ArrayRep::hbound() const
+{
+  return hibound;
+}
+
+inline void
+ArrayRep::empty()
+{
+  resize(0, -1);
+}
+
+inline void
+ArrayRep::touch(int n)
+{
+   if (hibound < lobound)
+   {
+      resize(n,n);
+   } else
+   {
+      int nlo = lobound;
+      int nhi = hibound;
+      if (n < nlo) nlo = n;
+      if (n > nhi) nhi = n;
+      resize(nlo, nhi);
+   }
+}
+
+/** Dynamic array base class.
+    This is an auxiliary base class for \Ref{DArray} and \Ref{TArray}
+    implementing some shared functions independent of the type of array
+    elements. It's not supposed to be constructed by hands. Use \Ref{DArray}
+    and \Ref{TArray} instead.
+    */
+    
+class DJVUAPI ArrayBase : protected _ArrayBase
+{
+protected:
+   void		check(void);
+   void		detach(void);
+
+   ArrayBase(void) {};
+public:
+   /// Returns the number of elements in the array
+   int		size() const;
+   /** Returns the lower bound of the valid subscript range. */
+   int		lbound() const;
+   /** Returns the upper bound of the valid subscript range. */
+   int		hbound() const;
+   /** Erases the array contents. All elements in the array are destroyed.  
+       The valid subscript range is set to the empty range. */
+   void empty();
+   /** Extends the subscript range so that is contains #n#.
+       This function does nothing if #n# is already int the valid subscript range.
+       If the valid range was empty, both the lower bound and the upper bound
+       are set to #n#.  Otherwise the valid subscript range is extended
+       to encompass #n#. This function is very handy when called before setting
+       an array element:
+       \begin{verbatim}
+       int lineno=1;
+       DArray<GString> a;
+       while (! end_of_file()) { 
+       a.touch[lineno]; 
+       a[lineno++] = read_a_line(); 
+       }
+       \end{verbatim} 
+   */
+   void touch(int n);
+   /** Resets the valid subscript range to #0#---#hibound#.
+       This function may destroy some array elements and may construct
+       new array elements with the null constructor. Setting #hibound# to
+       #-1# resets the valid subscript range to the empty range.
+       @param hibound upper bound of the new subscript range. */      
+   void resize(int hibound);
+   /** Resets the valid subscript range to #lobound#---#hibound#. 
+       This function may destroy some array elements and may construct
+       new array elements with the null constructor. Setting #lobound# to #0# and
+       #hibound# to #-1# resets the valid subscript range to the empty range.
+       @param lobound lower bound of the new subscript range.
+       @param hibound upper bound of the new subscript range. */
+   void resize(int lobound, int hibound);
+   /** Shifts the valid subscript range. Argument #disp# is added to both 
+       bounds of the valid subscript range. Array elements previously
+       located at subscript #x# will now be located at subscript #x+disp#. */
+   void shift(int disp);
+   /** Deletes array elements. The array elements corresponding to
+       subscripts #n#...#n+howmany-1# are destroyed. All array elements
+       previously located at subscripts greater or equal to #n+howmany#
+       are moved to subscripts starting with #n#. The new subscript upper
+       bound is reduced in order to account for this shift. 
+       @param n subscript of the first element to delete.
+       @param howmany number of elements to delete. */
+   void del(int n, unsigned int howmany=1);
+
+   virtual ~ArrayBase(void) {};
+};
+
+inline void
+ArrayBase::detach(void)
+{
+   ArrayRep * new_rep=new ArrayRep(*(ArrayRep *) get());
+   assign(new_rep);
+}
+
+inline void
+ArrayBase::check(void)
+{
+   if (get()->get_count()>1) detach();
+}
+
+inline int
+ArrayBase::size() const
+{
+   return ((const ArrayRep *) get())->size();
+}
+
+inline int
+ArrayBase::lbound() const
+{
+   return ((const ArrayRep *) get())->lobound;
+}
+
+inline int
+ArrayBase::hbound() const
+{
+   return ((const ArrayRep *) get())->hibound;
+}
+
+inline void
+ArrayBase::empty()
+{
+   check();
+   ((ArrayRep *) get())->empty();
+}
+
+inline void
+ArrayBase::resize(int lo, int hi)
+{
+   check();
+   ((ArrayRep *) get())->resize(lo, hi);
+}
+
+inline void
+ArrayBase::resize(int hi)
+{
+   resize(0, hi);
+}
+
+inline void
+ArrayBase::touch(int n)
+{
+   check();
+   ((ArrayRep *) get())->touch(n);
+}
+
+inline void
+ArrayBase::shift(int disp)
+{
+   check();
+   ((ArrayRep *) get())->shift(disp);
+}
+
+inline void
+ArrayBase::del(int n, unsigned int howmany)
+{
+   check();
+   
+   ((ArrayRep *) get())->del(n, howmany);
+}
+
+/** Dynamic array template base class.
+    This is an auxiliary template base class for \Ref{DArray} and \Ref{TArray}
+    implementing some shared functions which {\em depend} on the type of
+    the array elements (this is contrary to \Ref{ArrayBase}).
+    It's not supposed to be constructed by hands. Use \Ref{DArray} and
+    \Ref{TArray} instead.
+    */
+
+template <class TYPE>
+class ArrayBaseT : public ArrayBase
+{
+public:
+   virtual ~ArrayBaseT(void) {};
+   
+   /** Returns a reference to the array element for subscript #n#.  This
+       reference can be used for both reading (as "#a[n]#") and writing (as
+       "#a[n]=v#") an array element.  This operation will not extend the valid
+       subscript range: an exception \Ref{GException} is thrown if argument #n#
+       is not in the valid subscript range. */
+   TYPE& operator[](int n);
+   /** Returns a constant reference to the array element for subscript #n#.
+       This reference can only be used for reading (as "#a[n]#") an array
+       element.  This operation will not extend the valid subscript range: an
+       exception \Ref{GException} is thrown if argument #n# is not in the valid
+       subscript range.  This variant of #operator[]# is necessary when dealing
+       with a #const DArray<TYPE>#. */
+   const TYPE& operator[](int n) const;
+   
+   /** Returns a pointer for reading or writing the array elements.  This
+       pointer can be used to access the array elements with the same
+       subscripts and the usual bracket syntax.  This pointer remains valid as
+       long as the valid subscript range is unchanged. If you change the
+       subscript range, you must stop using the pointers returned by prior
+       invocation of this conversion operator. */
+   operator TYPE* ();
+   /** Returns a pointer for reading (but not modifying) the array elements.
+       This pointer can be used to access the array elements with the same
+       subscripts and the usual bracket syntax.  This pointer remains valid as
+       long as the valid subscript range is unchanged. If you change the
+       subscript range, you must stop using the pointers returned by prior
+       invocation of this conversion operator. */
+   operator const TYPE* () const;
+   
+   /** Insert new elements into an array. This function inserts
+       #howmany# elements at position #n# into the array. The initial value #val#
+       is copied into the new elements. All array elements previously located at subscripts
+       #n# and higher are moved to subscripts #n+howmany# and higher. The upper bound of the 
+       valid subscript range is increased in order to account for this shift.
+       @param n subscript of the first inserted element.
+       @param val initial value of the new elements.
+       @param howmany number of elements to insert. */
+   void ins(int n, const TYPE &val, unsigned int howmany=1);
+
+   /** Sort array elements.  Sort all array elements in ascending order.  Array
+       elements are compared using the less-or-equal comparison operator for
+       type #TYPE#. */
+   void sort();
+   /** Sort array elements in subscript range #lo# to #hi#.  Sort all array
+       elements whose subscripts are in range #lo#..#hi# in ascending order.
+       The other elements of the array are left untouched.  An exception is
+       thrown if arguments #lo# and #hi# are not in the valid subscript range.
+       Array elements are compared using the less-or-equal comparison operator
+       for type #TYPE#.  
+       @param lo low bound for the subscripts of the elements to sort.  
+       @param hi high bound for the subscripts of the elements to sort. */
+   void sort(int lo, int hi);
+protected:
+   ArrayBaseT(void) {};
+private:
+      // Callbacks called from ArrayRep
+   static void		destroy(void * data, int lo, int hi);
+   static void		init1(void * data, int lo, int hi);
+   static void		init2(void * data, int lo, int hi,
+			     const void * src, int src_lo, int src_hi);
+   static void		copy(void * dst, int dst_lo, int dst_hi,
+			     const void * src, int src_lo, int src_hi);
+   static void		insert(void * data, int els, int where,
+			       const void * what, int howmany);
+};
+
+template <class TYPE> inline
+ArrayBaseT<TYPE>::operator TYPE* ()
+{
+   check();
+   
+   ArrayRep * rep=(ArrayRep *) get();
+   return &((TYPE *) rep->data)[-rep->minlo];
+}
+
+template <class TYPE> inline
+ArrayBaseT<TYPE>::operator const TYPE* () const
+{
+   const ArrayRep * rep=(const ArrayRep *) get();
+   return &((const TYPE *) rep->data)[-rep->minlo];
+}
+
+template <class TYPE> inline TYPE& 
+ArrayBaseT<TYPE>::operator[](int n)
+{
+   check();
+
+   ArrayRep * rep=(ArrayRep *) get();
+   if (n<rep->lobound || n>rep->hibound)
+      G_THROW( ERR_MSG("arrays.ill_sub") );
+   return ((TYPE *) rep->data)[n - rep->minlo];
+}
+
+template <class TYPE> inline const TYPE& 
+ArrayBaseT<TYPE>::operator[](int n) const
+{
+   const ArrayRep * rep=(const ArrayRep *) get();
+   if (n<rep->lobound || n>rep->hibound)
+      G_THROW( ERR_MSG("arrays.ill_sub") );
+   return ((const TYPE *) rep->data)[n - rep->minlo];
+}
+
+template <class TYPE> inline void
+ArrayBaseT<TYPE>::ins(int n, const TYPE &val, unsigned int howmany)
+{
+   check();
+   
+   ((ArrayRep *) get())->ins(n, &val, howmany);
+}
+
+template <class TYPE> void
+ArrayBaseT<TYPE>::sort()
+{
+   sort(lbound(), hbound());
+}
+
+template <class TYPE> void
+ArrayBaseT<TYPE>::sort(int lo, int hi)
+{
+   if (hi <= lo)
+      return;
+      // Test for insertion sort (optimize!)
+   if (hi <= lo + 20)
+   {
+      for (int i=lo+1; i<=hi; i++)
+      {
+	 int j = i;
+	 TYPE tmp = (*this)[i];
+	 while ((--j>=lo) && !((*this)[j]<=tmp))
+            (*this)[j+1] = (*this)[j];
+	 (*this)[j+1] = tmp;
+      }
+      return;
+   }
+      // -- determine suitable quick-sort pivot
+   TYPE tmp = (*this)[lo];
+   TYPE pivot = (*this)[(lo+hi)/2];
+   if (pivot <= tmp)
+   { tmp = pivot; pivot=(*this)[lo]; }
+   if ((*this)[hi] <= tmp)
+   { pivot = tmp; }
+   else if ((*this)[hi] <= pivot)
+   { pivot = (*this)[hi]; }
+      // -- partition set
+   int h = hi;
+   int l = lo;
+   while (l < h)
+   {
+      while (! (pivot <= (*this)[l])) l++;
+      while (! ((*this)[h] <= pivot)) h--;
+      if (l < h)
+      {
+	 tmp = (*this)[l];
+	 (*this)[l] = (*this)[h];
+	 (*this)[h] = tmp;
+	 l = l+1;
+	 h = h-1;
+      }
+   }
+      // -- recursively restart
+   sort(lo, h);
+   sort(l, hi);
+}
+
+/** Dynamic array for simple types.  
+    Template class #TArray<TYPE># implements an array of
+    elements of {\em simple} type #TYPE#. {\em Simple} means that the type
+    may be #char#, #int#, #float# etc. The limitation is imposed by the
+    way in which the #TArray# is working with its elements: it's not trying
+    to execute elements' constructors, destructors or copy operators. It's
+    just doing bitwise copy. Except for this it's pretty much the same as
+    \Ref{DArray}.
+    
+    Please note that most of the methods are implemented in the base classes
+    \Ref{ArrayBase} and \Ref{ArrayBaseT}.
+*/
+
+template <class TYPE>
+class TArray : public ArrayBaseT<TYPE> {
+public:
+   /** Constructs an empty array. The valid subscript range is initially
+       empty. Member function #touch# and #resize# provide convenient ways
+       to enlarge the subscript range. */
+   TArray();
+   /** Constructs an array with subscripts in range 0 to #hibound#. 
+       The subscript range can be subsequently modified with member functions
+       #touch# and #resize#.
+       @param hibound upper bound of the initial subscript range. */
+   TArray(int hibound);
+   /** Constructs an array with subscripts in range #lobound# to #hibound#.  
+       The subscript range can be subsequently modified with member functions
+       #touch# and #resize#.
+       @param lobound lower bound of the initial subscript range.
+       @param hibound upper bound of the initial subscript range. */
+   TArray(int lobound, int hibound);
+   
+   virtual ~TArray() {};
+private:
+      // Callbacks called from ArrayRep
+   static void		destroy(void * data, int lo, int hi);
+   static void		init1(void * data, int lo, int hi);
+   static void		init2(void * data, int lo, int hi,
+			     const void * src, int src_lo, int src_hi);
+   static void		insert(void * data, int els, int where,
+			       const void * what, int howmany);
+};
+
+template <class TYPE> void
+TArray<TYPE>::destroy(void * data, int lo, int hi)
+{
+}
+
+template <class TYPE> void
+TArray<TYPE>::init1(void * data, int lo, int hi)
+{
+}
+
+template <class TYPE> void
+TArray<TYPE>::init2(void * data, int lo, int hi,
+		    const void * src, int src_lo, int src_hi)
+{
+   if (data && src)
+   {
+      int els=hi-lo+1;
+      if (els>src_hi-src_lo+1) els=src_hi-src_lo+1;
+      if (els>0)
+	 memmove((void *) &((TYPE *) data)[lo],
+		 (void *) &((TYPE *) src)[src_lo], els*sizeof(TYPE));
+   };
+}
+
+// inline removed
+template <class TYPE> void
+TArray<TYPE>::insert(void * data, int els, int where,
+		     const void * what, int howmany)
+{
+   memmove(((TYPE *) data)+where+howmany,
+	   ((TYPE *) data)+where, sizeof(TYPE)*(els-where));
+   for(int i=0;i<howmany;i++)
+      ((TYPE *) data)[where+i]=*(TYPE *) what;
+}
+
+template <class TYPE> 
+TArray<TYPE>::TArray ()
+{
+   this->assign(new ArrayRep(sizeof(TYPE), destroy, init1,
+		       init2, init2, insert));
+}
+
+template <class TYPE> 
+TArray<TYPE>::TArray(int hi)
+{
+   this->assign(new ArrayRep(sizeof(TYPE), destroy, init1,
+		       init2, init2, insert, hi));
+}
+
+template <class TYPE> 
+TArray<TYPE>::TArray(int lo, int hi)
+{
+   this->assign(new ArrayRep(sizeof(TYPE), destroy, init1,
+		       init2, init2, insert, lo, hi));
+}
+
+//inline removal ends
+
+/** Dynamic array for general types.
+    Template class #DArray<TYPE># implements an array of
+    elements of type #TYPE#.  Each element is identified by an integer
+    subscript.  The valid subscripts range is defined by dynamically
+    adjustable lower- and upper-bounds.  Besides accessing and setting
+    elements, member functions are provided to insert or delete elements at
+    specified positions.
+
+    This template class must be able to access
+    \begin{itemize}
+    \item a null constructor #TYPE::TYPE()#, 
+    \item a copy constructor #TYPE::TYPE(const TYPE &)#,
+    \item and a copy operator #TYPE & operator=(const TYPE &)#.
+    \end{itemize}
+    
+    The class offers "copy-on-demand" policy, which means that when you
+    copy the array object, array elements will stay intact as long as you
+    don't try to modify them. As soon as you make an attempt to change
+    array contents, the copying is done automatically and transparently
+    for you - the procedure that we call "copy-on-demand". This is the main
+    difference between this class and \Ref{GArray} (now obsolete)
+        
+    Please note that most of the methods are implemented in the base classes
+    \Ref{ArrayBase} and \Ref{ArrayBaseT}.
+*/
+
+template <class TYPE>
+class DArray : public ArrayBaseT<TYPE> {
+public:
+   /** Constructs an empty array. The valid subscript range is initially
+       empty. Member function #touch# and #resize# provide convenient ways
+       to enlarge the subscript range. */
+   DArray(void);
+   /** Constructs an array with subscripts in range 0 to #hibound#. 
+       The subscript range can be subsequently modified with member functions
+       #touch# and #resize#.
+       @param hibound upper bound of the initial subscript range. */
+   DArray(const int hibound);
+   /** Constructs an array with subscripts in range #lobound# to #hibound#.  
+       The subscript range can be subsequently modified with member functions
+       #touch# and #resize#.
+       @param lobound lower bound of the initial subscript range.
+       @param hibound upper bound of the initial subscript range. */
+   DArray(const int lobound, const int hibound);
+   
+   virtual ~DArray() {};
+private:
+      // Callbacks called from ArrayRep
+   static void		destroy(void * data, int lo, int hi);
+   static void		init1(void * data, int lo, int hi);
+   static void		init2(void * data, int lo, int hi,
+			     const void * src, int src_lo, int src_hi);
+   static void		copy(void * dst, int dst_lo, int dst_hi,
+			     const void * src, int src_lo, int src_hi);
+   static void		insert(void * data, int els, int where,
+			       const void * what, int howmany);
+};
+
+template <class TYPE> void
+DArray<TYPE>::destroy(void * data, int lo, int hi)
+{
+   if (data)
+      for(int i=lo;i<=hi;i++)
+	 ((TYPE *) data)[i].TYPE::~TYPE();
+}
+
+template <class TYPE> void
+DArray<TYPE>::init1(void * data, int lo, int hi)
+{
+   if (data)
+      for(int i=lo;i<=hi;i++)
+	 new ((void *) &((TYPE *) data)[i]) TYPE;
+}
+
+template <class TYPE> void
+DArray<TYPE>::init2(void * data, int lo, int hi,
+		    const void * src, int src_lo, int src_hi)
+{
+   if (data && src)
+   {
+      int i, j;
+      for(i=lo, j=src_lo;i<=hi && j<=src_hi;i++, j++)
+	 new ((void *) &((TYPE *) data)[i]) TYPE(((TYPE *) src)[j]);
+   };
+}
+
+template <class TYPE> void
+DArray<TYPE>::copy(void * dst, int dst_lo, int dst_hi,
+		   const void * src, int src_lo, int src_hi)
+{
+   if (dst && src)
+   {
+      int i, j;
+      for(i=dst_lo, j=src_lo;i<=dst_hi && j<=src_hi;i++, j++)
+	 ((TYPE *) dst)[i]=((TYPE *) src)[j];
+   };
+}
+
+template <class TYPE> inline void
+DArray<TYPE>::insert(void * data, int els, int where,
+		     const void * what, int howmany)
+{
+      // Now do the insertion
+   TYPE * d=(TYPE *) data;
+   
+   int i;
+   for (i=els+howmany-1; i>=els; i--)
+   {
+      if (i-where >= (int)howmany)
+	 new ((void*) &d[i]) TYPE (d[i-howmany]);
+      else
+	 new ((void*) &d[i]) TYPE (*(TYPE *) what);
+   }
+   
+   for (i=els-1; i>=where; i--)
+   {
+      if (i-where >= (int)howmany)
+	 d[i] = d[i-howmany];
+      else
+	 d[i] = *(TYPE *) what;
+   }
+}
+
+template <class TYPE> inline 
+DArray<TYPE>::DArray ()
+{
+   this->assign(new ArrayRep(sizeof(TYPE), destroy, init1,
+		       init2, copy, insert));
+}
+
+template <class TYPE> inline 
+DArray<TYPE>::DArray(const int hi)
+{
+   this->assign(new ArrayRep(sizeof(TYPE), destroy, init1,
+		       init2, copy, insert, hi));
+}
+
+template <class TYPE> inline 
+DArray<TYPE>::DArray(const int lo, const int hi)
+{
+   this->assign(new ArrayRep(sizeof(TYPE), destroy, init1,
+		       init2, copy, insert, lo, hi));
+}
+
+/** Dynamic array for \Ref{GPBase}d classes.
+
+    There are many situations when it's necessary to create arrays of
+    \Ref{GP} pointers. For example, #DArray<GP<Dialog> ># or #DArray<GP<Button> >#.
+    This would result in compilation of two instances of \Ref{DArray} because
+    from the viewpoint of the compiler there are two different classes used
+    as array elements: #GP<Dialog># and #GP<Button>#. In reality though,
+    all \Ref{GP} pointers have absolutely the same binary structure because
+    they are derived from \Ref{GPBase} class and do not add any variables
+    or virtual functions. That's why it's possible to instantiate \Ref{DArray}
+    only once for \Ref{GPBase} elements and then just cast types.
+
+    To implement this idea we have created this #DPArray<TYPE># class,
+    which can be used instead of #DArray<GP<TYPE> >#. It behaves absolutely
+    the same way as \Ref{DArray} but has one big advantage: overhead of
+    using #DPArray# with one more type is negligible.
+  */
+template <class TYPE>
+class DPArray : public DArray<GPBase> {
+public:
+  // -- CONSTRUCTORS
+  DPArray();
+  DPArray(int hibound);
+  DPArray(int lobound, int hibound);
+  DPArray(const DPArray<TYPE> &gc);
+  // -- DESTRUCTOR
+  virtual ~DPArray();
+  // -- ACCESS
+  GP<TYPE>& operator[](int n);
+  const GP<TYPE>& operator[](int n) const;
+  // -- CONVERSION
+  operator GP<TYPE>* ();
+  
+#ifndef __MWERKS__ //MCW can't compile
+  operator const GP<TYPE>* ();
+#endif 
+ 
+  operator const GP<TYPE>* () const;
+  // -- ALTERATION
+  void ins(int n, const GP<TYPE> &val, unsigned int howmany=1);
+  DPArray<TYPE>& operator= (const DPArray &ga);
+};
+
+template<class TYPE>
+DPArray<TYPE>::DPArray() {}
+
+template<class TYPE>
+DPArray<TYPE>::DPArray(int hibound) :
+      DArray<GPBase>(hibound) {}
+
+template<class TYPE>
+DPArray<TYPE>::DPArray(int lobound, int hibound) :
+      DArray<GPBase>(lobound, hibound) {}
+
+template<class TYPE>
+DPArray<TYPE>::DPArray(const DPArray<TYPE> &gc) :
+      DArray<GPBase>(gc) {}
+
+template<class TYPE>
+DPArray<TYPE>::~DPArray() {}
+
+template<class TYPE>
+inline GP<TYPE> &
+DPArray<TYPE>::operator[](int n)
+{
+   return (GP<TYPE> &) DArray<GPBase>::operator[](n);
+}
+
+template<class TYPE>
+inline const GP<TYPE> &
+DPArray<TYPE>::operator[](int n) const
+{
+   return (const GP<TYPE> &) DArray<GPBase>::operator[](n);
+}
+
+template<class TYPE>
+inline DPArray<TYPE>::operator GP<TYPE>* ()
+{
+   return (GP<TYPE> *) DArray<GPBase>::operator GPBase*();
+}
+
+#ifndef __MWERKS__ //MCW can't compile
+template<class TYPE>
+inline DPArray<TYPE>::operator const GP<TYPE>* ()
+{
+   return (const GP<TYPE> *) DArray<GPBase>::operator const GPBase*();
+}
+#endif
+
+template<class TYPE>
+inline DPArray<TYPE>::operator const GP<TYPE>* () const
+{
+   return (const GP<TYPE> *) DArray<GPBase>::operator const GPBase*();
+}
+
+template<class TYPE>
+inline void
+DPArray<TYPE>::ins(int n, const GP<TYPE> & val, unsigned int howmany)
+{
+   DArray<GPBase>::ins(n, val, howmany);
+}
+
+template<class TYPE>
+inline DPArray<TYPE> &
+DPArray<TYPE>::operator= (const DPArray &ga)
+{
+   DArray<GPBase>::operator=(ga);
+   return *this;
+}
+
+// ------------ THE END
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp
new file mode 100644
index 0000000..abad357
--- /dev/null
+++ b/libdjvu/BSByteStream.cpp
@@ -0,0 +1,425 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// - Author: Leon Bottou, 07/1998
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "BSByteStream.h"
+#undef BSORT_TIMER
+#ifdef BSORT_TIMER
+#include "GOS.h"
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class BSByteStream::Decode : public BSByteStream
+{
+public:
+  /** Creates a Static object for allocating the memory area of
+      length #sz# starting at address #buffer#. */
+  Decode(GP<ByteStream> bs);
+  ~Decode();
+  void init(void);
+  // Virtual functions
+  virtual size_t read(void *buffer, size_t sz);
+  virtual void flush(void);
+protected:
+  unsigned int decode(void);
+private:
+  bool eof;
+};
+
+// ========================================
+// --- Assertion
+
+#define ASSERT(expr) do{if(!(expr))G_THROW("assertion ("#expr") failed");}while(0)
+
+// ========================================
+// --- Construction
+
+BSByteStream::BSByteStream(GP<ByteStream> xbs)
+: offset(0), bptr(0), blocksize(0), size(0), bs(xbs),
+  gbs(xbs), gdata(data,0)
+{
+  // Initialize context array
+  memset(ctx, 0, sizeof(ctx));
+}
+
+BSByteStream::~BSByteStream() {}
+
+BSByteStream::Decode::Decode(GP<ByteStream> xbs)
+: BSByteStream(xbs), eof(false) {}
+
+void
+BSByteStream::Decode::init(void)
+{
+  gzp=ZPCodec::create(gbs,false,true);
+}
+
+BSByteStream::Decode::~Decode() {}
+
+GP<ByteStream>
+BSByteStream::create(GP<ByteStream> xbs)
+{
+  BSByteStream::Decode *rbs=new BSByteStream::Decode(xbs);
+  GP<ByteStream> retval=rbs;
+  rbs->init();
+  return retval;
+}
+
+void 
+BSByteStream::Decode::flush()
+{
+  size = bptr = 0;
+}
+
+// ========================================
+// -- Decoding
+
+
+static int 
+decode_raw(ZPCodec &zp, int bits)
+{
+  int n = 1;
+  const int m = (1<<bits);
+  while (n < m)
+    {
+      const int b = zp.decoder();
+      n = (n<<1) | b;
+    }
+  return n - m;
+}
+
+static inline int 
+decode_binary(ZPCodec &zp, BitContext *ctx, int bits)
+{
+  int n = 1;
+  int m = (1<<bits);
+  ctx = ctx - 1;
+  while (n < m)
+    {
+      int b = zp.decoder(ctx[n]);
+      n = (n<<1) | b;
+    }
+  return n - m;
+}
+  
+unsigned int
+BSByteStream::Decode::decode(void)
+{
+  /////////////////////////////////
+  ////////////  Decode input stream
+  
+  int i;
+  // Decode block size
+  ZPCodec &zp=*gzp;
+  size = decode_raw(zp, 24);
+  if (!size)
+    return 0;
+  if (size>MAXBLOCK*1024)
+    G_THROW( ERR_MSG("ByteStream.corrupt") );
+  // Allocate
+  if ((int)blocksize < size)
+    {
+      blocksize = size;
+      if (data)
+      {
+        gdata.resize(0);
+      }
+    }
+  if (! data) 
+    gdata.resize(blocksize);
+  // Decode Estimation Speed
+  int fshift = 0;
+  if (zp.decoder())
+    {
+      fshift += 1;
+      if (zp.decoder())
+        fshift += 1;
+    }
+  // Prepare Quasi MTF
+  static const unsigned char xmtf[256]={
+    0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+    0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+    0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+    0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+    0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
+    0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+    0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
+    0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+    0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
+    0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+    0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
+    0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+    0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
+    0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+    0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
+    0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
+    0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+    0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
+    0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+    0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
+    0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+    0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
+    0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+    0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
+    0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+    0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
+    0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+    0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
+    0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+    0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
+    0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF};
+  unsigned char mtf[256];
+  memcpy(mtf,xmtf,sizeof(xmtf));
+  unsigned int freq[FREQMAX];
+  memset(freq,0,sizeof(freq));
+  int fadd = 4;
+  // Decode
+  int mtfno = 3;
+  int markerpos = -1;
+  for (i=0; i<size; i++)
+    {
+      int ctxid = CTXIDS-1;
+      if (ctxid>mtfno) ctxid=mtfno;
+      BitContext *cx = ctx;
+      if (zp.decoder(cx[ctxid]))
+        { mtfno=0; data[i]=mtf[mtfno]; goto rotate; }
+      cx+=CTXIDS;
+      if (zp.decoder(cx[ctxid]))
+        { mtfno=1; data[i]=mtf[mtfno]; goto rotate; } 
+      cx+=CTXIDS;
+      if (zp.decoder(cx[0]))
+        { mtfno=2+decode_binary(zp,cx+1,1); data[i]=mtf[mtfno]; goto rotate; } 
+      cx+=1+1;
+      if (zp.decoder(cx[0]))
+        { mtfno=4+decode_binary(zp,cx+1,2); data[i]=mtf[mtfno]; goto rotate; } 
+      cx+=1+3;
+      if (zp.decoder(cx[0]))
+        { mtfno=8+decode_binary(zp,cx+1,3); data[i]=mtf[mtfno]; goto rotate; } 
+      cx+=1+7;
+      if (zp.decoder(cx[0]))
+        { mtfno=16+decode_binary(zp,cx+1,4); data[i]=mtf[mtfno]; goto rotate; } 
+      cx+=1+15;
+      if (zp.decoder(cx[0]))
+        { mtfno=32+decode_binary(zp,cx+1,5); data[i]=mtf[mtfno]; goto rotate; } 
+      cx+=1+31;
+      if (zp.decoder(cx[0]))
+        { mtfno=64+decode_binary(zp,cx+1,6); data[i]=mtf[mtfno]; goto rotate; } 
+      cx+=1+63;
+      if (zp.decoder(cx[0]))
+        { mtfno=128+decode_binary(zp,cx+1,7); data[i]=mtf[mtfno]; goto rotate; } 
+      mtfno=256;
+      data[i]=0;
+      markerpos=i;
+      continue;
+      // Rotate mtf according to empirical frequencies (new!)
+    rotate:
+      // Adjust frequencies for overflow
+      int k;
+      fadd = fadd + (fadd>>fshift);
+      if (fadd > 0x10000000) 
+        {
+          fadd    >>= 24;
+          freq[0] >>= 24;
+          freq[1] >>= 24;
+          freq[2] >>= 24;
+          freq[3] >>= 24;
+          for (k=4; k<FREQMAX; k++)
+            freq[k] = freq[k]>>24;
+        }
+      // Relocate new char according to new freq
+      unsigned int fc = fadd;
+      if (mtfno < FREQMAX)
+        fc += freq[mtfno];
+      for (k=mtfno; k>=FREQMAX; k--) 
+        mtf[k] = mtf[k-1];
+      for (; k>0 && fc>=freq[k-1]; k--)
+        {
+          mtf[k] = mtf[k-1];
+          freq[k] = freq[k-1];
+        }
+      mtf[k] = data[i];
+      freq[k] = fc;
+    }
+  
+
+  /////////////////////////////////
+  ////////// Reconstruct the string
+  
+  if (markerpos<1 || markerpos>=size)
+    G_THROW( ERR_MSG("ByteStream.corrupt") );
+  // Allocate pointers
+  unsigned int *posn;
+  GPBuffer<unsigned int> gposn(posn,blocksize);
+  memset(posn, 0, sizeof(unsigned int)*size);
+  // Prepare count buffer
+  int count[256];
+  for (i=0; i<256; i++)
+    count[i] = 0;
+  // Fill count buffer
+  for (i=0; i<markerpos; i++) 
+    {
+      unsigned char c = data[i];
+      posn[i] = (c<<24) | (count[c] & 0xffffff);
+      count[c] += 1;
+    }
+  for (i=markerpos+1; i<size; i++)
+    {
+      unsigned char c = data[i];
+      posn[i] = (c<<24) | (count[c] & 0xffffff);
+      count[c] += 1;
+    }
+  // Compute sorted char positions
+  int last = 1;
+  for (i=0; i<256; i++)
+    {
+      int tmp = count[i];
+      count[i] = last;
+      last += tmp;
+    }
+  // Undo the sort transform
+  i = 0;
+  last = size-1;
+  while (last>0)
+    {
+      unsigned int n = posn[i];
+      unsigned char c = (posn[i]>>24);
+      data[--last] = c;
+      i = count[c] + (n & 0xffffff);
+    }
+  // Free and check
+  if (i != markerpos)
+    G_THROW( ERR_MSG("ByteStream.corrupt") );
+  return size;
+}
+
+
+
+// ========================================
+// -- ByteStream interface
+
+
+
+long 
+BSByteStream::tell() const
+{
+  return offset;
+}
+
+size_t 
+BSByteStream::Decode::read(void *buffer, size_t sz)
+{
+  if (eof)
+    return 0;
+  // Loop
+  int copied = 0;
+  while (sz>0 && !eof)
+    {
+      // Decode if needed
+      if (!size)
+        {
+          bptr = 0;
+          if (! decode()) 
+          {
+            size = 1 ;
+            eof = true;
+          }
+          size -= 1;
+        }
+      // Compute remaining
+      int bytes = size;
+      if (bytes > (int)sz)
+        bytes = sz;
+      // Transfer
+      if (buffer && bytes)
+        {
+          memcpy(buffer, data+bptr, bytes);
+          buffer = (void*)((char*)buffer + bytes);
+        }
+      size -= bytes;
+      bptr += bytes;
+      sz -= bytes;
+      copied += bytes;
+      offset += bytes;
+    }
+  // Return copied bytes
+  return copied;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/BSByteStream.h b/libdjvu/BSByteStream.h
new file mode 100644
index 0000000..1be5a9f
--- /dev/null
+++ b/libdjvu/BSByteStream.h
@@ -0,0 +1,273 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _BSBYTESTREAM_H
+#define _BSBYTESTREAM_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name BSByteStream.h
+    
+    Files #"BSByteStream.h"# and #"BSByteStream.cpp"# implement a very compact
+    general purpose compressor based on the Burrows-Wheeler transform.  The
+    utility program \Ref{bzz} provides a front-end for this class. Although
+    this compression model is not currently used in DjVu files, it may be used
+    in the future for encoding textual data chunks.
+
+    {\bf Algorithms} --- The Burrows-Wheeler transform (also named Block-Sorting)
+    is performed using a combination of the Karp-Miller-Rosenberg and the
+    Bentley-Sedgewick algorithms. This is comparable to (Sadakane, DCC 98)
+    with a slightly more flexible ranking scheme. Symbols are then ordered
+    according to a running estimate of their occurrence frequencies.  The
+    symbol ranks are then coded using a simple fixed tree and the
+    \Ref{ZPCodec} binary adaptive coder.
+
+    {\bf Performances} --- The basic algorithm is mostly similar to those
+    implemented in well known compressors like #bzip# or #bzip2#
+    (\URL{http://www.muraroa.demon.co.uk}).  The adaptive binary coder however
+    generates small differences. The adaptation noise may cost up to 5\% in
+    file size, but this penalty is usually offset by the benefits of
+    adaptation.  This is good when processing large and highly structured
+    files like spreadsheet files.  Compression and decompression speed is
+    about twice slower than #bzip2# but the sorting algorithms is more
+    robust. Unlike #bzip2# (as of August 1998), this code can compress half a
+    megabyte of "abababab...." in bounded time.
+    
+    Here are some comparative results (in bits per character) obtained on the
+    Canterbury Corpus (\URL{http://corpus.canterbury.ac.nz}) as of August
+    1998. The BSByteStream performance on the single spreadsheet file #Excl#
+    moves #bzz#'s weighted average ahead of much more sophisticated methods,
+    like Suzanne Bunton's #fsmxBest# system
+    \URL{http://corpus.canterbury.ac.nz/methodinfo/fsmx.html}.  This result
+    will not last very long.
+
+    {\footnotesize
+    \begin{tabular}{lccccccccccccc}
+      & text & fax & Csrc & Excl & SPRC & tech 
+      & poem & html & lisp & man & play & Weighted & Average \\
+      compress 
+      & 3.27 & 0.97 & 3.56 & 2.41 & 4.21 & 3.06 
+      & 3.38 & 3.68 & 3.90 & 4.43 & 3.51 
+      & 2.55 & 3.31 \\
+      gzip -9
+      & 2.85 & 0.82 & 2.24 & 1.63 & 2.67 & 2.71 
+      & 3.23 & 2.59 & 2.65 & 3.31 & 3.12 
+      & 2.08 & 2.53 \\  
+      bzip2 -9
+      & 2.27 & 0.78 & 2.18 & 1.01 & 2.70 & 2.02 
+      & 2.42 & 2.48 & 2.79 & 3.33 & 2.53 
+      & 1.54 & 2.23 \\
+      ppmd
+      & 2.31 & 0.99 & 2.11 & 1.08 & 2.68 & 2.19 
+      & 2.48 & 2.38 & 2.43 & 3.00 & 2.53 
+      & 1.65 & 2.20 \\
+      fsmx
+      & {\bf 2.10} & 0.79 & {\bf 1.89} & 1.48 & {\bf 2.52} & {\bf 1.84} 
+      & {\bf 2.21} & {\bf 2.24} & {\bf 2.29} & {\bf 2.91} & {\bf 2.35} 
+      & 1.63 & {\bf 2.06} \\
+      {\bf bzz}
+      & 2.25 & {\bf 0.76} & 2.13 & {\bf 0.78} & 2.67 & 2.00
+      & 2.40 & 2.52 & 2.60 & 3.19 & 2.52 
+      & {\bf 1.44} & 2.16
+    \end{tabular}
+    }
+
+    Note that the DjVu people have several entries in this table.  Program
+    #compress# was written some time ago by Joe Orost
+    (\URL{http://www.research.att.com/info/orost}). The #ppmc# method, (a
+    precursor of #ppmd#) was created by Paul Howard
+    (\URL{http://www.research.att.com/info/pgh}). The #bzz# program is just
+    below your eyes.
+
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- Initial implementation\\
+    Andrei Erofeev <eaf@geocities.com> -- Improved Block Sorting algorithm.
+    @memo
+    Simple Burrows-Wheeler general purpose compressor.
+*/
+//@{
+
+
+#include "ByteStream.h"
+#include "GException.h"
+#include "ZPCodec.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/** Performs bzz compression/decompression.
+    
+    Class #BSByteStream# defines a \Ref{ByteStream} which transparently
+    performs the BZZ compression/decompression. The constructor of class
+    \Ref{BSByteStream} takes another \Ref{ByteStream} as argument.  Any data
+    written to the BSByteStream is compressed and written to this second
+    ByteStream. Any data read from the BSByteStream is internally generated by
+    decompressing data read from the second ByteStream.
+
+    Program \Ref{bzz} demonstrates how to use this class.  All the hard work
+    is achieved by a simple ByteStream to ByteStream copy, as shown below.
+    \begin{verbatim}
+      GP<ByteStream> in=ByteStream::create(infile,"rb");
+      GP<ByteStream> out=ByteStream::create(outfile,"wb");
+      if (encoding) {
+          BSByteStream bsb(out, blocksize);
+          bsb.copy(*in);
+      } else {
+          BSByteStream bsb(in);
+          out->copy(bsb);
+      }
+    \end{verbatim}
+    Due to the block oriented nature of the Burrows-Wheeler transform, there
+    is a very significant latency between the data input and the data output.
+    You can use function #flush# to force data output at the expense of
+    compression efficiency.
+
+    You should never directly access a ByteStream object connected to a valid
+    BSByteStream object. The ByteStream object can be accessed again after the
+    destruction of the BSByteStream object.  Note that the encoder always
+    flushes its internal buffers and writes a few final code bytes when the
+    BSByteStream object is destroyed.  Note also that the decoder often reads
+    a few bytes beyond the last code byte written by the encoder.  This lag
+    means that you must reposition the ByteStream after the destruction of the
+    BSByteStream object and before re-using the ByteStream object (see
+    \Ref{IFFByteStream}.)
+*/
+class DJVUAPI BSByteStream : public ByteStream
+{
+public:
+// Limits on block sizes
+  enum { MINBLOCK=10, MAXBLOCK=4096 };
+
+// Sorting tresholds
+  enum { FREQMAX=4, CTXIDS=3 };
+
+  class Decode;
+  class Encode;
+protected:
+  BSByteStream(GP<ByteStream> bs);
+
+public:
+  /** Creates a BSByteStream.
+      The BSByteStream will be used for decompressing data.
+      \begin{description}
+      \item[Decompression]
+      The BSByteStream is created and the decompressor initializes.  Chunks of
+      data will be read from ByteStream #bs# and decompressed into an internal
+      buffer. Function #read# can be used to access the decompressed data.
+      \end{description} */
+  static GP<ByteStream> create(GP<ByteStream> bs);
+
+  /** Constructs a BSByteStream.
+      The BSByteStream will be used for compressing data.
+      \begin{description}
+      \item[Compression]
+      Set #blocksize# to a positive number smaller than 4096 to 
+      initialize the compressor.  Data written to the BSByteStream will be
+      accumulated into an internal buffer.  The buffered data will be
+      compressed and written to ByteStream #bs# whenever the buffer sizes
+      reaches the maximum value specified by argument #blocksize# (in
+      kilobytes).  Using a larger block size usually increases the compression
+      ratio at the expense of computation time.  There is no need however to
+      specify a block size larger than the total number of bytes to compress.
+      Setting #blocksize# to #1024# is a good starting point.  A minimal block
+      size of 10 is silently enforced.
+      \end{description} */
+  static GP<ByteStream> create(GP<ByteStream> bs, const int blocksize);
+
+  // ByteStream Interface
+  ~BSByteStream();
+  virtual long tell(void) const;
+  virtual void flush(void) = 0;
+protected:
+  // Data
+  long            offset;
+  int             bptr;
+  unsigned int    blocksize;
+  int             size;
+  ByteStream *bs;
+  GP<ByteStream> gbs;
+  unsigned char  *data;
+  GPBuffer<unsigned char> gdata;
+  // Coder
+  GP<ZPCodec> gzp;
+  BitContext ctx[300];
+private:  
+  // Cancel C++ default stuff
+  BSByteStream(const BSByteStream &);
+  BSByteStream & operator=(const BSByteStream &);
+  BSByteStream(ByteStream *);
+  BSByteStream(ByteStream *, int);
+};
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp
new file mode 100644
index 0000000..68bc3e3
--- /dev/null
+++ b/libdjvu/BSEncodeByteStream.cpp
@@ -0,0 +1,1010 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// - Author: Leon Bottou, 07/1998
+
+
+
+#include "BSByteStream.h"
+#include "GString.h"
+#undef BSORT_TIMER
+#ifdef BSORT_TIMER
+#include "GOS.h"
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// ========================================
+// --- Assertion
+
+#define ASSERT(expr) do{if(!(expr))G_THROW("assertion ("#expr") failed");}while(0)
+
+
+
+// ========================================
+// --- Global Definitions
+            
+
+#ifdef OVERFLOW
+#undef OVERFLOW
+#endif
+// Overflow required when encoding
+static const int OVERFLOW=32;
+
+// Sorting tresholds
+static const int RANKSORT_THRESH=10;
+static const int QUICKSORT_STACK=512;
+static const int PRESORT_THRESH=10;
+static const int PRESORT_DEPTH=8;
+static const int RADIX_THRESH=32768;
+
+static const int FREQS0=100000;
+static const int FREQS1=1000000;
+
+// ========================================
+// -- Sorting Routines
+
+  
+class _BSort  // DJVU_CLASS
+{
+public:
+  ~_BSort();
+  _BSort(unsigned char *data, int size);
+  void run(int &markerpos);
+private:
+  // Members
+  int            size;
+  unsigned char *data;
+  unsigned int  *posn;
+  GPBuffer<unsigned int> gposn;
+  int           *rank;
+  GPBuffer<int> grank;
+  // Helpers
+  inline int GT(int p1, int p2, int depth);
+  inline int GTD(int p1, int p2, int depth);
+  // -- final in-depth sort
+  void ranksort(int lo, int hi, int d);
+  // -- doubling sort
+  int  pivot3r(int *rr, int lo, int hi);
+  void quicksort3r(int lo, int hi, int d);
+  // -- presort to depth PRESORT_DEPTH
+  unsigned char pivot3d(unsigned char *dd, int lo, int hi);
+  void quicksort3d(int lo, int hi, int d);
+  // -- radixsort
+  void radixsort16(void);
+  void radixsort8(void);
+};
+
+
+// blocksort -- the main entry point
+
+static void 
+blocksort(unsigned char *data, int size, int &markerpos)
+{
+  _BSort bsort(data, size);
+  bsort.run(markerpos);
+}
+
+
+// _BSort construction
+
+_BSort::_BSort(unsigned char *xdata, int xsize)
+  : size(xsize), data(xdata), gposn(posn,xsize), grank(rank,xsize+1)
+{
+  ASSERT(size>0 && size<0x1000000);
+  rank[size] = -1;
+}
+
+_BSort::~_BSort()
+{
+}
+
+
+
+// GT -- compare suffixes using rank information
+
+inline int 
+_BSort::GT(int p1, int p2, int depth)
+{
+  int r1, r2;
+  int twod = depth + depth;
+  while (1)
+    {
+      r1=rank[p1+depth]; r2=rank[p2+depth];
+      p1+=twod;  p2+=twod;
+      if (r1!=r2) 
+        return (r1>r2);
+      r1=rank[p1]; r2=rank[p2];
+      if (r1!=r2) 
+        return (r1>r2);
+      r1=rank[p1+depth]; r2=rank[p2+depth];
+      p1+=twod;  p2+=twod;
+      if (r1!=r2) 
+        return (r1>r2);
+      r1=rank[p1]; r2=rank[p2];
+      if (r1!=r2) 
+        return (r1>r2);
+      r1=rank[p1+depth]; r2=rank[p2+depth];
+      p1+=twod;  p2+=twod;
+      if (r1!=r2) 
+        return (r1>r2);
+      r1=rank[p1]; r2=rank[p2];
+      if (r1!=r2) 
+        return (r1>r2);
+      r1=rank[p1+depth]; r2=rank[p2+depth];
+      p1+=twod;  p2+=twod;
+      if (r1!=r2) 
+        return (r1>r2);
+      r1=rank[p1]; r2=rank[p2];
+      if (r1!=r2) 
+        return (r1>r2);
+    };
+}
+
+
+// _BSort::ranksort -- 
+// -- a simple insertion sort based on GT
+
+void 
+_BSort::ranksort(int lo, int hi, int depth)
+{
+  int i,j;
+  for (i=lo+1; i<=hi; i++)
+    {
+      int tmp = posn[i];
+      for(j=i-1; j>=lo && GT(posn[j], tmp, depth); j--)
+        posn[j+1] = posn[j];
+      posn[j+1] = tmp;
+    }
+  for(i=lo;i<=hi;i++) 
+    rank[posn[i]]=i;
+}
+
+// pivot -- return suitable pivot
+
+inline int
+_BSort::pivot3r(int *rr, int lo, int hi)
+{
+  int c1, c2, c3;
+  if (hi-lo > 256)
+    {
+      c1 = pivot3r(rr, lo, (6*lo+2*hi)/8);
+      c2 = pivot3r(rr, (5*lo+3*hi)/8, (3*lo+5*hi)/8);
+      c3 = pivot3r(rr, (2*lo+6*hi)/8, hi);
+    }
+  else
+    {
+      c1 = rr[posn[lo]];
+      c2 = rr[posn[(lo+hi)/2]];
+      c3 = rr[posn[hi]];
+    }
+  // Extract median
+  if (c1>c3)
+    { int tmp=c1; c1=c3; c3=tmp; }
+  if (c2<=c1)
+    return c1;
+  else if (c2>=c3)
+    return c3;
+  else
+    return c2;
+}
+
+
+// _BSort::quicksort3r -- Three way quicksort algorithm 
+//    Sort suffixes based on rank at pos+depth
+//    The algorithm breaks into ranksort when size is 
+//    smaller than RANKSORT_THRESH
+
+static inline int
+mini(int a, int b) 
+{
+  return (a<=b) ? a : b;
+}
+
+static inline void
+vswap(int i, int j, int n, unsigned int *x)
+{
+  while (n-- > 0) 
+    { int tmp = x[i]; x[i++]=x[j]; x[j++]=tmp; }
+}
+
+void 
+_BSort::quicksort3r(int lo, int hi, int depth)
+{
+  /* Initialize stack */
+  int slo[QUICKSORT_STACK];
+  int shi[QUICKSORT_STACK];
+  int sp = 1;
+  slo[0] = lo;
+  shi[0] = hi;
+  // Recursion elimination loop
+  while (--sp>=0)
+    {
+      lo = slo[sp];
+      hi = shi[sp];
+      // Test for insertion sort
+      if (hi-lo<RANKSORT_THRESH)
+        {
+          ranksort(lo, hi, depth);
+        }
+      else
+        {
+          int tmp;
+          int *rr=rank+depth;
+          int med = pivot3r(rr,lo,hi);
+          // -- positions are organized as follows:
+          //   [lo..l1[ [l1..l[ ]h..h1] ]h1..hi]
+          //      =        <       >        =
+          int l1 = lo;
+          int h1 = hi;
+          while (rr[posn[l1]]==med && l1<h1) { l1++; }
+          while (rr[posn[h1]]==med && l1<h1) { h1--; }
+          int l = l1;
+          int h = h1;
+          // -- partition set
+          for (;;)
+            {
+              while (l<=h)
+                {
+                  int c = rr[posn[l]] - med;
+                  if (c > 0) break;
+                  if (c == 0) { tmp=posn[l]; posn[l]=posn[l1]; posn[l1++]=tmp; }
+                  l++;
+                }
+              while (l<=h)
+                {
+                  int c = rr[posn[h]] - med;
+                  if (c < 0) break;
+                  if (c == 0) { tmp=posn[h]; posn[h]=posn[h1]; posn[h1--]=tmp; }
+                  h--;
+                }
+              if (l>h) break;
+              tmp=posn[l]; posn[l]=posn[h]; posn[h]=tmp;
+            }
+          // -- reorganize as follows
+          //   [lo..l1[ [l1..h1] ]h1..hi]
+          //      <        =        > 
+          tmp = mini(l1-lo, l-l1);
+          vswap(lo, l-tmp, tmp, posn);
+          l1 = lo + (l-l1);
+          tmp = mini(hi-h1, h1-h);
+          vswap(hi-tmp+1, h+1, tmp, posn);
+          h1 = hi - (h1-h);
+          // -- process segments
+          ASSERT(sp+2<QUICKSORT_STACK);
+          // ----- middle segment (=?) [l1, h1]
+          for(int i=l1;i<=h1;i++) 
+            rank[posn[i]] = h1;
+          // ----- lower segment (<) [lo, l1[
+          if (l1 > lo)
+            {
+              for(int i=lo;i<l1;i++) 
+                rank[posn[i]]=l1-1;
+              slo[sp]=lo;
+              shi[sp]=l1-1;
+              if (slo[sp] < shi[sp])  
+                sp++;
+            }
+          // ----- upper segment (>) ]h1, hi]
+          if (h1 < hi)
+            {
+              slo[sp]=h1+1;
+              shi[sp]=hi;
+              if (slo[sp] < shi[sp])  
+                sp++;
+            }
+        }
+    }
+}
+
+
+
+
+
+
+// GTD -- compare suffixes using data information 
+//  (up to depth PRESORT_DEPTH)
+
+inline int 
+_BSort::GTD(int p1, int p2, int depth)
+{
+  unsigned char c1, c2;
+  p1+=depth; p2+=depth;
+  while (depth < PRESORT_DEPTH)
+    {
+      // Perform two
+      c1=data[p1]; c2=data[p2];
+      if (c1!=c2) 
+        return (c1>c2);
+      c1=data[p1+1]; c2=data[p2+1];
+      p1+=2;  p2+=2; depth+=2;
+      if (c1!=c2) 
+        return (c1>c2);
+    }
+  if (p1<size && p2<size)
+    return 0;
+  return (p1<p2);
+}
+
+// pivot3d -- return suitable pivot
+
+inline unsigned char
+_BSort::pivot3d(unsigned char *rr, int lo, int hi)
+{
+  unsigned char c1, c2, c3;
+  if (hi-lo > 256)
+    {
+      c1 = pivot3d(rr, lo, (6*lo+2*hi)/8);
+      c2 = pivot3d(rr, (5*lo+3*hi)/8, (3*lo+5*hi)/8);
+      c3 = pivot3d(rr, (2*lo+6*hi)/8, hi);
+    }
+  else
+    {
+      c1 = rr[posn[lo]];
+      c2 = rr[posn[(lo+hi)/2]];
+      c3 = rr[posn[hi]];
+    }
+  // Extract median
+  if (c1>c3)
+    { int tmp=c1; c1=c3; c3=tmp; }
+  if (c2<=c1)
+    return c1;
+  else if (c2>=c3)
+    return c3;
+  else
+    return c2;
+}
+
+
+// _BSort::quicksort3d -- Three way quicksort algorithm 
+//    Sort suffixes based on strings until reaching
+//    depth rank at pos+depth
+//    The algorithm breaks into ranksort when size is 
+//    smaller than PRESORT_THRESH
+
+void 
+_BSort::quicksort3d(int lo, int hi, int depth)
+{
+  /* Initialize stack */
+  int slo[QUICKSORT_STACK];
+  int shi[QUICKSORT_STACK];
+  int sd[QUICKSORT_STACK];
+  int sp = 1;
+  slo[0] = lo;
+  shi[0] = hi;
+  sd[0] = depth;
+  // Recursion elimination loop
+  while (--sp>=0)
+    {
+      lo = slo[sp];
+      hi = shi[sp];
+      depth = sd[sp];
+      // Test for insertion sort
+      if (depth >= PRESORT_DEPTH)
+        {
+          for (int i=lo; i<=hi; i++)
+            rank[posn[i]] = hi;
+        }
+      else if (hi-lo<PRESORT_THRESH)
+        {
+          int i,j;
+          for (i=lo+1; i<=hi; i++)
+            {
+              int tmp = posn[i];
+              for(j=i-1; j>=lo && GTD(posn[j], tmp, depth); j--)
+                posn[j+1] = posn[j];
+              posn[j+1] = tmp;
+            }
+          for(i=hi;i>=lo;i=j)
+            {
+              int tmp = posn[i];
+              rank[tmp] = i;
+              for (j=i-1; j>=lo && !GTD(tmp,posn[j],depth); j--)
+                rank[posn[j]] = i;
+            }
+        }
+        else
+        {
+          int tmp;
+          unsigned char *dd=data+depth;
+          unsigned char med = pivot3d(dd,lo,hi);
+          // -- positions are organized as follows:
+          //   [lo..l1[ [l1..l[ ]h..h1] ]h1..hi]
+          //      =        <       >        =
+          int l1 = lo;
+          int h1 = hi;
+          while (dd[posn[l1]]==med && l1<h1) { l1++; }
+          while (dd[posn[h1]]==med && l1<h1) { h1--; }
+          int l = l1;
+          int h = h1;
+          // -- partition set
+          for (;;)
+            {
+              while (l<=h)
+                {
+                  int c = (int)dd[posn[l]] - (int)med;
+                  if (c > 0) break;
+                  if (c == 0) { tmp=posn[l]; posn[l]=posn[l1]; posn[l1++]=tmp; }
+                  l++;
+                }
+              while (l<=h)
+                {
+                  int c = (int)dd[posn[h]] - (int)med;
+                  if (c < 0) break;
+                  if (c == 0) { tmp=posn[h]; posn[h]=posn[h1]; posn[h1--]=tmp; }
+                  h--;
+                }
+              if (l>h) break;
+              tmp=posn[l]; posn[l]=posn[h]; posn[h]=tmp;
+            }
+          // -- reorganize as follows
+          //   [lo..l1[ [l1..h1] ]h1..hi]
+          //      <        =        > 
+          tmp = mini(l1-lo, l-l1);
+          vswap(lo, l-tmp, tmp, posn);
+          l1 = lo + (l-l1);
+          tmp = mini(hi-h1, h1-h);
+          vswap(hi-tmp+1, h+1, tmp, posn);
+          h1 = hi - (h1-h);
+          // -- process segments
+          ASSERT(sp+3<QUICKSORT_STACK);
+          // ----- middle segment (=?) [l1, h1]
+          l = l1; h = h1;
+          if (med==0) // special case for marker [slow]
+            for (int i=l; i<=h; i++)
+              if ((int)posn[i]+depth == size-1)
+                { 
+                  tmp=posn[i]; posn[i]=posn[l]; posn[l]=tmp; 
+                  rank[tmp]=l++; break; 
+                }
+          if (l<h)
+            { slo[sp] = l; shi[sp] = h; sd[sp++] = depth+1; }
+          else if (l==h)
+            { rank[posn[h]] = h; }
+          // ----- lower segment (<) [lo, l1[
+          l = lo;
+          h = l1-1;
+          if (l<h)
+            { slo[sp] = l; shi[sp] = h; sd[sp++] = depth; }
+          else if (l==h)
+            { rank[posn[h]] = h; }
+          // ----- upper segment (>) ]h1, hi]
+          l = h1+1;
+          h = hi;
+          if (l<h)
+            { slo[sp] = l; shi[sp] = h; sd[sp++] = depth; }
+          else if (l==h)
+            { rank[posn[h]] = h; }
+        }
+    }
+}
+
+
+
+
+// _BSort::radixsort8 -- 8 bit radix sort
+
+void 
+_BSort::radixsort8(void)
+{
+  int i;
+  // Initialize frequency array
+  int lo[256], hi[256];
+  for (i=0; i<256; i++)
+    hi[i] = lo[i] = 0;
+  // Count occurences
+  for (i=0; i<size-1; i++)
+    hi[data[i]] ++;
+  // Compute positions (lo)
+  int last = 1;
+  for (i=0; i<256; i++)
+    {
+      lo[i] = last;
+      hi[i] = last + hi[i] - 1;
+      last = hi[i] + 1;
+    }
+  for (i=0; i<size-1; i++)
+    {
+      posn[ lo[data[i]]++ ] = i;
+      rank[ i ] = hi[data[i]];
+    }
+  // Process marker "$"
+  posn[0] = size-1;
+  rank[size-1] = 0;
+  // Extra element
+  rank[size] = -1;
+}
+
+
+// _BSort::radixsort16 -- 16 bit radix sort
+
+void 
+_BSort::radixsort16(void)
+{
+  int i;
+  // Initialize frequency array
+  int *ftab;
+  GPBuffer<int> gftab(ftab,65536);
+  for (i=0; i<65536; i++)
+    ftab[i] = 0;
+  // Count occurences
+  unsigned char c1 = data[0];
+  for (i=0; i<size-1; i++)
+    {
+      unsigned char c2 = data[i+1];
+      ftab[(c1<<8)|c2] ++;
+      c1 = c2;
+    }
+  // Generate upper position
+  for (i=1;i<65536;i++)
+    ftab[i] += ftab[i-1];
+  // Fill rank array with upper bound
+  c1 = data[0];
+  for (i=0; i<size-2; i++)
+    {
+      unsigned char c2 = data[i+1];
+      rank[i] = ftab[(c1<<8)|c2];
+      c1 = c2;
+    }
+  // Fill posn array (backwards)
+  c1 = data[size-2];
+  for (i=size-3; i>=0; i--)
+    {
+      unsigned char c2 = data[i];
+      posn[ ftab[(c2<<8)|c1]-- ] = i;
+      c1 = c2;
+    }
+  // Fixup marker stuff
+  ASSERT(data[size-1]==0);
+  c1 = data[size-2];
+  posn[0] = size-1;
+  posn[ ftab[(c1<<8)] ] = size-2;
+  rank[size-1] = 0;
+  rank[size-2] = ftab[(c1<<8)];
+  // Extra element
+  rank[size] = -1;
+}
+
+
+
+// _BSort::run -- main sort loop
+
+void
+_BSort::run(int &markerpos)
+{
+  int lo, hi;
+  ASSERT(size>0);
+  ASSERT(data[size-1]==0);
+#ifdef BSORT_TIMER
+  long start = GOS::ticks();
+#endif  
+  // Step 1: Radix sort 
+  int depth = 0;
+  if (size > RADIX_THRESH)
+    { 
+      radixsort16();
+      depth=2;
+    }
+  else
+    { 
+      radixsort8(); 
+      depth=1;
+    }
+  // Step 2: Perform presort to depth PRESORT_DEPTH
+  for (lo=0; lo<size; lo++)
+    {
+      hi = rank[posn[lo]];
+      if (lo < hi)
+        quicksort3d(lo, hi, depth);
+      lo = hi;
+    }
+  depth = PRESORT_DEPTH;
+#ifdef BSORT_TIMER
+  long middle = GOS::ticks();
+#endif  
+  // Step 3: Perform rank doubling
+  int again = 1;
+  while (again)
+    {
+      again = 0;
+      int sorted_lo = 0;
+      for (lo=0; lo<size; lo++)
+        {
+          hi = rank[posn[lo]&0xffffff];
+          if (lo == hi)
+            {
+              lo += (posn[lo]>>24) & 0xff;
+            }
+          else
+            {
+              if (hi-lo < RANKSORT_THRESH)
+                {
+                  ranksort(lo, hi, depth);
+                }
+              else
+                {
+                  again += 1;
+                  while (sorted_lo < lo-1)
+                    {
+                      int step = mini(255, lo-1-sorted_lo);
+                      posn[sorted_lo] = (posn[sorted_lo]&0xffffff) | (step<<24);
+                      sorted_lo += step+1;
+                    }
+                  quicksort3r(lo, hi, depth);
+                  sorted_lo = hi + 1;
+                }
+              lo = hi;
+            }
+        }
+      // Finish threading
+      while (sorted_lo < lo-1)
+        {
+          int step = mini(255, lo-1-sorted_lo);
+          posn[sorted_lo] = (posn[sorted_lo]&0xffffff) | (step<<24);
+          sorted_lo += step+1;
+        }
+      // Double depth
+      depth += depth;
+    }
+  // Step 4: Permute data
+  int i;
+  markerpos = -1;
+  for (i=0; i<size; i++)
+    rank[i] = data[i];
+  for (i=0; i<size; i++)
+    {
+      int j = posn[i] & 0xffffff;
+      if (j>0) 
+        { 
+          data[i] = rank[j-1];
+        } 
+      else 
+        {
+          data[i] = 0;
+          markerpos = i;
+        }
+    }
+  ASSERT(markerpos>=0 && markerpos<size);
+#ifdef BSORT_TIMER
+  long end = GOS::ticks();
+  DjVuPrintErrorUTF8("Sorting time: %d bytes in %ld + %ld = %ld ms\n", 
+          size-1, middle-start, end-middle, end-start);
+#endif  
+}
+
+
+// ========================================
+// -- Encoding
+
+static void
+encode_raw(ZPCodec &zp, int bits, int x)
+{
+  int n = 1;
+  int m = (1<<bits);
+  while (n < m)
+    {
+      x = (x & (m-1)) << 1;
+      int b = (x >> bits);
+      zp.encoder(b);
+      n = (n<<1) | b;
+    }
+}
+
+static inline void
+encode_binary(ZPCodec &zp, BitContext *ctx, int bits, int x)
+{
+  // Require 2^bits-1  contexts
+  int n = 1;
+  int m = (1<<bits);
+  ctx = ctx - 1;
+  while (n < m)
+    {
+      x = (x & (m-1)) << 1;
+      int b = (x >> bits);
+      zp.encoder(b, ctx[n]);
+      n = (n<<1) | b;
+    }
+}
+
+class BSByteStream::Encode : public BSByteStream
+{
+public:
+  /** Creates a Static object for allocating the memory area of
+      length #sz# starting at address #buffer#. */
+  Encode(GP<ByteStream> bs);
+  ~Encode();
+  void init(const int encoding);
+  // Virtual functions
+  virtual size_t write(const void *buffer, size_t sz);
+  virtual void flush(void);
+protected:
+  unsigned int encode(void);
+};
+
+unsigned int
+BSByteStream::Encode::encode()
+{ 
+  /////////////////////////////////
+  ////////////  Block Sort Tranform
+
+  int markerpos = size-1;
+  blocksort(data,size,markerpos);
+
+  /////////////////////////////////
+  //////////// Encode Output Stream
+
+  // Header
+  ZPCodec &zp=*gzp;
+  encode_raw(zp, 24, size);
+  // Determine and Encode Estimation Speed
+  int fshift = 0;
+  if (size < FREQS0)
+    { fshift=0; zp.encoder(0); }
+  else if (size < FREQS1)
+    { fshift = 1; zp.encoder(1); zp.encoder(0); }
+  else
+    { fshift = 2; zp.encoder(1); zp.encoder(1); }
+  // MTF
+  unsigned char mtf[256];
+  unsigned char rmtf[256];
+  unsigned int  freq[FREQMAX];
+  int m = 0;
+  for (m=0; m<256; m++)
+    mtf[m] = m;
+  for (m=0; m<256; m++)
+    rmtf[mtf[m]] = m;
+  int fadd = 4;
+  for (m=0; m<FREQMAX; m++)
+    freq[m] = 0;
+  // Encode
+  int i;
+  int mtfno = 3;
+  for (i=0; i<size; i++)
+    {
+      // Get MTF data
+      int c = data[i];
+      int ctxid = CTXIDS-1;
+      if (ctxid>mtfno) ctxid=mtfno;
+      mtfno = rmtf[c];
+      if (i==markerpos)
+        mtfno = 256;
+      // Encode using ZPCoder
+      int b;
+      BitContext *cx = ctx;
+      b = (mtfno==0);
+      zp.encoder(b, cx[ctxid]);
+      if (b) goto rotate; cx+=CTXIDS;
+      b = (mtfno==1);
+      zp.encoder(b, cx[ctxid]);
+      if (b) goto rotate; cx+=CTXIDS;
+      b = (mtfno<4);
+      zp.encoder(b, cx[0]);
+      if (b) { encode_binary(zp,cx+1,1,mtfno-2); goto rotate; } 
+      cx+=1+1;
+      b = (mtfno<8);
+      zp.encoder(b, cx[0]);
+      if (b) { encode_binary(zp,cx+1,2,mtfno-4); goto rotate; } 
+      cx+=1+3;
+      b = (mtfno<16);
+      zp.encoder(b, cx[0]);
+      if (b) { encode_binary(zp,cx+1,3,mtfno-8); goto rotate; } 
+      cx+=1+7;
+      b = (mtfno<32);
+      zp.encoder(b, cx[0]);
+      if (b) { encode_binary(zp,cx+1,4,mtfno-16); goto rotate; } 
+      cx+=1+15;
+      b = (mtfno<64);
+      zp.encoder(b, cx[0]);
+      if (b) { encode_binary(zp,cx+1,5,mtfno-32); goto rotate; } 
+      cx+=1+31;
+      b = (mtfno<128);
+      zp.encoder(b, cx[0]);
+      if (b) { encode_binary(zp,cx+1,6,mtfno-64); goto rotate; } 
+      cx+=1+63;
+      b = (mtfno<256);
+      zp.encoder(b, cx[0]);
+      if (b) { encode_binary(zp,cx+1,7,mtfno-128); goto rotate; } 
+      continue;
+      // Rotate MTF according to empirical frequencies (new!)
+    rotate:
+      // Adjust frequencies for overflow
+      fadd = fadd + (fadd>>fshift);
+      if (fadd > 0x10000000) 
+        {
+          fadd = fadd>>24;
+          freq[0] >>= 24;
+          freq[1] >>= 24;
+          freq[2] >>= 24;
+          freq[3] >>= 24;
+          for (int k=4; k<FREQMAX; k++)
+            freq[k] = freq[k]>>24;
+        }
+      // Relocate new char according to new freq
+      unsigned int fc = fadd;
+      if (mtfno < FREQMAX)
+        fc += freq[mtfno];
+      int k;
+      for (k=mtfno; k>=FREQMAX; k--)
+        {
+          mtf[k] = mtf[k-1];
+          rmtf[mtf[k]] = k;
+        }
+      for (; k>0 && fc>=freq[k-1]; k--)
+        {
+          mtf[k] = mtf[k-1];
+          freq[k] = freq[k-1];
+          rmtf[mtf[k]] = k;
+        }
+      mtf[k] = c;
+      freq[k] = fc;
+      rmtf[mtf[k]] = k;
+    }
+  // Terminate
+  return 0;
+}
+
+// ========================================
+// --- Construction
+
+BSByteStream::Encode::Encode(GP<ByteStream> xbs)
+: BSByteStream(xbs) {}
+
+void
+BSByteStream::Encode::init(const int xencoding)
+{
+  gzp=ZPCodec::create(gbs,true,true);
+  const int encoding=(xencoding<MINBLOCK)?MINBLOCK:xencoding;
+  if (encoding > MAXBLOCK)
+    G_THROW( ERR_MSG("ByteStream.blocksize") "\t" + GUTF8String(MAXBLOCK) );
+  // Record block size
+  blocksize = encoding * 1024;
+  // Initialize context array
+}
+
+BSByteStream::Encode::~Encode()
+{
+  // Flush
+  flush();
+  // Encode EOF marker
+  encode_raw(*gzp, 24, 0);
+  // Free allocated memory
+}
+
+GP<ByteStream>
+BSByteStream::create(GP<ByteStream> xbs,const int blocksize)
+{
+  BSByteStream::Encode *rbs=new BSByteStream::Encode(xbs);
+  GP<ByteStream> retval=rbs;
+  rbs->init(blocksize);
+  return retval;
+}
+
+// ========================================
+// -- ByteStream interface
+
+void 
+BSByteStream::Encode::flush()
+{
+  if (bptr>0)
+  {
+    ASSERT(bptr<(int)blocksize);
+    memset(data+bptr, 0, OVERFLOW);
+    size = bptr+1;
+    encode();
+  }
+  size = bptr = 0;
+}
+
+size_t 
+BSByteStream::Encode::write(const void *buffer, size_t sz)
+{
+  // Trivial checks
+  if (sz == 0)
+    return 0;
+  // Loop
+  int copied = 0;
+  while (sz > 0)
+    {
+      // Initialize
+      if (!data) 
+        {
+          bptr = 0;
+          gdata.resize(blocksize+OVERFLOW);
+        }
+      // Compute remaining
+      int bytes = blocksize - 1 - bptr;
+      if (bytes > (int)sz)
+        bytes = sz;
+      // Store date (todo: rle)
+      memcpy(data+bptr, buffer, bytes);
+      buffer = (void*)((char*)buffer + bytes);
+      bptr += bytes;
+      sz -= bytes;
+      copied += bytes;
+      offset += bytes;
+      // Flush when needed
+      if (bptr + 1 >= (int)blocksize)
+        flush();
+    }
+  // return
+  return copied;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp
new file mode 100644
index 0000000..4b75605
--- /dev/null
+++ b/libdjvu/ByteStream.cpp
@@ -0,0 +1,1378 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+// From: Leon Bottou, 1/31/2002
+// This file has very little to do with my initial implementation.
+// It has been practically rewritten by Lizardtech for i18n changes.
+// Our original implementation consisted of multiple classes.
+// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// - Author: Leon Bottou, 04/1997
+
+#include "DjVuGlobal.h"
+#include "ByteStream.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+#include <stddef.h>
+#include <fcntl.h>
+#if defined(_WIN32) || defined(__CYGWIN32__)
+# include <io.h>
+#endif
+
+#ifdef UNIX
+# ifndef HAS_MEMMAP
+#  define HAS_MEMMAP 1
+# endif
+#endif
+
+#ifdef UNIX
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <unistd.h>
+# include <errno.h>
+# ifdef HAS_MEMMAP
+#  include <sys/mman.h>
+# endif
+#endif
+
+#ifdef macintosh
+# ifndef UNIX
+#  include <unistd.h>
+_MSL_IMP_EXP_C int _dup(int);
+_MSL_IMP_EXP_C int _dup2(int,int);
+_MSL_IMP_EXP_C int _close(int);
+__inline int dup(int _a ) { return _dup(_a);}
+__inline int dup2(int _a, int _b ) { return _dup2(_a, _b);}
+# endif
+#endif
+
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+#  define close _close
+#  define fdopen _fdopen
+#  define dup _dup
+#endif
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+const char *ByteStream::EndOfFile=ERR_MSG("EOF");
+
+/** ByteStream interface for stdio files. 
+    The virtual member functions #read#, #write#, #tell# and #seek# are mapped
+    to the well known stdio functions #fread#, #fwrite#, #ftell# and #fseek#.
+    @see Unix man page fopen(3), fread(3), fwrite(3), ftell(3), fseek(3) */
+
+class ByteStream::Stdio : public ByteStream {
+public:
+  Stdio(void);
+
+  /** Constructs a ByteStream for accessing the file named #url#.
+      Arguments #url# and #mode# are similar to the arguments of the well
+      known stdio function #fopen#. In addition a url of #-# will be
+      interpreted as the standard output or the standard input according to
+      #mode#.  This constructor will open a stdio file and construct a
+      ByteStream object accessing this file. Destroying the ByteStream object
+      will flush and close the associated stdio file.  Returns an error code
+      if the stdio file cannot be opened. */
+  GUTF8String init(const GURL &url, const char * const mode);
+
+  /** Constructs a ByteStream for accessing the stdio file #f#.
+      Argument #mode# indicates the type of the stdio file, as in the
+      well known stdio function #fopen#.  Destroying the ByteStream
+      object will not close the stdio file #f# unless closeme is true. */
+  GUTF8String init(FILE * const f, const char * const mode="rb", const bool closeme=false);
+
+  /** Initializes from stdio */
+  GUTF8String init(const char mode[]);
+
+  // Virtual functions
+  ~Stdio();
+  virtual size_t read(void *buffer, size_t size);
+  virtual size_t write(const void *buffer, size_t size);
+  virtual void flush(void);
+  virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false);
+  virtual long tell(void) const;
+private:
+  // Cancel C++ default stuff
+  Stdio(const Stdio &);
+  Stdio & operator=(const Stdio &);
+private:
+  // Implementation
+  bool can_read;
+  bool can_write;
+  bool must_close;
+protected:
+  FILE *fp;
+  long pos;
+};
+
+inline GUTF8String
+ByteStream::Stdio::init(FILE * const f,const char mode[],const bool closeme)
+{
+  fp=f;
+  must_close=closeme;
+  return init(mode);
+}
+
+
+/** ByteStream interface managing a memory buffer.  
+    Class #ByteStream::Memory# manages a dynamically resizable buffer from
+    which data can be read or written.  The buffer itself is organized as an
+    array of blocks of 4096 bytes.  */
+
+class ByteStream::Memory : public ByteStream
+{
+public:
+  /** Constructs an empty ByteStream::Memory.
+      The buffer is initially empty. You must first use function #write#
+      to store data into the buffer, use function #seek# to rewind the
+      current position, and function #read# to read the data back. */
+  Memory();
+  /** Constructs a Memory by copying initial data.  The
+      Memory buffer is initialized with #size# bytes copied from the
+      memory area pointed to by #buffer#. */
+  GUTF8String init(const void * const buffer, const size_t size);
+  // Virtual functions
+  ~Memory();
+  virtual size_t read(void *buffer, size_t size);
+  virtual size_t write(const void *buffer, size_t size);
+  virtual int    seek(long offset, int whence=SEEK_SET, bool nothrow=false);
+  virtual long   tell(void) const;
+  /** Erases everything in the Memory.
+      The current location is reset to zero. */
+  void empty();
+  /** Returns the total number of bytes contained in the buffer.  Valid
+      offsets for function #seek# range from 0 to the value returned by this
+      function. */
+  virtual int size(void) const;
+  /** Returns a reference to the byte at offset #n#. This reference can be
+      used to read (as in #mbs[n]#) or modify (as in #mbs[n]=c#) the contents
+      of the buffer. */
+  char &operator[] (int n);
+  /** Copies all internal data into \Ref{TArray} and returns it */
+private:
+  // Cancel C++ default stuff
+  Memory(const Memory &);
+  Memory & operator=(const Memory &);
+  // Current position
+  int where;
+protected:
+  /** Reads data from a random position. This function reads at most #sz#
+      bytes at position #pos# into #buffer# and returns the actual number of
+      bytes read.  The current position is unchanged. */
+  virtual size_t readat(void *buffer, size_t sz, int pos);
+  /** Number of bytes in internal buffer. */
+  int bsize;
+  /** Number of 4096 bytes blocks. */
+  int nblocks;
+  /** Pointers (possibly null) to 4096 bytes blocks. */
+  char **blocks;
+  /** Pointers (possibly null) to 4096 bytes blocks. */
+  GPBuffer<char *> gblocks;
+};
+
+
+
+inline int
+ByteStream::Memory::size(void) const
+{
+  return bsize;
+}
+
+inline char &
+ByteStream::Memory::operator[] (int n)
+{
+  return blocks[n>>12][n&0xfff];
+}
+
+
+
+/** Read-only ByteStream interface to a memory area.  
+    Class #ByteStream::Static# implements a read-only ByteStream interface for a
+    memory area specified by the user at construction time. Calls to function
+    #read# directly access this memory area.  The user must therefore make
+    sure that its content remain valid long enough.  */
+
+class ByteStream::Static : public ByteStream
+{
+public:
+
+  /** Creates a Static object for allocating the memory area of
+      length #sz# starting at address #buffer#. */
+  Static(const void * const buffer, const size_t sz);
+  ~Static();
+  // Virtual functions
+  virtual size_t read(void *buffer, size_t sz);
+  virtual int    seek(long offset, int whence = SEEK_SET, bool nothrow=false);
+  virtual long tell(void) const;
+  /** Returns the total number of bytes contained in the buffer, file, etc.
+      Valid offsets for function #seek# range from 0 to the value returned
+      by this function. */
+  virtual int size(void) const;
+protected:
+  const char *data;
+  int bsize;
+private:
+  int where;
+};
+
+ByteStream::Static::~Static() {}
+
+inline int
+ByteStream::Static::size(void) const
+{
+  return bsize;
+}
+
+#if HAS_MEMMAP
+/** Read-only ByteStream interface to a memmap area.
+    Class #MemoryMapByteStream# implements a read-only ByteStream interface
+    for a memory map to a file. */
+
+class MemoryMapByteStream : public ByteStream::Static
+{
+public:
+  MemoryMapByteStream(void);
+  virtual ~MemoryMapByteStream();  
+private:
+  GUTF8String init(const int fd, const bool closeme);
+  GUTF8String init(FILE *const f,const bool closeme);
+  friend class ByteStream;
+};
+#endif
+
+//// CLASS BYTESTREAM
+
+
+ByteStream::~ByteStream()
+{
+}
+
+int 
+ByteStream::scanf(const char *fmt, ...)
+{
+  G_THROW( ERR_MSG("ByteStream.not_implemented") ); // This is a place holder function.
+  return 0;
+}
+
+size_t 
+ByteStream::read(void *buffer, size_t sz)
+{
+  G_THROW( ERR_MSG("ByteStream.cant_read") );      //  Cannot read from a ByteStream created for writing
+  return 0;
+}
+
+size_t 
+ByteStream::write(const void *buffer, size_t sz)
+{
+  G_THROW( ERR_MSG("ByteStream.cant_write") );      //  Cannot write from a ByteStream created for reading
+  return 0;
+}
+
+void
+ByteStream::flush()
+{
+}
+
+int
+ByteStream::seek(long offset, int whence, bool nothrow)
+{
+  int nwhere = 0;
+  int ncurrent = tell();
+  switch (whence)
+    {
+    case SEEK_SET:
+      nwhere=0; break;
+    case SEEK_CUR:
+      nwhere=ncurrent; break;
+    case SEEK_END: 
+    {
+      if(offset)
+      {
+        if (nothrow)
+          return -1;
+        G_THROW( ERR_MSG("ByteStream.backward") );
+      }
+      char buffer[1024];
+      int bytes;
+      while((bytes=read(buffer, sizeof(buffer))))
+        EMPTY_LOOP;
+      return 0;
+    }
+    default:
+      G_THROW( ERR_MSG("ByteStream.bad_arg") );       //  Illegal argument in seek
+    }
+  nwhere += offset;
+  if (nwhere < ncurrent) 
+  {
+    //  Seeking backwards is not supported by this ByteStream
+    if (nothrow)
+      return -1;
+    G_THROW( ERR_MSG("ByteStream.backward") );
+  }
+  while (nwhere>ncurrent)
+  {
+    char buffer[1024];
+    const int xbytes=(ncurrent+(int)sizeof(buffer)>nwhere)
+      ?(nwhere - ncurrent):(int)sizeof(buffer);
+    const int bytes = read(buffer, xbytes);
+    ncurrent += bytes;
+    if (!bytes)
+      G_THROW( ByteStream::EndOfFile );
+    //  Seeking works funny on this ByteStream (ftell() acts strange)
+    if (ncurrent!=tell())
+      G_THROW( ERR_MSG("ByteStream.seek") );
+  }
+  return 0;
+}
+
+size_t 
+ByteStream::readall(void *buffer, size_t size)
+{
+  size_t total = 0;
+    while (size > 0)
+    {
+      int nitems = read(buffer, size);
+      // Replaced perror() below with G_THROW(). It still makes little sense
+      // as there is no guarantee, that errno is right. Still, throwing
+      // exception instead of continuing to loop is better.
+      // - eaf
+      if(nitems < 0) 
+        G_THROW(strerror(errno));               //  (No error in the DjVuMessageFile)
+      if (nitems == 0)
+        break;
+      total += nitems;
+      size -= nitems; 
+      buffer = (void*)((char*)buffer + nitems);
+    }
+  return total;
+}
+
+size_t
+ByteStream::format(const char *fmt, ... )
+{
+  va_list args;
+  va_start(args, fmt); 
+  const GUTF8String message(fmt,args);
+  return writestring(message);
+}
+
+size_t
+ByteStream::writestring(const GNativeString &s)
+{
+  int retval;
+  if(cp != UTF8)
+  {
+    retval=writall((const char *)s,s.length());
+    if(cp == AUTO)
+      cp=NATIVE; // Avoid mixing string types.
+  }else
+  { 
+    const GUTF8String msg(s.getNative2UTF8());
+    retval=writall((const char *)msg,msg.length());
+  }
+  return retval;
+}
+
+size_t
+ByteStream::writestring(const GUTF8String &s)
+{
+  int retval;
+  if(cp != NATIVE)
+  {
+    retval=writall((const char *)s,s.length());
+    if(cp == AUTO)
+      cp=UTF8; // Avoid mixing string types.
+  }else
+  { 
+    const GNativeString msg(s.getUTF82Native());
+    retval=writall((const char *)msg,msg.length());
+  }
+  return retval;
+}
+
+size_t 
+ByteStream::writall(const void *buffer, size_t size)
+{
+  size_t total = 0;
+  while (size > 0)
+    {
+      size_t nitems = write(buffer, size);
+      if (nitems == 0)
+        G_THROW( ERR_MSG("ByteStream.write_error") );      //  Unknown error in write
+      total += nitems;
+      size -= nitems; 
+      buffer = (void*)((char*)buffer + nitems);
+    }
+  return total;
+}
+
+size_t 
+ByteStream::copy(ByteStream &bsfrom, size_t size)
+{
+  size_t total = 0;
+  const size_t max_buffer_size=200*1024;
+  const size_t buffer_size=(size>0 && size<max_buffer_size)
+    ?size:max_buffer_size;
+  char *buffer;
+  GPBuffer<char> gbuf(buffer,buffer_size);
+  for(;;)
+    {
+      size_t bytes = buffer_size;
+      if (size>0 && bytes+total>size)
+        bytes = size - total;
+      if (bytes == 0)
+        break;
+      bytes = bsfrom.read((void*)buffer, bytes);
+      if (bytes == 0)
+        break;
+      writall((void*)buffer, bytes);
+      total += bytes;
+    }
+  return total;
+}
+
+
+void 
+ByteStream::write8 (unsigned int card)
+{
+  unsigned char c[1];
+  c[0] = (card) & 0xff;
+  if (write((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW(strerror(errno));   //  (No error in the DjVuMessageFile)
+}
+
+void 
+ByteStream::write16(unsigned int card)
+{
+  unsigned char c[2];
+  c[0] = (card>>8) & 0xff;
+  c[1] = (card) & 0xff;
+  if (writall((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW(strerror(errno));   //  (No error in the DjVuMessageFile)
+}
+
+void 
+ByteStream::write24(unsigned int card)
+{
+  unsigned char c[3];
+  c[0] = (card>>16) & 0xff;
+  c[1] = (card>>8) & 0xff;
+  c[2] = (card) & 0xff;
+  if (writall((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW(strerror(errno));   //  (No error in the DjVuMessageFile)
+}
+
+void 
+ByteStream::write32(unsigned int card)
+{
+  unsigned char c[4];
+  c[0] = (card>>24) & 0xff;
+  c[1] = (card>>16) & 0xff;
+  c[2] = (card>>8) & 0xff;
+  c[3] = (card) & 0xff;
+  if (writall((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW(strerror(errno));   //  (No error in the DjVuMessageFile)
+}
+
+unsigned int 
+ByteStream::read8 ()
+{
+  unsigned char c[1];
+  if (readall((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW( ByteStream::EndOfFile );
+  return c[0];
+}
+
+unsigned int 
+ByteStream::read16()
+{
+  unsigned char c[2];
+  if (readall((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW( ByteStream::EndOfFile );
+  return (c[0]<<8)+c[1];
+}
+
+unsigned int 
+ByteStream::read24()
+{
+  unsigned char c[3];
+  if (readall((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW( ByteStream::EndOfFile );
+  return (((c[0]<<8)+c[1])<<8)+c[2];
+}
+
+unsigned int 
+ByteStream::read32()
+{
+  unsigned char c[4];
+  if (readall((void*)c, sizeof(c)) != sizeof(c))
+    G_THROW( ByteStream::EndOfFile );
+  return (((((c[0]<<8)+c[1])<<8)+c[2])<<8)+c[3];
+}
+
+
+
+//// CLASS ByteStream::Stdio
+
+ByteStream::Stdio::Stdio(void)
+: can_read(false),can_write(false),must_close(true),fp(0),pos(0)
+{}
+
+ByteStream::Stdio::~Stdio()
+{
+  if (fp && must_close)
+    fclose(fp);
+}
+
+GUTF8String
+ByteStream::Stdio::init(const char mode[])
+{
+  char const *mesg=0;
+  bool binary=false;
+  if(!fp)
+    must_close=false;
+  for (const char *s=mode; s && *s; s++)
+  {
+    switch(*s) 
+    {
+      case 'r':
+        can_read=true;
+        if(!fp) fp=stdin;
+        break;
+      case 'w': 
+      case 'a':
+        can_write=true;
+        if(!fp) fp=stdout;
+        break;
+      case '+':
+        can_read=can_write=true;
+        break;
+      case 'b':
+        binary=true;
+        break;
+      default:
+        mesg= ERR_MSG("ByteStream.bad_mode"); //  Illegal mode in Stdio
+    }
+  }
+  if(binary && fp) {
+#if defined(__CYGWIN32__)
+    setmode(fileno(fp), O_BINARY);
+#elif defined(_WIN32)
+    _setmode(_fileno(fp), _O_BINARY);
+#endif
+  }
+  GUTF8String retval;
+  if(!mesg)
+  {
+    tell();
+  }else
+  {
+    retval=mesg;
+  }
+  if(mesg &&(fp && must_close))
+  {
+    fclose(fp);
+    fp=0;
+    must_close=false;
+  }
+  return retval;
+}
+
+static FILE *
+urlfopen(const GURL &url,const char mode[])
+{
+#if defined(_WIN32)
+  FILE *retval=0;
+  const GUTF8String filename(url.UTF8Filename());
+  wchar_t *wfilename;
+  const size_t wfilename_size=filename.length()+1;
+  GPBuffer<wchar_t> gwfilename(wfilename,wfilename_size);
+  if(filename.ncopy(wfilename,wfilename_size) > 0)
+  {
+    const GUTF8String gmode(mode);
+    wchar_t *wmode;
+    const size_t wmode_size=gmode.length()+1;
+    GPBuffer<wchar_t> gwmode(wmode,wmode_size);
+	if(gmode.ncopy(wmode,wmode_size) > 0)
+	{
+	  retval=_wfopen(wfilename,wmode);
+	}
+  }
+  return retval?retval:fopen((const char *)url.NativeFilename(),mode);
+#elif defined(__APPLE__)
+  return fopen((const char *)url.UTF8Filename(),mode);
+#else
+  return fopen((const char *)url.NativeFilename(),mode);
+#endif
+}
+
+#ifdef UNIX
+static int
+urlopen(const GURL &url, const int mode, const int perm)
+{
+#if defined(__APPLE__)
+  return open((const char *)url.UTF8Filename(),mode,perm);
+#else
+  return open((const char *)url.NativeFilename(),mode,perm);
+#endif
+}
+#endif /* UNIX */
+
+GUTF8String
+ByteStream::Stdio::init(const GURL &url, const char mode[])
+{
+  GUTF8String retval;
+  if (url.fname() != "-")
+  {
+    fp = urlfopen(url,mode);
+    if (!fp)
+    {
+      //  Failed to open '%s': %s
+      G_THROW( ERR_MSG("ByteStream.open_fail") "\t" + url.name()
+               +"\t"+GNativeString(strerror(errno)).getNative2UTF8());
+    }
+  }
+  return retval.length()?retval:init(mode);
+}
+
+size_t 
+ByteStream::Stdio::read(void *buffer, size_t size)
+{
+  if (!can_read)
+    G_THROW( ERR_MSG("ByteStream.no_read") ); //  Stdio not opened for reading
+  size_t nitems;
+  do
+  {
+    clearerr(fp);
+    nitems = fread(buffer, 1, size, fp); 
+    if (nitems<=0 && ferror(fp))
+    {
+#ifdef EINTR
+      if (errno!=EINTR)
+#endif
+        G_THROW(strerror(errno)); //  (No error in the DjVuMessageFile)
+    }
+    else
+      break;
+  } while(true);
+  pos += nitems;
+  return nitems;
+}
+
+size_t 
+ByteStream::Stdio::write(const void *buffer, size_t size)
+{
+  if (!can_write)
+    G_THROW( ERR_MSG("ByteStream.no_write") ); //  Stdio not opened for writing
+  size_t nitems;
+  do
+  {
+    clearerr(fp);
+    nitems = fwrite(buffer, 1, size, fp);
+    if (nitems<=0 && ferror(fp))
+    {
+#ifdef EINTR
+      if (errno!=EINTR)
+#endif
+        G_THROW(strerror(errno)); //  (No error in the DjVuMessageFile)
+    }
+    else
+      break;
+  } while(true);
+  pos += nitems;
+  return nitems;
+}
+
+void
+ByteStream::Stdio::flush()
+{
+  if (fflush(fp) < 0)
+    G_THROW(strerror(errno)); //  (No error in the DjVuMessageFile)
+}
+
+long 
+ByteStream::Stdio::tell(void) const
+{
+  long x = ftell(fp);
+  if (x >= 0)
+  {
+    Stdio *sbs=const_cast<Stdio *>(this);
+    (sbs->pos) = x;
+  }else
+  {
+    x=pos;
+  }
+  return x;
+}
+
+int
+ByteStream::Stdio::seek(long offset, int whence, bool nothrow)
+{
+  if (whence==SEEK_SET && offset>=0 && offset==ftell(fp))
+    return 0;
+  clearerr(fp);
+  if (fseek(fp, offset, whence)) 
+    {
+      if (nothrow) 
+        return -1;
+      G_THROW(strerror(errno)); //  (No error in the DjVuMessageFile)
+    }
+  return tell();
+}
+
+
+
+
+///////// ByteStream::Memory
+
+ByteStream::Memory::Memory()
+  : where(0), bsize(0), nblocks(0), gblocks(blocks,0)
+{
+}
+
+GUTF8String
+ByteStream::Memory::init(void const * const buffer, const size_t sz)
+{
+  GUTF8String retval;
+  G_TRY
+  {
+    writall(buffer, sz);
+    where = 0;
+  }
+  G_CATCH(ex) // The only error that should be thrown is out of memory...
+  {
+    retval=ex.get_cause();
+  }
+  G_ENDCATCH;
+  return retval;
+}
+
+void 
+ByteStream::Memory::empty()
+{
+  for (int b=0; b<nblocks; b++)
+  {
+    delete [] blocks[b];
+    blocks[b]=0;
+  }
+  bsize = 0;
+  where = 0;
+  nblocks = 0;
+}
+
+ByteStream::Memory::~Memory()
+{
+  empty();
+}
+
+size_t 
+ByteStream::Memory::write(const void *buffer, size_t sz)
+{
+  int nsz = (int)sz;
+  if (nsz <= 0)
+    return 0;
+  // check memory
+  if ( (where+nsz) > ((bsize+0xfff)&~0xfff) )
+    {
+      // reallocate pointer array
+      if ( (where+nsz) > (nblocks<<12) )
+        {
+          const int old_nblocks=nblocks;
+          nblocks = (((where+nsz)+0xffff)&~0xffff) >> 12;
+          gblocks.resize(nblocks);
+          char const ** eblocks=(char const **)(blocks+old_nblocks);
+          for(char const * const * const new_eblocks=blocks+nblocks;
+            eblocks <new_eblocks; eblocks++) 
+          {
+            *eblocks = 0;
+          }
+        }
+      // allocate blocks
+      for (int b=(where>>12); (b<<12)<(where+nsz); b++)
+      {
+        if (! blocks[b])
+          blocks[b] = new char[0x1000];
+      }
+    }
+  // write data to buffer
+  while (nsz > 0)
+    {
+      int n = (where|0xfff) + 1 - where;
+      n = ((nsz < n) ? nsz : n);
+      memcpy( (void*)&blocks[where>>12][where&0xfff], buffer, n);
+      buffer = (void*) ((char*)buffer + n);
+      where += n;
+      nsz -= n;
+    }
+  // adjust size
+  if (where > bsize)
+    bsize = where;
+  return sz;
+}
+
+size_t 
+ByteStream::Memory::readat(void *buffer, size_t sz, int pos)
+{
+  if ((int) sz > bsize - pos)
+    sz = bsize - pos;
+  int nsz = (int)sz;
+  if (nsz <= 0)
+    return 0;
+  // read data from buffer
+  while (nsz > 0)
+    {
+      int n = (pos|0xfff) + 1 - pos;
+      n = ((nsz < n) ? nsz : n);
+      memcpy(buffer, (void*)&blocks[pos>>12][pos&0xfff], n);
+      buffer = (void*) ((char*)buffer + n);
+      pos += n;
+      nsz -= n;
+    }
+  return sz;
+}
+
+size_t 
+ByteStream::Memory::read(void *buffer, size_t sz)
+{
+  sz = readat(buffer,sz,where);
+  where += sz;
+  return sz;
+}
+
+long 
+ByteStream::Memory::tell(void) const
+{
+  return where;
+}
+
+int
+ByteStream::Memory::seek(long offset, int whence, bool nothrow)
+{
+  int nwhere = 0;
+  switch (whence)
+    {
+    case SEEK_SET: nwhere = 0; break;
+    case SEEK_CUR: nwhere = where; break;
+    case SEEK_END: nwhere = bsize; break;
+    default: G_THROW( ERR_MSG("bad_arg") "\tByteStream::Memory::seek()");      // Illegal argument in ByteStream::Memory::seek()
+    }
+  nwhere += offset;
+  if (nwhere<0)
+    G_THROW( ERR_MSG("ByteStream.seek_error2") );                          //  Attempt to seek before the beginning of the file
+  where = nwhere;
+  return 0;
+}
+
+
+
+/** This function has been moved into Arrays.cpp
+    In order to avoid dependencies from ByteStream.o
+    to Arrays.o */
+#ifdef DO_NOT_MOVE_GET_DATA_TO_ARRAYS_CPP
+TArray<char>
+ByteStream::get_data(void)
+{
+   TArray<char> data(0, size()-1);
+   readat((char*)data, size(), 0);
+   return data;
+}
+#endif
+
+
+///////// ByteStream::Static
+
+ByteStream::Static::Static(const void * const buffer, const size_t sz)
+  : data((const char *)buffer), bsize(sz), where(0)
+{
+}
+
+size_t 
+ByteStream::Static::read(void *buffer, size_t sz)
+{
+  int nsz = (int)sz;
+  if (nsz > bsize - where)
+    nsz = bsize - where;
+  if (nsz <= 0)
+    return 0;
+  memcpy(buffer, data+where, nsz);
+  where += nsz;
+  return nsz;
+}
+
+int
+ByteStream::Static::seek(long offset, int whence, bool nothrow)
+{
+  int nwhere = 0;
+  switch (whence)
+    {
+    case SEEK_SET: nwhere = 0; break;
+    case SEEK_CUR: nwhere = where; break;
+    case SEEK_END: nwhere = bsize; break;
+    default: G_THROW("bad_arg\tByteStream::Static::seek()");      //  Illegal argument to ByteStream::Static::seek()
+    }
+  nwhere += offset;
+  if (nwhere<0)
+    G_THROW( ERR_MSG("ByteStream.seek_error2") );                          //  Attempt to seek before the beginning of the file
+  where = nwhere;
+  return 0;
+}
+
+long 
+ByteStream::Static::tell(void) const
+{
+  return where;
+}
+
+GP<ByteStream>
+ByteStream::create(void)
+{
+  return new Memory();
+}
+
+GP<ByteStream>
+ByteStream::create(void const * const buffer, const size_t size)
+{
+  Memory *mbs=new Memory();
+  GP<ByteStream> retval=mbs;
+  mbs->init(buffer,size);
+  return retval;
+}
+
+GP<ByteStream>
+ByteStream::create(const GURL &url,char const * const xmode)
+{
+  GP<ByteStream> retval;
+  const char *mode = ((xmode) ? xmode : "rb");
+#ifdef UNIX
+  if (!strcmp(mode,"rb")) 
+    {
+      int fd = urlopen(url,O_RDONLY,0777);
+      if (fd >= 0)
+        {
+#if HAS_MEMMAP && defined(S_IFREG)
+          struct stat buf;
+          if ( (fstat(fd, &buf) >= 0) && (buf.st_mode & S_IFREG) )
+            {
+              MemoryMapByteStream *rb = new MemoryMapByteStream();
+              retval = rb;
+              GUTF8String errmessage = rb->init(fd,true);
+              if(errmessage.length())
+                retval=0;
+            }
+#endif
+          if (! retval)
+            {
+              FILE *f = fdopen(fd, mode);
+              if (f) 
+                {
+                  Stdio *sbs=new Stdio();
+                  retval=sbs;
+                  GUTF8String errmessage=sbs->init(f, mode, true);
+                  if(errmessage.length())
+                    retval=0;
+                }
+            }
+          if (! retval)
+            close(fd);
+        }     
+    }
+#endif
+  if (! retval)
+    {
+      Stdio *sbs=new Stdio();
+      retval=sbs;
+      GUTF8String errmessage=sbs->init(url, mode);
+      if(errmessage.length())
+        G_THROW(errmessage);
+    }
+  return retval;
+}
+
+GP<ByteStream>
+ByteStream::create(char const * const mode)
+{
+  GP<ByteStream> retval;
+  Stdio *sbs=new Stdio();
+  retval=sbs;
+  GUTF8String errmessage=sbs->init(mode?mode:"rb");
+  if(errmessage.length())
+  {
+    G_THROW(errmessage);
+  }
+  return retval;
+}
+
+GP<ByteStream>
+ByteStream::create(const int fd,char const * const mode,const bool closeme)
+{
+  GP<ByteStream> retval;
+  const char *default_mode="rb";
+#if HAS_MEMMAP
+  if (   (!mode&&(fd!=0)&&(fd!=1)&&(fd!=2)) 
+      || (mode&&(GUTF8String("rb") == mode)))
+  {
+    MemoryMapByteStream *rb=new MemoryMapByteStream();
+    retval=rb;
+    GUTF8String errmessage=rb->init(fd,closeme);
+    if(errmessage.length())
+    {
+      retval=0;
+    }
+  }
+  if(!retval)
+#endif
+  {
+    int fd2 = fd;
+    FILE *f = 0;
+    if (fd == 0 && !closeme 
+        && (!mode || mode[0]=='r') )
+      {
+        f=stdin;
+        default_mode = "r";
+        fd2=(-1);
+      }
+    else if (fd == 1 && !closeme 
+             && (!mode || mode[0]=='a' || mode[0]=='w') )
+      {
+        default_mode = "a";
+        f=stdout;
+        fd2 = -1;
+      }
+    else if (fd == 2 && !closeme
+             && (!mode || mode[0]=='a' || mode[0]=='w') )
+      {
+        default_mode = "a";
+        f=stderr;
+        fd2 = -1;
+      }
+    else
+      {
+        if (! closeme)
+          fd2 = dup(fd);
+        f = fdopen(fd2,(char*)(mode?mode:default_mode));
+      }
+
+    if(!f)
+      {
+        if ( fd2 >= 0)
+          close(fd2);
+        G_THROW( ERR_MSG("ByteStream.open_fail2") );
+      }
+    Stdio *sbs=new Stdio();
+    retval=sbs;
+    GUTF8String errmessage=sbs->init(f,mode?mode:default_mode,(fd2>=0));
+    if(errmessage.length())
+      G_THROW(errmessage);
+  }
+  return retval;
+}
+
+GP<ByteStream>
+ByteStream::create(FILE * const f,char const * const mode,const bool closeme)
+{
+  GP<ByteStream> retval;
+#if HAS_MEMMAP
+  if (!mode || (GUTF8String("rb") == mode))
+  {
+    MemoryMapByteStream *rb=new MemoryMapByteStream();
+    retval=rb;
+    GUTF8String errmessage=rb->init(fileno(f),false);
+    if(errmessage.length())
+    {
+      retval=0;
+    }else
+    {
+      fclose(f);
+    }
+  }
+  if(!retval)
+#endif
+  {
+    Stdio *sbs=new Stdio();
+    retval=sbs;
+    GUTF8String errmessage=sbs->init(f,mode?mode:"rb",closeme);
+    if(errmessage.length())
+    {
+      G_THROW(errmessage);
+    }
+  }
+  return retval;
+}
+
+GP<ByteStream>
+ByteStream::create_static(const void * buffer, size_t sz)
+{
+  return new Static(buffer, sz);
+}
+
+#if HAS_MEMMAP
+MemoryMapByteStream::MemoryMapByteStream(void)
+: ByteStream::Static(0,0)
+{}
+
+GUTF8String
+MemoryMapByteStream::init(FILE *const f,const bool closeme)
+{
+  GUTF8String retval;
+  retval=init(fileno(f),false);
+  if(closeme)
+  {
+    fclose(f);
+  }
+  return retval;
+}
+
+GUTF8String
+MemoryMapByteStream::init(const int fd,const bool closeme)
+{
+  GUTF8String retval;
+  data = (char*)(-1);
+#if defined(PROT_READ) && defined(MAP_SHARED)
+  struct stat statbuf;
+  if(!fstat(fd,&statbuf) && statbuf.st_size)
+    {
+      bsize=statbuf.st_size;
+      data=(char *)mmap(0,statbuf.st_size,PROT_READ,MAP_SHARED,fd,0);
+    }
+#endif
+  if(data == (char *)(-1))
+    retval = ERR_MSG("ByteStream.open_fail2");
+  if(closeme)
+    close(fd);
+  return retval;
+}
+
+MemoryMapByteStream::~MemoryMapByteStream()
+{
+  if(data)
+  {
+    munmap(const_cast<char *>(data),bsize);
+  }
+}
+
+#endif
+
+ByteStream::Wrapper::~Wrapper() {}
+
+
+GP<ByteStream> 
+ByteStream::get_stdin(char const *mode)
+{
+  static GP<ByteStream> gp = ByteStream::create(0,mode,false);
+  return gp;
+}
+
+GP<ByteStream> 
+ByteStream::get_stdout(char const *mode)
+{
+  static GP<ByteStream> gp = ByteStream::create(1,mode,false);
+  return gp;
+}
+
+GP<ByteStream> 
+ByteStream::get_stderr(char const *mode)
+{
+  static GP<ByteStream> gp = ByteStream::create(2,mode,false);
+  return gp;
+}
+
+
+/** Looks up the message and writes it to the specified stream. */
+void ByteStream::formatmessage( const char *fmt, ... )
+{
+  va_list args;
+  va_start(args, fmt);
+  const GUTF8String message(fmt,args);
+  writemessage( message );
+}
+
+/** Looks up the message and writes it to the specified stream. */
+void ByteStream::writemessage( const char *message )
+{
+  writestring( DjVuMessage::LookUpUTF8( message ) );
+}
+
+static void 
+read_file(ByteStream &bs,char *&buffer,GPBuffer<char> &gbuffer)
+{
+  const int size=bs.size();
+  int pos=0;
+  if(size>0)
+  {
+    size_t readsize=size+1;
+    gbuffer.resize(readsize);
+    for(int i;readsize&&(i=bs.read(buffer+pos,readsize))>0;pos+=i,readsize-=i)
+      EMPTY_LOOP;
+  }else
+  {
+    const size_t readsize=32768;
+    gbuffer.resize(readsize);
+    for(int i;((i=bs.read(buffer+pos,readsize))>0);
+      gbuffer.resize((pos+=i)+readsize))
+      EMPTY_LOOP;
+  }
+  buffer[pos]=0;
+}
+
+GNativeString
+ByteStream::getAsNative(void)
+{
+  char *buffer;
+  GPBuffer<char> gbuffer(buffer);
+  read_file(*this,buffer,gbuffer);
+  return GNativeString(buffer);
+}
+
+GUTF8String
+ByteStream::getAsUTF8(void)
+{
+  char *buffer;
+  GPBuffer<char> gbuffer(buffer);
+  read_file(*this,buffer,gbuffer);
+  return GUTF8String(buffer);
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+void
+DjVuPrintErrorUTF8(const char *fmt, ... )
+{
+  G_TRY {
+    GP<ByteStream> errout = ByteStream::get_stderr();
+    if (errout)
+      {
+        errout->cp=ByteStream::NATIVE;
+        va_list args;
+        va_start(args, fmt); 
+        const GUTF8String message(fmt,args);
+        errout->writestring(message);
+      }
+    // Need to catch all exceptions because these might be 
+    // called from an outer exception handler (with prejudice)
+  } G_CATCH_ALL { } G_ENDCATCH;
+}
+
+void
+DjVuPrintErrorNative(const char *fmt, ... )
+{
+  G_TRY {
+    GP<ByteStream> errout = ByteStream::get_stderr();
+    if (errout)
+      {
+        errout->cp=ByteStream::NATIVE;
+        va_list args;
+        va_start(args, fmt); 
+        const GNativeString message(fmt,args);
+        errout->writestring(message);
+      }
+    // Need to catch all exceptions because these might be 
+    // called from an outer exception handler (with prejudice)
+  } G_CATCH_ALL { } G_ENDCATCH;
+}
+
+void
+DjVuPrintMessageUTF8(const char *fmt, ... )
+{
+  G_TRY {
+    GP<ByteStream> strout = ByteStream::get_stdout();
+    if (strout)
+      {
+        strout->cp=ByteStream::NATIVE;
+        va_list args;
+        va_start(args, fmt);
+        const GUTF8String message(fmt,args);
+        strout->writestring(message);
+      }
+    // Need to catch all exceptions because these might be 
+    // called from an outer exception handler (with prejudice)
+  } G_CATCH_ALL { } G_ENDCATCH;
+}
+
+void
+DjVuPrintMessageNative(const char *fmt, ... )
+{
+  G_TRY {
+    GP<ByteStream> strout = ByteStream::get_stdout();
+    if (strout)
+      {
+        strout->cp=ByteStream::NATIVE;
+        va_list args;
+        va_start(args, fmt);
+        const GNativeString message(fmt,args);
+        strout->writestring(message);
+      }
+    // Need to catch all exceptions because these might be 
+    // called from an outer exception handler (with prejudice)
+  } G_CATCH_ALL { } G_ENDCATCH;
+}
diff --git a/libdjvu/ByteStream.h b/libdjvu/ByteStream.h
new file mode 100644
index 0000000..0615f7a
--- /dev/null
+++ b/libdjvu/ByteStream.h
@@ -0,0 +1,406 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _BYTESTREAM_H
+#define _BYTESTREAM_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name ByteStream.h
+    
+    Files #"ByteStream.h"# and #"ByteStream.cpp"# define input/output classes
+    similar in spirit to the well known C++ #iostream# classes.  Class
+    \Ref{ByteStream} is an abstract base class for all byte streams.  It
+    defines a virtual interface and also provides useful functions.  These
+    files provide two subclasses. Class \Ref{ByteStream::Stdio} provides a
+    simple interface to the Ansi C buffered input/output functions. Class
+    \Ref{ByteStream::Memory} provides stream-like access to a dynamical array
+    maintained in memory. Class \Ref{ByteStream::Static} provides read-only
+    stream-like access to a user allocated data buffer.
+
+    {\bf Notes} --- These classes were partly written because we did not want to
+    depend on the standard C++ library.  The main reason however is related to
+    the browser interface. We want to have a tight control over the
+    implementation of subclasses because we want to use a byte stream to
+    represent data passed by a web browser to a plugin.  This operation
+    involves multi-threading issues that many implementations of the standard
+    C++ library would squarely ignore.
+
+    @memo 
+    Input/output classes
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation\\
+    Andrei Erofeev <eaf@geocities.com> -- 
+
+// From: Leon Bottou, 1/31/2002
+// This file has very little to do with my initial implementation.
+// It has been practically rewritten by Lizardtech for i18n changes.
+// Our original implementation consisted of multiple classes.
+// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+
+*/
+//@{
+
+
+#include "Arrays.h"
+#include <stdio.h>
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class GURL;
+class GUTF8String;
+class GNativeString;
+
+/** Abstract class for a stream of bytes.  Class #ByteStream# represent an
+    object from which (resp. to which) bytes can be read (resp. written) as
+    with a regular file.  Virtual functions #read# and #write# must implement
+    these two basic operations.  In addition, function #tell# returns an
+    offset identifying the current position, and function #seek# may be used
+    to change the current position.
+
+    {\bf Note}. Both the copy constructor and the copy operator are declared
+    as private members. It is therefore not possible to make multiple copies
+    of instances of this class, as implied by the class semantic.  
+*/
+class DJVUAPI ByteStream : public GPEnabled
+{
+public:
+  class Stdio;
+  class Static;
+  class Memory;
+  class Wrapper;
+  enum codepage_type {RAW,AUTO,NATIVE,UTF8} cp;
+
+  /** @name Virtual Functions.
+      These functions are usually implemented by each subclass of #ByteStream#.
+  */
+  //@{
+public:
+  /** Virtual destructor. */
+  virtual ~ByteStream();
+  /** Reads data from a ByteStream.  This function {\em must} be implemented
+      by each subclass of #ByteStream#.  At most #size# bytes are read from
+      the ByteStream and stored in the memory area pointed to by #buffer#.
+      Function #read# returns immediately if #size# is zero. The actual number
+      of bytes read is returned.  Function #read# returns a number of bytes
+      smaller than #size# if the end-of-file mark is reached before filling
+      the buffer. Subsequent invocations will always return value #0#.
+      Function #read# may also return a value greater than zero but smaller
+      than #size# for internal reasons. Programs must be ready to handle these
+      cases or use function \Ref{readall}. Exception \Ref{GException} is
+      thrown with a plain text error message whenever an error occurs. */
+  virtual size_t read(void *buffer, size_t size);
+  /** Writes data to a ByteStream.  This function {\em must} be implemented by
+      each subclass of #ByteStream#.  At most #size# bytes from buffer
+      #buffer# are written to the ByteStream.  Function #write# returns
+      immediately if #size# is zero.  The actual number of bytes written is
+      returned. Function #write# may also return a value greater than zero but
+      smaller than #size# for internal reasons. Programs must be ready to
+      handle these cases or use function \Ref{writall}. Exception
+      \Ref{GException} is thrown with a plain text error message whenever an
+      error occurs. */
+  virtual size_t write(const void *buffer, size_t size);
+  /** Returns the offset of the current position in the ByteStream.  This
+      function {\em must} be implemented by each subclass of #ByteStream#. */
+  virtual long tell(void) const  = 0;
+  /** Sets the current position for reading or writing the ByteStream.  Class
+      #ByteStream# provides a default implementation able to seek forward by
+      calling function #read# until reaching the desired position.  Subclasses
+      implementing better seek capabilities must override this default
+      implementation.  The new current position is computed by applying
+      displacement #offset# to the position represented by argument
+      #whence#. The following values are recognized for argument #whence#:
+      \begin{description}
+      \item[#SEEK_SET#] Argument #offset# indicates the position relative to
+      the beginning of the ByteStream.
+      \item[#SEEK_CUR#] Argument #offset# is a signed displacement relative to
+      the current position.
+      \item[#SEEK_END#] Argument #offset# is a displacement relative to the end
+      of the file. It is then advisable to provide a negative value for #offset#.
+      \end{description}
+      Results are undefined whenever the new position is greater than the
+      total size of the ByteStream.
+
+      {\bf Error reporting}:
+      If #seek()# succeeds, #0# is returned. Otherwise it either returns
+      #-1# (if #nothrow# is set to #FALSE#) or throws the \Ref{GException}
+      exception. */
+  virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false);
+  /** Flushes all buffers in the ByteStream.  Calling this function
+      guarantees that pending data have been actually written (i.e. passed to
+      the operating system). Class #ByteStream# provides a default
+      implementation which does nothing. */
+  virtual void flush(void);
+  //@}
+  /** @name Utility Functions.  
+      Class #ByteStream# implements these functions using the virtual
+      interface functions only.  All subclasses of #ByteStream# inherit these
+      functions. */
+  //@{
+public:
+  /** Reads data and blocks until everything has been read.  This function is
+      essentially similar to function #read#.  Unlike function #read# however,
+      function #readall# will never return a value smaller than #size# unless
+      an end-of-file mark is reached.  This is implemented by repeatedly
+      calling function #read# until everything is read or until we reach an
+      end-of-file mark.  Note that #read# and #readall# are equivalent when
+      #size# is one. */
+  size_t readall(void *buffer, size_t size);
+  /** Writes data and blocks until everything has been written.  This function
+      is essentially similar to function #write#.  Unlike function #write#
+      however, function #writall# will only return after all #size# bytes have
+      been written.  This is implemented by repeatedly calling function
+      #write# until everything is written.  Note that #write# and #writall#
+      are equivalent when #size# is one. */
+  size_t writall(const void *buffer, size_t size);
+  /** Copy data from another ByteStream.  A maximum of #size# bytes are read
+      from the ByteStream #bsfrom# and are written to the ByteStream #*this#
+      at the current position.  Less than #size# bytes may be written if an
+      end-of-file mark is reached on #bsfrom#.  This function returns the
+      total number of bytes copied.  Setting argument #size# to zero (the
+      default value) has a special meaning: the copying process will continue
+      until reaching the end-of-file mark on ByteStream #bsfrom#, regardless
+      of the number of bytes transferred.  */
+  size_t copy(ByteStream &bsfrom, size_t size=0);
+  /// Allows printf() type operations to a bytestream.
+  size_t format(const char *fmt, ... );
+  /// Allows scanf() type operations on a bytestream.
+  int scanf(const char *fmt, ... );
+  /** Writes the string as is, to the specified stream. */
+  size_t writestring(const GUTF8String &s);
+  /** Writes the string as is, to the specified stream. */
+  size_t writestring(const GNativeString &s);
+  /** Formats the message string, looks up the external representation
+      and writes it to the specified stream. */
+  void formatmessage( const char *fmt, ... );
+  /** Looks up the message and writes it to the specified stream. */
+  void writemessage( const char *message );
+  /** Writes a one-byte integer to a ByteStream. */
+  void write8 (unsigned int card8);
+  /** Writes a two-bytes integer to a ByteStream.
+      The integer most significant byte is written first,
+      regardless of the processor endianness. */
+  void write16(unsigned int card16);
+  /** Writes a three-bytes integer to a ByteStream.
+      The integer most significant byte is written first,
+      regardless of the processor endianness. */
+  void write24(unsigned int card24);
+  /** Writes a four-bytes integer to a ByteStream. 
+      The integer most significant bytes are written first,
+      regardless of the processor endianness. */
+  void write32(unsigned int card32);
+  /** Reads a one-byte integer from a ByteStream. */
+  unsigned int read8 ();
+  /** Reads a two-bytes integer from a ByteStream.
+      The integer most significant byte is read first,
+      regardless of the processor endianness. */
+  unsigned int read16();
+  /** Reads a three-bytes integer from a ByteStream.
+      The integer most significant byte is read first,
+      regardless of the processor endianness. */
+  unsigned int read24();
+  /** Reads a four-bytes integer from a ByteStream.
+      The integer most significant bytes are read first,
+      regardless of the processor endianness. */
+  unsigned int read32();
+  /** Returns the total number of bytes contained in the buffer, file, etc.
+      Valid offsets for function #seek# range from 0 to the value returned
+      by this function. */
+  virtual int size(void) const;
+  /// Use at your own risk, only guarenteed to work for ByteStream::Memorys.
+  TArray<char> get_data(void);
+  /** Reads data from a random position. This function reads at most #sz#
+      bytes at position #pos# into #buffer# and returns the actual number of
+      bytes read.  The current position is unchanged. */
+  virtual size_t readat(void *buffer, size_t sz, int pos);
+  //@}
+protected:
+  ByteStream(void) : cp(AUTO) {};
+private:
+  // Cancel C++ default stuff
+  ByteStream(const ByteStream &);
+  ByteStream & operator=(const ByteStream &);
+public:
+  /** Constructs an empty Memory ByteStream.  The buffer itself is organized
+      as an array of 4096 byte blocks.  The buffer is initially empty. You
+      must first use function #write# to store data into the buffer, use
+      function #seek# to rewind the current position, and function #read# to
+      read the data back. */
+  static GP<ByteStream> create(void);
+  /** Constructs a Memory ByteStream by copying initial data.  The
+      Memory buffer is initialized with #size# bytes copied from the
+      memory area pointed to by #buffer#. */
+  static GP<ByteStream> create(void const * const buffer, const size_t size);
+  /** Constructs a ByteStream for accessing the file named #url#.
+      Arguments #url# and #mode# are similar to the arguments of the well
+      known stdio function #fopen#. In addition a url of #-# will be
+      interpreted as the standard output or the standard input according to
+      #mode#.  This constructor will open a stdio file and construct a
+      ByteStream object accessing this file. Destroying the ByteStream object
+      will flush and close the associated stdio file.  Exception
+      \Ref{GException} is thrown with a plain text error message if the stdio
+      file cannot be opened. */
+  static GP<ByteStream> create(
+    const GURL &url, char const * const mode);
+  /** Same as the above, but uses stdin or stdout */
+  static GP<ByteStream> create( char const * const mode);
+
+  /** Constructs a ByteStream for accessing the stdio file #f#.
+      Argument #mode# indicates the type of the stdio file, as in the
+      well known stdio function #fopen#.  Destroying the ByteStream
+      object will not close the stdio file #f# unless closeme is true. */
+  static GP<ByteStream> create(
+    const int fd, char const * const mode, const bool closeme);
+
+  /** Constructs a ByteStream for accessing the stdio file #f#.
+      Argument #mode# indicates the type of the stdio file, as in the
+      well known stdio function #fopen#.  Destroying the ByteStream
+      object will not close the stdio file #f# unless closeme is true. */
+  static GP<ByteStream> create(
+    FILE * const f, char const * const mode, const bool closeme);
+  /** Creates a ByteStream object for allocating the memory area of
+      length #sz# starting at address #buffer#.  This call impliments 
+      a read-only ByteStream interface for a memory area specified by
+      the user at construction time. Calls to function #read# directly
+      access this memory area.  The user must therefore make sure that its
+      content remain valid long enough.  */
+  static GP<ByteStream> create_static(void const *buffer, size_t size);
+  
+  /** Easy access to preallocated stdin/stdout/stderr bytestreams */
+  static GP<ByteStream> get_stdin(char const * mode=0);
+  static GP<ByteStream> get_stdout(char const * mode=0);  
+  static GP<ByteStream> get_stderr(char const * mode=0);
+
+  /** This is the conventional name for EOF exceptions */
+  static const char *EndOfFile;
+  /** Returns the contents of the file as a GNativeString */
+  GNativeString getAsNative(void);
+  /** Returns the contents of the file as a GUTF8String */
+  GUTF8String getAsUTF8(void);
+};
+
+inline size_t
+ByteStream::readat(void *buffer, size_t sz, int pos)
+{
+  size_t retval;
+  long tpos=tell();
+  seek(pos, SEEK_SET, true);
+  retval=readall(buffer,sz);
+  seek(tpos, SEEK_SET, true);
+  return retval;
+}
+
+inline int
+ByteStream::size(void) const
+{
+  ByteStream *bs=const_cast<ByteStream *>(this);
+  int bsize=(-1);
+  long pos=tell();
+  if(bs->seek(0,SEEK_END,true))
+  {
+    bsize=(int)tell();
+    (void)(bs->seek(pos,SEEK_SET,false));
+  }
+  return bsize;
+}
+
+/** ByteStream::Wrapper implements wrapping bytestream.  This is useful
+    for derived classes that take a GP<ByteStream> as a creation argument,
+    and the backwards compatible bytestreams.  */
+class DJVUAPI ByteStream::Wrapper : public ByteStream
+{
+protected:
+  GP<ByteStream> gbs;
+  ByteStream *bs;
+  Wrapper(void) : bs(0) {}
+  Wrapper(const GP<ByteStream> &xbs) : gbs(xbs), bs(xbs) {}
+public:
+  ~Wrapper();
+  ByteStream * operator & () const {return bs;}
+  ByteStream * operator & () {return bs;}
+  virtual size_t read(void *buffer, size_t size)
+    { return bs->read(buffer,size); }
+  virtual size_t write(const void *buffer, size_t size)
+    { return bs->write(buffer,size); }
+  virtual long tell(void) const
+    { return bs->tell(); }
+  virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false)
+    { return bs->seek(offset,whence,nothrow); }
+  virtual void flush(void)
+    { bs->flush(); }
+};
+
+
+//@}
+
+// ------------ THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
diff --git a/libdjvu/DataPool.cpp b/libdjvu/DataPool.cpp
new file mode 100644
index 0000000..c1d1269
--- /dev/null
+++ b/libdjvu/DataPool.cpp
@@ -0,0 +1,1815 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DataPool.h"
+#include "IFFByteStream.h"
+#include "GString.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "debug.h"
+
+#ifndef macintosh
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+const char * DataPool::Stop = ERR_MSG("STOP");
+
+static void
+// call_callback(void (* callback)(GP<GPEnabled> &), GP<GPEnabled> cl_data)
+call_callback(void (* callback)(void *), void *cl_data)
+{
+   G_TRY
+   {
+      if (callback)
+        callback(cl_data);
+   } G_CATCH_ALL {} G_ENDCATCH;
+}
+
+
+//****************************************************************************
+//****************************** OpenFiles ***********************************
+//****************************************************************************
+
+#define MAX_OPEN_FILES	15
+
+/** The purpose of this class is to limit the number of files open by
+    connected DataPools. Now, when a DataPool is connected to a file, it
+    doesn't necessarily has it open. Every time it needs access to data
+    it's supposed to ask this file for the ByteStream. It should
+    also inform the class when it's going to die (so that the file can
+    be closed). OpenFiles makes sure, that the number of open files
+    doesn't exceed MAX_OPEN_FILES. When it does, it looks for the oldest
+    file, closes it and asks all DataPools working with it to ZERO
+    their GP<> pointers. */
+class DataPool::OpenFiles_File : public GPEnabled
+{
+public:
+  GURL			url;
+  GP<ByteStream>	        stream;		// Stream connected to 'url'
+  GCriticalSection		stream_lock;
+  GPList<DataPool>		pools_list;	// List of pools using this stream
+  GCriticalSection		pools_lock;
+  unsigned long		open_time;	// Time when stream was open
+  
+  int	add_pool(GP<DataPool> &pool);
+  int	del_pool(GP<DataPool> &pool);
+  
+  OpenFiles_File(const GURL &url, GP<DataPool> &pool);
+  virtual ~OpenFiles_File(void);
+  void clear_stream(void);
+};
+
+class DataPool::OpenFiles : public GPEnabled
+{
+private:
+   static OpenFiles	* global_ptr;
+
+   GPList<DataPool::OpenFiles_File>		files_list;
+   GCriticalSection	files_lock;
+public:
+   static OpenFiles	* get(void);
+
+      // Opend the specified file if necessary (or finds an already open one)
+      // and returns it. The caller (pool) is stored in the list associated
+      // with the stream. Whenever OpenFiles decides, that this stream
+      // had better be closed, it will order every pool from the list to
+      // ZERO their references to it
+   GP<DataPool::OpenFiles_File> request_stream(const GURL &url, GP<DataPool> pool);
+      // If there are more than MAX_STREAM_FILES open, close the oldest.
+   void		prune(void);
+      // Removes the pool from the list associated with the stream.
+      // If there is nobody else using this stream, the stream will
+      // be closed too.
+   void		stream_released(GP<ByteStream> &stream, GP<DataPool> pool);
+
+   void 	close_all(void);
+};
+
+DataPool::OpenFiles * DataPool::OpenFiles::global_ptr;
+
+DataPool::OpenFiles_File::OpenFiles_File(const GURL &xurl, GP<DataPool> &pool) : url(xurl)
+{
+   DEBUG_MSG("DataPool::OpenFiles_File::OpenFiles_File(): Opening file '" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   open_time=GOS::ticks();
+   stream=ByteStream::create(url,"rb");
+   add_pool(pool);
+}
+
+DataPool::OpenFiles_File::~OpenFiles_File(void)
+{
+   DEBUG_MSG("DataPool::OpenFiles_File::~OpenFiles_File(): Closing file '" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   clear_stream();
+}
+
+void
+DataPool::OpenFiles_File::clear_stream(void)
+{
+  GCriticalSectionLock lock(&pools_lock);
+  for(GPosition pos=pools_list;pos;++pos)
+    if(pools_list[pos])
+      pools_list[pos]->clear_stream(false);
+  pools_list.empty();
+}
+
+int
+DataPool::OpenFiles_File::add_pool(GP<DataPool> &pool)
+{
+   DEBUG_MSG("DataPool::OpenFiles_File::add_pool: pool=" << (void *) pool << "\n");
+   DEBUG_MAKE_INDENT(3);
+   GCriticalSectionLock lock(&pools_lock);
+   if (!pools_list.contains(pool))
+     pools_list.append(pool);
+   return pools_list.size();
+}
+
+int
+DataPool::OpenFiles_File::del_pool(GP<DataPool> &pool)
+{
+   DEBUG_MSG("DataPool::OpenFiles_File::del_pool: pool=" << (void *) pool << "\n");
+   DEBUG_MAKE_INDENT(3);
+   GCriticalSectionLock lock(&pools_lock);
+   GPosition pos;
+   if (pools_list.search(pool, pos))
+     pools_list.del(pos);
+   return pools_list.size();
+}
+
+inline DataPool::OpenFiles *
+DataPool::OpenFiles::get(void)
+{
+   DEBUG_MSG("DataPool::OpenFiles::get()\n");
+   DEBUG_MAKE_INDENT(3);
+   if (!global_ptr)
+     global_ptr=new OpenFiles();
+   return global_ptr;
+}
+
+void
+DataPool::OpenFiles::prune(void)
+{
+  DEBUG_MSG("DataPool::OpenFiles::prune(void): "<<files_list.size()<< "\n");
+  DEBUG_MAKE_INDENT(3);
+  while(files_list.size()>MAX_OPEN_FILES)
+    {
+      // Too many open files (streams). Get rid of the oldest one.
+      unsigned long oldest_time=GOS::ticks();
+      GPosition oldest_pos=files_list;
+      for(GPosition pos=files_list;pos;++pos)
+        {
+          if (files_list[pos]->open_time<oldest_time)
+            {
+              oldest_time=files_list[pos]->open_time;
+              oldest_pos=pos;
+            }
+        }
+      files_list[oldest_pos]->clear_stream();
+      files_list.del(oldest_pos);
+    }
+}
+
+//			  GP<ByteStream> & stream,
+//			  GCriticalSection ** stream_lock)
+GP<DataPool::OpenFiles_File>
+DataPool::OpenFiles::request_stream(const GURL &url, GP<DataPool> pool)
+{
+   DEBUG_MSG("DataPool::OpenFiles::request_stream(): url='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GP<DataPool::OpenFiles_File> file;
+
+      // Check: maybe the stream has already been open by request of
+      // another DataPool
+   GCriticalSectionLock lock(&files_lock);
+   for(GPosition pos=files_list;pos;++pos)
+   {
+      if (files_list[pos]->url==url)
+      {
+	 DEBUG_MSG("found existing stream\n");
+	 file=files_list[pos];
+	 break;
+      }
+   }
+
+      // No? Open the stream, but check, that there are not
+      // too many streams open
+   if (!file)
+   {
+      file=new DataPool::OpenFiles_File(url, pool);
+      files_list.append(file);
+      prune();
+   }
+   
+   file->add_pool(pool);
+   return file;
+}
+
+void
+DataPool::OpenFiles::stream_released(GP<ByteStream> &stream, GP<DataPool> pool)
+{
+   DEBUG_MSG("DataPool::OpenFiles::stream_release: stream=" 
+             << (void *)stream << " pool=" << (void *)pool << "\n");
+   DEBUG_MAKE_INDENT(3);
+   GCriticalSectionLock lock(&files_lock);
+   for(GPosition pos=files_list;pos;)
+   {
+     GPosition dpos = pos;
+     ++pos;
+     GP<DataPool::OpenFiles_File> f=files_list[dpos];
+     if ((ByteStream *)(f->stream) == (ByteStream *)stream)
+       if (f->del_pool(pool)==0)
+         files_list.del(dpos);
+   }
+}
+
+// This isn't really an accurate url.  The files are not really
+// closed.  Instead they are dereferenced from the data pool.  If
+// a there is another reference to the respective bytestream, it
+// will remain open until dereferenced.
+void
+DataPool::OpenFiles::close_all(void)
+{
+  DEBUG_MSG("DataPool::OpenFiles::close_all\n");
+  DEBUG_MAKE_INDENT(3);
+  GCriticalSectionLock lock(&files_lock);
+  files_list.empty();
+}
+
+//****************************************************************************
+//******************************** FCPools ***********************************
+//****************************************************************************
+
+/** This class is used to maintain a list of DataPools connected to a file.
+    It's important to have this list if we want to do something with this file
+    like to modify it or just erase. Since any modifications of the file
+    will break DataPools directly connected to it, it would be nice to have
+    a mechanism for signaling all the related DataPools to read data into
+    memory. This is precisely the purpose of this class. */
+class FCPools
+{
+private:
+   GMap<GURL, GPList<DataPool> >	map;	// GMap<GUTF8String, GPList<DataPool>> in fact
+   GCriticalSection		map_lock;
+
+   static FCPools	* global_ptr;
+public:
+   static FCPools *	get(void);
+      // Adds the <furl, pool> pair into the list
+   void		add_pool(const GURL &furl, GP<DataPool> pool);
+      // Removes the <furl, pool> pair from the list
+   void		del_pool(const GURL &furl, GP<DataPool> pool);
+      // Looks for the list of DataPools connected to 'furl' and makes
+      // each of them load the contents of the file into memory
+   void		load_file(const GURL &url);
+      // Retrieve a local URL, if available.
+   GP<DataPool> get_pool(const GURL &url, int start, int length);
+   void clean(void);
+};
+
+void
+FCPools::clean(void)
+{
+  GCriticalSectionLock lock(&map_lock);
+  static int count=0;
+  if(! count++)
+  {
+    bool restart = true;
+    while (restart)
+      {
+        restart = false;
+        for (GPosition posmap = map; posmap; ++posmap)
+          {
+            GPList<DataPool> *lst;
+            lst = & map[posmap];
+            if (lst->isempty())
+              {
+                map.del(posmap);
+                restart = true;
+                break;
+              }
+            for (GPosition poslst = *lst; poslst; ++poslst)
+              if ((*lst)[poslst]->get_count() < 2) 
+                {
+                  lst->del(poslst);
+                  restart = true;
+                  break;
+                }
+            if (restart)
+              break;
+          }
+      }
+  }
+  --count;
+}
+
+void
+FCPools::add_pool(const GURL &url, GP<DataPool> pool)
+{
+  DEBUG_MSG("FCPools::add_pool: url='" << url << "' pool=" << (void *)pool << "\n");
+  DEBUG_MAKE_INDENT(3);
+  GCriticalSectionLock lock(&map_lock);
+
+   if (url.is_local_file_url())
+   {
+      GPList<DataPool> list;
+      GPosition pos(map.contains(url));
+      if (! pos)
+      {
+        map[url]=list;
+        pos=map.contains(url);
+      }
+      GPList<DataPool> &plist=map[pos];
+      if (!plist.contains(pool))
+        plist.append(pool);
+   }
+  clean();
+}
+
+GP<DataPool>
+FCPools::get_pool(const GURL &url, int start, int length)
+{
+  DEBUG_MSG("FCPools::get_pool: url='" << url << "\n");
+  DEBUG_MAKE_INDENT(3);
+  GP<DataPool> retval;
+  if (url.is_local_file_url())
+  {
+    GCriticalSectionLock lock(&map_lock);
+    GPosition pos(map.contains(url));
+    if (pos)
+    {
+      GPList<DataPool> &plist=map[pos];
+      for(pos=plist;pos;++pos)
+      {
+        DataPool &pool=*plist[pos];
+        if(start == pool.start && (length < 0 || (length == pool.length)))
+        {
+          retval=plist[pos];
+          break;
+        }
+      }
+    }
+    clean();
+  }
+  return retval;
+}
+
+void
+FCPools::del_pool(const GURL &url, GP<DataPool> pool)
+{
+  DEBUG_MSG("FCPools::del_pool: url='" << url << "' pool=" << (void *)pool << "\n");
+  DEBUG_MAKE_INDENT(3);
+  GCriticalSectionLock lock(&map_lock);
+
+  clean();
+   if (url.is_local_file_url())
+   {
+      GPosition pos;
+      if (map.contains(url, pos))
+      {
+	 GPList<DataPool> &list=map[pos];
+	 GPosition list_pos;
+	 while(list.search(pool, list_pos))
+	    list.del(list_pos);
+	 if (list.isempty())
+	 {
+	    map.del(pos);
+	 }
+      }
+   }
+}
+
+void
+FCPools::load_file(const GURL &url)
+{
+  DEBUG_MSG("FCPools::load_file: url='" << url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  GCriticalSectionLock lock(&map_lock);
+   
+  clean();
+   if (url.is_local_file_url())
+   {
+      GPosition pos;
+      if (map.contains(url, pos))
+      {
+	    // We make here a copy of the list because DataPool::load_file()
+	    // will call FCPools::del_pool(), which will modify the list
+	 GPList<DataPool> list=map[pos];
+	 for(GPosition list_pos=list;list_pos;++list_pos)
+	    list[list_pos]->load_file();
+      }
+   }
+}
+
+FCPools	* FCPools::global_ptr;
+
+inline FCPools *
+FCPools::get(void)
+{
+   if (!global_ptr)
+     global_ptr=new FCPools();
+   return global_ptr;
+}
+
+//****************************************************************************
+//****************************** BlockList ***********************************
+//****************************************************************************
+
+// Since data can be added to the DataPool at any offset now, there may
+// be white spots, which contain illegal data. This class is to contain
+// the list of valid and invalid regions.
+// The class is basically a list of integers. Abs(integer)=size of the
+// block. If the integer is positive, data for the block is known.
+// Otherwise it's unkown.
+
+class DataPool::BlockList
+{
+         // See comments in .cpp file.
+private:
+   GCriticalSection  lock;
+   GList<int>        list;
+public:
+   BlockList() {};
+   void              clear(void);
+   void              add_range(int start, int length);
+   int               get_bytes(int start, int length) const;
+   int               get_range(int start, int length) const;
+friend class DataPool;
+};
+
+void
+DataPool::BlockList::clear(void)
+{
+  DEBUG_MSG("DataPool::BlockList::clear()\n");
+  DEBUG_MAKE_INDENT(3);
+   GCriticalSectionLock lk(&lock);
+   list.empty();
+}
+
+void
+DataPool::BlockList::add_range(int start, int length)
+      // Adds range of known data.
+{
+  DEBUG_MSG("DataPool::BlockList::add_range: start=" << start << " length=" << length << "\n");
+  DEBUG_MAKE_INDENT(3);
+   if (start<0)
+     G_THROW( ERR_MSG("DataPool.neg_start") );
+   if (length<=0)
+     G_THROW( ERR_MSG("DataPool.bad_length") );
+   if (length>0)
+   {
+      GCriticalSectionLock lk(&lock);
+
+	 // Look thru existing zones, change their sign and split if
+	 // necessary.
+      GPosition pos=list;
+      int block_start=0, block_end=0;
+      while(pos && block_start<start+length)
+      {
+	 int size=list[pos];
+	 block_end=block_start+abs(size);
+	 if (size<0)
+	   {
+	     if (block_start<start)
+	       {
+		 if (block_end>start && block_end<=start+length)
+		   {
+		     list[pos]=-(start-block_start);
+		     list.insert_after(pos, block_end-start);
+		     ++pos;
+		     block_start=start;
+		   } else if (block_end>start+length)
+		   {
+		     list[pos]=-(start-block_start);
+		     list.insert_after(pos, length);
+		     ++pos;
+		     list.insert_after(pos, -(block_end-(start+length)));
+		     ++pos;
+		     block_start=start+length;
+		   }
+	       } else if (block_start>=start && block_start<start+length)
+	       {
+		 if (block_end<=start+length) list[pos]=abs(size);
+		 else
+		   {
+		     list[pos]=start+length-block_start;
+		     list.insert_after(pos, -(block_end-(start+length)));
+		     ++pos;
+		     block_start=start+length;
+		   }
+	       }
+	   }
+	 block_start=block_end;
+	 ++pos;
+      }
+      if (block_end<start)
+      {
+	 list.append(-(start-block_end));
+	 list.append(length);
+      } else if (block_end<start+length) list.append(start+length-block_end);
+
+	 // Now merge adjacent areas with the same sign
+      pos=list;
+      while(pos)
+      {
+	 GPosition pos1=pos; ++pos1;
+	 while(pos1)
+	   {
+	     if ( (list[pos]<0 && list[pos1]>0) ||
+		  (list[pos]>0 && list[pos1]<0) )
+	       break;
+	     list[pos]+=list[pos1];
+	     GPosition this_pos=pos1;
+	     ++pos1;
+	     list.del(this_pos);
+	   }
+	 pos=pos1;
+      }
+   } // if (length>0)
+}
+
+int
+DataPool::BlockList::get_bytes(int start, int length) const
+      // Returns the number of bytes of data available in the range
+      // [start, start+length[. There may be holes between data chunks
+{
+  DEBUG_MSG("DataPool::BlockList::get_bytes: start=" << start << " length=" << length << "\n");
+  DEBUG_MAKE_INDENT(3);
+
+   if (length<0)
+     G_THROW( ERR_MSG("DataPool.bad_length") );
+
+   GCriticalSectionLock lk((GCriticalSection *) &lock);
+   int bytes=0;
+   int block_start=0, block_end=0;
+   for(GPosition pos=list;pos && block_start<start+length;++pos)
+   {
+      int size=list[pos];
+      block_end=block_start+abs(size);
+      if (size>0)
+	{
+	  if (block_start<start)
+	    {
+	      if (block_end>=start && block_end<start+length)
+		bytes+=block_end-start;
+	      else if (block_end>=start+length)
+		bytes+=length;
+	    }
+	  else
+	    {
+	      if (block_end<=start+length)
+		bytes+=block_end-block_start;
+	      else bytes+=start+length-block_start;
+	    }
+	}
+      block_start=block_end;
+   }
+   return bytes;
+}
+
+int
+DataPool::BlockList::get_range(int start, int length) const
+      // Finds a range covering offset=start and returns the length
+      // of intersection of this range with [start, start+length[
+      // 0 is returned if nothing can be found
+{
+  DEBUG_MSG("DataPool::BlockList::get_range: start=" << start << " length=" << length << "\n");
+  DEBUG_MAKE_INDENT(3);
+   if (start<0)
+     G_THROW( ERR_MSG("DataPool.neg_start") );
+   if (length<=0)
+      G_THROW( ERR_MSG("DataPool.bad_length") );
+
+   GCriticalSectionLock lk((GCriticalSection *) &lock);
+   int block_start=0, block_end=0;
+   for(GPosition pos=list;pos && block_start<start+length;++pos)
+     {
+       int size=list[pos];
+       block_end=block_start+abs(size);
+       if (block_start<=start && block_end>start)
+	 {
+	   if (size<0)
+	     return -1;
+	   else if (block_end>start+length)
+	     return length;
+	   else
+	     return block_end-start;
+	 }
+       block_start=block_end;
+     }
+   return 0;
+}
+
+//****************************************************************************
+//******************************* DataPool ***********************************
+//****************************************************************************
+
+class DataPool::Reader : public GPEnabled
+{
+public:
+   GEvent event;
+   bool reenter_flag;
+   int  offset;
+   int  size;
+   Reader() : reenter_flag(false), offset(0), size(-1){};
+   Reader(int offset_in, int size_in=-1) :
+   reenter_flag(false), offset(offset_in), size(size_in) {};
+   virtual ~Reader() {};
+};
+
+class DataPool::Trigger : public GPEnabled
+{
+public:
+   GSafeFlags disabled;
+   int  start, length;
+//   void (* callback)(GP<GPEnabled> &);
+   void (* callback)(void *);
+//   GP<GPEnabled> cl_data;
+   void *cl_data;
+
+   Trigger() : start(0), length(-1), callback(0), cl_data(0) {};
+   Trigger(int xstart, int xlength,
+//   void (* xcallback)(GP<GPEnabled> &), GP<GPEnabled> xcl_data) :
+   void (* xcallback)(void *), void *xcl_data) :
+      start(xstart), length(xlength), callback(xcallback), cl_data(xcl_data) {};
+   virtual ~Trigger() {};
+};
+
+class DataPool::Counter
+{
+private:
+   int               counter;
+   GCriticalSection  lock;
+public:
+   Counter() : counter(0) {};
+   operator int(void) const;
+   void              inc(void);
+   void              dec(void);
+};
+
+#define DATAPOOL_INIT eof_flag(false),stop_flag(false), \
+    stop_blocked_flag(false), \
+    add_at(0),start(0),length(-1)
+
+void
+DataPool::init(void)
+{
+  DEBUG_MSG("DataPool::init(): Initializing\n");
+  DEBUG_MAKE_INDENT(3);
+  start=0; length=-1; add_at=0;
+  eof_flag=false;
+  stop_flag=false;
+  stop_blocked_flag=false;
+
+  active_readers=new Counter;
+  block_list=0;
+  G_TRY
+  {   
+    block_list=new BlockList;
+    data=ByteStream::create();
+  }
+  G_CATCH_ALL
+  {
+    delete block_list;
+    block_list=0;
+    delete active_readers;
+    active_readers=0;
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+DataPool::DataPool(void) : DATAPOOL_INIT {}
+
+GP<DataPool>
+DataPool::create(void)
+{
+  DEBUG_MSG("DataPool::DataPool()\n");
+  DEBUG_MAKE_INDENT(3);
+  DataPool *pool=new DataPool();
+
+  GP<DataPool> retval=pool;
+  pool->init();
+
+      // If we maintain the data ourselves, we want to interpret its
+      // IFF structure to predict its length
+  pool->add_trigger(0, 32, static_trigger_cb, pool);
+  return retval;
+}
+
+GP<DataPool> 
+DataPool::create(const GP<ByteStream> &gstr)
+{
+  DEBUG_MSG("DataPool::create: str="<<(ByteStream *)gstr<<"\n");
+  DEBUG_MAKE_INDENT(3);
+  DataPool *pool=new DataPool();
+  GP<DataPool> retval=pool;
+  pool->init();
+
+  // It's nice to have IFF data analyzed in this case too.
+  pool->add_trigger(0, 32, static_trigger_cb, pool);
+
+  char buffer[1024];
+  int length;
+  while((length=gstr->read(buffer, 1024)))
+    pool->add_data(buffer, length);
+  pool->set_eof();
+
+  return retval;
+}
+
+GP<DataPool>
+DataPool::create(const GP<DataPool> & pool, int start, int length)
+{
+  DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << " start=" << start << " length= " << length << "\n");
+  DEBUG_MAKE_INDENT(3);
+
+  DataPool *xpool=new DataPool();
+  GP<DataPool> retval=xpool;
+  xpool->init();
+  xpool->connect(pool, start, length);
+  return retval;
+}
+
+GP<DataPool>
+DataPool::create(const GURL &furl, int start, int length)
+{
+  DEBUG_MSG("DataPool::DataPool: furl='" << furl << "' start=" << start << " length= " << length << "\n");
+  DEBUG_MAKE_INDENT(3);
+
+  GP<DataPool> retval=FCPools::get()->get_pool(furl,start,length);
+  if(! retval)
+  {
+    DataPool *pool=new DataPool();
+    retval=pool;
+    pool->init();
+    pool->connect(furl, start, length);
+  }
+  return retval;
+}
+
+void
+DataPool::clear_stream(const bool release)
+{
+  DEBUG_MSG("DataPool::clear_stream()\n");
+  DEBUG_MAKE_INDENT(3);
+  if(fstream)
+  {
+    GCriticalSectionLock lock1(&class_stream_lock);
+    GP<OpenFiles_File> f=fstream;
+    if(f)
+    {
+      GCriticalSectionLock lock2(&(f->stream_lock));
+      fstream=0;
+      if(release)
+        OpenFiles::get()->stream_released(f->stream, this);
+    }
+  }
+}
+
+DataPool::~DataPool(void)
+{
+  DEBUG_MSG("DataPool::~DataPool()\n");
+  DEBUG_MAKE_INDENT(3);
+
+  clear_stream(true);
+  if (furl.is_local_file_url())
+    if (this->get_count() > 1)
+      FCPools::get()->del_pool(furl, this);
+  
+  GP<DataPool> pool = this->pool;
+  {
+	 // Wait until the static_trigger_cb() exits
+      GCriticalSectionLock lock(&trigger_lock);
+      if (pool)
+        pool->del_trigger(static_trigger_cb, this);
+      del_trigger(static_trigger_cb, this);
+  }
+  if (pool)
+  {
+      GCriticalSectionLock lock(&triggers_lock);
+      for(GPosition pos=triggers_list;pos;++pos)
+      {
+	 GP<Trigger> trigger=triggers_list[pos];
+	 pool->del_trigger(trigger->callback, trigger->cl_data);
+      }
+  }
+  delete block_list;
+  delete active_readers;
+}
+
+void
+DataPool::connect(const GP<DataPool> & pool_in, int start_in, int length_in)
+{
+   DEBUG_MSG("DataPool::connect(): connecting to another DataPool\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   if (pool) G_THROW( ERR_MSG("DataPool.connected1") );
+   if (furl.is_local_file_url()) G_THROW( ERR_MSG("DataPool.connected2") );
+   if (start_in<0) G_THROW( ERR_MSG("DataPool.neg_start") );
+
+   pool=pool_in;
+   start=start_in;
+   length=length_in;
+
+      // The following will work for length<0 too
+   if (pool->has_data(start, length))
+     eof_flag=true;
+   else
+     pool->add_trigger(start, length, static_trigger_cb, this);
+
+   data=0;
+
+   wake_up_all_readers();
+   
+      // Pass registered trigger callbacks to the DataPool
+   GCriticalSectionLock lock(&triggers_lock);
+   for(GPosition pos=triggers_list;pos;++pos)
+   {
+      GP<Trigger> t=triggers_list[pos];
+      int tlength=t->length;
+      if (tlength<0 && length>0)
+        tlength=length-t->start;
+      pool->add_trigger(start+t->start, tlength, t->callback, t->cl_data);
+   }
+}
+
+void
+DataPool::connect(const GURL &furl_in, int start_in, int length_in)
+{
+   DEBUG_MSG("DataPool::connect(): connecting to a file\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   if (pool)
+     G_THROW( ERR_MSG("DataPool.connected1") );
+   if (furl.is_local_file_url())
+     G_THROW( ERR_MSG("DataPool.connected2") );
+   if (start_in<0)
+     G_THROW( ERR_MSG("DataPool.neg_start") );
+
+
+   if (furl_in.name() == "-")
+   {
+      DEBUG_MSG("This is stdin => just read the data...\n");
+      DEBUG_MAKE_INDENT(3);
+      char buffer[1024];
+      int length;
+      GP<ByteStream> gstr=ByteStream::create(furl_in, "rb");
+      ByteStream &str=*gstr;
+      while((length=str.read(buffer, 1024)))
+	 add_data(buffer, length);
+      set_eof();
+   } else if(furl_in.is_local_file_url())
+   {
+	 // Open the stream (just in this function) too see if
+	 // the file is accessible. In future we will be using 'OpenFiles'
+	 // to request and release streams
+      GP<ByteStream> str=ByteStream::create(furl_in,"rb");
+      str->seek(0, SEEK_END);
+      int file_size=str->tell();
+
+      furl=furl_in;
+      start=start_in;
+      length=length_in;
+      if (start>=file_size)
+        length=0;
+      else if (length<0 || start+length>=file_size)
+        length=file_size-start;
+      
+      eof_flag=true;
+      data=0;
+      
+      FCPools::get()->add_pool(furl, this);
+
+      wake_up_all_readers();
+   
+	 // Call every trigger callback
+      GCriticalSectionLock lock(&triggers_lock);
+      for(GPosition pos=triggers_list;pos;++pos)
+      {
+	 GP<Trigger> t=triggers_list[pos];
+	 call_callback(t->callback, t->cl_data);
+      }
+      triggers_list.empty();
+   }
+}
+
+int
+DataPool::get_length(void) const
+{
+      // Not connected and length has been guessed
+      // Or connected to a file
+      // Or connected to a pool, but length was preset
+   int retval=(-1);
+   if (length>=0) 
+   {
+     retval=length;
+   }else if (pool)
+   {
+      int plength=pool->get_length();
+      if (plength>=0)
+        retval=plength-start;
+   }
+   return retval;
+}
+
+int
+DataPool::get_size(int dstart, int dlength) const
+{
+   if (dlength<0 && length>0)
+   {
+      dlength=length-dstart;
+      if (dlength<0) return 0;
+   }
+   
+   GP<DataPool> pool = this->pool;
+   if (pool) 
+     return pool->get_size(start+dstart, dlength);
+   else if (furl.is_local_file_url())
+   {
+      if (start+dstart+dlength>length) return length-(start+dstart);
+      else return dlength;
+   } else
+   {
+      if (dlength<0)
+      {
+	 GCriticalSectionLock lock((GCriticalSection *) &data_lock);
+	 dlength=data->size()-dstart;
+      }
+      return (dlength<0)?0:(block_list->get_bytes(dstart, dlength));
+   }
+}
+
+void
+DataPool::add_data(const void * buffer, int size)
+      // This function adds data sequentially at 'add_at' position
+{
+   DEBUG_MSG("DataPool::add_data(): adding " << size << " bytes of data...\n");
+   DEBUG_MAKE_INDENT(3);
+
+   add_data(buffer, add_at, size);
+   add_at+=size;
+}
+
+void
+DataPool::add_data(const void * buffer, int offset, int size)
+{
+   DEBUG_MSG("DataPool::add_data(): adding " << size << " bytes at pos=" <<
+	     offset << "...\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (furl.is_local_file_url() || pool)
+      G_THROW( ERR_MSG("DataPool.add_data") );
+   
+      // Add data to the data storage
+   {
+      GCriticalSectionLock lock(&data_lock);
+      if (offset>data->size())
+      {
+	 char ch=0;
+	 data->seek(0, SEEK_END);
+	 for(int i=data->size();i<offset;i++)
+	    data->write(&ch, 1);
+      } else
+      {
+	 data->seek(offset, SEEK_SET);
+	 data->writall(buffer, size);
+      }
+   }
+
+   added_data(offset, size);
+}
+
+void
+DataPool::added_data(const int offset, const int size)
+{
+     // Modify map of blocks
+  block_list->add_range(offset, size);
+   
+     // Wake up all threads, which may be waiting for this data
+  {
+    GCriticalSectionLock lock(&readers_lock);
+    for(GPosition pos=readers_list;pos;++pos)
+    {
+      GP<Reader> reader=readers_list[pos];
+      if (block_list->get_bytes(reader->offset, 1))
+      {
+        DEBUG_MSG("waking up reader: offset=" << reader->offset <<
+          ", size=" << reader->size << "\n");
+        DEBUG_MAKE_INDENT(3);
+        reader->event.set();
+      }
+    }
+  }
+
+    // And call triggers
+  check_triggers();
+
+      // Do not undo the following two lines. The reason why we need them
+      // here is the connected DataPools, which use 'length' (more exactly
+      // has_data()) to see if they have all data required. So, right after
+      // all data has been added to the master DataPool, but before EOF
+      // is set, the master and slave DataPools disagree regarding if
+      // all data is there or not. These two lines solve the problem
+  GCriticalSectionLock lock(&data_lock);
+  if (length>=0 && data->size()>=length)
+    set_eof();
+}
+
+bool
+DataPool::has_data(int dstart, int dlength)
+{
+   if (dlength<0 && length>0)
+     dlength=length-dstart;
+   return (pool?(pool->has_data(start+dstart, dlength))
+     :((furl.is_local_file_url())?(start+dstart+dlength<=length)
+       :((dlength<0)?is_eof()
+         :(block_list->get_bytes(dstart, dlength)==dlength))));
+}
+
+int
+DataPool::get_data(void * buffer, int offset, int sz)
+{
+   return get_data(buffer, offset, sz, 0);
+}
+
+class DataPool::Incrementor
+{
+private:
+   Counter      & counter;
+public:
+   Incrementor(Counter & xcounter) : counter(xcounter) {counter.inc();}
+   ~Incrementor() {counter.dec();}
+};
+
+int
+DataPool::get_data(void * buffer, int offset, int sz, int level)
+{
+   DEBUG_MSG("DataPool::get_data()\n");
+   DEBUG_MAKE_INDENT(3);
+   Incrementor inc(*active_readers);
+   
+   if (stop_flag)
+     G_THROW( DataPool::Stop );
+   if (stop_blocked_flag && !is_eof() &&
+       !has_data(offset, sz))
+     G_THROW( DataPool::Stop );
+   
+   if (sz < 0)
+     G_THROW( ERR_MSG("DataPool.bad_size") );
+   
+   if (! sz)
+     return 0;
+
+   GP<DataPool> pool = this->pool;
+   if (pool)
+     {
+       DEBUG_MSG("DataPool::get_data(): from pool\n");
+       DEBUG_MAKE_INDENT(3);
+       int retval=0;
+       if (length>0 && offset+sz>length)
+	 sz=length-offset;
+       if (sz<0)
+	 sz=0;
+       for(;;)
+	 {
+	   // Ask the underlying (master) DataPool for data. Note, that
+	   // master DataPool may throw the "DATA_POOL_REENTER" exception
+	   // demanding all readers to restart. This happens when
+	   // a DataPool in the chain of DataPools stops. All readers
+	   // should return to the most upper level and then reenter the
+	   // DataPools hierarchy. Some of them will be stopped by
+	   // DataPool::Stop exception.
+	   G_TRY
+	     {
+	       if(stop_flag
+		  || (stop_blocked_flag && !is_eof() && !has_data(offset, sz)))
+		 G_THROW( DataPool::Stop );
+	       retval=pool->get_data(buffer, start+offset, sz, level+1);
+	     }
+	   G_CATCH(exc)
+	   {
+	     pool->clear_stream(true);
+	     if ((exc.get_cause() != GUTF8String(ERR_MSG("DataPool.reenter")))
+		 || level)
+	       G_RETHROW;
+	   } G_ENDCATCH;
+	   pool->clear_stream(true);
+	   return retval;
+	 }
+     }
+   else if (furl.is_local_file_url())
+     {
+       DEBUG_MSG("DataPool::get_data(): from file\n");
+       DEBUG_MAKE_INDENT(3);
+       if (length>0 && offset+sz>length)
+	 sz=length-offset;
+       if (sz<0)
+         sz=0;
+       
+       GP<OpenFiles_File> f=fstream;
+       if (!f)
+         {
+           GCriticalSectionLock lock(&class_stream_lock);
+           f=fstream;
+           if(!f)
+             {
+               fstream=f=OpenFiles::get()->request_stream(furl, this);
+             }
+         }
+       GCriticalSectionLock lock2(&(f->stream_lock));
+       f->stream->seek(start+offset, SEEK_SET); 
+       return f->stream->readall(buffer, sz);
+     } 
+   else
+     {
+       DEBUG_MSG("DataPool::get_data(): direct\n");
+       DEBUG_MAKE_INDENT(3);
+       // We're not connected to anybody => handle the data
+       int size=block_list->get_range(offset, sz);
+       if (size>0)
+         {
+           // Hooray! Some data is there
+           GCriticalSectionLock lock(&data_lock);
+           data->seek(offset, SEEK_SET);
+           return data->readall(buffer, size);
+         }
+       
+       // No data available.
+       
+       // If there is no data and nothing else is expected, we can do
+       // two things: throw ByteStream::EndOfFile exception or return ZERO bytes.
+       // The exception is for the cases when the data flow has been
+       // terminated in the middle. ZERO bytes is for regular read() beyond
+       // the boundaries of legal data. The problem is to distinguish
+       // these two cases. We do it here with the help of analysis of the
+       // IFF structure of the data (which sets the 'length' variable).
+       // If we attempt to read beyond the [0, length[, ZERO bytes will be
+       // returned. Otherwise an ByteStream::EndOfFile exception will be thrown.
+       if (eof_flag)
+         {
+           if (length>0 && offset<length) 
+             {
+               G_THROW( ByteStream::EndOfFile );
+             }
+           else 
+             {
+               return 0;
+             }
+         } 
+       // Some data is still expected => add this reader to the
+       // list of readers and call virtual wait_for_data()
+       DEBUG_MSG("DataPool::get_data(): There is no data in the pool.\n");
+       DEBUG_MSG("offset=" << offset << ", size=" << sz <<
+                 ", data_size=" << data->size() << "\n");
+       GP<Reader> reader=new Reader(offset, sz);
+       G_TRY 
+         {
+           {
+             GCriticalSectionLock slock(&readers_lock);
+             readers_list.append(reader);
+           }
+           wait_for_data(reader);
+         } 
+       G_CATCH_ALL 
+         {
+           {
+             GCriticalSectionLock slock(&readers_lock);
+             GPosition pos;
+             if (readers_list.search(reader, pos)) readers_list.del(pos);
+           }
+           G_RETHROW;
+         } 
+       G_ENDCATCH;
+       
+       {
+         GCriticalSectionLock slock(&readers_lock);
+         GPosition pos;
+         if (readers_list.search(reader, pos)) readers_list.del(pos);
+       }
+       
+       // This call to get_data() should return immediately as there MUST
+       // be data in the buffer after wait_for_data(reader) returns
+       // or eof_flag should be TRUE
+       return get_data(buffer, reader->offset, reader->size, level);
+     }
+   return 0;
+}
+
+void
+DataPool::wait_for_data(const GP<Reader> & reader)
+      // This function may NOT return until there is some data for the
+      // given reader in the internal buffer
+{
+   DEBUG_MSG("DataPool::wait_for_data(): waiting for data at offset=" << reader->offset <<
+	     ", length=" << reader->size << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   for(;;)
+   {
+      if (stop_flag)
+        G_THROW( DataPool::Stop );
+      if (reader->reenter_flag)
+        G_THROW( ERR_MSG("DataPool.reenter") );
+      if (eof_flag || block_list->get_bytes(reader->offset, 1))
+        return;
+      if (pool || furl.is_local_file_url())
+        return;
+
+      if (stop_blocked_flag)
+        G_THROW( DataPool::Stop );
+
+      DEBUG_MSG("calling event.wait()...\n");
+      reader->event.wait();
+   }
+   
+   DEBUG_MSG("Got some data to read\n");
+}
+
+void
+DataPool::wake_up_all_readers(void)
+{
+   DEBUG_MSG("DataPool::wake_up_all_readers(): waking up all readers\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock(&readers_lock);
+   for(GPosition pos=readers_list;pos;++pos)
+      readers_list[pos]->event.set();
+}
+
+void
+DataPool::set_eof(void)
+      // Has no effect on connected DataPools
+{
+   if (!furl.is_local_file_url() && !pool)
+   {
+      eof_flag=true;
+      
+	 // Can we set the length now?
+      if (length<0)
+      {
+	 GCriticalSectionLock lock(&data_lock);
+	 length=data->size();
+      }
+
+	 // Wake up all readers to let them rescan the flags
+      wake_up_all_readers();
+   
+	 // Activate all trigger callbacks with negative threshold
+      check_triggers();
+   }
+}
+
+void
+DataPool::stop(bool only_blocked)
+{
+   DEBUG_MSG("DataPool::stop(): Stopping this and dependent DataPools, only_blocked="
+	     << only_blocked << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (only_blocked) stop_blocked_flag=true;
+   else stop_flag=true;
+   
+
+   wake_up_all_readers();
+
+      // Now let all readers, which already go thru to the master DataPool,
+      // come back and reenter. While reentering some of them will go
+      // thru this DataPool again and will be stopped (DataPool::Stop exception)
+      // Others (which entered the master DataPool thru other slave DataPools)
+      // will simply continue waiting for their data.
+   GP<DataPool> pool = this->pool;
+   if (pool)
+   {
+	 // This loop is necessary because there may be another thread, which
+	 // is going down thru the DataPool chain and did not reach the
+	 // lowest "master" DataPool yet. Since it didn't reach it yet,
+	 // the "pool->restart_readers()" will not restart it. So we're going
+	 // to continue issuing this command until we get rid of all
+	 // "active_readers"
+      while(*active_readers)
+        pool->restart_readers();
+   }
+}
+
+void
+DataPool::restart_readers(void)
+{
+   DEBUG_MSG("DataPool::restart_readers(): telling all readers to reenter\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   GCriticalSectionLock slock(&readers_lock);
+   for(GPosition pos=readers_list;pos;++pos)
+   {
+      GP<Reader> reader=readers_list[pos];
+      reader->reenter_flag=true;
+      reader->event.set();
+   }
+      
+   if (pool)
+     pool->restart_readers();
+}
+
+void
+DataPool::load_file(void)
+{
+   DEBUG_MSG("DataPool::load_file() called\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (pool)
+   {
+      DEBUG_MSG("passing the request down.\n");
+      pool->load_file();
+   } else if (furl.is_local_file_url())
+   {
+      DEBUG_MSG("loading the data from \""<<(const char *)furl<<"\".\n");
+
+      GCriticalSectionLock lock1(&class_stream_lock);
+      GP<OpenFiles_File> f=fstream;
+      if (!f)
+      {
+        fstream=f=OpenFiles::get()->request_stream(furl, this);
+      }
+      {  // Scope to de-allocate lock2 before stream gets released
+         GCriticalSectionLock lock2(&(f->stream_lock));
+
+         data=ByteStream::create();
+         block_list->clear();
+         FCPools::get()->del_pool(furl, this);
+         furl=GURL();
+
+         const GP<ByteStream> gbs = f->stream;
+         gbs->seek(0, SEEK_SET);
+         
+         char buffer[1024];
+         int length;
+         while((length = f->stream->read(buffer, 1024)))
+           add_data(buffer, length);
+         set_eof();
+         
+         OpenFiles::get()->stream_released(f->stream, this);
+      }
+      fstream=0;
+   } else DEBUG_MSG("Not connected\n");
+}
+
+void
+DataPool::load_file(const GURL &url )
+{
+   FCPools::get()->load_file(url);
+}
+
+void
+DataPool::check_triggers(void)
+      // This function is for not connected DataPools only
+{
+  DEBUG_MSG("DataPool::check_triggers(): calling activated trigger callbacks.\n");
+  DEBUG_MAKE_INDENT(3);
+
+  if (!pool && !furl.is_local_file_url())
+    while(true)
+      {
+	GP<Trigger> trigger;
+
+	// First find a candidate (trigger, which needs to be called)
+	// Don't remove it from the list yet. del_trigger() should
+	// be able to find it if necessary and disable.
+	{
+	  GCriticalSectionLock list_lock(&triggers_lock);
+	  for(GPosition pos=triggers_list;pos;++pos)
+	    {
+	      GP<Trigger> t=triggers_list[pos];
+	      if (is_eof()
+		  || (t->length>=0 &&
+		      block_list->get_bytes(t->start, t->length)==t->length))
+		{
+		  trigger=t;
+		  break;
+		}
+	    }
+	}
+
+	if (trigger)
+	  {
+	    // Now check that the trigger is not disabled
+	    // and lock the trigger->disabled lock for the duration
+	    // of the trigger. This will block the del_trigger() and
+	    // will postpone client's destruction (usually following
+	    // the call to del_trigger())
+	    {
+	      GMonitorLock lock(&trigger->disabled);
+	      if (!trigger->disabled)
+		call_callback(trigger->callback, trigger->cl_data);
+	    }
+
+	    // Finally - remove the trigger from the list.
+	    GCriticalSectionLock list_lock(&triggers_lock);
+	    for(GPosition pos=triggers_list;pos;++pos)
+	      if (triggers_list[pos]==trigger)
+		{
+		  triggers_list.del(pos);
+		  break;
+		}
+	  } else break;
+      }
+}
+
+void
+DataPool::add_trigger(int thresh, void (* callback)(void *), void * cl_data)
+{
+  if (thresh>=0)
+    add_trigger(0, thresh+1, callback, cl_data);
+  else
+    add_trigger(0, -1, callback, cl_data);
+}
+
+void
+DataPool::add_trigger(int tstart, int tlength,
+		      void (* callback)(void *), void * cl_data)
+{
+   DEBUG_MSG("DataPool::add_trigger(): start=" << tstart <<
+	     ", length=" << tlength << ", func=" << (void *) callback << "\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   if (callback)
+   {
+      if (is_eof())
+      {
+        call_callback(callback, cl_data);
+      }else
+      {
+         GP<DataPool> pool = this->pool;
+	 if (pool)
+	 {
+	       // We're connected to a DataPool
+	       // Just pass the triggers down remembering it in the list
+	    if (tlength<0 && length>0) tlength=length-tstart;
+	    GP<Trigger> trigger=new Trigger(tstart, tlength, callback, cl_data);
+	    pool->add_trigger(start+tstart, tlength, callback, cl_data);
+	    GCriticalSectionLock lock(&triggers_lock);
+	    triggers_list.append(trigger);
+	 } 
+         else if (!furl.is_local_file_url())
+	 {
+	       // We're not connected to anything and maintain our own data
+	    if (tlength>=0 && block_list->get_bytes(tstart, tlength)==tlength)
+	       call_callback(callback, cl_data);
+	    else
+	    {
+              GP<Trigger> trigger=new Trigger(tstart, tlength, callback, cl_data);
+              GCriticalSectionLock lock(&triggers_lock);
+              triggers_list.append(trigger);
+	    }
+	 }
+      }
+   }
+}
+
+void
+DataPool::del_trigger(void (* callback)(void *), void * cl_data)
+{
+   DEBUG_MSG("DataPool::del_trigger(): func=" << (void *) callback << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   for(;;)
+   {
+      GP<Trigger> trigger;
+      {
+	 GCriticalSectionLock lock(&triggers_lock);
+	 for(GPosition pos=triggers_list;pos;)
+	 {
+	    GP<Trigger> t=triggers_list[pos];
+	    if (t->callback==callback && t->cl_data==cl_data)
+	    {
+	       trigger=t;
+	       GPosition this_pos=pos;
+	       ++pos;
+	       triggers_list.del(this_pos);
+	       break;
+	    } else
+              ++pos;
+	 }
+      }
+
+	 // Above we removed the trigger from the list and unlocked the list
+	 // Now we will disable it and will wait if necessary (if the
+	 // trigger is currently being processed by check_triggers())
+	 // check_triggers() locks the trigger for the duration of the
+	 // trigger callback. Thus we will wait for the trigger callback
+	 // to finish and avoid client's destruction.
+      if (trigger)
+        trigger->disabled=1;
+      else
+        break;
+   }
+
+   GP<DataPool> pool = this->pool;
+   if (pool)
+     pool->del_trigger(callback, cl_data);
+}
+
+void
+// DataPool::static_trigger_cb(GP<GPEnabled> &cl_data)
+DataPool::static_trigger_cb(void *cl_data)
+{
+//  GP<DataPool> d=(DataPool *)(GPEnabled *)cl_data;
+  GP<DataPool> d=(DataPool *)cl_data;
+  d->trigger_cb();
+}
+
+void
+DataPool::trigger_cb(void)
+      // This function may be triggered by the DataPool, which we're
+      // connected to, or by ourselves, if we're connected to nothing
+{
+      // Don't want to be destroyed while I'm here. Can't use GP<> life saver
+      // because it may be called from the constructor
+   GCriticalSectionLock lock(&trigger_lock);
+   
+   DEBUG_MSG("DataPool::trigger_cb() called\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GP<DataPool> pool = this->pool;
+   if (pool)
+   {
+      // Connected to a pool
+      // We may be here when either EOF is set on the master DataPool
+      // Or when it may have learnt its length (from IFF or whatever)
+      if (pool->is_eof() || pool->has_data(start, length)) eof_flag=true;
+   } else if (!furl.is_local_file_url())
+   {
+	    // Not connected to anything => Try to guess the length
+      if (length<0) analyze_iff();
+      
+	    // Failed to analyze? Check, maybe it's EOF already
+      if (length<0 && is_eof())
+      {
+	       GCriticalSectionLock lock(&data_lock);
+	       length=data->size();
+      }
+   }
+}
+
+void
+DataPool::analyze_iff(void)
+      // In order to display decode progress properly, we need to know
+      // the size of the data. It's trivial to figure it out if is_eof()
+      // is true. Otherwise we need to make a prediction. Luckily all
+      // DjVuFiles have IFF structure, which makes it possible to do it.
+      // If due to some reason we fail, the length will remain -1.
+{
+   DEBUG_MSG("DataPool::analyze_iff(): Trying to decode IFF structure of " << furl << ".\n");
+   DEBUG_MSG("in order to predict the DataPool's size\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GP<ByteStream> str=get_stream();
+   
+   GP<IFFByteStream> giff=IFFByteStream::create(str);
+   IFFByteStream &iff=*giff;
+   GUTF8String chkid;
+   int size;
+   if ((size=iff.get_chunk(chkid)) && size>=0)
+   {
+      length=size+iff.tell()-4;
+      DEBUG_MSG("Got size=" << size << ", length=" << length << "\n");
+   }
+}
+
+
+
+
+
+//****************************************************************************
+//****************************** PoolByteStream ******************************
+//****************************************************************************
+
+// This is an internal ByteStream receiving data from the associated DataPool.
+// It's just a sequential interface, nothing more. All the job for data
+// retrieval, waiting and thread synchronization is done by DataPool
+
+class PoolByteStream : public ByteStream
+{
+public:
+   PoolByteStream(GP<DataPool> data_pool);
+   virtual ~PoolByteStream() {};
+
+   virtual size_t read(void *buffer, size_t size);
+   virtual size_t write(const void *buffer, size_t size);
+   virtual long tell(void) const ;
+   virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false);
+private:
+      // Don't make data_pool GP<>. The problem is that DataPool creates
+      // and soon destroys this ByteStream from the constructor. Since
+      // there are no other pointers to the DataPool created yet, it becomes
+      // destroyed immediately :(
+   DataPool		* data_pool;
+   GP<DataPool>		data_pool_lock;
+   long			position;
+   
+   char			buffer[512];
+   size_t		buffer_size;
+   size_t		buffer_pos;
+
+      // Cancel C++ default stuff
+   PoolByteStream & operator=(const PoolByteStream &);
+};
+
+inline
+PoolByteStream::PoolByteStream(GP<DataPool> xdata_pool) :
+   data_pool(xdata_pool), position(0), buffer_size(0), buffer_pos(0)
+{
+   if (!data_pool) 
+       G_THROW( ERR_MSG("DataPool.zero_DataPool") );
+
+      // Secure the DataPool if possible. If we're called from DataPool
+      // constructor (get_count()==0) there is no need to secure at all.
+   if (data_pool->get_count()) data_pool_lock=data_pool;
+}
+
+size_t
+PoolByteStream::read(void *data, size_t size)
+{
+  if (buffer_pos >= buffer_size) {
+    if (size >= sizeof(buffer)) {
+      // Direct read
+      size = data_pool->get_data(data, position, size);
+      position += size;
+      return size;
+    } else {
+      // Refill buffer
+      buffer_size = data_pool->get_data(buffer, position, sizeof(buffer));
+      buffer_pos=0;
+    }
+  }
+  if (buffer_pos + size >= buffer_size)
+    size = buffer_size - buffer_pos;
+  memcpy(data, buffer+buffer_pos, size);
+  buffer_pos += size;
+  position += size;
+  return size;
+}
+
+size_t
+PoolByteStream::write(const void *buffer, size_t size)
+{
+   G_THROW( ERR_MSG("not_implemented_n") "\tPoolByteStream::write()");   //  PoolByteStream::write() is not implemented.
+   return 0;	// For compiler not to bark
+}
+
+long
+PoolByteStream::tell(void) const
+{
+   return position;
+}
+
+int
+PoolByteStream::seek(long offset, int whence, bool nothrow)
+{
+  int retval=(-1);
+  switch(whence)
+  {
+    case SEEK_CUR:
+      offset+=position;
+      // fallthrough;
+    case SEEK_SET:
+      if(offset<position)
+      {
+        if((int)(offset+buffer_pos)>=(int)position)
+        {
+          buffer_pos-=position-offset;
+        }else
+        {
+          buffer_size=0;
+        }
+        position=offset;
+      }else if(offset>position)
+      {
+        buffer_pos+=(offset-position)-1;
+        position=offset-1;
+        unsigned char c;
+        if(read(&c,1)<1)
+        {
+          G_THROW( ByteStream::EndOfFile );
+        }
+      }
+      retval=0;
+      break;
+    case SEEK_END:
+      if(! nothrow)
+        G_THROW( ERR_MSG("DataPool.seek_backward") );
+      break;
+   }
+   return retval;
+}
+
+void
+DataPool::close_all(void)
+{
+  OpenFiles::get()->close_all();
+  FCPools::get()->clean();
+}
+
+
+GP<ByteStream>
+DataPool::get_stream(void)
+{
+  return new PoolByteStream(this);
+}
+
+
+inline
+DataPool::Counter::operator int(void) const
+{
+   GCriticalSectionLock lk((GCriticalSection *) &lock);
+   int cnt=counter;
+   return cnt;
+}
+
+inline void
+DataPool::Counter::inc(void)
+{
+   GCriticalSectionLock lk(&lock);
+   counter++;
+}
+
+inline void
+DataPool::Counter::dec(void)
+{
+   GCriticalSectionLock lk(&lock);
+   counter--;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DataPool.h b/libdjvu/DataPool.h
new file mode 100644
index 0000000..9e5083c
--- /dev/null
+++ b/libdjvu/DataPool.h
@@ -0,0 +1,627 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DATAPOOL_H
+#define _DATAPOOL_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GThreads.h"
+#include "GString.h"
+#include "GURL.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+
+/** @name DataPool.h
+    Files #"DataPool.h"# and #"DataPool.cpp"# implement classes \Ref{DataPool}
+    and \Ref{DataRange} used by DjVu decoder to access data.
+
+    The main goal of class \Ref{DataPool} is to provide concurrent access
+    to the same data from many threads with a possibility to add data
+    from yet another thread. It is especially important in the case of the
+    Netscape plugin when data is not immediately available, but decoding
+    should be started as soon as possible. In this situation it is vital
+    to provide transparent access to the data from many threads possibly
+    blocking readers that try to access information that has not been
+    received yet.
+
+    When the data is local though, it can be accessed directly using
+    standard IO mechanism. To provide a uniform interface for decoding
+    routines, \Ref{DataPool} supports file mode as well.
+
+    @memo Thread safe data storage
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+/** Thread safe data storage.
+    The purpose of #DataPool# is to provide a uniform interface for
+    accessing data from decoding routines running in a multi-threaded
+    environment. Depending on the mode of operation it may contain the
+    actual data, may be connected to another #DataPool# or may be mapped
+    to a file. Regardless of the mode, the class returns data in a
+    thread-safe way, blocking reading threads if there is no data of
+    interest available. This blocking is especially useful in the
+    networking environment (plugin) when there is a running decoding thread,
+    which wants to start decoding as soon as there is just one byte available
+    blocking if necessary.
+
+    Access to data in a #DataPool# may be direct (Using \Ref{get_data}()
+    function) or sequential (See \Ref{get_stream}() function).
+
+    If the #DataPool# is not connected to anything, that is it contains
+    some real data, this data can be added to it by means of two
+    \Ref{add_data}() functions. One of them adds data sequentially maintaining
+    the offset of the last block of data added by it. The other can store
+    data anywhere. Thus it's important to realize, that there may be "white
+    spots" in the data storage.
+
+    There is also a way to test if data is available for some given data
+    range (See \Ref{has_data}()). In addition to this mechanism, there are
+    so-called {\em trigger callbacks}, which are called, when there is
+    all data available for a given data range.
+
+    Let us consider all modes of operation in details:
+
+    \begin{enumerate}
+       \item {\bf Not connected #DataPool#}. In this mode the #DataPool#
+             contains some real data. As mentioned above, it may be added  
+             by means of two functions \Ref{add_data}() operating independent
+	     of each other and allowing to add data sequentially and
+	     directly to any place of data storage. It's important to call
+	     function \Ref{set_eof}() after all data has been added.
+
+	     Functions like \Ref{get_data}() or \Ref{get_stream}() can
+	     be used to obtain direct or sequential access to the data. As
+	     long as \Ref{is_eof}() is #FALSE#, #DataPool# will block every
+	     reader, which is trying to read unavailable data until it
+	     really becomes available. But as soon as \Ref{is_eof}() is
+	     #TRUE#, any attempt to read non-existing data will read #0# bytes.
+
+	     Taking into account the fact, that #DataPool# was designed to
+	     store DjVu files, which are in IFF formats, it becomes possible
+	     to predict the size of the #DataPool# as soon as the first
+	     #32# bytes have been added. This is invaluable for estimating
+	     download progress. See function \Ref{get_length}() for details.
+	     If this estimate fails (which means, that stored data is not
+	     in IFF format), \Ref{get_length}() returns #-1#.
+
+	     Triggers may be added and removed by means of \Ref{add_trigger}()
+	     and \Ref{del_trigger}() functions. \Ref{add_trigger}() takes
+	     a data range. As soon as all data in that data range is
+	     available, the trigger callback will be called.
+
+	     All trigger callbacks will be called when #EOF# condition
+	     has been set.
+
+       \item {\bf #DataPool# connected to another #DataPool#}. In this
+             {\em slave} mode you can map a given #DataPool# to any offsets
+	     range inside another #DataPool#. You can connect the slave
+	     #DataPool# even if there is no data in the master #DataPool#.
+	     Any \Ref{get_data}() request will be forwarded to the master
+	     #DataPool#, and it will be responsible for blocking readers
+	     trying to access unavailable data.
+
+	     The usage of \Ref{add_data}() functions is prohibited for
+	     connected #DataPool#s.
+
+	     The offsets range used to map a slave #DataPool# can be fully
+	     specified (both start offset and length are positive numbers)
+	     or partially specified (the length is negative). In this mode
+	     the slave #DataPool# is assumed to extend up to the end
+	     of the master #DataPool#.
+
+	     Triggers may be used with slave #DataPool#s as well as with
+	     the master ones.
+
+	     Calling \Ref{stop}() function of a slave will stop only the slave
+	     (and any other slave connected to it), but not the master.
+
+	     \Ref{set_eof}() function is meaningless for slaves. They obtain
+	     the #ByteStream::EndOfFile# status from their master.
+
+	     Depending on the offsets range passed to the constructor,
+	     \Ref{get_length}() returns different values. If the length
+	     passed to the constructor was positive, then it is returned
+	     by \Ref{get_length}() all the time. Otherwise the value returned
+	     is either #-1# if master's length is still unknown (it didn't
+	     manage to parse IFF data yet) or it is calculated as
+	     #masters_length-slave_start#.
+
+       \item {\bf #DataPool# connected to a file}. This mode is quite similar
+             to the case, when the #DataPool# is connected to another
+	     #DataPool#. Similarly, the #DataPool# stores no data inside.
+	     It just forwards all \Ref{get_data}() requests to the underlying
+	     source (a file in this case). Thus these requests will never
+	     block the reader. But they may return #0# if there is no data
+	     available at the requested offset.
+
+	     The usage of \Ref{add_data}() functions is meaningless and
+	     is prohibited.
+
+	     \Ref{is_eof}() function always returns #TRUE#. Thus \Ref{set_eof}()
+	     us meaningless and does nothing.
+
+	     \Ref{get_length}() function always returns the file size.
+
+	     Calling \Ref{stop}() function will stop this #DataPool# and
+	     any other slave connected to it.
+
+	     Trigger callbacks passed through \Ref{add_trigger}() function
+	     are called immediately.
+
+	     This mode is useful to read and decode DjVu files without reading
+	     and storing them in full in memory.
+    \end{enumerate}
+*/
+
+class DJVUAPI DataPool : public GPEnabled
+{
+public: // Classes used internally by DataPool
+	// These are declared public to support buggy C++ compilers.
+   class Incrementor;
+   class Reader;
+   class Trigger;
+   class OpenFiles;
+   class OpenFiles_File;
+   class BlockList;
+   class Counter;
+protected:
+   DataPool(void);
+
+public:
+      /** @name Initialization */
+      //@{
+      /** Default creator. Will prepare #DataPool# for accepting data
+	  added through functions \Ref{add_data}(). Use \Ref{connect}()
+	  functions if you want to map this #DataPool# to another or
+	  to a file. */
+   static GP<DataPool> create(void);
+
+      /** Creates and initialized the #DataPool# with data from stream #str#.
+	  The constructor will read the stream's contents and add them
+	  to the pool using the \Ref{add_data}() function. Afterwards it
+	  will call \Ref{set_eof}() function, and no other data will be
+	  allowed to be added to the pool. */
+   static GP<DataPool> create(const GP<ByteStream> & str);
+
+      /** Initializes the #DataPool# in slave mode and connects it
+	  to the specified offsets range of the specified master #DataPool#.
+	  It is equivalent to calling default constructor and function
+	  \Ref{connect}().
+
+	  @param master_pool Master #DataPool# providing data for this slave
+	  @param start Beginning of the offsets range which the slave is
+	         mapped into
+          @param length Length of the offsets range. If negative, the range
+	         is assumed to extend up to the end of the master #DataPool#.
+      */
+   static GP<DataPool> create(const GP<DataPool> & master_pool, int start=0, int length=-1);
+
+      /** Initializes the #DataPool# in slave mode and connects it
+	  to the specified offsets range of the specified file.
+	  It is equivalent to calling default constructor and function
+	  \Ref{connect}().
+	  @param url Name of the file to connect to.
+	  @param start Beginning of the offsets range which the #DataPool# is
+	         mapped into
+          @param length Length of the offsets range. If negative, the range
+	         is assumed to extend up to the end of the file.
+      */
+   static GP<DataPool> create(const GURL &url, int start=0, int length=-1);
+
+   virtual ~DataPool();
+
+      /** Switches the #DataPool# to slave mode and connects it to the
+	  specified offsets range of the master #DataPool#.
+	  @param master_pool Master #DataPool# providing data for this slave
+	  @param start Beginning of the offsets range which the slave is
+	         mapped into
+          @param length Length of the offsets range. If negative, the range
+	         is assumed to extend up to the end of the master #DataPool#.
+      */
+   void		connect(const GP<DataPool> & master_pool, int start=0, int length=-1);
+      /** Connects the #DataPool# to the specified offsets range of
+	  the named #url#.
+	  @param url Name of the file to connect to.
+	  @param start Beginning of the offsets range which the #DataPool# is
+	         mapped into
+          @param length Length of the offsets range. If negative, the range
+	         is assumed to extend up to the end of the file.
+      */
+   void		connect(const GURL &url, int start=0, int length=-1);
+      //@}
+
+      /** Tells the #DataPool# to stop serving readers.
+
+	  If #only_blocked# flag is #TRUE# then only those requests will
+	  be processed, which would not block. Any attempt to get non-existing
+	  data would result in a #STOP# exception (instead of blocking until
+	  data is available).
+
+	  If #only_blocked# flag is #FALSE# then any further attempt to read
+	  from this #DataPool# (as well as from any #DataPool# connected
+	  to this one) will result in a #STOP# exception. */
+   void		stop(bool only_blocked=false);
+
+      /** @name Adding data.
+	  Please note, that these functions are for not connected #DataPool#s
+	  only. You can not add data to a #DataPool#, which is connected
+	  to another #DataPool# or to a file.
+	*/
+      //@{
+      /** Appends the new block of data to the #DataPool#. There are two
+	  \Ref{add_data}() functions available. One is for adding data
+	  sequentially. It keeps track of the last byte position, which has
+	  been stored {\bf by it} and always appends the next block after
+	  this position. The other \Ref{add_data}() can store data anywhere.
+	  
+	  The function will unblock readers waiting for data if this data
+	  arrives with this block. It may also trigger some {\em trigger
+	  callbacks}, which may have been added by means of \Ref{add_trigger}()
+	  function.
+
+	  {\bf Note:} After all the data has been added, it's necessary
+	  to call \Ref{set_eof}() to tell the #DataPool# that nothing else
+	  is expected.
+
+	  {\bf Note:} This function may not be called if the #DataPool#
+	  has been connected to something.
+
+	  @param buffer data to append
+	  @param size length of the {\em buffer}
+      */
+   void		add_data(const void * buffer, int size);
+
+      /** Stores the specified block of data at the specified offset.
+	  Like the function above this one can also unblock readers
+	  waiting for data and engage trigger callbacks. The difference
+	  is that {\bf this} function can store data anywhere.
+
+	  {\bf Note:} After all the data has been added, it's necessary
+	  to call \Ref{set_eof}() to tell the #DataPool# that nothing else
+	  is expected.
+
+	  {\bf Note:} This function may not be called if the #DataPool#
+	  has been connected to something.
+
+	  @param buffer data to store
+	  @param offset where to store the data
+	  @param size length of the {\em buffer} */
+   void		add_data(const void * buffer, int offset, int size);
+
+      /** Tells the #DataPool# that all data has been added and nothing else
+	  is anticipated. When #EOF# is true, any reader attempting to read
+	  non existing data will not be blocked. It will either read #ZERO#
+	  bytes or will get an #ByteStream::EndOfFile# exception (see \Ref{get_data}()).
+	  Calling this function will also activate all registered trigger
+	  callbacks.
+
+	  {\bf Note:} This function is meaningless and does nothing
+	  when the #DataPool# is connected to another #DataPool# or to
+	  a file. */
+   void		set_eof(void);
+      //@}
+
+      /** @name Accessing data.
+	  These functions provide direct and sequential access to the
+	  data of the #DataPool#. If the #DataPool# is not connected
+	  (contains some real data) then it handles the requests itself.
+	  Otherwise they are forwarded to the master #DataPool# or the file.
+	*/
+      //@{
+      /** Attempts to return a block of data at the given #offset#
+	  of the given #size#.
+
+	  \begin{enumerate}
+	     \item If the #DataPool# is connected to another #DataPool# or
+	           to a file, the request will just be forwarded to them.
+	     \item If the #DataPool# is not connected to anything and
+	           some of the data requested is in the internal buffer,
+		   the function copies available data to #buffer# and returns
+		   immediately.
+
+		   If there is no data available, and \Ref{is_eof}() returns
+		   #FALSE#, the reader (and the thread) will be {\bf blocked}
+		   until the data actually arrives. Please note, that since
+		   the reader is blocked, it should run in a separate thread
+		   so that other threads have a chance to call \Ref{add_data}().
+		   If there is no data available, but \Ref{is_eof}() is #TRUE#
+		   the behavior is different and depends on the #DataPool#'s
+		   estimate of the file size:
+		   \begin{itemize}
+		      \item If #DataPool# learns from the IFF structure of the
+		            data, that its size should be greater than it
+			    really is, then any attempt to read non-existing
+			    data in the range of {\em valid} offsets will
+			    result in an #ByteStream::EndOfFile# exception. This is done to
+			    indicate, that there was an error in adding data,
+			    and the data requested is {\bf supposed} to be
+			    there, but has actually not been added.
+		      \item If #DataPool#'s expectations about the data size
+		            coincide with the reality then any attempt to
+			    read data beyond the legal range of offsets will
+			    result in #ZERO# bytes returned.
+		   \end{itemize}.
+          \end{enumerate}.
+
+	  @param buffer Buffer to be filled with data
+	  @param offset Offset in the #DataPool# to read data at
+	  @param size Size of the {\em buffer}
+	  @return The number of bytes actually read
+	  @exception STOP The stream has been stopped
+	  @exception EOF The requested data is not there and will not be added,
+	             although it should have been.
+      */
+   int		get_data(void * buffer, int offset, int size);
+
+      /** Returns a \Ref{ByteStream} to access contents of the #DataPool#
+	  sequentially. By reading from the returned stream you basically
+          call \Ref{get_data}() function. Thus, everything said for it
+	  remains true for the stream too. */
+   GP<ByteStream>	get_stream(void);
+      //@}
+
+      /** @name State querying functions. */
+      //@{
+      /** Returns #TRUE# if this #DataPool# is connected to another #DataPool#
+	  or to a file. */
+   bool		is_connected(void) const;
+   
+      /** Returns #TRUE# if all data available for offsets from
+	  #start# till #start+length-1#. If #length# is negative, the
+          range is assumed to extend up to the end of the #DataPool#.
+	  This function works both for connected and not connected #DataPool#s.
+	  Once it returned #TRUE# for some offsets range, you can be
+	  sure that the subsequent \Ref{get_data}() request will not block.
+      */
+   bool		has_data(int start, int length);
+
+      /* Returns #TRUE# if no more data is planned to be added.
+
+	 {\bf Note:} This function always returns #TRUE# when the #DataPool#
+	 has been initialized with a file name. */
+   bool		is_eof(void) const {return eof_flag;}
+
+      /** Returns the {\em length} of data in the #DataPool#. The value
+	  returned depends on the mode of operation:
+	  \begin{itemize}
+	     \item If the #DataPool# is not connected to anything then
+	           the length returned is either calculated by interpreting
+		   the IFF structure of stored data (if successful) or
+		   by calculating the real size of data after \Ref{set_eof}()
+		   has been called. Otherwise it is #-1#.
+	     \item If the #DataPool# is connected to a file, the length
+	           is calculated basing on the length passed to the
+		   \Ref{connect}() function and the file size.
+	     \item If the #DataPool# is connected to a master #DataPool#,
+	           the length is calculated basing on the value returned
+		   by the master's #get_length()# function and the length
+		   passed to the \Ref{connect}() function.
+	  \end{itemize}. */
+   int		get_length(void) const;
+      /** Returns the number of bytes of data available in this #DataPool#.
+	  Contrary to the \Ref{get_length}() function, this one doesn't try
+	  to interpret the IFF structure and predict the file length.
+	  It just returns the number of bytes of data really available inside
+	  the #DataPool#, if it contains data, or inside its range, if it's
+	  connected to another #DataPool# or a file. */
+   int		get_size(void) const {return get_size(0, -1);}
+      //@}
+
+      /** @name Trigger callbacks.
+	  {\em Trigger callbacks} are special callbacks called when
+	  all data for the given range of offsets has been made available.
+	  Since reading unavailable data may result in a thread block,
+	  which may be bad, the usage of {\em trigger callbacks} appears
+	  to be a convenient way to signal availability of data.
+
+	  You can add a trigger callback in two ways:
+	  \begin{enumerate}
+	     \item By specifying a range. This is the most general case
+	     \item By providing just one {\em threshold}. In this case
+	           the range is assumed to start from offset #ZERO# and
+		   last for {\em threshold}+1 bytes.
+	  \end{enumerate}
+	*/
+      //@{
+      /** Associates the specified {\em trigger callback} with the
+	  given data range.
+
+	  {\bf Note:} The callback may be called immediately if all
+	  data for the given range is already available or #EOF# is #TRUE#.
+
+	  @param start The beginning of the range for which all data
+	         should be available
+	  @param length If the {\em length} is not negative then the callback
+	         will be called when there is data available for every
+		 offset from {\em start} to {\em start+length-1}.
+	         If {\em thresh} is negative, the callback is called after
+		 #EOF# condition has been set.
+	  @param callback Function to call
+	  @param cl_data Argument to pass to the callback when it's called. */
+   void		add_trigger(int start, int length,
+			    void (* callback)(void *), void * cl_data);
+
+      /** Associates the specified {\em trigger callback} with the
+	  specified threshold.
+
+	  This function is a simplified version of the function above.
+	  The callback will be called when there is data available for
+	  every offset from #0# to #thresh#, if #thresh# is positive, or
+	  when #EOF# condition has been set otherwise. */
+
+   void		add_trigger(int thresh, 
+                            void (* callback)(void *), void * cl_data);
+
+      /** Use this function to unregister callbacks, which are no longer
+	  needed. {\bf Note!} It's important to do it when the client
+	  is about to be destroyed. */
+   void		del_trigger(void (* callback)(void *), void *  cl_data);
+
+      //@}
+
+      /** Loads data from the file into memory. This function is only useful
+	  for #DataPool#s getting data from a file. It descends the #DataPool#s
+	  hierarchy until it either reaches a file-connected #DataPool#
+	  or #DataPool# containing the real data. In the latter case it
+	  does nothing, in the first case it makes the #DataPool# read all
+	  data from the file into memory and stop using the file.
+
+	  This may be useful when you want to overwrite the file and leave
+	  existing #DataPool#s with valid data. */
+   void		load_file(void);
+      /** This function will make every #DataPool# in the program, which
+	  is connected to a file, to load the file contents to the main
+	  memory and close the file. This feature is important when you
+	  want to do something with the file like remove or overwrite it
+	  not affecting the rest of the program. */
+   static void	load_file(const GURL &url);
+
+      /** This function will remove OpenFiles filelist. */
+   static void	close_all(void);
+
+      // Internal. Used by 'OpenFiles'
+   void		clear_stream(const bool release = true);
+
+      /** Useful in comparing data pools.  Returns true if dirived from
+          same URL or bytestream. */
+   bool simple_compare(DataPool &pool) const;
+
+
+private:
+   bool		eof_flag;
+   bool		stop_flag;
+   bool		stop_blocked_flag;
+
+   Counter	*active_readers;
+   
+      // Source or storage of data
+   GP<DataPool>		pool;
+   GURL		furl;
+   GP<OpenFiles_File>   fstream;
+   GCriticalSection	class_stream_lock;
+   GP<ByteStream>	data;
+   GCriticalSection	data_lock;
+   BlockList		*block_list;
+   int			add_at;
+   int			start, length;
+
+      // List of readers waiting for data
+   GPList<Reader>	readers_list;
+   GCriticalSection	readers_lock;
+
+      // Triggers
+   GPList<Trigger>	triggers_list;		// List of passed or our triggers
+   GCriticalSection	triggers_lock;		// Lock for the list above
+   GCriticalSection	trigger_lock;		// Lock for static_trigger_cb()
+
+   void		init(void);
+   void		wait_for_data(const GP<Reader> & reader);
+   void		wake_up_all_readers(void);
+   void		check_triggers(void);
+   int		get_data(void * buffer, int offset, int size, int level);
+   int		get_size(int start, int length) const;
+   void		restart_readers(void);
+
+//   static void	static_trigger_cb(GP<GPEnabled> &);
+   static void	static_trigger_cb(void *);
+   void		trigger_cb(void);
+   void		analyze_iff(void);
+   void		added_data(const int offset, const int size);
+public:
+  static const char *Stop;
+  friend class FCPools;
+};
+
+inline bool 
+DataPool::simple_compare(DataPool &pool) const
+{
+  // return true if these pools are identical.  False means they may or may
+  // not be identical.
+  return (this == &pool)
+    ||(furl.is_valid()&&!furl.is_empty()&&pool.furl.is_valid()&&(furl == pool.furl))
+    ||(data && (data == pool.data));
+}
+
+inline bool
+DataPool::is_connected(void) const
+{
+   return furl.is_local_file_url() || pool!=0;
+}
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp
new file mode 100644
index 0000000..153e3c7
--- /dev/null
+++ b/libdjvu/DjVmDir.cpp
@@ -0,0 +1,848 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVmDir.h"
+#include "BSByteStream.h"
+#include "GURL.h"
+#include "debug.h"
+
+#include <ctype.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+GP<DjVmDir::File>
+DjVmDir::File::create(const GUTF8String &load_name,
+  const GUTF8String &save_name, const GUTF8String &title,
+  const FILE_TYPE file_type)
+{
+  File *file_ptr=new File();
+  GP<File> file=file_ptr;
+  file_ptr->set_load_name(load_name);
+  file_ptr->set_save_name(save_name);
+  file_ptr->set_title(title);
+  file_ptr->flags=(file_type & TYPE_MASK);
+  return file;
+}
+
+const GUTF8String &
+DjVmDir::File::check_save_name(const bool xis_bundled)
+{
+  if(!xis_bundled && !valid_name)
+  {
+    GUTF8String retval=name.length()?name:id;
+    if(GUTF8String(GNativeString(retval)) != retval)
+    {
+      const_cast<bool &>(valid_name)=true;
+      char *buf;
+      GPBuffer<char> gbuf(buf,2*retval.length()+1);
+      char *s=buf;
+      int i=0;
+      for(char c=retval[i++];c;)
+      {
+        static const char hex[]="0123456789ABCDEF";
+        int len=retval.nextChar(i)-i;
+        if(len>1 || ((len == 1)&&(c&0x80)))
+        {
+          do
+          {
+            s++[0]=hex[(c>>4)&0xf];
+            s++[0]=hex[(c&0xf)];
+            c=retval[i++];
+          } while(c && ((--len) > 0));
+        }else
+        {
+          s++[0]=c;
+          c=retval[i++];
+        }
+      }
+      s++[0]=0;
+      oldname=retval;
+      name=buf;
+    }
+    const_cast<bool &>(valid_name)=true;
+  }
+  return *(name.length()?&name:&id);
+}
+
+const GUTF8String &
+DjVmDir::File::get_save_name(void) const
+{
+  return *(name.length()?&name:&id);
+}
+
+void
+DjVmDir::File::set_load_name(const GUTF8String &xid)
+{
+  GURL url=GURL::UTF8(xid);
+  if(!url.is_valid())
+  {
+    url=GURL::Filename::UTF8(xid);
+  }
+  id=url.fname();
+}
+
+void
+DjVmDir::File::set_save_name(const GUTF8String &xname)
+{
+  GURL url;
+  valid_name=false;
+  if(!xname.length())
+  {
+    GURL url=GURL::UTF8(id);
+    if(!url.is_valid())
+    {
+      name=id;
+    }else
+    {
+      name=url.fname();
+    }
+  }else
+  {
+    GURL url=GURL::UTF8(xname);
+    if(!url.is_valid())
+    {
+      url=GURL::Filename::UTF8(xname);
+    }
+    name=url.fname();
+  }
+  oldname="";
+}
+
+/* DjVmDir::File */
+
+DjVmDir::File::File(void) : offset(0), size(0), valid_name(false),
+   flags(0), page_num(-1) { }
+
+GUTF8String
+DjVmDir::File::get_str_type(void) const
+{
+   GUTF8String type;
+   switch(flags & TYPE_MASK)
+   {
+      case INCLUDE:
+        type="INCLUDE";
+        break;
+      case PAGE:
+        type="PAGE";
+        break;
+      case THUMBNAILS:
+        type="THUMBNAILS";
+        break;
+      case SHARED_ANNO:
+        type="SHARED_ANNO";
+        break;
+      default:
+        //  Internal error: please modify DjVmDir::File::get_str_type()
+        //  to contain all possible File types.
+	      G_THROW( ERR_MSG("DjVmDir.get_str_type") );
+   }
+   return type;
+}
+
+
+const int DjVmDir::version=1;
+
+void 
+DjVmDir::decode(const GP<ByteStream> &gstr)
+{
+   ByteStream &str=*gstr;
+   DEBUG_MSG("DjVmDir::decode(): decoding contents of 'DIRM' chunk...\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   GCriticalSectionLock lock(&class_lock);
+
+   GPosition pos;
+
+   files_list.empty();
+   page2file.resize(-1);
+   name2file.empty();
+   id2file.empty();
+   title2file.empty();
+
+   int ver=str.read8();
+   bool bundled=(ver & 0x80)!=0;
+   ver&=0x7f;
+
+   DEBUG_MSG("DIRM version=" << ver << ", our version=" << version << "\n");
+   if (ver>version)
+      G_THROW( ERR_MSG("DjVmDir.version_error") "\t" 
+               + GUTF8String(version) + "\t" + GUTF8String(ver));
+   // Unable to read DJVM directories of versions higher than xxx
+   // Data version number is yyy.
+   DEBUG_MSG("bundled directory=" << bundled << "\n");
+   DEBUG_MSG("reading the directory records...\n");
+   int files=str.read16();
+   DEBUG_MSG("number of files=" << files << "\n");
+
+   if (files)
+   {
+      DEBUG_MSG("reading offsets (and sizes for ver==0)\n");
+      for(int nfile=0;nfile<files;nfile++)
+      {
+         GP<File> file=new File();
+         files_list.append(file);
+         if (bundled)
+         {
+            file->offset=str.read32();
+            if (ver==0)
+              file->size=str.read24();
+            if (file->offset==0)
+               G_THROW( ERR_MSG("DjVmDir.no_indirect") );
+         } else
+         {
+           file->offset=file->size=0;
+         }
+      }
+
+      GP<ByteStream> gbs_str=BSByteStream::create(gstr);
+      ByteStream &bs_str=*gbs_str;
+      if (ver>0)
+      {
+         DEBUG_MSG("reading and decompressing sizes...\n");
+         for(GPosition pos=files_list;pos;++pos)
+            files_list[pos]->size=bs_str.read24();
+      }
+         
+      DEBUG_MSG("reading and decompressing flags...\n");
+      for(pos=files_list;pos;++pos)
+         files_list[pos]->flags=bs_str.read8();
+
+      if (!ver)
+      {
+         DEBUG_MSG("converting flags from version 0...\n");
+         for(pos=files_list;pos;++pos)
+         {
+            unsigned char flags_0=files_list[pos]->flags;
+            unsigned char flags_1;
+            flags_1=(flags_0 & File::IS_PAGE_0)?(File::PAGE):(File::INCLUDE);
+            if (flags_0 & File::HAS_NAME_0)
+              flags_1|=File::HAS_NAME;
+            if (flags_0 & File::HAS_TITLE_0)
+              flags_1|=File::HAS_TITLE;
+            files_list[pos]->flags=flags_1;
+         }
+      }
+   
+      DEBUG_MSG("reading and decompressing names...\n");
+      GTArray<char> strings;
+      char buffer[1024];
+      int length;
+      while((length=bs_str.read(buffer, 1024)))
+      {
+         int strings_size=strings.size();
+         strings.resize(strings_size+length-1);
+         memcpy((char*) strings+strings_size, buffer, length);
+      }
+      DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n");
+   
+         // Copy names into the files
+      const char * ptr=strings;
+      for(pos=files_list;pos;++pos)
+      {
+         GP<File> file=files_list[pos];
+
+         file->id=ptr;
+         ptr+=file->id.length()+1;
+         if (file->flags & File::HAS_NAME)
+         {
+            file->name=ptr;
+            ptr+=file->name.length()+1;
+         } else
+         {
+            file->name=file->id;
+         }
+         if (file->flags & File::HAS_TITLE)
+         {
+            file->title=ptr;
+       ptr+=file->title.length()+1;
+         } else
+       file->title=file->id;
+   /* msr debug:  multipage file, file->title is null.  
+         DEBUG_MSG(file->name << ", " << file->id << ", " << file->title << ", " <<
+                   file->offset << ", " << file->size << ", " <<
+                   file->is_page() << "\n"); */
+      }
+
+         // Check that there is only one file with SHARED_ANNO flag on
+      int shared_anno_cnt=0;
+      for(pos=files_list;pos;++pos)
+      {
+         if (files_list[pos]->is_shared_anno())
+         {
+            shared_anno_cnt++;
+         }
+      }
+      if (shared_anno_cnt>1)
+        G_THROW( ERR_MSG("DjVmDir.corrupt") );
+
+         // Now generate page=>file array for direct access
+      int pages=0;
+      for(pos=files_list;pos;++pos)
+              pages+=files_list[pos]->is_page() ? 1 : 0;
+      DEBUG_MSG("got " << pages << " pages\n");
+      page2file.resize(pages-1);
+      int page_num=0;
+      for(pos=files_list;pos;++pos)
+      {
+               GP<File> file=files_list[pos];
+               if (file->is_page())
+               {
+                  page2file[page_num]=file;
+                  file->page_num=page_num++;
+               }
+      }
+
+         // Generate name2file map
+      for(pos=files_list;pos;++pos)
+      {
+	       GP<File> file=files_list[pos];
+	       if (name2file.contains(file->name))
+	          G_THROW( ERR_MSG("DjVmDir.dupl_name") "\t" + file->name );
+	       name2file[file->name]=file;
+      }
+
+         // Generate id2file map
+      for(pos=files_list;pos;++pos)
+      {
+	       GP<File> file=files_list[pos];
+	       if (id2file.contains(file->id))
+	          G_THROW( ERR_MSG("DjVmDir.dupl_id") "\t" + file->id);
+	       id2file[file->id]=file;
+      }
+
+         // Generate title2file map
+      for(pos=files_list;pos;++pos)
+      {
+	       GP<File> file=files_list[pos];
+	       if (file->title.length())
+	       {
+	          if (title2file.contains(file->title))
+	             G_THROW( ERR_MSG("DjVmDir.dupl_title") "\t" + file->title);
+	          title2file[file->title]=file;
+	       }
+      }
+   }
+}
+
+
+void
+DjVmDir::encode(const GP<ByteStream> &gstr, const bool do_rename) const
+{
+  bool bundled = true;
+  GPosition pos = files_list;
+  if (files_list.size() && !files_list[pos]->offset)
+    bundled = false;
+  for (pos=files_list; pos; ++pos)
+    if ( !bundled !=  !files_list[pos]->offset)
+      //  There directory contains both indirect and bundled records.
+      G_THROW( ERR_MSG("DjVmDir.bad_dir") );
+  // Do the real work
+  encode(gstr, bundled, do_rename);
+}
+
+void
+DjVmDir::encode(const GP<ByteStream> &gstr, const bool bundled, const bool do_rename) const
+{
+  ByteStream &str=*gstr;
+  DEBUG_MSG("DjVmDir::encode(): encoding contents of the 'DIRM' chunk do_rename=" << do_rename << "\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+  GPosition pos;
+
+  DEBUG_MSG("encoding version number=" << version << ", bundled=" << bundled << "\n");
+  str.write8(version | ((int) bundled<< 7));
+   
+  DEBUG_MSG("storing the number of records=" << files_list.size() << "\n");
+  str.write16(files_list.size());
+
+  if (files_list.size())
+    {
+      // Check that there is only one file with shared annotations
+      int shared_anno_cnt=0;
+      for (pos=files_list; pos; ++pos)
+        if (files_list[pos]->is_shared_anno())
+          shared_anno_cnt++;
+      if (shared_anno_cnt>1)
+        G_THROW( ERR_MSG("DjVmDir.multi_save") );
+      
+      if (bundled)
+        {
+          // We need to store offsets uncompressed. That's because when
+          // we save a DjVmDoc, we first compress the DjVmDir with dummy
+          // offsets and after computing the real offsets we rewrite the
+          // DjVmDir, which should not change its size during this operation
+          DEBUG_MSG("storing offsets for every record\n");
+          for (pos=files_list; pos; ++pos)
+            {
+              GP<File> file=files_list[pos];
+              if (!file->offset)
+                // The directory contains record without offset
+                G_THROW( ERR_MSG("DjVmDir.bad_dir") );
+              str.write32(file->offset);
+            }
+        }
+
+      GP<ByteStream> gbs_str=BSByteStream::create(gstr, 50);
+      ByteStream &bs_str=*gbs_str;
+      DEBUG_MSG("storing and compressing sizes for every record\n");
+      for (pos=files_list; pos; ++pos)
+        {
+          const GP<File> file(files_list[pos]);
+          bs_str.write24(file->size);
+        }
+      DEBUG_MSG("storing and compressing flags for every record\n");
+      const bool xdo_rename=(do_rename||!bundled);
+      for (pos=files_list;pos;++pos)
+	{
+	  const GP<File> file(files_list[pos]);
+	  if (xdo_rename)
+	    {
+	      const GUTF8String new_id = file->name;
+	      if (!new_id)
+		{
+		  if (!file->oldname.length() || file->oldname == new_id)
+		    file->flags &= ~File::HAS_NAME;
+		  else
+		    file->flags |= File::HAS_NAME;
+		}
+	    }
+	  else
+	    {
+	      if (!file->name.length() || file->name == file->id)
+		file->flags &= ~File::HAS_NAME;
+	      else
+		file->flags |= File::HAS_NAME;
+	    }
+	  if (file->title.length() && (file->title!=file->id))
+	    file->flags |= File::HAS_TITLE;
+	  else
+	    file->flags &= ~File::HAS_TITLE;
+
+	  bs_str.write8(file->flags);
+	}
+
+     DEBUG_MSG("storing and compressing names...\n");
+     for(pos=files_list;pos;++pos)
+     {
+         GP<File> file=files_list[pos];
+         GUTF8String id;
+         GUTF8String name;
+         GUTF8String title;
+         if (xdo_rename)
+           {
+             id = file->name;
+             if (! id)
+               id = file->id;
+             if ((file->flags) & File::HAS_NAME)
+               name = file->oldname;
+           }
+         else
+           {
+             id=file->id;
+             if ((file->flags) & File::HAS_NAME)
+               name = file->name;
+           }
+         if ((file->flags) & File::HAS_TITLE)
+           title = file->title;
+         DEBUG_MSG("rename=" <<xdo_rename<<" id='" << id << "' name='" << name << "' title='" << title << "'\n");
+         bs_str.writestring(id);
+         bs_str.write8(0);
+         if (name.length())
+           {
+             bs_str.writestring(name);
+             bs_str.write8(0);
+           }
+         if (title.length())
+           {
+             bs_str.writestring(title);
+             bs_str.write8(0);
+           }
+     }
+    }
+  DEBUG_MSG("done\n");
+}
+
+GP<DjVmDir::File>
+DjVmDir::page_to_file(int page_num) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   return (page_num<page2file.size())?page2file[page_num]:(GP<DjVmDir::File>(0));
+}
+
+GP<DjVmDir::File>
+DjVmDir::name_to_file(const GUTF8String & name) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   GPosition pos;
+   return (name2file.contains(name, pos))?name2file[pos]:(GP<DjVmDir::File>(0));
+}
+
+GP<DjVmDir::File>
+DjVmDir::id_to_file(const GUTF8String &id) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   GPosition pos;
+   return (id2file.contains(id, pos))?id2file[pos]:(GP<DjVmDir::File>(0));
+}
+
+GP<DjVmDir::File>
+DjVmDir::title_to_file(const GUTF8String &title) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   GPosition pos;
+   return (title2file.contains(title, pos))?title2file[pos]:(GP<DjVmDir::File>(0));
+}
+
+GP<DjVmDir::File>
+DjVmDir::pos_to_file(int fileno, int *ppageno) const
+{
+  GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+  GPosition pos = files_list;
+  int pageno = 0;
+  while (pos && --fileno >= 0) {
+    if (files_list[pos]->is_page())
+      ++pageno;
+    ++pos;
+  }
+  if (!pos)
+    return 0;
+  if (ppageno)
+    *ppageno = pageno;
+  return files_list[pos];
+}
+
+GPList<DjVmDir::File>
+DjVmDir::get_files_list(void) const
+{
+  GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+  return files_list;
+}
+
+int
+DjVmDir::get_files_num(void) const
+{
+  GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+  return files_list.size();
+}
+
+int
+DjVmDir::get_pages_num(void) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   return page2file.size();
+}
+
+int
+DjVmDir::get_file_pos(const File * f) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   int cnt;
+   GPosition pos;
+   for(pos=files_list, cnt=0;pos&&(files_list[pos]!=f);++pos, cnt++)
+                   continue;
+   return (pos)?cnt:(-1);
+}
+
+int
+DjVmDir::get_page_pos(int page_num) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   
+   GP<File> file=page_to_file(page_num);
+   return (file)?get_file_pos(file):(-1);
+}
+
+GP<DjVmDir::File>
+DjVmDir::get_shared_anno_file(void) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   GP<File> file;
+   for(GPosition pos=files_list;pos;++pos)
+   {
+      GP<File> frec=files_list[pos];
+      if (frec->is_shared_anno())
+      {
+         file=frec;
+         break;
+      }
+   }
+   return file;
+}
+
+int
+DjVmDir::insert_file(const GP<File> & file, int pos_num)
+{
+   DEBUG_MSG("DjVmDir::insert_file(): name='" 
+             << file->name << "', pos=" << pos_num << "\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   
+   if (pos_num<0)
+     pos_num=files_list.size();
+
+   //// Modify maps
+   //   if (! File::is_legal_id(file->id))
+   //     G_THROW( ERR_MSG("DjVmDir.bad_file") "\t" + file->id);
+   if (id2file.contains(file->id))
+     G_THROW( ERR_MSG("DjVmDir.dupl_id2") "\t" + file->id);
+   if (name2file.contains(file->name))
+     G_THROW( ERR_MSG("DjVmDir.dupl_name2") "\t" + file->name);
+   name2file[file->name]=file;
+   id2file[file->id]=file;
+   if (file->title.length())
+     {
+       if (title2file.contains(file->title))  
+         // duplicate titles may become ok some day
+         G_THROW( ERR_MSG("DjVmDir.dupl_title2") "\t" + file->title);
+       title2file[file->title]=file;
+     }
+
+      // Make sure that there is no more than one file with shared annotations
+   if (file->is_shared_anno())
+   {
+      for(GPosition pos=files_list;pos;++pos)
+         if (files_list[pos]->is_shared_anno())
+            G_THROW( ERR_MSG("DjVmDir.multi_save2") );
+   }
+   
+      // Add the file to the list
+   int cnt;
+   GPosition pos;
+   for(pos=files_list, cnt=0;pos&&(cnt!=pos_num);++pos, cnt++)
+                   continue;
+   if (pos)
+     files_list.insert_before(pos, file);
+   else
+     files_list.append(file);
+
+   if (file->is_page())
+   {
+         // This file is also a page
+         // Count its number
+      int page_num=0;
+      for(pos=files_list;pos;++pos)
+      {
+         GP<File> &f=files_list[pos];
+         if (f==file)
+           break;
+         if (f->is_page())
+           page_num++;
+      }
+
+      int i;
+      page2file.resize(page2file.size());
+      for(i=page2file.size()-1;i>page_num;i--)
+         page2file[i]=page2file[i-1];
+      page2file[page_num]=file;
+      for(i=page_num;i<page2file.size();i++)
+         page2file[i]->page_num=i;
+   }
+   return pos_num;
+}
+
+void
+DjVmDir::delete_file(const GUTF8String &id)
+{
+   DEBUG_MSG("Deleting file with id='" << (const char *)id << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   
+   for(GPosition pos=files_list;pos;++pos)
+   {
+      GP<File> & f=files_list[pos];
+      if (id == f->id)
+      {
+         name2file.del(f->name);
+         id2file.del(f->id);
+         title2file.del(f->title);
+         if (f->is_page())
+         {
+            for(int page=0;page<page2file.size();page++)
+            {
+               if (page2file[page]==f)
+               {
+                  int i;
+                  for(i=page;i<page2file.size()-1;i++)
+                     page2file[i]=page2file[i+1];
+                  page2file.resize(page2file.size()-2);
+                  for(i=page;i<page2file.size();i++)
+                     page2file[i]->page_num=i;
+                  break;
+               }
+            }
+         }
+         files_list.del(pos);
+         break;
+      }
+   }
+}
+
+void
+DjVmDir::set_file_name(const GUTF8String &id, const GUTF8String &name)
+{
+   DEBUG_MSG("DjVmDir::set_file_name(): id='" << id << "', name='" << name << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   GPosition pos;
+   
+      // First see, if the name is unique
+   for(pos=files_list;pos;++pos)
+   {
+      GP<File> file=files_list[pos];
+      if (file->id!=id && file->name==name)
+        G_THROW( ERR_MSG("DjVmDir.name_in_use") "\t" + GUTF8String(name));
+   }
+
+      // Check if ID is valid
+   if (!id2file.contains(id, pos))
+      G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id));
+   GP<File> file=id2file[pos];
+   name2file.del(file->name);
+   file->name=name;
+   name2file[name]=file;
+}
+
+void
+DjVmDir::set_file_title(const GUTF8String &id, const GUTF8String &title)
+{
+   DEBUG_MSG("DjVmDir::set_file_title(): id='" << id << "', title='" << title << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   GPosition pos;
+      // Check if ID is valid
+   if (!id2file.contains(id, pos))
+      G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id));
+   GP<File> file=id2file[pos];
+   title2file.del(file->title);
+   file->title=title;
+   title2file[title]=file;
+}
+
+GPList<DjVmDir::File>
+DjVmDir::resolve_duplicates(const bool save_as_bundled)
+{
+  GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+  // Make sure all the filenames are unique.
+  GPosition pos;
+  GMap<GUTF8String,void *> save_map;
+  GMap<GUTF8String,GPList<DjVmDir::File> > conflicts;
+  for(pos=files_list;pos;++pos)
+  {
+    const GUTF8String save_name=files_list[pos]->check_save_name(save_as_bundled).downcase();
+    if(save_map.contains(save_name))
+    {
+      conflicts[save_name].append(files_list[pos]);
+    }else
+    {
+      save_map[save_name]=0;
+    }
+  }
+  for(pos=conflicts;pos;++pos)
+  {
+    const GUTF8String &save_name=conflicts.key(pos);
+    const int dot=save_name.rsearch('.',0);
+    GPList<DjVmDir::File> &cfiles=conflicts[pos];
+    int count=1;
+    for(GPosition qpos=cfiles;qpos;++qpos)
+    {
+      GUTF8String new_name=cfiles[qpos]->get_load_name();
+      if((new_name != GUTF8String(GNativeString(new_name)))
+        ||conflicts.contains(new_name))
+      {
+        do
+        {
+          new_name=(dot<0)
+            ?(save_name+"-"+GUTF8String(count++))
+            :(save_name.substr(0,dot)+"-"+GUTF8String(count++)+
+              save_name.substr(dot,(unsigned int)(-1)));
+        } while(save_map.contains(new_name.downcase()));
+      }
+      cfiles[qpos]->set_save_name(new_name);
+      save_map[new_name]=0;
+    }
+  }
+  return files_list;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVmDir.h b/libdjvu/DjVmDir.h
new file mode 100644
index 0000000..4226305
--- /dev/null
+++ b/libdjvu/DjVmDir.h
@@ -0,0 +1,453 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVMDIR_H
+#define _DJVMDIR_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name DjVmDir.h
+    Files #"DjVmDir.h"# and #"DjVmDir.cpp"# implement class \Ref{DjVmDir} for
+    representing the directory of a DjVu multipage document.
+
+    {\bf Bundled vs. Indirect format} --- There are currently two multipage
+    DjVu formats supported: {\em bundled} and {\em indirect}.  In the first
+    format all component files composing a given document are packaged (or
+    bundled) into one file, in the second one every page and component is
+    stored in a separate file and there is one more file, which contains the
+    list of all others.
+
+    {\bf Multipage DjVu format} --- Multipage DjVu documents follow the EA
+    IFF85 format (cf. \Ref{IFFByteStream.h}.)  A document is composed of a
+    #"FORM:DJVM"# whose first chunk is a #"DIRM"# chunk containing the {\em
+    document directory}.  This directory lists all component files composing
+    the given document, helps to access every component file and identify the
+    pages of the document.
+    \begin{itemize} 
+    \item In a {\em bundled} multipage file, the component files 
+         are stored immediately after the #"DIRM"# chunk,
+         within the #"FORM:DJVU"# composite chunk.  
+    \item In an {\em indirect} multipage file, the component files are 
+          stored in different files whose URLs are composed using information 
+          stored in the #"DIRM"# chunk.
+    \end{itemize} 
+    Most of the component files represent pages of a document.  Some files
+    however represent data shared by several pages.  The pages refer to these
+    supporting files by means of an inclusion chunk (#"INCL"# chunks)
+    identifying the supporting file.
+
+    {\bf Document Directory} --- Every directory record describes a component
+    file.  Each component file is identified by a small string named the
+    identifier (ID).  Each component file also contains a file name and a
+    title.  The format of the #"DIRM"# chunk is described in section
+    \Ref{Format of the DIRM chunk.}.
+
+    Theoretically, IDs are used to uniquely identify each component file in
+    #"INCL"# chunks, names are used to compose the the URLs of the component
+    files in an indirect multipage DjVu file, and titles are cosmetic names
+    possibly displayed when viewing a page of a document.  There are however
+    many problems with this scheme, and we {\em strongly suggest}, with the
+    current implementation to always make the file ID, the file name and the
+    file title identical.
+
+    @memo Implements DjVu multipage document directory
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+//@{
+
+
+
+#include "GString.h"
+#include "GThreads.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+
+/** Implements DjVu multipage document directory.  There are currently two
+    multipage DjVu formats supported: {\em bundled} and {\em indirect}.  In
+    the first format all component files composing a given document are
+    packaged (or bundled) into one file, in the second one every page and
+    component is stored in a separate file and there is one more file, which
+    contains the list of all others.
+
+    The multipage document directory lists all component files composing the
+    given document, helps to access every file, identify pages and maintain
+    user-specified shortcuts.  Every directory record describes a file
+    composing the document.  Each file is identified by a small string named
+    the identifier (ID).  Each file may also contain a file name and a title.
+
+    The #DjVmDir# class represents a multipage document directory.  Its main
+    purpose is to encode and decode the document directory when writing or
+    reading the #DIRM# chunk.  Normally you don't have to create this class
+    yourself. It's done automatically when \Ref{DjVmDoc} class initializes
+    itself. It may be useful though to be able to access records in the
+    directory because some classes (like \Ref{DjVuDocument} and \Ref{DjVmDoc})
+    return a pointer to #DjVmDir# in some cases. */
+
+class DJVUAPI DjVmDir : public GPEnabled
+{
+protected:
+      /** Class \Ref{DjVmDir::File} represents the directory records
+          managed by class \Ref{DjVmDir}. */
+   DjVmDir(void) { } ;
+public:
+   class File;
+
+   static const int version;
+
+      /** Class \Ref{DjVmDir::File} represents the directory records
+          managed by class \Ref{DjVmDir}. */
+   static GP<DjVmDir> create(void) {return new DjVmDir; } ;
+
+      /** Decodes the directory from the specified stream. */
+   void decode(const GP<ByteStream> &stream);
+      /** Encodes the directory into the specified stream. */
+   void encode(const GP<ByteStream> &stream, const bool do_rename=false) const;
+      /** Encodes the directory into the specified stream, 
+          explicitely as bundled or indirect. */
+  void encode(const GP<ByteStream> &stream, 
+              const bool bundled, const bool do_rename) const;
+      /** Tests if directory defines an {\em indirect} document. */
+   inline bool is_indirect(void) const;
+      /** Tests if the directory defines a {\em bundled} document. */
+   inline bool is_bundled(void) const;
+      /** Translates page numbers to file records. */
+   GP<File> page_to_file(int page_num) const;
+      /** Translates file names to file records. */
+   GP<File> name_to_file(const GUTF8String & name) const;
+      /** Translates file IDs to file records. */
+   GP<File> id_to_file(const GUTF8String &id) const;
+      /** Translates file shortcuts to file records. */
+   GP<File> title_to_file(const GUTF8String &title) const;
+      /** Access file record by position. */
+   GP<File> pos_to_file(int fileno, int *ppageno=0) const;
+      /** Returns position of the file in the directory. */
+   int get_file_pos(const File * f) const;
+      /** Returns position of the given page in the directory. */
+   int get_page_pos(int page_num) const;
+      /** Check for duplicate names, and resolve them. */
+   GPList<File> resolve_duplicates(const bool save_as_bundled);
+      /** Returns a copy of the list of file records. */
+   GPList<File> get_files_list(void) const;
+      /** Returns the number of file records. */
+   int get_files_num(void) const;
+      /** Returns the number of file records representing pages. */
+   int get_pages_num(void) const;
+      /** Returns back pointer to the file with #SHARED_ANNO# flag.
+        Note that there may be only one file with shared annotations
+        in any multipage DjVu document. */
+   GP<File> get_shared_anno_file(void) const;
+      /** Changes the title of the file with ID #id#. */
+   void set_file_title(const GUTF8String &id, const GUTF8String &title);
+      /** Changes the name of the file with ID #id#. */
+   void set_file_name(const GUTF8String &id, const GUTF8String &name);
+      /** Inserts the specified file record at the specified position.
+        Specifying #pos# equal to #-1# means to append.  The actual position
+        inserted is returned. */
+   int insert_file(const GP<File> & file, int pos=-1);
+      /** Removes a file record with ID #id#. */
+   void delete_file(const GUTF8String &id);
+private:
+   GCriticalSection class_lock;
+   GPList<File>	files_list;
+   GPArray<File> page2file;
+   GPMap<GUTF8String, File> name2file;
+   GPMap<GUTF8String, File> id2file;
+   GPMap<GUTF8String, File> title2file;
+private: //dummy stuff
+   static void decode(ByteStream *);
+   static void encode(ByteStream *);
+};
+
+class DJVUAPI DjVmDir::File : public GPEnabled
+{
+public:
+  // Out of the record: INCLUDE below must be zero and PAGE must be one.
+  // This is to avoid problems with the File constructor, which now takes
+  // 'int file_type' as the last argument instead of 'bool is_page'
+  
+  /** File type. Possible file types are:
+     \begin{description}
+       \item[PAGE] This is a top level page file. It may include other
+         #INCLUDE#d files, which may in turn be shared between
+         different pages.
+       \item[INCLUDE] This file is included into some other file inside
+         this document.
+       \item[THUMBNAILS] This file contains thumbnails for the document
+         pages.
+       \item[SHARED_ANNO] This file contains annotations shared by
+         all the pages. It's supposed to be included into every page
+         for the annotations to take effect. There may be only one
+         file with shared annotations in a document.
+     \end{description} */
+  enum FILE_TYPE { INCLUDE=0, PAGE=1, THUMBNAILS=2, SHARED_ANNO=3 };
+protected:
+  /** Default constructor. */
+  File(void);
+
+public:
+  static GP<File> create(void) { return new File(); }
+  static GP<File> create(const GUTF8String &load_name,
+     const GUTF8String &save_name, const GUTF8String &title,
+     const FILE_TYPE file_type);
+
+  /** Check for filenames that are not valid for the native encoding,
+      and change them. */
+  const GUTF8String &check_save_name(const bool as_bundled);
+
+  /** File name.  The optional file name must be unique and is the name
+      that will be used when the document is saved to an indirect file.
+      If not assigned, the value of #id# will be used for this purpose.
+      By keeping the name in {\em bundled} document we guarantee, that it
+      can be expanded later into {\em indirect} document and files will
+      still have the same names, if the name is legal on a given filesystem.
+    */
+  const GUTF8String &get_save_name(void) const;
+
+  /** File identifier.  The encoder assigns a unique identifier to each file
+      in a multipage document. This is the name used when loading files.
+      Indirection chunks in other files (#"INCL"# chunks) may refer to another
+      file using its identifier. */
+  const GUTF8String &get_load_name(void) const;
+  void set_load_name(const GUTF8String &id);
+
+  /** File title.  The file title is assigned by the user and may be used as
+      a shortcut for viewing a particular page.  Names like #"chapter1"# or
+      #"appendix"# are appropriate. */
+  const GUTF8String &get_title() const;
+  void set_title(const GUTF8String &id);
+
+  /** Reports an ascii string indicating file type. */
+  GUTF8String get_str_type(void) const;
+
+  /** Offset of the file data in a bundled DJVM file.  This number is
+      relevant in the {\em bundled} case only when everything is packed into
+      one single file. */
+  int offset;
+
+  /** Size of the file data in a bundled DJVM file.  This number is
+      relevant in the {\em bundled} case only when everything is
+      packed into one single file. */
+  int size;
+
+  /** Have we checked the saved file name, to see if it is valid on the
+      local disk? */
+  bool valid_name;
+
+  /** Tests if this file represents a page of the document. */
+  bool is_page(void) const 
+  {
+    return (flags & TYPE_MASK)==PAGE;
+  }
+
+  /** Returns #TRUE# if this file is included into some other files of
+      this document. */
+  bool is_include(void) const
+  {
+    return (flags & TYPE_MASK)==INCLUDE;
+  }
+
+  /** Returns #TRUE# if this file contains thumbnails for the document pages. */
+  bool is_thumbnails(void) const
+  {
+    return (flags & TYPE_MASK)==THUMBNAILS;
+  }
+
+  /** Returns the page number of this file. This function returns
+      #-1# if this file does not represent a page of the document. */
+  bool is_shared_anno(void) const
+  { return (flags & TYPE_MASK)==SHARED_ANNO; }
+
+  int get_page_num(void) const 
+  { return page_num; } 
+protected:
+  GUTF8String name;
+  GUTF8String oldname;
+  GUTF8String id;
+  GUTF8String title; 
+  void set_save_name(const GUTF8String &name);
+private:
+      friend class DjVmDir;
+      enum FLAGS_0 { IS_PAGE_0=1, HAS_NAME_0=2, HAS_TITLE_0=4 };
+      enum FLAGS_1 { HAS_NAME=0x80, HAS_TITLE=0x40, TYPE_MASK=0x3f };
+      unsigned char flags;
+      int page_num;
+};
+
+inline const GUTF8String &
+DjVmDir::File::get_load_name(void) const
+{ return id; }
+
+inline const GUTF8String &
+DjVmDir::File::get_title() const
+{ return *(title.length()?&title:&id); }
+
+inline void
+DjVmDir::File::set_title(const GUTF8String &xtitle) { title=xtitle; }
+
+/** @name Format of the DIRM chunk.
+
+    {\bf Variants} --- There are two versions of the #"DIRM"# chunk format.
+    The version number is identified by the seven low bits of the first byte
+    of the chunk.  Version {\bf 0} is obsolete and should never be used.  This
+    section describes version {\bf 1}.  There are two major multipage DjVu
+    formats supported: {\em bundled} and {\em indirect}.  The #"DIRM"# chunk
+    indicates which format is used in the most significant bit of the first
+    byte of the chunk.  The document is bundled when this bit is set.
+    Otherwise the document is indirect.
+
+    {\bf Unencoded data} --- The #"DIRM"# chunk is composed some unencoded
+    data followed by \Ref{bzz} encoded data.  The unencoded data starts with
+    the version byte and a 16 bit integer representing the number of component
+    files.  All integers are encoded with the most significant byte first.
+    \begin{verbatim}
+          BYTE:             Flags/Version:  0x<bundled>0000011
+          INT16:            Number of component files.
+    \end{verbatim}
+    When the document is a bundled document (i.e. the flag #bundled# is set),
+    this header is followed by the offsets of each of the component files within
+    the #"FORM:DJVM"#.  These offsets allow for random component file access.
+    \begin{verbatim}
+          INT32:            Offset of first component file.
+          INT32:            Offset of second component file.
+          ...
+          INT32:            Offset of last component file.
+    \end{verbatim}
+
+    {\bf BZZ encoded data} --- The rest of the chunk is entirely compressed
+    with the BZZ general purpose compressor.  We describe now the data fed
+    into (or retrieved from) the BZZ codec (cf. \Ref{BSByteStream}.)  First
+    come the sizes and the flags associated with each component file.
+    \begin{verbatim}
+          INT24:             Size of the first component file.
+          INT24:             Size of the second component file.
+          ...
+          INT24:             Size of the last component file.
+          BYTE:              Flag byte for the first component file.
+          BYTE:              Flag byte for the second component file.
+          ...
+          BYTE:              Flag byte for the last component file.
+    \end{verbatim}
+    The flag bytes have the following format:
+    \begin{verbatim}
+          0b<hasname><hastitle>000000     for a file included by other files.
+          0b<hasname><hastitle>000001     for a file representing a page.
+          0b<hasname><hastitle>000010     for a file containing thumbnails.
+    \end{verbatim}
+    Flag #hasname# is set when the name of the file is different from the file
+    ID.  Flag #hastitle# is set when the title of the file is different from
+    the file ID.  These flags are used to avoid encoding the same string three
+    times.  Then come a sequence of zero terminated strings.  There are one to
+    three such strings per component file.  The first string contains the ID
+    of the component file.  The second string contains the name of the
+    component file.  It is only present when the flag #hasname# is set. The third
+    one contains the title of the component file. It is only present when the
+    flag #hastitle# is set. The \Ref{bzz} encoding system makes sure that 
+    all these strings will be encoded efficiently despite their possible
+    redundancies.
+    \begin{verbatim}
+          ZSTR:     ID of the first component file.
+          ZSTR:     Name of the first component file (only if #hasname# is set.)
+          ZSTR:     Title of the first component file (only if #hastitle# is set.)
+          ... 
+          ZSTR:     ID of the last component file.
+          ZSTR:     Name of the last component file (only if #hasname# is set.)
+          ZSTR:     Title of the last component file (only if #hastitle# is set.)
+    \end{verbatim}
+
+    @memo Description of the format of the DIRM chunk.  */
+//@}
+
+
+
+// -------------- IMPLEMENTATION
+
+
+inline bool
+DjVmDir::is_bundled(void) const
+{
+  return ! is_indirect();
+}
+
+inline bool
+DjVmDir::is_indirect(void) const
+{
+  GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+  return ( files_list.size() && files_list[files_list] != 0 &&
+           files_list[files_list]->offset==0 );
+}
+
+
+
+// ----- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVmDir0.cpp b/libdjvu/DjVmDir0.cpp
new file mode 100644
index 0000000..c495581
--- /dev/null
+++ b/libdjvu/DjVmDir0.cpp
@@ -0,0 +1,168 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVmDir0.h"
+#include "ByteStream.h"
+#include "debug.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+int
+DjVmDir0::get_size(void) const
+      // WARNING! make sure, that get_size(), encode() and decode() are in sync
+{
+   int size=0;
+
+   size+=2;	// number of files
+   for(int i=0;i<num2file.size();i++)
+   {
+      FileRec & file=*num2file[i];
+      size+=file.name.length()+1;	// file name
+      size+=1;				// is IFF file
+      size+=4;				// file offset
+      size+=4;				// file size
+   };
+
+   return size;
+}
+
+#ifndef NEED_DECODER_ONLY
+void
+DjVmDir0::encode(ByteStream & bs)
+      // WARNING! make sure, that get_size(), encode() and decode() are in sync
+{
+   bs.write16(num2file.size());
+   for(int i=0;i<num2file.size();i++)
+   {
+      FileRec & file=*num2file[i];
+      bs.writestring(file.name);
+      bs.write8(0);
+      bs.write8(file.iff_file);
+      bs.write32(file.offset);
+      bs.write32(file.size);
+   }
+}
+#endif
+
+void
+DjVmDir0::decode(ByteStream & bs)
+      // WARNING! make sure, that get_size(), encode() and decode() are in sync
+{
+   name2file.empty();
+   num2file.empty();
+
+   for(int i=bs.read16();i>0;i--)
+   {
+      GUTF8String name;
+      char ch;
+      while(bs.read(&ch, 1) && ch) name+=ch;
+      bool iff_file=bs.read8()?true:false;
+      int offset=bs.read32();
+      int size=bs.read32();
+      add_file(name, iff_file, offset, size);
+   };
+}
+
+GP<DjVmDir0::FileRec>
+DjVmDir0::get_file(const GUTF8String &name)
+{
+   if (name2file.contains(name))
+     return name2file[name];
+   return 0;
+}
+
+GP<DjVmDir0::FileRec>
+DjVmDir0::get_file(int file_num)
+{
+   if (file_num<num2file.size()) return num2file[file_num];
+   return 0;
+}
+
+void
+DjVmDir0::add_file(
+  const GUTF8String &name, bool iff_file, int offset, int size)
+{
+   DEBUG_MSG("DjVmDir0::add_file(): name='" << name << "', iff=" << iff_file <<
+	     ", offset=" << offset << "\n");
+   
+   if (name.search('/') >= 0)
+     G_THROW( ERR_MSG("DjVmDir0.no_slash") );
+   
+   GP<FileRec> file=new FileRec(name, iff_file, offset, size);
+   name2file[name]=file;
+   num2file.resize(num2file.size());
+   num2file[num2file.size()-1]=file;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVmDir0.h b/libdjvu/DjVmDir0.h
new file mode 100644
index 0000000..14f6886
--- /dev/null
+++ b/libdjvu/DjVmDir0.h
@@ -0,0 +1,216 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVMDIR0_H
+#define _DJVMDIR0_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GString.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+
+/** @name DjVmDir0.h
+
+    Files #"DjVmDir0.h"# and #"DjVmDir0.cpp"# contain implementation of
+    \Ref{DjVmDir0} class responsible for reading and writing the directory
+    of a multipage all-in-one-file DjVu document (usually referred to as
+    {\bf DjVm} document.
+
+    This is {\bf not} a navigation directory, which lists all the pages
+    in a multipage document. The navigation directory is supported by class
+    \Ref{DjVuNavDir}. This is the directory of a DjVm archive.
+    
+
+    @memo Directory of DjVu all-in-one-file DjVu documents.
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+/** Directory of all-in-one-file DjVu documents (also known as DjVm documents).
+    This class can read and write the directory (table of contents, in other
+    words) of a DjVm document. This table of contents lists all {\bf files}
+    included into the document, not {\bf pages} like \Ref{DjVuNavDir} does.
+    It is normally stored in the document inside {\bf DIR0} chunk where
+    {\bf "0"} refers to the version number.
+
+    An object of this class can be created either as a result of the decoding
+    of an existing DjVm file, or manually by calling the default constructor
+    and adding later directory entries by means of \Ref{add_file}() function.
+
+    You normally will not want to create or decode this directory manually.
+    \Ref{DjVmFile} class will do it for you. */
+class DjVmDir0 : public GPEnabled
+{
+public:
+      /** Describes a file record inside a DjVm document (archive) */
+   class FileRec;
+private:
+   GMap<GUTF8String, GP<FileRec> >	name2file;
+   GPArray<FileRec>		num2file;
+protected:
+      /// Default constructor
+   DjVmDir0(void) {};
+public:
+      /// Copy constructor
+   DjVmDir0(const DjVmDir0 & d);
+
+   static GP<DjVmDir0> create(void) {return new DjVmDir0;}
+
+   virtual ~DjVmDir0(void) {};
+
+      /// Returns the number of files in the DjVm archive
+   int		get_files_num(void) const;
+   
+      /// Returns the file record with name #name#
+   GP<FileRec>	get_file(const GUTF8String &name);
+
+      /// Returns the file record number #file_num#
+   GP<FileRec>	get_file(int file_num);
+
+      /** Creates a new file record with name #name# at offset
+	  #offset# and size #size#, which is in IFF format if
+	  #iff_file# is #TRUE#. */
+   void		add_file(const GUTF8String &name, bool iff_file,
+			 int offset=-1, int size=-1);
+
+      /// Returns the size of the directory if it were encoded in #DIR0# chunk
+   int		get_size(void) const;
+
+      /** Encodes the directory in #DIR0# chunk into the specified
+	  \Ref{ByteStream} */
+   void		encode(ByteStream & bs);
+
+      /** Decodes the directory from #DIR0# chunk from the specified
+	  \Ref{ByteStream} */
+   void		decode(ByteStream & bs);
+
+};
+
+      /** Describes a file record inside a DjVm document (archive) */
+class DjVmDir0::FileRec : public GPEnabled
+{
+public:
+  /// Name of the file.
+  GUTF8String		name;
+  /// 1 if the file is in IFF format.
+  bool		iff_file;
+  /// Offset of the file in the archive.
+  int		offset;
+  /// Size of the file
+  int		size;
+
+  friend int	operator==(const FileRec & f1, const FileRec & f2);
+
+  /// Constructs the #FileRec# object
+  FileRec(const GUTF8String &name, bool iff_file,
+	      int offset=-1, int size=-1);
+  /// Default constructor
+  FileRec(void);
+  virtual ~FileRec(void);
+};
+
+inline
+DjVmDir0::FileRec::FileRec(
+  const GUTF8String &name_in, bool iff_file_in, int offset_in, int size_in)
+: name(name_in), iff_file(iff_file_in), offset(offset_in), size(size_in)
+{
+}
+
+inline
+DjVmDir0::FileRec::FileRec(void) : iff_file(0), offset(-1), size(-1)
+{
+}
+
+inline
+DjVmDir0::FileRec::~FileRec(void)
+{
+}
+
+inline int
+DjVmDir0::get_files_num(void) const
+{
+   return num2file.size();
+}
+
+inline
+DjVmDir0::DjVmDir0(const DjVmDir0 & d) :
+      name2file(d.name2file), num2file(d.num2file)
+{
+}
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVmDoc.cpp b/libdjvu/DjVmDoc.cpp
new file mode 100644
index 0000000..b5db247
--- /dev/null
+++ b/libdjvu/DjVmDoc.cpp
@@ -0,0 +1,662 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVmDoc.h"
+#include "DjVmNav.h"
+#include "DataPool.h"
+#include "IFFByteStream.h"
+#include "GOS.h"
+#include "debug.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+static const char octets[4]={0x41,0x54,0x26,0x54};
+
+// Save the file to disk, remapping INCL chunks while saving.
+static void
+save_file(
+  IFFByteStream &iff_in, IFFByteStream &iff_out, const DjVmDir &dir,
+  GMap<GUTF8String,GUTF8String> &incl)
+{
+  GUTF8String chkid;
+  if (iff_in.get_chunk(chkid))
+  {
+    iff_out.put_chunk(chkid,true);
+    if(!chkid.cmp("FORM:",5))
+    {
+      for(;iff_in.get_chunk(chkid);iff_in.close_chunk())
+      {
+        iff_out.put_chunk(chkid);
+        if(chkid == "INCL")
+        {
+          GUTF8String incl_str;
+          char buffer[1024];
+          int length;
+          while((length=iff_in.read(buffer, 1024)))
+            incl_str+=GUTF8String(buffer, length);
+          // Eat '\n' in the beginning and at the end
+          while(incl_str.length() && incl_str[0]=='\n')
+          {
+            incl_str=incl_str.substr(1,(unsigned int)(-1));
+          }
+          while(incl_str.length()>0 && incl_str[(int)incl_str.length()-1]=='\n')
+          {
+            incl_str.setat(incl_str.length()-1, 0);
+          }
+          GPosition pos=incl.contains(incl_str);
+          if(pos)
+          { 
+            iff_out.get_bytestream()->writestring(incl[pos]);
+          }else
+          {
+            GP<DjVmDir::File> incl_file=dir.id_to_file(incl_str); 
+            if(incl_file)
+            {
+              DEBUG_MSG("INCL '"<<(const char *)incl_file->get_save_name()<<"'\n");
+              const GUTF8String incl_name=incl_file->get_save_name();
+              incl[incl_str]=incl_name;
+              iff_out.get_bytestream()->writestring(incl_name);
+            }else
+            {
+              DEBUG_MSG("BOGUS INCL '"<<(const char *)incl_str<<"'\n");
+              iff_out.copy(*iff_in.get_bytestream());
+            }
+          }
+        }else
+        {
+          iff_out.copy(*iff_in.get_bytestream());
+        }
+        iff_out.close_chunk();
+      }
+    }else
+    {
+      iff_out.copy(*iff_in.get_bytestream());
+    }
+    iff_out.close_chunk();
+    iff_in.close_chunk();
+  }
+}
+
+DjVmDoc::DjVmDoc(void)
+{
+   DEBUG_MSG("DjVmDoc::DjVmDoc(): Constructing empty DjVm document.\n");
+   DEBUG_MAKE_INDENT(3);
+}
+
+void
+DjVmDoc::init(void)
+{
+  dir=DjVmDir::create();
+}
+
+GP<DjVmDoc>
+DjVmDoc::create(void)
+{
+  DjVmDoc *doc=new DjVmDoc();
+  GP<DjVmDoc> retval=doc;
+  doc->init();
+  return retval;
+}
+
+void
+DjVmDoc::insert_file(const GP<DjVmDir::File> & f,
+		     GP<DataPool> data_pool, int pos)
+{
+   DEBUG_MSG("DjVmDoc::insert_file(): inserting file '" << f->get_load_name() <<
+	     "' at pos " << pos << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (!f)
+     G_THROW( ERR_MSG("DjVmDoc.no_zero_file") );
+   if (data.contains(f->get_load_name()))
+     G_THROW( ERR_MSG("DjVmDoc.no_duplicate") );
+
+   char buffer[4];
+   if (data_pool->get_data(buffer, 0, 4)==4 && !memcmp(buffer, octets, 4))
+   {
+      data_pool=DataPool::create(data_pool, 4, -1);
+   } 
+   data[f->get_load_name()]=data_pool;
+   dir->insert_file(f, pos);
+}
+
+void
+DjVmDoc::insert_file(
+  ByteStream &data, DjVmDir::File::FILE_TYPE file_type,
+  const GUTF8String &name, const GUTF8String &id, const GUTF8String &title,
+  int pos)
+{
+   const GP<DjVmDir::File> file(
+     DjVmDir::File::create(name, id, title, file_type));
+   const GP<DataPool> pool(DataPool::create());
+      // Cannot connect to a bytestream.
+      // Must copy data into the datapool.
+   int nbytes;
+   char buffer[1024];
+   while ((nbytes = data.read(buffer, sizeof(buffer))))
+      pool->add_data(buffer, nbytes);
+   pool->set_eof();
+      // Call low level insert
+   insert_file(file, pool, pos);
+}
+
+void
+DjVmDoc::insert_file(
+  const GP<DataPool> &pool, DjVmDir::File::FILE_TYPE file_type,
+  const GUTF8String &name, const GUTF8String &id, const GUTF8String &title,
+  int pos)
+{
+   const GP<DjVmDir::File> file(
+     DjVmDir::File::create(name, id, title, file_type));
+      // Call low level insert
+   insert_file(file, pool, pos);
+}
+
+void
+DjVmDoc::delete_file(const GUTF8String &id)
+{
+   DEBUG_MSG("DjVmDoc::delete_file(): deleting file '" << id << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   if (!data.contains(id))
+      G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_delete") "\t") + id);
+   
+   data.del(id);
+   dir->delete_file(id);
+}
+
+void 
+DjVmDoc::set_djvm_nav(GP<DjVmNav> n)
+{
+  if (n && ! n->isValidBookmark())
+    G_THROW("Invalid bookmark data");
+  nav = n;
+}
+
+GP<DataPool>
+DjVmDoc::get_data(const GUTF8String &id) const
+{
+  GPosition pos;
+  if (!data.contains(id, pos))
+    G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_find") "\t") + id);
+  const GP<DataPool> pool(data[pos]);
+   // First check that the file is in IFF format
+  G_TRY
+  {
+    const GP<ByteStream> str_in(pool->get_stream());
+    const GP<IFFByteStream> giff_in=IFFByteStream::create(str_in);
+    IFFByteStream &iff_in=*giff_in;
+    GUTF8String chkid;
+    int size=iff_in.get_chunk(chkid);
+    if (size<0 || size>0x7fffffff)
+      G_THROW( ERR_MSG("DjVmDoc.not_IFF") "\t" + id);
+  }
+  G_CATCH_ALL 
+  {
+    G_THROW( ERR_MSG("DjVmDoc.not_IFF") "\t" + id);
+  }
+  G_ENDCATCH;
+  return pool;
+}
+
+void
+DjVmDoc::write(const GP<ByteStream> &gstr)
+{
+  const GMap<GUTF8String,void *> reserved;
+  write(gstr,reserved);
+}
+
+static inline GUTF8String
+get_name(const DjVmDir::File &file)
+{
+  const GUTF8String save_name(file.get_save_name());
+  return save_name.length()?save_name:(file.get_load_name());
+}
+
+void
+DjVmDoc::write(const GP<ByteStream> &gstr,
+               const GMap<GUTF8String,void *> &reserved)
+{
+  DEBUG_MSG("DjVmDoc::write(): Storing document into the byte stream.\n");
+  DEBUG_MAKE_INDENT(3);
+
+  GPList<DjVmDir::File> files_list=dir->resolve_duplicates(true);
+  bool do_rename=false;
+  GPosition pos(reserved);
+
+  GMap<GUTF8String,GUTF8String> incl;
+  DEBUG_MSG("pass 1: looking for reserved names.");
+  if(pos)
+  {
+      // Check if there are any conflicting file names.
+    for(pos=files_list;pos;++pos)
+    {
+      GP<DjVmDir::File> file=files_list[pos];
+      if((do_rename=(reserved.contains(file->get_load_name())?true:false))
+		  ||(do_rename=(reserved.contains(file->get_save_name())?true:false)))
+      {
+        break;
+      }
+    }
+    // If there are conflicting file names, check if the save names
+    // are OK.  If not, generate new save names.
+    if(do_rename)
+    {
+      DEBUG_MSG("pass 1: renaming reserved names.");
+      for(;;files_list=dir->resolve_duplicates(true))
+      {
+        GMap<GUTF8String,void *> this_doc;
+        for(pos=files_list;pos;++pos)
+        {
+          GP<DjVmDir::File> file=files_list[pos];
+          this_doc[::get_name(*file)]=0;
+        }
+        bool need_new_list=false;
+        for(pos=files_list;pos;++pos)
+        {
+          GP<DjVmDir::File> file=files_list[pos];
+          const GUTF8String name(::get_name(*file));
+          if(reserved.contains(name))
+          {
+            GUTF8String new_name;
+            int series=0;
+            do
+            {
+              int dot=name.rsearch('.');
+              if(dot>0)
+              {
+                new_name=name.substr(0,dot)+
+                  "_"+GUTF8String(++series)+name.substr(dot,-1);
+              }else
+              {
+                new_name=name+"_"+GUTF8String(++series);
+              }
+            } while(reserved.contains(new_name)||this_doc.contains(new_name));
+            dir->set_file_name(file->get_load_name(),new_name);
+            need_new_list=true;
+          }
+        }
+        if(!need_new_list)
+          break;
+      }
+    }
+  }
+
+  DEBUG_MSG("pass 2: create dummy DIRM chunk and calculate offsets...\n");
+  for(pos=files_list;pos;++pos)
+  {
+    GP<DjVmDir::File> file=files_list[pos];
+    file->offset=0xffffffff;
+    GPosition data_pos=data.contains(file->get_load_name());
+    if (!data_pos)
+      G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name());
+    if(do_rename)
+    {
+      GP<ByteStream> gout(ByteStream::create());
+      {
+        const GP<IFFByteStream> giff_in(
+          IFFByteStream::create(data[data_pos]->get_stream()));
+        const GP<IFFByteStream> giff_out(IFFByteStream::create(gout));
+        ::save_file(*giff_in,*giff_out,*dir,incl);
+      }
+      gout->seek(0L);
+      data[data_pos]=DataPool::create(gout);
+    }
+    file->size=data[data_pos]->get_length();
+    if (!file->size)
+      G_THROW( ERR_MSG("DjVmDoc.zero_file") );
+  }
+   
+  const GP<ByteStream> tmp_str(ByteStream::create());
+  const GP<IFFByteStream> gtmp_iff(IFFByteStream::create(tmp_str));
+  IFFByteStream &tmp_iff=*gtmp_iff;
+  tmp_iff.put_chunk("FORM:DJVM", 1);
+  tmp_iff.put_chunk("DIRM");
+  dir->encode(tmp_iff.get_bytestream(),do_rename);
+  tmp_iff.close_chunk();
+  if (nav)
+    {
+      tmp_iff.put_chunk("NAVM");
+      nav->encode(tmp_iff.get_bytestream());
+      tmp_iff.close_chunk();
+    }
+  tmp_iff.close_chunk();
+  int offset=tmp_iff.tell();
+
+  for(pos=files_list;pos;++pos)
+  {
+    if ((offset & 1)!=0)
+      offset++;
+      
+    GP<DjVmDir::File> & file=files_list[pos];
+    file->offset=offset;
+    offset+=file->size;	// file->size has been set in the first pass
+  }
+
+  DEBUG_MSG("pass 3: store the file contents.\n");
+
+  GP<IFFByteStream> giff=IFFByteStream::create(gstr);
+  IFFByteStream &iff=*giff;
+  iff.put_chunk("FORM:DJVM", 1);
+  iff.put_chunk("DIRM");
+  dir->encode(iff.get_bytestream(),do_rename);
+  iff.close_chunk();
+  if (nav)
+    {
+      iff.put_chunk("NAVM");
+      nav->encode(iff.get_bytestream());
+      iff.close_chunk();
+    }
+
+  for(pos=files_list;pos;++pos)
+  {
+    GP<DjVmDir::File> & file=files_list[pos];
+
+    const GP<DataPool> pool=get_data(file->get_load_name());
+    const GP<ByteStream> str_in(pool->get_stream());
+    if ((iff.tell() & 1)!=0)
+    {
+      iff.get_bytestream()->write8(0);
+    }
+    iff.copy(*str_in);
+  }
+
+  iff.close_chunk();
+  iff.flush();
+
+  DEBUG_MSG("done storing DjVm file.\n");
+}
+
+void
+DjVmDoc::read(const GP<DataPool> & pool)
+{
+   DEBUG_MSG("DjVmDoc::read(): reading the BUNDLED doc contents from the pool\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   const GP<ByteStream> str(pool->get_stream());
+   
+   GP<IFFByteStream> giff=IFFByteStream::create(str);
+   IFFByteStream &iff=*giff;
+   GUTF8String chkid;
+   iff.get_chunk(chkid);
+   if (chkid!="FORM:DJVM")
+      G_THROW( ERR_MSG("DjVmDoc.no_form_djvm") );
+
+   iff.get_chunk(chkid);
+   if (chkid!="DIRM")
+      G_THROW( ERR_MSG("DjVmDoc.no_dirm_chunk") );
+   dir->decode(iff.get_bytestream());
+   iff.close_chunk();
+
+   data.empty();
+
+   if (dir->is_indirect())
+      G_THROW( ERR_MSG("DjVmDoc.cant_read_indr") );
+
+   GPList<DjVmDir::File> files_list=dir->get_files_list();
+   for(GPosition pos=files_list;pos;++pos)
+   {
+      DjVmDir::File * f=files_list[pos];
+      
+      DEBUG_MSG("reading contents of file '" << f->get_load_name() << "'\n");
+      data[f->get_load_name()]=DataPool::create(pool, f->offset, f->size);
+   }
+}
+
+void
+DjVmDoc::read(ByteStream & str_in)
+{
+   DEBUG_MSG("DjVmDoc::read(): reading the BUNDLED doc contents from the stream\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GP<DataPool> pool=DataPool::create();
+   char buffer[1024];
+   int length;
+   while((length=str_in.read(buffer, 1024)))
+      pool->add_data(buffer, length);
+   pool->set_eof();
+
+   read(pool);
+}
+
+void
+DjVmDoc::read(const GURL &url)
+{
+   DEBUG_MSG("DjVmDoc::read(): reading the doc contents from the HDD\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GP<DataPool> pool=DataPool::create(url);
+   const GP<ByteStream> str(pool->get_stream());
+   GP<IFFByteStream> giff=IFFByteStream::create(str);
+   IFFByteStream &iff=*giff;
+   GUTF8String chkid;
+   iff.get_chunk(chkid);
+   if (chkid!="FORM:DJVM")
+      G_THROW( ERR_MSG("DjVmDoc.no_form_djvm2") );
+
+   iff.get_chunk(chkid);
+   if (chkid!="DIRM")
+      G_THROW( ERR_MSG("DjVmDoc.no_dirm_chunk") );
+   dir->decode(iff.get_bytestream());
+   iff.close_chunk();
+
+   if (dir->is_bundled())
+     read(pool);
+   else
+   {
+//      GUTF8String full_name=GOS::expand_name(name);
+//      GUTF8String dir_name=GOS::dirname(GOS::url_to_filename(url.base()));
+      GURL dirbase=url.base();
+
+      data.empty();
+
+      GPList<DjVmDir::File> files_list=dir->get_files_list();
+      for(GPosition pos=files_list;pos;++pos)
+      {
+	 DjVmDir::File * f=files_list[pos];
+      
+	 DEBUG_MSG("reading contents of file '" << f->get_load_name() << "'\n");
+
+         const GURL::UTF8 url(f->get_load_name(),dirbase);
+	 data[f->get_load_name()]=DataPool::create(url);
+      }
+   }
+}
+
+void
+DjVmDoc::write_index(const GP<ByteStream> &str)
+{
+   DEBUG_MSG("DjVmDoc::write_index(): Storing DjVm index file\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GPList<DjVmDir::File> files_list=dir->get_files_list();
+   for(GPosition pos=files_list;pos;++pos)
+   {
+      GP<DjVmDir::File> file=files_list[pos];
+      file->offset=0;
+
+      GPosition data_pos=data.contains(file->get_load_name());
+      if (!data_pos)
+	G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name());
+      file->size=data[data_pos]->get_length();
+      if (!file->size)
+        G_THROW( ERR_MSG("DjVmDoc.zero_file") );
+   }
+
+   GP<IFFByteStream> giff=IFFByteStream::create(str);
+   IFFByteStream &iff=*giff;
+   iff.put_chunk("FORM:DJVM", 1);
+   iff.put_chunk("DIRM");
+   dir->encode(iff.get_bytestream());
+   iff.close_chunk();
+   if (nav)
+     {
+       iff.put_chunk("NAVM");
+       nav->encode(iff.get_bytestream());
+       iff.close_chunk();
+     }
+   iff.close_chunk();
+   iff.flush();
+}
+
+void
+DjVmDoc::save_page(
+  const GURL &codebase, const DjVmDir::File &file) const
+{
+  GMap<GUTF8String,GUTF8String> incl;
+  save_file(codebase,file,&incl);
+}
+
+void
+DjVmDoc::save_page(
+  const GURL &codebase, const DjVmDir::File &file,
+  GMap<GUTF8String,GUTF8String> &incl ) const
+{
+  save_file(codebase,file,&incl);
+}
+
+void
+DjVmDoc::save_file(
+  const GURL &codebase, const DjVmDir::File &file) const
+{
+  save_file(codebase,file,0);
+}
+
+GUTF8String 
+DjVmDoc::save_file(const GURL &codebase, const DjVmDir::File &file,
+  GMap<GUTF8String,GUTF8String> &incl, const GP<DataPool> &pool) const
+{
+  const GUTF8String save_name(file.get_save_name());
+  const GURL::UTF8 new_url(save_name,codebase);
+  DEBUG_MSG("storing file '"<<new_url<<"'\n");
+  DataPool::load_file(new_url);
+  const GP<ByteStream> str_in(pool->get_stream());
+  const GP<ByteStream> str_out(ByteStream::create(new_url, "wb"));
+  ::save_file( *IFFByteStream::create(str_in),
+      *IFFByteStream::create(str_out), *dir, incl);
+  return save_name;
+}
+
+void
+DjVmDoc::save_file(
+  const GURL &codebase, const DjVmDir::File &file,
+  GMap<GUTF8String,GUTF8String> *incl) const
+{
+  const GUTF8String load_name=file.get_load_name();
+  if(!incl || !incl->contains(load_name))
+  {
+    GMap<GUTF8String,GUTF8String> new_incl;
+    const GUTF8String save_name(
+      save_file(codebase,file,new_incl,get_data(load_name)));
+
+    if(incl)
+    {
+      (*incl)[load_name]=save_name;
+      for(GPosition pos=new_incl;pos;++pos)
+      {
+        save_file(codebase,file,incl);
+      }
+    }
+  }
+}
+
+void
+DjVmDoc::expand(const GURL &codebase, const GUTF8String &idx_name)
+{
+   DEBUG_MSG("DjVmDoc::expand(): Expanding into '" << codebase << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   // Resolve any name conflicts
+   // Find the list of all files.
+   GPList<DjVmDir::File> files_list=dir->resolve_duplicates(false);
+
+      // store each file
+   for(GPosition pos=files_list;pos;++pos)
+   {
+     save_file(codebase,*files_list[pos]);
+   }
+
+   if (idx_name.length())
+   {
+      const GURL::UTF8 idx_url(idx_name, codebase);
+   
+      DEBUG_MSG("storing index file '" << idx_url << "'\n");
+
+      DataPool::load_file(idx_url);
+      GP<ByteStream> str=ByteStream::create(idx_url, "wb");
+      write_index(str);
+   }
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVmDoc.h b/libdjvu/DjVmDoc.h
new file mode 100644
index 0000000..3a5819f
--- /dev/null
+++ b/libdjvu/DjVmDoc.h
@@ -0,0 +1,272 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVMDOC_H
+#define _DJVMDOC_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "DjVmDir.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+class DataPool;
+class GURL;
+class GUTF8String;
+class DjVmNav;
+
+/** @name DjVmDoc.h
+    Files #"DjVmDoc.h"# and #"DjVmDoc.cpp"# contain implementation of the
+    \Ref{DjVmDoc} class used to read and write new DjVu multipage documents.
+
+    @memo DjVu multipage documents reader/writer.
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+/** Read/Write DjVu multipage documents.
+
+    The "new" DjVu multipage documents can be of two types: {\em bundled} and
+    {\em indirect}. In the first case all pages are packed into one file,
+    which is very like an archive internally. In the second case every page
+    is stored in a separate file. Plus there can be other components,
+    included into one or more pages, which also go into separate files. In
+    addition to pages and components, in the case of the {\em indirect} format
+    there is one more top-level file with the document directory (see
+    \Ref{DjVmDir}), which is basically an index file containing the
+    list of all files composing the document.
+
+    This class can read documents of both formats and can save them under any
+    format.  It is therefore ideal for converting between {\em bundled} and
+    {\em indirect} formats.  It cannot be used however for reading obsolete
+    formats.  The best way to convert obsolete formats consists in reading
+    them with class \Ref{DjVuDocument} class and saving them using
+    \Ref{DjVuDocument::write} or \Ref{DjVuDocument::expand}.
+
+    This class can also be used to create and modify multipage documents at
+    the low level without decoding every page or component (See
+    \Ref{insert_file}() and \Ref{delete_file}()). 
+*/
+
+class DJVUAPI DjVmDoc : public GPEnabled
+{
+      // Internal function.
+protected:   
+  DjVmDoc(void);
+  void init(void);
+public:
+      /// Creator
+   static GP<DjVmDoc> create(void);
+      /** Inserts a file into the document.
+          @param data  ByteStream containing the file data.
+          @param file_type Describes the type of the file to be inserted.
+	  	 See \Ref{DjVmDir::File} for details.
+          @param name  Name of the file in the document (e.g. an URL).
+          @param id    Identifier of the file (as used in INCL chunks).
+          @param title Optional title of the file (shown in browsers).
+          @param pos   Position of the file in the document (default is append).
+      */
+   void	insert_file(
+     ByteStream &data, DjVmDir::File::FILE_TYPE file_type,
+     const GUTF8String &name, const GUTF8String &id,
+     const GUTF8String &title=GUTF8String(), int pos=-1 );
+      /** Inserts a file into the document.
+          @param pool  Data pool containing file data.
+          @param file_type Describes the type of the file to be inserted.
+	  	 See \Ref{DjVmDir::File} for details.
+          @param name  Name of the file in the document (e.g. an URL).
+          @param id    Identifier of the file (as used in INCL chunks).
+          @param title Optional title of the file (shown in browsers).
+          @param pos   Position of the file in the document (default is append).
+      */
+   void	insert_file(
+     const GP<DataPool> &pool, DjVmDir::File::FILE_TYPE file_type,
+     const GUTF8String &name, const GUTF8String &id,
+     const GUTF8String &title=GUTF8String(), int pos=-1 );
+
+      /** Inserts a file described by \Ref{DjVmDir::File} structure with
+	  data #data# at position #pos#. If #pos# is negative, the file
+          will be appended to the document. Otherwise it will be inserted
+          at position #pos#. */
+   void	insert_file(const GP<DjVmDir::File> & f,
+                    GP<DataPool> data, int pos=-1);
+
+      /** Removes file with the specified #id# from the document. Every
+	  file inside a new DjVu multipage document has its unique ID
+	  (refer to \Ref{DjVmDir} for details), which is passed to this
+          function. */
+   void	delete_file(const GUTF8String &id);
+
+     /** Set the bookmarks */
+   void set_djvm_nav(GP<DjVmNav> n);
+
+      /** Returns the directory of the DjVm document (the one which will
+	  be encoded into #DJVM# chunk of the top-level file or the bundle). */
+   GP<DjVmDir>	get_djvm_dir(void);
+   
+      /** Returns contents of file with ID #id# from the document.
+	  Please refer to \Ref{DjVmDir} for the explanation of what
+          IDs mean. */
+   GP<DataPool>	get_data(const GUTF8String &id) const;
+
+      /** Reading routines */
+      //@{
+      /** Reads contents of a {\em bundled} multipage DjVu document from
+	  the stream. */
+   void	read(ByteStream & str);
+      /** Reads contents of a {\em bundled} multipage DjVu document from
+	  the \Ref{DataPool}. */
+   void	read(const GP<DataPool> & data_pool);
+      /** Reads the DjVu multipage document in either {\em bundled} or
+	  {\em indirect} format.
+
+	  {\bf Note:} For {\em bundled} documents the file is not
+	  read into memory. We just open it and access data directly there.
+	  Thus you should not modify the file contents.
+
+	  @param name For {\em bundled} documents this is the name
+	         of the document. For {\em indirect} documents this is
+		 the name of the top-level file of the document (containing
+		 the \Ref{DjVmDir} with the list of all files).
+		 The rest of the files are expected to be in the
+		 same directory and will be read by this function as well. */
+   void	read(const GURL &url);
+      //@}
+
+      /** Writing routines */
+      //@{
+      /** Writes the multipage DjVu document in the {\em bundled} format into
+	  the stream. */
+   void	write(const GP<ByteStream> &str);
+      /** Writes the multipage DjVu document in the {\em bundled} format into
+	  the stream, reserving any of the specified names. */
+   void	write(const GP<ByteStream> &str,
+              const GMap<GUTF8String,void *>& reserved);
+      /** Stored index (top-level) file of the DjVu document in the {\em
+	  indirect} format into the specified stream. */
+   void	write_index(const GP<ByteStream> &str);
+      /** Writes the multipage DjVu document in the {\em indirect} format
+	  into the given directory. Every page and included file will be
+          stored as a separate file. Besides, one top-level file with
+          the document directory (named #idx_name#) will be created unless
+	  #idx_name# is empty.
+
+          @param dir_name Name of the directory where files should be
+		 created
+	  @param idx_name Name of the top-level file with the \Ref{DjVmDir}
+		 with the list of files composing the given document.
+		 If empty, the file will not be created. */
+   void	expand(const GURL &codebase, const GUTF8String &idx_name);
+
+      /** Writes an individual file, and all included files. 
+          INCL chunks will be remapped as appropriate. */
+   void save_page(const GURL &codebase, const DjVmDir::File &file) const;
+
+      /** Writes an individual file if not mapped, and all included files. 
+          INCL chunks will be remapped as appropriate.  All pages saved
+          are added to the #incl# map. */
+   void save_page(const GURL &codebase, const DjVmDir::File &file,
+                  GMap<GUTF8String,GUTF8String> &incl) const;
+
+      /** Writes an individual file specified, remapping INCL chunks as
+          appropriate.  Included files will not be saved. */
+   void save_file(const GURL &codebase, const DjVmDir::File &file) const;
+
+      /** Writes the specified file from the given #pool#. */
+   GUTF8String save_file(const GURL &codebase, const DjVmDir::File &file,
+                         GMap<GUTF8String,GUTF8String> &incl, 
+                         const GP<DataPool> &pool) const;
+  //@}
+private:
+   void save_file(const GURL &codebase, const DjVmDir::File &file,
+                  GMap<GUTF8String,GUTF8String> *incl) const;
+   GP<DjVmDir> dir;
+   GP<DjVmNav> nav;
+   GPMap<GUTF8String, DataPool > data;
+private: // dummy stuff
+   static void write(ByteStream *);
+   static void write_index(ByteStream *);
+};
+
+inline GP<DjVmDir>
+DjVmDoc::get_djvm_dir(void)
+{
+   return dir;
+}
+
+
+//@}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVmNav.cpp b/libdjvu/DjVmNav.cpp
new file mode 100644
index 0000000..7e94779
--- /dev/null
+++ b/libdjvu/DjVmNav.cpp
@@ -0,0 +1,337 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include <ctype.h>
+
+#include "DjVuDocument.h"
+#include "DjVmNav.h"
+#include "BSByteStream.h"
+#include "GURL.h"
+#include "debug.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+GP<DjVmNav::DjVuBookMark>
+DjVmNav::DjVuBookMark::create(void)
+{
+  return new DjVuBookMark();
+}
+
+GP<DjVmNav::DjVuBookMark>
+DjVmNav::DjVuBookMark::create(const unsigned short count,
+                              const GUTF8String &displayname, 
+                              const GUTF8String &url)
+{
+  DjVuBookMark *pvm=new DjVuBookMark();
+  GP<DjVuBookMark> bookmark=pvm;
+  pvm->count=count;
+  pvm->displayname=displayname;
+  pvm->url=url;
+  return bookmark;
+}   
+
+DjVmNav::DjVuBookMark::DjVuBookMark(void)
+  : count(0), displayname(), url()
+{ 
+}
+
+GP<DjVmNav>
+DjVmNav::create(void)
+{
+  return new DjVmNav;
+}
+
+// Decode the input bytestream and populate this object
+void 
+DjVmNav::DjVuBookMark::decode(const GP<ByteStream> &gstr)
+{
+  int textsize=0, readsize=0;
+  char *buffer=0;
+  ByteStream &bs=*gstr;
+  count = bs.read8();
+  displayname.empty();
+#ifdef DJVMNAV_WITH_256LIMIT
+  textsize = bs.read24();
+#else
+  int counthi = bs.read8();
+  count = (counthi<<8)+ count;
+  textsize = bs.read16();
+#endif
+  if (textsize)
+    {
+      buffer = displayname.getbuf(textsize);
+      readsize = bs.read(buffer,textsize);
+      buffer[readsize] = 0;
+    }
+  url.empty();
+  textsize = bs.read24();
+  if (textsize)
+    {
+      buffer = url.getbuf(textsize);
+      readsize = bs.read(buffer,textsize);
+      buffer[readsize] = 0;
+    }
+}
+
+// Serialize this object to the output bytestream
+void  
+DjVmNav::DjVuBookMark::encode(const GP<ByteStream> &gstr) 
+{
+  int textsize=0;
+  ByteStream &bs=*gstr;
+#ifdef DJVMNAV_WITH_256LIMIT
+  if (count>255)
+    G_THROW("Excessive number of children in bookmark tree");
+  bs.write8(count);
+  textsize = displayname.length();
+  bs.write24( textsize );
+#else
+  if (count>65535)
+    G_THROW("Excessive number of children in bookmark tree");
+  bs.write8( count & 0xff );
+  bs.write8( (count>>8) & 0xff );
+  textsize = displayname.length();
+  bs.write16( textsize );
+#endif
+  bs.writestring(displayname);
+  textsize = url.length();
+  bs.write24( textsize );
+  bs.writestring(url);
+}
+
+// Text dump of this object to the output bytestream
+void 
+DjVmNav::DjVuBookMark::dump(const GP<ByteStream> &gstr) 
+{
+  int textsize=0;
+  ByteStream &bs=*gstr;
+  bs.format("\n  count=%d\n",count);
+  textsize = displayname.length();
+  bs.format("  (%d) %s\n",textsize, displayname.getbuf());
+  textsize = url.length();
+  bs.format("  (%d) %s\n",textsize, url.getbuf());
+}
+
+// Decode the input bytestream and populate this object
+void 
+DjVmNav::decode(const GP<ByteStream> &gstr)
+{
+  //ByteStream &str=*gstr;
+  GP<ByteStream> gpBSByteStream = BSByteStream::create(gstr);
+  GCriticalSectionLock lock(&class_lock);
+  bookmark_list.empty();
+  int nbookmarks=gpBSByteStream->read16();
+  if (nbookmarks)
+    {
+      for(int bookmark=0;bookmark<nbookmarks;bookmark++)
+        {
+          GP<DjVuBookMark> pBookMark=DjVuBookMark::create();
+          pBookMark->decode(gpBSByteStream);
+          bookmark_list.append(pBookMark);  
+        }
+    }
+}
+
+// Serialize this object to the output stream
+void 
+DjVmNav::encode(const GP<ByteStream> &gstr)
+{
+  //ByteStream &str=*gstr;
+  GP<ByteStream> gpBSByteStream = BSByteStream::create(gstr, 1024);
+  GCriticalSectionLock lock(&class_lock);
+  int nbookmarks=bookmark_list.size();
+  gpBSByteStream->write16(nbookmarks);
+  if (nbookmarks)
+    {
+      GPosition pos;
+      int cnt=0;
+      for (pos = bookmark_list; pos; ++pos)
+        {
+          bookmark_list[pos]->encode(gpBSByteStream);
+          cnt++;
+        }
+      if (nbookmarks != cnt)
+        {
+          GUTF8String msg;
+          msg.format("Corrupt bookmarks found during encode: %d of %d \n",
+                     cnt, nbookmarks);
+          G_THROW (msg);
+        }
+    }
+}
+
+int 
+DjVmNav::getBookMarkCount()
+{
+  return(bookmark_list.size());
+}
+
+void 
+DjVmNav::append (const GP<DjVuBookMark> &gpBookMark) 
+{
+  bookmark_list.append(gpBookMark);
+}
+
+bool 
+DjVmNav::getBookMark(GP<DjVuBookMark> &gpBookMark, int iPos)
+{
+  GPosition pos = bookmark_list.nth(iPos);
+  if (pos)
+    gpBookMark = bookmark_list[pos];
+  else
+    gpBookMark = 0;
+  return (gpBookMark?true:false);
+}
+
+
+// A text dump of this object
+void 
+DjVmNav::dump(const GP<ByteStream> &gstr)
+{
+  ByteStream &str=*gstr;
+  GCriticalSectionLock lock(&class_lock);
+  int nbookmarks=bookmark_list.size();
+  str.format("%d bookmarks:\n",nbookmarks);
+  if (nbookmarks)
+    {
+      GPosition pos;
+      int cnt=0;
+      for (pos = bookmark_list; pos; ++pos)
+        {
+          bookmark_list[pos]->dump(&str);
+          cnt++;
+        }
+      if (nbookmarks != cnt)
+        {
+          GUTF8String msg;
+          msg.format("Corrupt bookmarks found during encode: %d of %d \n",
+                     cnt,nbookmarks);
+          G_THROW (msg);
+        }
+    }
+}
+
+bool 
+DjVmNav::isValidBookmark()
+{
+  //test if the bookmark is properly given
+  //for example: (4, "A", urla)
+  //	         (0, "B", urlb)
+  //             (0, "C", urlc)
+  //is not a bookmark since A suppose to have 4 decendents, it only get one.
+  int bookmark_totalnum=getBookMarkCount();
+  GP<DjVuBookMark> gpBookMark;
+  int* count_array=(int*)malloc(sizeof(int)*bookmark_totalnum);
+  for(int i=0;i<bookmark_totalnum;i++)
+    {
+      getBookMark(gpBookMark, i);
+      count_array[i]=gpBookMark->count;
+    }
+  int index=0;
+  int trees=0;
+  int* treeSizes=(int*)malloc(sizeof(int)*bookmark_totalnum);
+  while(index<bookmark_totalnum)
+    {
+      int treeSize=get_tree(index,count_array,bookmark_totalnum);
+      if(treeSize>0) //is a tree
+        {
+          index+=treeSize;
+          treeSizes[trees++]=treeSize;
+        }
+      else //not a tree
+        break;
+    }
+  free(count_array);
+  free(treeSizes);
+  return true;
+}
+
+int 
+DjVmNav::get_tree(int index, int* count_array, int count_array_size)
+{
+  int i=index;
+  int accumulate_count=0;
+  while(i<count_array_size)
+    {
+      accumulate_count+=count_array[i];
+      if(accumulate_count==0)
+        return 1;
+      else if(accumulate_count == i-index) //get a tree
+        return accumulate_count;
+      i++;
+    }
+  return 0;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVmNav.h b/libdjvu/DjVmNav.h
new file mode 100644
index 0000000..e644c1d
--- /dev/null
+++ b/libdjvu/DjVmNav.h
@@ -0,0 +1,145 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVMNAV_H
+#define _DJVMNAV_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#include "DjVuGlobal.h"
+#include "GString.h"
+#include "GThreads.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+class ByteStream;
+
+/** The NAVM chunk.
+    The optional #"NAVM"# chunk which follows the DIRM chunk describes
+    how the user can navigate the document.
+    This is a list of DjVuBookMarks.
+**/
+
+class DJVUAPI DjVmNav : public GPEnabled
+{
+public:
+   /** Class \Ref{DjVmNav::DjVuBookMark} represents a entry in the 
+       hierarchy of contents. */
+   class DjVuBookMark;
+ 
+   static GP<DjVmNav> create(void);
+      /** Decodes the directory from the specified stream. */
+   void decode(const GP<ByteStream> &stream);
+      /** Encodes the directory into the specified stream. */
+   void encode(const GP<ByteStream> &stream) ;
+   void dump(const GP<ByteStream> &stream) ;
+      /** Return bookmark at zero-based position i */
+   bool getBookMark(GP<DjVuBookMark> &gpBookMark, int i) ;
+   int getBookMarkCount();
+      /** Append the BookMark to the end of the list */
+   void append (const GP<DjVuBookMark> &gpBookMark) ;
+      /** This function will check the given bookmark is valid or not */
+   bool isValidBookmark();
+      /** This function determines if the given count_array is a tree
+          sequence, that is if it fits a tree. */
+   int get_tree(int index, int* count_array, int count_array_size);
+protected:
+   DjVmNav(void) { } ;
+private:
+   GCriticalSection class_lock;
+   GPList<DjVuBookMark>	bookmark_list;
+};
+
+/** The DjVuBookMark.
+    Each entry in the Navigation chunk (NAVM) is a bookmark.  A bookmark
+    contains a count of immediate children, a display string and a url.
+**/
+
+class DJVUAPI DjVmNav::DjVuBookMark : public GPEnabled
+{
+protected:
+  /** Default constructor. */
+  DjVuBookMark(void);
+public:
+  static GP<DjVuBookMark> create(void);
+  static GP<DjVuBookMark> create(const unsigned short count,
+                                 const GUTF8String &displayname, 
+                                 const GUTF8String &url);
+  void encode(const GP<ByteStream> &stream);
+  void dump(const GP<ByteStream> &stream);
+  void decode(const GP<ByteStream> &stream);
+  int count;	           // count of immediate children.
+  GUTF8String displayname; // example:  "Section 3.5 - Encryption"
+  GUTF8String url;	   // url, may be blank or relative.
+};
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuAnno.cpp b/libdjvu/DjVuAnno.cpp
new file mode 100644
index 0000000..9a986f0
--- /dev/null
+++ b/libdjvu/DjVuAnno.cpp
@@ -0,0 +1,1546 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuAnno.h"
+#include "GContainer.h"
+#include "GException.h"
+#include "IFFByteStream.h"
+#include "BSByteStream.h"
+#include "GMapAreas.h"
+
+#include "debug.h"
+
+#include <ctype.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// GLParser.h and GLParser.cpp used to be separate files capable to decode
+// that weird ANTa chunk format into C++ structures and lists. But since
+// its implementation is temporary and is used only in this file (DjVuAnno.cpp)
+// it appears reasonable to build it in here.
+
+//***************************************************************************
+//****************************** GLParser.h *********************************
+//***************************************************************************
+
+
+class GLObject : public GPEnabled
+{
+public:
+   enum GLObjectType { INVALID=0, NUMBER=1, STRING=2, SYMBOL=3, LIST=4 };
+   static const char * const GLObjectString[LIST+1];
+
+   GLObject(int _number=0);
+   GLObject(GLObjectType type, const char * str);
+   GLObject(const char * name, const GPList<GLObject> & list);
+   virtual ~GLObject(void);
+   
+   int		get_number(void) const;
+   GUTF8String	get_string(void) const;
+   GUTF8String	get_symbol(void) const;
+   GPList<GLObject>	& get_list(void);
+   GP<GLObject>	operator[](int n) const;
+   
+   GLObjectType	get_type(void) const;
+   GUTF8String	get_name(void) const;
+   void		print(ByteStream & str, int compact=1, int indent=0, int * cur_pos=0) const;
+private:
+   GLObjectType	type;
+   GUTF8String	name;
+   
+   int		number;
+   GUTF8String	string;
+   GUTF8String	symbol;
+   GPList<GLObject>	list;
+   void throw_can_not_convert_to(const GLObjectType to) const;
+};
+
+const char * const GLObject::GLObjectString[]=
+  {"invalid", "number", "string", "symbol", "list"};
+
+inline GLObject::GLObjectType
+GLObject::get_type(void) const { return type; }
+
+inline
+GLObject::~GLObject(void) {}
+
+class GLToken
+{
+public:
+   enum GLTokenType { OPEN_PAR, CLOSE_PAR, OBJECT };
+   GLTokenType	type;
+   GP<GLObject>	object;
+   
+   GLToken(GLTokenType type, const GP<GLObject> & object);
+};
+
+inline
+GLToken::GLToken(GLTokenType xtype, const GP<GLObject> & xobject) :
+      type(xtype), object(xobject) {}
+
+class GLParser
+{
+public:
+   void		parse(const char * str);
+   GPList<GLObject>	& get_list(void);
+   GP<GLObject>		get_object(const char * name, bool last=true);
+   void		print(ByteStream & str, int compact=1);
+
+   GLParser(void);
+   GLParser(const char * str);
+   ~GLParser(void);
+private:
+   GPList<GLObject>	list;
+
+   bool   	compat;
+   void		skip_white_space(const char * & start);
+   void 	check_compat(const char *str);
+   GLToken	get_token(const char * & start);
+   void		parse(const char * cur_name, GPList<GLObject> & list,
+		      const char * & start);
+};
+
+GLParser::GLParser(void) 
+  : compat(false)
+{
+}
+
+GLParser::~GLParser(void) 
+{
+}
+
+GPList<GLObject> &
+GLParser::get_list(void) 
+{ 
+  return list; 
+}
+
+GLParser::GLParser(const char * str) 
+  : compat(false)
+{
+  parse(str); 
+}
+
+
+//***************************************************************************
+//***************************** GLParser.cpp ********************************
+//***************************************************************************
+
+
+GLObject::GLObject(int xnumber) : type(NUMBER), number(xnumber) {}
+
+GLObject::GLObject(GLObjectType xtype, const char * str) : type(xtype)
+{
+   if (type!=STRING && type!=SYMBOL)
+      G_THROW( ERR_MSG("DjVuAnno.bad_type") );
+   if (type==STRING) 
+      string=str;
+   else symbol=str;
+}
+
+GLObject::GLObject(const char * xname, const GPList<GLObject> & xlist) :
+      type(LIST), name(xname), list(xlist) {}
+
+
+static GUTF8String make_c_string(GUTF8String string)
+{
+  GUTF8String buffer;
+  const char *data = (const char*)string;
+  int length = string.length();
+  buffer = GUTF8String("\"");
+  while (*data && length>0) 
+    {
+      int span = 0;
+      while (span<length && (unsigned char)(data[span])>=0x20 && 
+             data[span]!=0x7f && data[span]!='"' && data[span]!='\\' )
+        span++;
+      if (span > 0) 
+        {  
+          buffer = buffer + GUTF8String(data, span);
+          data += span;
+          length -= span;
+        }  
+      else 
+        {
+          char buf[8];
+          static const char *tr1 = "\"\\tnrbf";
+          static const char *tr2 = "\"\\\t\n\r\b\f";
+          sprintf(buf,"\\%03o", (int)(((unsigned char*)data)[span]));
+          for (int i=0; tr2[i]; i++)
+            if (data[span] == tr2[i])
+              buf[1] = tr1[i];
+          if (buf[1]<'0' || buf[1]>'3')
+            buf[2] = 0;
+          buffer = buffer + GUTF8String(buf);
+          data += 1;
+          length -= 1;
+        }
+    }
+  buffer = buffer + GUTF8String("\"");
+  return buffer;
+}
+
+
+void
+GLObject::print(ByteStream & str, int compact, int indent, int * cur_pos) const
+{
+  int local_cur_pos = 0;
+  if (!cur_pos) { cur_pos = &local_cur_pos; }
+  
+  GUTF8String buffer;
+  switch(type)
+  {
+  case NUMBER:
+    buffer.format("%d",number);
+    break;
+  case STRING:
+    buffer = make_c_string(string);
+    break;
+  case SYMBOL:
+    buffer.format("%s",(const char *)symbol);
+    break;
+  case LIST:
+    buffer.format("(%s",(const char *)name);
+    break;
+  case INVALID:
+    break;
+  }
+  const char * to_print = (const char*)buffer;
+  if (!compact && *cur_pos+strlen(to_print)>70)
+  {
+    char ch='\n';
+    str.write(&ch, 1);
+    ch=' ';
+    for(int i=0;i<indent;i++) str.write(&ch, 1);
+    *cur_pos=indent;
+  }
+  str.write(to_print, strlen(to_print));
+  char ch=' ';
+  str.write(&ch, 1);
+  *cur_pos+=strlen(to_print)+1;
+  if (type==LIST)
+  {
+    int indent=*cur_pos-strlen(to_print);
+    for(GPosition pos=list;pos;++pos)
+      list[pos]->print(str, compact, indent, cur_pos);
+    str.write(") ", 2);
+    *cur_pos+=2;
+  }
+}
+
+//  This function constructs message names for external lookup.
+//  The message names are constructed to avoid the problems of concatenating
+//  phrases (which does not translate well into other languages). The
+//  message names that can be generated are (listed here to appease the
+//  auditing program which reads comments):
+//    ERR_MSG("DjVuAnno.invalid2number"), ERR_MSG("DjVuAnno.string2number"),
+//    ERR_MSG("DjVuAnno.symbol2number"), ERR_MSG("DjVuAnno.list2number")
+//    ERR_MSG("DjVuAnno.invalid2string"), ERR_MSG("DjVuAnno.number2string"),
+//    ERR_MSG("DjVuAnno.symbol2string"), ERR_MSG("DjVuAnno.list2string")
+//    ERR_MSG("DjVuAnno.invalid2symbol"), ERR_MSG("DjVuAnno.number2symbol"),
+//    ERR_MSG("DjVuAnno.string2symbol"), ERR_MSG("DjVuAnno.list2symbol")
+//    ERR_MSG("DjVuAnno.invalid2list"), ERR_MSG("DjVuAnno.number2list"),
+//    ERR_MSG("DjVuAnno.string2list"), ERR_MSG("DjVuAnno.symbol2list")
+void
+GLObject::throw_can_not_convert_to(const GLObjectType to) const
+{
+  static const GUTF8String two('2');
+  static const GUTF8String tab('\t');
+  GUTF8String mesg("DjVuAnno.");
+  switch(type)
+  {
+    case NUMBER:
+      mesg+=GLObjectString[NUMBER]+two+GLObjectString[to]+tab+GUTF8String(number);
+      break;
+    case STRING:
+      mesg+=GLObjectString[STRING]+two+GLObjectString[to]+tab+string;
+      break;
+    case SYMBOL:
+      mesg+=GLObjectString[SYMBOL]+two+GLObjectString[to]+tab+symbol;
+      break;
+    case LIST:
+      mesg+=GLObjectString[LIST]+two+GLObjectString[to]+tab+name;
+      break;
+    default:
+      mesg+=GLObjectString[INVALID]+two+GLObjectString[to];
+      break;
+  }
+  G_THROW(mesg);
+}
+
+GUTF8String
+GLObject::get_string(void) const
+{
+   if (type!=STRING)
+   {
+      throw_can_not_convert_to(STRING);
+   }
+   return string;
+}
+
+GUTF8String
+GLObject::get_symbol(void) const
+{
+   if (type!=SYMBOL)
+   {
+      throw_can_not_convert_to(SYMBOL);
+   }
+   return symbol;
+}
+
+int
+GLObject::get_number(void) const
+{
+   if (type!=NUMBER)
+   {
+      throw_can_not_convert_to(NUMBER);
+   }
+   return number;
+}
+
+GUTF8String
+GLObject::get_name(void) const
+{
+   if (type!=LIST)
+   {
+      throw_can_not_convert_to(LIST);
+   }
+   return name;
+}
+
+GP<GLObject>
+GLObject::operator[](int n) const
+{
+   if (type!=LIST)
+   {
+      throw_can_not_convert_to(LIST);
+   }
+   if (n>=list.size()) G_THROW( ERR_MSG("DjVuAnno.too_few") "\t"+name);
+   int i;
+   GPosition pos;
+   for(i=0, pos=list;i<n && pos;i++, ++pos)
+   		continue;
+   return list[pos];
+}
+
+GPList<GLObject> &
+GLObject::get_list(void)
+{
+   if (type!=LIST)
+   {
+      throw_can_not_convert_to(LIST);
+   }
+   return list;
+}
+
+//********************************** GLParser *********************************
+
+void
+GLParser::skip_white_space(const char * & start)
+{
+   while(*start && isspace(*start)) start++;
+   if (!*start) 
+       G_THROW( ByteStream::EndOfFile );
+}
+
+GLToken
+GLParser::get_token(const char * & start)
+{
+   skip_white_space(start);
+   char c = *start;
+   if (c == '(')
+     {
+       start++;
+       return GLToken(GLToken::OPEN_PAR, 0);
+     }
+   else if (c == ')')
+     {
+       start++;
+       return GLToken(GLToken::CLOSE_PAR, 0);
+     }
+   else if (c == '"')
+     {
+       GUTF8String str;
+       start++;
+       while(1)
+	 {
+           int span = 0;
+           while (start[span] && start[span]!='\\' && start[span]!='\"')
+             span++;
+           if (span > 0)
+             {
+               str = str + GUTF8String(start,span);
+               start += span;
+             }
+           else if (start[0]=='\"')
+             {
+               start += 1;
+               break;
+             }
+           else if (start[0]=='\\' && compat)
+             {
+               char c = start[1];
+               if (c == '\"')
+                 {
+                   start += 2;
+                   str += '\"';
+                 }
+               else
+                 {
+                   start += 1;
+                   str += '\\';
+                 }
+             }
+           else if (start[0]=='\\' && start[1])
+             {
+               char c = *++start;
+               if (c>='0' && c<='7')
+                 {
+                   int x = 0;
+                   for (int i=0; i<3 && c>='0' && c<='7'; i++) 
+                     {
+                       x = x * 8 + c - '0';
+                       c = *++start;
+                     }
+                   str += (char)(x & 0xff);
+                 }
+               else
+                 {
+                   static const char *tr1 = "tnrbfva";
+                   static const char *tr2 = "\t\n\r\b\f\013\007";
+                   for (int i=0; tr1[i]; i++)
+                     if (c == tr1[i])
+                       c = tr2[i];
+                   start += 1;
+                   str += c;
+                 }
+             }
+           else 
+             {
+               G_THROW( ByteStream::EndOfFile );
+             }
+         }
+       return GLToken(GLToken::OBJECT, new GLObject(GLObject::STRING, str));
+     }
+   else if (c=='-' || (c>='0' && c<='9'))
+     {
+       const char *here = start;
+       long val = strtol(start, (char**) &start, 10);
+       if (start > here)
+         return GLToken(GLToken::OBJECT, new GLObject(val));
+     }
+   
+   GUTF8String str;
+   while(c != 0 && c != ')' && c != '(' && c != '"' && !isspace(c))
+     {
+       str += c;
+       c = *++start;
+     }
+   if (c == 0)
+     G_THROW(ByteStream::EndOfFile);
+   else
+     return GLToken(GLToken::OBJECT, new GLObject(GLObject::SYMBOL, str));
+} 
+
+void
+GLParser::parse(const char * cur_name, GPList<GLObject> & list,
+		const char * & start)
+{
+  DEBUG_MSG("GLParse::parse(): Parsing contents of object '" << cur_name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  while(1)
+  {
+    GLToken token=get_token(start);
+    if (token.type==GLToken::OPEN_PAR)
+    {
+      if (isspace(*start))
+      {
+        GUTF8String mesg=GUTF8String( ERR_MSG("DjVuAnno.paren") "\t")+cur_name;
+        G_THROW(mesg);
+      }
+      
+      GLToken tok=get_token(start);
+      GP<GLObject> object=tok.object;	// This object should be SYMBOL
+      // We will convert it to LIST later
+      if (tok.type!=GLToken::OBJECT || object->get_type()!=GLObject::SYMBOL)
+      {
+        if (tok.type==GLToken::OPEN_PAR ||
+          tok.type==GLToken::CLOSE_PAR)
+        {
+          GUTF8String mesg=GUTF8String( ERR_MSG("DjVuAnno.no_paren") "\t")+cur_name;
+          G_THROW(mesg);
+        }
+        if (tok.type==GLToken::OBJECT)
+        {
+          GLObject::GLObjectType type=object->get_type();
+          if (type==GLObject::NUMBER)
+          {
+            GUTF8String mesg( ERR_MSG("DjVuAnno.no_number") "\t");
+            mesg += cur_name;
+            G_THROW(mesg);
+          }
+          else if (type==GLObject::STRING)
+          {
+            GUTF8String mesg( ERR_MSG("DjVuAnno.no_string") "\t");
+            mesg += cur_name;
+            G_THROW(mesg);
+          }
+        }
+      }
+      
+      // OK. Get the object contents
+      GPList<GLObject> new_list;
+      G_TRY
+      {
+        parse(object->get_symbol(), new_list, start);
+      } 
+      G_CATCH(exc)
+      {
+        if (exc.cmp_cause(ByteStream::EndOfFile))
+          G_RETHROW;
+      } 
+      G_ENDCATCH;
+      list.append(new GLObject(object->get_symbol(), new_list));
+      continue;
+    }
+    if (token.type==GLToken::CLOSE_PAR) 
+      return;
+    list.append(token.object);
+  }
+}
+
+void 
+GLParser::check_compat(const char *s)
+{
+  int state = 0;
+  while (s && *s && !compat)
+    {
+      switch(state)
+        {
+        case 0:
+          if (*s == '\"')
+            state = '\"';
+          break;
+        case '\"':
+          if (*s == '\"')
+            state = 0;
+          else if (*s == '\\')
+            state = '\\';
+          else if ((unsigned char)(*s)<0x20 || *s==0x7f)
+            compat = true;
+          break;
+        case '\\':
+          if (!strchr("01234567tnrbfva\"\\",*s))
+            compat = true;
+          state = '\"';
+          break;
+        }
+      s += 1;
+    }
+}
+
+void
+GLParser::parse(const char * str)
+{
+   DEBUG_MSG("GLParser::parse(): parsing string contents\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   G_TRY
+   {
+      check_compat(str);
+      parse("toplevel", list, str);
+   } G_CATCH(exc)
+   {
+      if (exc.cmp_cause(ByteStream::EndOfFile))
+        G_RETHROW;
+   } G_ENDCATCH;
+}
+
+void
+GLParser::print(ByteStream & str, int compact)
+{
+   for(GPosition pos=list;pos;++pos)
+      list[pos]->print(str, compact);
+}
+
+GP<GLObject>
+GLParser::get_object(const char * name, bool last)
+{
+   GP<GLObject> object;
+   for(GPosition pos=list;pos;++pos)
+   {
+      GP<GLObject> obj=list[pos];
+      if (obj->get_type()==GLObject::LIST &&
+	  obj->get_name()==name)
+      {
+	 object=obj;
+	 if (!last) break;
+      }
+   }
+   return object;
+}
+
+//***************************************************************************
+//********************************** ANT ************************************
+//***************************************************************************
+
+static const char *zoom_strings[]={
+  "default","page","width","one2one","stretch"};
+static const int zoom_strings_size=sizeof(zoom_strings)/sizeof(const char *);
+
+static const char *mode_strings[]={
+  "default","color","fore","back","bw"};
+static const int mode_strings_size=sizeof(mode_strings)/sizeof(const char *);
+
+static const char *align_strings[]={
+  "default","left","center","right","top","bottom"};
+static const int align_strings_size=sizeof(align_strings)/sizeof(const char *);
+
+#define PNOTE_TAG	"pnote"
+#define BACKGROUND_TAG	"background"
+#define ZOOM_TAG	"zoom"
+#define MODE_TAG	"mode"
+#define ALIGN_TAG	"align"
+#define HALIGN_TAG	"halign"
+#define VALIGN_TAG	"valign"
+#define METADATA_TAG    "metadata"
+#define XMP_TAG         "xmp"
+
+static const unsigned long default_bg_color=0xffffffff;
+
+DjVuANT::DjVuANT(void)
+{
+   bg_color=default_bg_color;
+   zoom=0;
+   mode=MODE_UNSPEC;
+   hor_align=ver_align=ALIGN_UNSPEC;
+}
+
+DjVuANT::~DjVuANT()
+{
+}
+
+GUTF8String
+DjVuANT::get_paramtags(void) const
+{
+  GUTF8String retval;
+  if(zoom > 0)
+  {
+    retval+="<PARAM name=\"" ZOOM_TAG "\" value=\""+GUTF8String(zoom)+="\" />\n";
+  }else if(zoom && ((-zoom)<zoom_strings_size))
+  {
+    retval+="<PARAM name=\"" ZOOM_TAG "\" value=\""+GUTF8String(zoom_strings[-zoom])+"\" />\n";
+  }
+  if((mode>0)&&(mode<mode_strings_size))
+  {
+    retval+="<PARAM name=\"" MODE_TAG "\" value=\""+GUTF8String(mode_strings[mode])+"\" />\n";
+  }
+  if((hor_align>ALIGN_UNSPEC)&&(hor_align<align_strings_size))
+  {
+    retval+="<PARAM name=\"" HALIGN_TAG "\" value=\""+GUTF8String(align_strings[hor_align])+"\" />\n";
+  }
+  if((ver_align>ALIGN_UNSPEC)&&(ver_align<align_strings_size))
+  {
+    retval+="<PARAM name=\"" VALIGN_TAG "\" value=\""+GUTF8String(align_strings[ver_align])+"\" />\n";
+  }
+  if((bg_color&0xffffff) == bg_color)
+  {
+    retval+="<PARAM name=\"" BACKGROUND_TAG "\" value=\""+GUTF8String().format("#%06lX",bg_color)+"\" />\n";
+  }
+  return retval;
+}
+
+void
+DjVuANT::writeParam(ByteStream &str_out) const
+{
+  str_out.writestring(get_paramtags());
+}
+
+GUTF8String
+DjVuANT::get_xmlmap(const GUTF8String &name,const int height) const
+{
+  GUTF8String retval("<MAP name=\""+name.toEscaped()+"\" >\n");
+  for(GPosition pos(map_areas);pos;++pos)
+  {
+    retval+=map_areas[pos]->get_xmltag(height);
+  }
+  return retval+"</MAP>\n";
+}
+
+void
+DjVuANT::writeMap(
+  ByteStream &str_out,const GUTF8String &name,const int height) const
+{
+  str_out.writestring("<MAP name=\""+name.toEscaped()+"\" >\n");
+  for(GPosition pos(map_areas);pos;++pos)
+  {
+    str_out.writestring(GUTF8String(map_areas[pos]->get_xmltag(height)));
+  }
+  str_out.writestring(GUTF8String("</MAP>\n"));
+}
+
+GUTF8String
+DjVuANT::read_raw(ByteStream & str)
+{
+   GUTF8String raw;
+   char buffer[1024];
+   int length;
+   while((length=str.read(buffer, 1024)))
+      raw+=GUTF8String(buffer, length);
+   return raw;
+}
+
+void
+DjVuANT::decode(class GLParser & parser)
+{
+   bg_color=get_bg_color(parser);
+   zoom=get_zoom(parser);
+   mode=get_mode(parser);
+   hor_align=get_hor_align(parser);
+   ver_align=get_ver_align(parser);
+   map_areas=get_map_areas(parser);
+   metadata=get_metadata(parser); 
+   xmpmetadata=get_xmpmetadata(parser);
+}
+
+
+void 
+DjVuANT::decode(ByteStream & str)
+{
+   GLParser parser(read_raw(str));
+   decode(parser);
+}
+
+void
+DjVuANT::merge(ByteStream & str)
+{
+   GLParser parser(encode_raw());
+   GUTF8String add_raw=read_raw(str);
+   parser.parse(add_raw);
+   decode(parser);
+}
+
+void
+DjVuANT::encode(ByteStream &bs)
+{
+  GUTF8String raw=encode_raw();
+  bs.writall((const char*) raw, raw.length());
+}
+
+unsigned int 
+DjVuANT::get_memory_usage() const
+{
+  return sizeof(DjVuANT);
+}
+
+unsigned char
+DjVuANT::decode_comp(char ch1, char ch2)
+{
+   unsigned char dig1=0;
+   if (ch1)
+   {
+      ch1=toupper(ch1);
+      if (ch1>='0' && ch1<='9') dig1=ch1-'0';
+      if (ch1>='A' && ch1<='F') dig1=10+ch1-'A';
+      
+      unsigned char dig2=0;
+      if (ch2)
+      {
+	 ch2=toupper(ch2);
+	 if (ch2>='0' && ch2<='9') dig2=ch2-'0';
+	 if (ch2>='A' && ch2<='F') dig2=10+ch2-'A';
+	 return (dig1 << 4) | dig2;
+      }
+      return dig1;
+   }
+   return 0;
+}
+
+unsigned long int
+DjVuANT::cvt_color(const char * color, unsigned long int def)
+{
+   if (color[0]!='#') return def;
+
+   unsigned long int color_rgb=0;
+   color++;
+   const char * start, * end;
+   
+      // Do blue
+   end=color+strlen(color); start=end-2;
+   if (start<color) start=color;
+   if (end>start)
+      color_rgb|=decode_comp(start[0], start+1<end ? start[1] : 0);
+   
+      // Do green
+   end=color+strlen(color)-2; start=end-2;
+   if (start<color) start=color;
+   if (end>start)
+      color_rgb|=decode_comp(start[0], start+1<end ? start[1] : 0) << 8;
+   
+      // Do red
+   end=color+strlen(color)-4; start=end-2;
+   if (start<color) start=color;
+   if (end>start)
+      color_rgb|=decode_comp(start[0], start+1<end ? start[1] : 0) << 16;
+
+      // Do the fourth byte
+   end=color+strlen(color)-6; start=end-2;
+   if (start<color) start=color;
+   if (end>start)
+      color_rgb|=decode_comp(start[0], start+1<end ? start[1] : 0) << 24;
+   
+   return color_rgb;
+}
+
+unsigned long int
+DjVuANT::get_bg_color(GLParser & parser)
+{
+  unsigned long retval=default_bg_color;
+  DEBUG_MSG("DjVuANT::get_bg_color(): getting background color ...\n");
+  DEBUG_MAKE_INDENT(3);
+  G_TRY
+  {
+    GP<GLObject> obj=parser.get_object(BACKGROUND_TAG);
+    if (obj && obj->get_list().size()==1)
+    {
+      GUTF8String color=(*obj)[0]->get_symbol();
+      DEBUG_MSG("color='" << color << "'\n");
+      retval=cvt_color(color, 0xffffff);
+    }
+#ifndef NDEBUG
+    if(retval == default_bg_color)
+    {
+      DEBUG_MSG("can't find any.\n");
+    }
+#endif // NDEBUG
+  } G_CATCH_ALL {} G_ENDCATCH;
+#ifndef NDEBUG
+  if(retval == default_bg_color)
+  {
+    DEBUG_MSG("resetting color to 0xffffffff (UNSPEC)\n");
+  }
+#endif // NDEBUG
+  return retval;
+}
+
+int
+DjVuANT::get_zoom(GLParser & parser)
+      // Returns:
+      //   <0 - special zoom (like ZOOM_STRETCH)
+      //   =0 - not set
+      //   >0 - numeric zoom (%%)
+{
+  int retval=ZOOM_UNSPEC;
+  DEBUG_MSG("DjVuANT::get_zoom(): getting zoom factor ...\n");
+  DEBUG_MAKE_INDENT(3);
+  G_TRY
+  {
+    GP<GLObject> obj=parser.get_object(ZOOM_TAG);
+    if (obj && obj->get_list().size()==1)
+    {
+      const GUTF8String zoom((*obj)[0]->get_symbol());
+      DEBUG_MSG("zoom='" << zoom << "'\n");
+     
+      for(int i=0;(i<zoom_strings_size);++i)
+      {
+        if(zoom == zoom_strings[i])
+        {
+          retval=(-i);
+          break;
+        }
+      }
+      if(retval == ZOOM_UNSPEC)
+      {
+        if (zoom[0]!='d')
+        {
+          G_THROW( ERR_MSG("DjVuAnno.bad_zoom") );
+        }else
+        {
+          retval=zoom.substr(1, zoom.length()).toInt(); //atoi((const char *) zoom+1);
+        }
+      }
+    }
+#ifndef NDEBUG
+    if(retval == ZOOM_UNSPEC)
+    {
+      DEBUG_MSG("can't find any.\n");
+    }
+#endif // NDEBUG
+  } G_CATCH_ALL {} G_ENDCATCH;
+#ifndef NDEBUG
+  if(retval == ZOOM_UNSPEC)
+  {
+    DEBUG_MSG("resetting zoom to 0 (UNSPEC)\n");
+  }
+#endif // NDEBUG
+  return retval;
+}
+
+int
+DjVuANT::get_mode(GLParser & parser)
+{
+  int retval=MODE_UNSPEC;
+  DEBUG_MSG("DjVuAnt::get_mode(): getting default mode ...\n");
+  DEBUG_MAKE_INDENT(3);
+  G_TRY
+  {
+    GP<GLObject> obj=parser.get_object(MODE_TAG);
+    if (obj && obj->get_list().size()==1)
+    {
+      const GUTF8String mode((*obj)[0]->get_symbol());
+      DEBUG_MSG("mode='" << mode << "'\n");
+      for(int i=0;(i<mode_strings_size);++i)
+      {
+        if(mode == mode_strings[i])
+        {
+          retval=i;
+          break;
+        }
+      }
+    }
+#ifndef NDEBUG
+    if(retval == MODE_UNSPEC)
+    {
+      DEBUG_MSG("can't find any.\n");
+    }
+#endif // NDEBUG
+  } G_CATCH_ALL {} G_ENDCATCH;
+#ifndef NDEBUG
+  if(retval == MODE_UNSPEC)
+  {
+    DEBUG_MSG("resetting mode to MODE_UNSPEC\n");
+  }
+#endif // NDEBUG
+  return retval;
+}
+
+static inline DjVuANT::alignment
+legal_halign(const int i)
+{
+  DjVuANT::alignment retval;
+  switch((DjVuANT::alignment)i)
+  {
+  case DjVuANT::ALIGN_LEFT:
+  case DjVuANT::ALIGN_CENTER:
+  case DjVuANT::ALIGN_RIGHT:
+    retval=(DjVuANT::alignment)i;
+    break;
+  default:
+    retval=DjVuANT::ALIGN_UNSPEC;
+    break;
+  }
+  return retval;
+}
+
+static inline DjVuANT::alignment
+legal_valign(const int i)
+{
+  DjVuANT::alignment retval;
+  switch((DjVuANT::alignment)i)
+  {
+  case DjVuANT::ALIGN_CENTER:
+  case DjVuANT::ALIGN_TOP:
+  case DjVuANT::ALIGN_BOTTOM:
+    retval=(DjVuANT::alignment)i;
+    break;
+  default:
+    retval=DjVuANT::ALIGN_UNSPEC;
+    break;
+  }
+  return retval;
+}
+
+DjVuANT::alignment
+DjVuANT::get_hor_align(GLParser & parser)
+{
+  DEBUG_MSG("DjVuAnt::get_hor_align(): getting hor page alignemnt ...\n");
+  DEBUG_MAKE_INDENT(3);
+  alignment retval=ALIGN_UNSPEC;
+  G_TRY
+  {
+    GP<GLObject> obj=parser.get_object(ALIGN_TAG);
+    if (obj && obj->get_list().size()==2)
+    {
+      const GUTF8String align((*obj)[0]->get_symbol());
+      DEBUG_MSG("hor_align='" << align << "'\n");
+      
+      for(int i=(int)ALIGN_UNSPEC;(i<align_strings_size);++i)
+      {
+        const alignment j=legal_halign(i);
+        if((i == (int)j)&&(align == align_strings[i]))
+        {
+          retval=j;
+          break;
+        }
+      }
+    }
+#ifndef NDEBUG
+    if(retval == ALIGN_UNSPEC)
+    {
+      DEBUG_MSG("can't find any.\n");
+    }
+#endif // NDEBUG
+  } G_CATCH_ALL {} G_ENDCATCH;
+#ifndef NDEBUG
+  if(retval == ALIGN_UNSPEC)
+  {
+    DEBUG_MSG("resetting alignment to ALIGN_UNSPEC\n");
+  }
+#endif // NDEBUG
+  return retval;
+}
+
+DjVuANT::alignment
+DjVuANT::get_ver_align(GLParser & parser)
+{
+  DEBUG_MSG("DjVuAnt::get_ver_align(): getting vert page alignemnt ...\n");
+  DEBUG_MAKE_INDENT(3);
+  alignment retval=ALIGN_UNSPEC;
+  G_TRY
+  {
+    GP<GLObject> obj=parser.get_object(ALIGN_TAG);
+    if (obj && obj->get_list().size()==2)
+    {
+      const GUTF8String align((*obj)[1]->get_symbol());
+      DEBUG_MSG("ver_align='" << align << "'\n");
+      for(int i=(int)ALIGN_UNSPEC;(i<align_strings_size);++i)
+      {
+        const alignment j=legal_valign(i);
+        if((i == (int)j)&&(align == align_strings[i]))
+        {
+          retval=j;
+          break;
+        }
+      }
+    }
+#ifndef NDEBUG
+    if(retval == ALIGN_UNSPEC)
+    {
+      DEBUG_MSG("can't find any.\n");
+    }
+#endif // NDEBUG
+  } G_CATCH_ALL {} G_ENDCATCH;
+#ifndef NDEBUG
+  if(retval == ALIGN_UNSPEC)
+  {
+    DEBUG_MSG("resetting alignment to ALIGN_UNSPEC\n");
+  }
+#endif // NDEBUG
+  return retval;
+}
+
+GMap<GUTF8String, GUTF8String>
+DjVuANT::get_metadata(GLParser & parser)
+{
+  DEBUG_MSG("DjVuANT::get_metadata(): forming and returning metadata table\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  GMap<GUTF8String, GUTF8String> mdata;
+  
+  GPList<GLObject> list=parser.get_list();
+  for(GPosition pos=list;pos;++pos)
+    {
+      GLObject & obj=*list[pos];
+      if (obj.get_type()==GLObject::LIST && obj.get_name()==METADATA_TAG)  
+        { 
+          G_TRY 
+            {
+              for(int obj_num=0;obj_num<obj.get_list().size();obj_num++)
+                {
+                  GLObject & el=*obj[obj_num];
+                  const int type = el.get_type();
+                  if (type == GLObject::LIST)
+                    { 
+                      const GUTF8String & name=el.get_name();  
+                      mdata[name]=(el[0])->get_string();
+                    }
+                }
+            } 
+          G_CATCH_ALL { } G_ENDCATCH;
+        }
+    }
+  return mdata;
+}
+
+GUTF8String
+DjVuANT::get_xmpmetadata(GLParser & parser)
+{
+  DEBUG_MSG("DjVuANT::get_xmpmetadata(): returning xmp metadata string\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  GUTF8String xmp;
+  GPList<GLObject> list=parser.get_list();
+  for(GPosition pos=list;pos;++pos)
+    {
+      GLObject &obj = *list[pos];
+      if (obj.get_type()==GLObject::LIST && obj.get_name()==XMP_TAG)  
+        { 
+          G_TRY 
+            {
+              if (obj.get_list().size() >= 1)
+                {
+                  GLObject &el = *obj[0];
+                  xmp = el.get_string();
+                  break;
+                }
+            } 
+          G_CATCH_ALL { } G_ENDCATCH;
+        }
+    }
+  return xmp;
+}
+
+
+GPList<GMapArea>
+DjVuANT::get_map_areas(GLParser & parser)
+{
+  DEBUG_MSG("DjVuANT::get_map_areas(): forming and returning back list of map areas\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  GPList<GMapArea> map_areas;
+  
+  GPList<GLObject> list=parser.get_list();
+
+  for(GPosition pos=list;pos;++pos)
+  {
+    GLObject & obj=*list[pos];
+    const int type=obj.get_type();
+    if (type == GLObject::LIST)
+    {
+      const GUTF8String name=obj.get_name();
+      if(name == GMapArea::MAPAREA_TAG)
+      {
+        G_TRY {
+	       // Getting the url
+          GUTF8String url;
+          GUTF8String target=GMapArea::TARGET_SELF;
+          GLObject & url_obj=*(obj[0]);
+          if (url_obj.get_type()==GLObject::LIST)
+          {
+            if (url_obj.get_name()!=GMapArea::URL_TAG)
+              G_THROW( ERR_MSG("DjVuAnno.bad_url") );
+            url=(url_obj[0])->get_string();
+            target=(url_obj[1])->get_string();
+          } else url=url_obj.get_string();
+        
+	       // Getting the comment
+          GUTF8String comment=(obj[1])->get_string();
+        
+          DEBUG_MSG("found maparea '" << comment << "' (" <<
+            url << ":" << target << ")\n");
+        
+          GLObject * shape=obj[2];
+          GP<GMapArea> map_area;
+          if (shape->get_type()==GLObject::LIST)
+          {
+            if (shape->get_name()==GMapArea::RECT_TAG)
+            {
+              DEBUG_MSG("it's a rectangle.\n");
+              GRect grect((*shape)[0]->get_number(),
+                          (*shape)[1]->get_number(),
+                          (*shape)[2]->get_number(),
+                          (*shape)[3]->get_number());
+              GP<GMapRect> map_rect=GMapRect::create(grect);
+              map_area=(GMapRect *)map_rect;
+            } else if (shape->get_name()==GMapArea::POLY_TAG)
+            {
+              DEBUG_MSG("it's a polygon.\n");
+              int points=shape->get_list().size()/2;
+              GTArray<int> xx(points-1), yy(points-1);
+              for(int i=0;i<points;i++)
+              {
+                xx[i]=(*shape)[2*i]->get_number();
+                yy[i]=(*shape)[2*i+1]->get_number();
+              }
+              GP<GMapPoly> map_poly=GMapPoly::create(xx,yy,points);
+              map_area=(GMapPoly *)map_poly;
+            } else if (shape->get_name()==GMapArea::OVAL_TAG)
+            {
+              DEBUG_MSG("it's an ellipse.\n");
+              GRect grect((*shape)[0]->get_number(),
+                          (*shape)[1]->get_number(),
+                          (*shape)[2]->get_number(),
+                          (*shape)[3]->get_number());
+              GP<GMapOval> map_oval=GMapOval::create(grect);
+              map_area=(GMapOval *)map_oval;
+            }
+          }
+        
+          if (map_area)
+          {
+            map_area->url=url;
+            map_area->target=target;
+            map_area->comment=comment;
+            for(int obj_num=3;obj_num<obj.get_list().size();obj_num++)
+            {
+              GLObject * el=obj[obj_num];
+              if (el->get_type()==GLObject::LIST)
+              {
+                const GUTF8String & name=el->get_name();
+                if (name==GMapArea::BORDER_AVIS_TAG)
+                  map_area->border_always_visible=true;
+                else if (name==GMapArea::HILITE_TAG)
+                {
+                  GLObject * obj=el->get_list()[el->get_list().firstpos()];
+                  if (obj->get_type()==GLObject::SYMBOL)
+                    map_area->hilite_color=cvt_color(obj->get_symbol(), 0xff);
+                } else
+                {
+                  int border_type=
+                    name==GMapArea::NO_BORDER_TAG ? GMapArea::NO_BORDER :
+                    name==GMapArea::XOR_BORDER_TAG ? GMapArea::XOR_BORDER :
+                    name==GMapArea::SOLID_BORDER_TAG ? GMapArea::SOLID_BORDER :
+                    name==GMapArea::SHADOW_IN_BORDER_TAG ? GMapArea::SHADOW_IN_BORDER :
+                    name==GMapArea::SHADOW_OUT_BORDER_TAG ? GMapArea::SHADOW_OUT_BORDER :
+                    name==GMapArea::SHADOW_EIN_BORDER_TAG ? GMapArea::SHADOW_EIN_BORDER :
+                    name==GMapArea::SHADOW_EOUT_BORDER_TAG ? GMapArea::SHADOW_EOUT_BORDER : -1;
+                  if (border_type>=0)
+                  {
+                    map_area->border_type=(GMapArea::BorderType) border_type;
+                    for(GPosition pos=el->get_list();pos;++pos)
+                    {
+                      GLObject * obj=el->get_list()[pos];
+                      if (obj->get_type()==GLObject::SYMBOL)
+                        map_area->border_color=cvt_color(obj->get_symbol(), 0xff);
+                      if (obj->get_type()==GLObject::NUMBER)
+                        map_area->border_width=obj->get_number();
+                    }
+                  }
+                }	    
+              } // if (el->get_type()==...)
+            } // for(int obj_num=...)
+            map_areas.append(map_area);
+          } // if (map_area) ...
+        } G_CATCH_ALL {} G_ENDCATCH;
+      }
+    }
+  } // while(item==...)
+   
+  DEBUG_MSG("map area list size = " << list.size() << "\n");
+  
+  return map_areas;
+}
+
+void
+DjVuANT::del_all_items(const char * name, GLParser & parser)
+{
+   GPList<GLObject> & list=parser.get_list();
+   GPosition pos=list;
+   while(pos)
+   {
+      GLObject & obj=*list[pos];
+      if (obj.get_type()==GLObject::LIST &&
+	  obj.get_name()==name)
+      {
+	 GPosition this_pos=pos;
+	 ++pos;
+	 list.del(this_pos);
+      } else ++pos;
+   }
+}
+
+GUTF8String
+DjVuANT::encode_raw(void) const
+{
+   GUTF8String buffer;
+   GLParser parser;
+
+      //*** Background color
+   del_all_items(BACKGROUND_TAG, parser);
+   if (bg_color!=default_bg_color)
+   {
+      buffer.format("(" BACKGROUND_TAG " #%02X%02X%02X)",
+	      (unsigned int)((bg_color & 0xff0000) >> 16),
+	      (unsigned int)((bg_color & 0xff00) >> 8),
+	      (unsigned int)(bg_color & 0xff));
+      parser.parse(buffer);
+   }
+
+      //*** Zoom
+   del_all_items(ZOOM_TAG, parser);
+   if (zoom>0 || (zoom>=ZOOM_STRETCH && zoom<=ZOOM_PAGE))
+   {
+      buffer="(" ZOOM_TAG " ";
+      if (zoom < 0)
+        buffer += zoom_strings[-zoom];
+      else
+        buffer += "d"+GUTF8String(zoom);
+      buffer+=")";
+      parser.parse(buffer);
+   }
+
+      //*** Mode
+   del_all_items(MODE_TAG, parser);
+   if (mode!=MODE_UNSPEC)
+   {
+      const int i=mode-1;
+      if((i>=0)&& (i<mode_strings_size))
+      { 
+        buffer="(" MODE_TAG " " + GUTF8String(mode_strings[mode]) + ")";
+      }
+      parser.parse(buffer);
+   }
+
+      //*** Alignment
+   del_all_items(ALIGN_TAG, parser);
+   if (hor_align!=ALIGN_UNSPEC || ver_align!=ALIGN_UNSPEC)
+   {
+      buffer= GUTF8String("(" ALIGN_TAG " ")
+        +align_strings[((hor_align<ALIGN_UNSPEC)||
+                        (hor_align>=align_strings_size))?ALIGN_UNSPEC:hor_align]
+        +" "+align_strings[((ver_align<ALIGN_UNSPEC)||
+                            (ver_align>=align_strings_size))?ALIGN_UNSPEC:ver_align]+")";
+      parser.parse(buffer);
+   }
+      //*** Metadata
+   del_all_items(METADATA_TAG, parser);
+   if (!metadata.isempty())
+     {
+       GUTF8String mdatabuffer("(");
+       mdatabuffer +=  METADATA_TAG ;
+       for (GPosition pos=metadata; pos; ++pos)
+         mdatabuffer +=" (" + metadata.key(pos) + " " + make_c_string(metadata[pos]) + ")";
+       mdatabuffer += " )";
+       parser.parse(mdatabuffer);
+     }
+      //*** XMP Metadata
+   del_all_items(XMP_TAG, parser);
+   if (!!xmpmetadata)
+     {
+       GUTF8String mdatabuffer("(");
+       mdatabuffer +=  XMP_TAG;
+       mdatabuffer += " " + make_c_string(xmpmetadata) + ")";
+       parser.parse(mdatabuffer);
+     }
+     //*** Mapareas
+   del_all_items(GMapArea::MAPAREA_TAG, parser);
+   for(GPosition pos=map_areas;pos;++pos)
+     {
+       GUTF8String mapareabuffer = map_areas[pos]->print();
+       parser.parse(mapareabuffer);
+     }
+   GP<ByteStream> gstr=ByteStream::create();
+   ByteStream &str=*gstr;
+   parser.print(str, 1);
+   GUTF8String ans;
+   int size = str.size();
+   str.seek(0);
+   str.read(ans.getbuf(size), size);
+   return ans;
+}
+
+bool
+DjVuANT::is_empty(void) const
+{
+   GUTF8String raw=encode_raw();
+   for(int i=raw.length()-1;i>=0;i--)
+      if (isspace(raw[i])) raw.setat(i, 0);
+      else break;
+   return raw.length()==0;
+}
+
+GP<DjVuANT>
+DjVuANT::copy(void) const
+{
+   GP<DjVuANT> ant=new DjVuANT(*this);
+      // Now process the list of hyperlinks.
+   ant->map_areas.empty();
+   for(GPosition pos=map_areas;pos;++pos)
+      ant->map_areas.append(map_areas[pos]->get_copy());
+   return ant;
+}
+
+//***************************************************************************
+//******************************** DjVuAnno *********************************
+//***************************************************************************
+
+GUTF8String
+DjVuAnno::get_xmlmap(const GUTF8String &name,const int height) const
+{
+  return ant
+    ?(ant->get_xmlmap(name,height))
+    :("<MAP name=\""+name.toEscaped()+"\"/>\n");
+}
+
+void
+DjVuAnno::writeMap(ByteStream &str_out,const GUTF8String &name,const int height) const
+{
+  if(ant)
+  {
+    ant->writeMap(str_out,name,height);
+  }else
+  {
+    str_out.writestring(get_xmlmap(name,height));
+  }
+}
+
+GUTF8String
+DjVuAnno::get_paramtags(void) const
+{
+  return ant
+    ?(ant->get_paramtags())
+    :GUTF8String();
+}
+
+void
+DjVuAnno::writeParam(ByteStream &str_out) const
+{
+  str_out.writestring(get_paramtags());
+}
+
+
+void
+DjVuAnno::decode(const GP<ByteStream> &gbs)
+{
+  GUTF8String chkid;
+  GP<IFFByteStream> giff=IFFByteStream::create(gbs);
+  IFFByteStream &iff=*giff;
+  while( iff.get_chunk(chkid) )
+  {
+    if (chkid == "ANTa")
+    {
+      if (ant) {
+        ant->merge(*iff.get_bytestream());
+      } else {
+        ant=DjVuANT::create();
+        ant->decode(*iff.get_bytestream());
+      }
+    }
+    else if (chkid == "ANTz")
+    {
+      GP<ByteStream> gbsiff=BSByteStream::create(giff->get_bytestream());
+      if (ant) {
+        ant->merge(*gbsiff);
+      } else {
+        ant=DjVuANT::create();
+        ant->decode(*gbsiff);
+      }
+    }
+    // Add decoding of other chunks here
+    iff.close_chunk();
+  }
+}
+
+void
+DjVuAnno::encode(const GP<ByteStream> &gbs)
+{
+  GP<IFFByteStream> giff=IFFByteStream::create(gbs);
+  IFFByteStream &iff=*giff;
+  if (ant)
+    {
+#if 0
+      iff.put_chunk("ANTa");
+      ant->encode(iff);
+      iff.close_chunk();
+#else
+      iff.put_chunk("ANTz");
+      {
+//	 GP<ByteStream> bsbinput = giff.get_bytestream();
+	 GP<ByteStream> bsb = BSByteStream::create(giff->get_bytestream(), 50);
+	 ant->encode(*bsb);
+      }
+      iff.close_chunk();
+#endif
+    }
+  // Add encoding of other chunks here
+}
+
+
+GP<DjVuAnno>
+DjVuAnno::copy(void) const
+{
+   GP<DjVuAnno> anno= new DjVuAnno;
+      // Copy any primitives (if any)
+   *anno=*this;
+      // Copy each substructure
+   if (ant) anno->ant = ant->copy();
+   return anno;
+}
+
+void
+DjVuAnno::merge(const GP<DjVuAnno> & anno)
+{
+   if (anno)
+   {
+      GP<ByteStream> gstr=ByteStream::create();
+      encode(gstr);
+      anno->encode(gstr);
+      gstr->seek(0);
+      decode(gstr);
+   }
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuAnno.h b/libdjvu/DjVuAnno.h
new file mode 100644
index 0000000..b87cb53
--- /dev/null
+++ b/libdjvu/DjVuAnno.h
@@ -0,0 +1,292 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUANNO_H
+#define _DJVUANNO_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+
+/** @name DjVuAnno.h
+
+    Files #"DjVuAnno.h"# and #"DjVuAnno.cpp"# implement the mechanism for
+    annotating DjVuImages. Annotations are additional instructions for the
+    plugin about how the image should be displayed.  The exact format of
+    annotations is not strictly defined. The only requirement is that they
+    have to be stored as a sequence of chunks inside a #FORM:ANNO#.
+
+    This file implements annotations understood by the DjVu plugins 
+    and encoders.
+
+
+    using: contents of #ANT*# chunks.
+
+    Contents of the #FORM:ANNO# should be passed to \Ref{DjVuAnno::decode}()
+    for parsing, which initializes \Ref{DjVuAnno::ANT} 
+    and fills them with decoded data. 
+    @memo Implements support for DjVuImage annotations
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+//@{
+
+
+#include "GString.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class GMapArea;
+class ByteStream;
+
+// -------- DJVUANT --------
+
+/** This class contains some trivial annotations of the page or of the
+    document such as page border color, page alignment, initial zoom and
+    display mode, hyperlinks and highlighted areas.  All this information is
+    put inside a textual chunk #ANTa# in pseudo-lisp format. Decoding and
+    encoding are normally done by \Ref{DjVuANT::decode}() and
+    \Ref{DjVuANT::encode}() functions. */
+
+class DJVUAPI DjVuANT : public GPEnabled
+{
+protected:
+      /// Constructs an empty annotation object.
+   DjVuANT(void);
+
+public:
+   enum { MODE_UNSPEC=0, MODE_COLOR, MODE_FORE, MODE_BACK, MODE_BW };
+   enum { ZOOM_STRETCH=-4, ZOOM_ONE2ONE=-3, ZOOM_WIDTH=-2,
+	  ZOOM_PAGE=-1, ZOOM_UNSPEC=0 };
+   enum alignment { ALIGN_UNSPEC=0, ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT,
+	  ALIGN_TOP, ALIGN_BOTTOM };
+
+      /// Creates an empty annotation object.
+   static GP<DjVuANT> create(void) { return new DjVuANT; }
+   virtual ~DjVuANT();
+
+      /** Background color. Is in #0x00RRBBGG# format. #0xffffffff# if
+	  there were no background color records in the annotation chunk. */
+   unsigned long int	bg_color;
+      /** Initial zoom. Possible values are:
+	  \begin{description}
+          \item[ZOOM_STRETCH] the image is stretched to the viewport.
+          \item[ZOOM_ONE2ONE] the image is displayed pixel-to-pixel.
+          \item[ZOOM_WIDTH] "Fit width" mode.
+          \item[ZOOM_PAGE] "Fit page" mode.
+          \item[ZOOM_UNSPEC] Annotation does not specify a zoom factor.
+          \end{description} */
+   int		zoom;
+      /** Initial mode. Possible values are:
+	  \begin{description}
+             \item[MODE_COLOR] color mode.
+             \item[MODE_FORE] foreground mode.
+             \item[MODE_BACK] background mode.
+             \item[MODE_BW] black and white mode.
+             \item[MODE_UNSPEC] Annotation does not specify a display mode.
+	     \item[Any positive number] Zoom in \%. Please note that
+                   all constants above are either negative or ZERO. Thus
+                   it's possible to distinguish numerical zoom from those
+                   special cases.
+          \end{description} */
+   int		mode;
+      /** Horizontal page alignment. Possible values are #ALIGN_LEFT#,
+	  #ALIGN_CENTER#, #ALIGN_RIGHT# and #ALIGN_UNSPEC#. */
+   alignment hor_align;
+      /** Vertical page alignment. Possible values are #ALIGN_TOP#,
+	  #ALIGN_CENTER#, #ALIGN_BOTTOM# and #ALIGN_UNSPEC#. */
+   alignment ver_align;
+      /** List of defined map areas. They may be just areas of highlighting
+	  or hyperlink. Please refer to \Ref{GMapArea}, \Ref{GMapRect},
+	  \Ref{GMapPoly} and \Ref{GMapOval} for details. */
+   GPList<GMapArea> map_areas;
+      /** Metainformations like title, author ... */
+   GMap<GUTF8String,GUTF8String> metadata;
+      /** Metainformations like title, author ... */
+   GUTF8String xmpmetadata;
+      /** Returns TRUE if no features are specified or specified features
+         are not different from default ones */
+   bool	is_empty(void) const;
+
+      /** Decodes contents of annotation chunk #ANTa#. The chunk data is
+	  read from ByteStream #bs# until reaching an end-of-stream marker.
+	  This function is normally called after a call to
+	  \Ref{IFFByteStream::get_chunk}(). */
+   void	decode(ByteStream &bs);
+
+      /** Same as \Ref{decode}() but adds the new data to what has
+	  been decoded before. */
+   void merge(ByteStream & bs);
+
+      /** Encodes the #ANTa# chunk. The annotation data is simply written
+	  into ByteStream #bs# with no IFF header. This function is normally
+	  called after a call to \Ref{IFFByteStream::put_chunk}(). */
+   void encode(ByteStream &bs);
+
+      /// Encodes data back into raw annotation data.
+   GUTF8String encode_raw(void) const;
+
+      /// Returns a copy of this object
+   GP<DjVuANT>	copy(void) const;
+   
+      /** Returns the number of bytes needed by this data structure. It's
+	  used by caching routines to estimate the size of a \Ref{DjVuImage}. */
+   unsigned int get_memory_usage() const;
+
+      /// Converts color from string in \#RRGGBB notation to an unsigned integer
+   static unsigned long int	cvt_color(const char * color, unsigned long int def);
+      /// Obtain the <MAP></MAP> tag for these annotations.
+   GUTF8String get_xmlmap(const GUTF8String &name, const int height) const;
+      /// Write the <MAP></MAP> tag for these annotations.
+   void writeMap(
+     ByteStream &bs,const GUTF8String &name, const int height) const;
+      /// Obtain the XML flags for the default specifications.
+   GUTF8String get_paramtags(void) const;
+      /// Write the XML flags for the default specifications.
+   void writeParam(ByteStream &out_str) const;
+private:
+   void	decode(class GLParser & parser);
+   static GUTF8String read_raw(ByteStream & str);
+   static unsigned char	decode_comp(char ch1, char ch2);
+   static unsigned long int get_bg_color(class GLParser & parser);
+   static int get_zoom(class GLParser & parser);
+   static int get_mode(class GLParser & parser);
+   static alignment get_hor_align(class GLParser & parser);
+   static alignment get_ver_align(class GLParser & parser);
+   static GPList<GMapArea> get_map_areas(class GLParser & parser);
+   static GMap<GUTF8String, GUTF8String>get_metadata(GLParser & parser);
+   static GUTF8String get_xmpmetadata(GLParser & parser);
+   static void del_all_items(const char * name, class GLParser & parser);
+};
+
+// -------- DJVUANNO --------
+
+
+/** This is a top-level class containing annotations of a DjVu document (or
+    just a page). It has only two functions: \Ref{encode}() and
+    \Ref{decode}().  Both of them work with a sequence of annotation chunks
+    from #FORM:ANNO# form. Basing on the name of the chunks they call
+    #encode()# and #decode()# functions of the proper annotation structure
+    (like \Ref{ANT}). The real work of encoding and decoding is done by
+    lower-level classes. */
+class DJVUAPI DjVuAnno : public GPEnabled
+{
+protected:
+   DjVuAnno(void) {}
+public:
+   /// Creation method.
+   static GP<DjVuAnno> create(void) { return new DjVuAnno; }
+
+   GP<DjVuANT>	ant;
+
+      /** Decodes a sequence of annotation chunks and merges contents of every
+	  chunk with previously decoded information. This function
+	  should be called right after applying \Ref{IFFByteStream::get_chunk}()
+	  to data from #FORM:ANNO#. */
+   void decode(const GP<ByteStream> &bs);
+
+      /** Encodes all annotations back into a sequence of chunks to be put
+	  inside a #FORM:ANNO#. */
+   void	encode(const GP<ByteStream> &bs);
+
+      /// Returns a copy of this object
+   GP<DjVuAnno>	copy(void) const;
+
+      /** Merged the contents of this class and of annotations
+	  pointed by #anno# pointer */
+   void		merge(const GP<DjVuAnno> & anno);
+
+      /** Returns the number of bytes needed by this data structure. It's
+	  used by caching routines to estimate the size of a \Ref{DjVuImage}. */
+   inline unsigned int get_memory_usage() const;
+      /// Obtain the <MAP></MAP> tag for these annotations.
+   GUTF8String get_xmlmap(const GUTF8String &name, const int height) const;
+      /// Write the <MAP></MAP> tag for these annotations.
+   void writeMap(
+     ByteStream &bs,const GUTF8String &name, const int height) const;
+      /// Obtain the XML flags for the default specifications.
+   GUTF8String get_paramtags(void) const;
+      /// Write the XML flags for the default specifications.
+   void writeParam(ByteStream &out_str) const;
+private: // dummy stuff
+   static void decode(ByteStream *);
+   static void encode(ByteStream *);
+};
+
+//@}
+
+inline unsigned int 
+DjVuAnno::get_memory_usage() const
+{
+  return (ant)?(ant->get_memory_usage()):0;
+}
+
+// ----- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuDocEditor.cpp b/libdjvu/DjVuDocEditor.cpp
new file mode 100644
index 0000000..77a8c99
--- /dev/null
+++ b/libdjvu/DjVuDocEditor.cpp
@@ -0,0 +1,2202 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuDocEditor.h"
+#include "DjVuImage.h"
+#include "IFFByteStream.h"
+#include "DataPool.h"
+#include "IW44Image.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuAnno.h"
+#include "GRect.h"
+#include "DjVmNav.h"
+
+#include "debug.h"
+
+#include <ctype.h>
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+static const char octets[4]={0x41,0x54,0x26,0x54};
+
+int        DjVuDocEditor::thumbnails_per_file=10;
+
+// This is a structure for active files and DataPools. It may contain
+// a DjVuFile, which is currently being used by someone (I check the list
+// and get rid of hanging files from time to time) or a DataPool,
+// which is "custom" with respect to the document (was modified or
+// inserted), or both.
+//
+// DjVuFile is set to smth!=0 when it's created using url_to_file().
+//          It's reset back to ZERO in clean_files_map() when
+//	  it sees, that a given file is not used by anyone.
+// DataPool is updated when a file is inserted
+class DjVuDocEditor::File : public GPEnabled
+{
+public:
+  // 'pool' below may be non-zero only if it cannot be retrieved
+  // by the DjVuDocument, that is it either corresponds to a
+  // modified DjVuFile or it has been inserted. Otherwise it's ZERO
+  // Once someone assigns a non-zero DataPool, it remains non-ZERO
+  // (may be updated if the file gets modified) and may be reset
+  // only by save() or save_as() functions.
+  GP<DataPool>	pool;
+
+  // If 'file' is non-zero, it means, that it's being used by someone
+  // We check for unused files from time to time and ZERO them.
+  // But before we do it, we may save the DataPool in the case if
+  // file has been modified.
+  GP<DjVuFile>	file;
+};
+
+void
+DjVuDocEditor::check(void)
+{
+   if (!initialized) G_THROW( ERR_MSG("DjVuDocEditor.not_init") );
+}
+
+DjVuDocEditor::DjVuDocEditor(void)
+{
+   initialized=false;
+   refresh_cb=0;
+   refresh_cl_data=0;
+}
+
+DjVuDocEditor::~DjVuDocEditor(void)
+{
+   GCriticalSectionLock lock(&thumb_lock);
+   thumb_map.empty();
+   DataPool::close_all();
+}
+
+void
+DjVuDocEditor::init(void)
+{
+   DEBUG_MSG("DjVuDocEditor::init() called\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // If you remove this check be sure to delete thumb_map
+   if (initialized) G_THROW( ERR_MSG("DjVuDocEditor.init") );
+
+   doc_url=GURL::Filename::UTF8("noname.djvu");
+
+   const GP<DjVmDoc> doc(DjVmDoc::create());
+   const GP<ByteStream> gstr(ByteStream::create());
+   doc->write(gstr);
+   gstr->seek(0, SEEK_SET);
+   doc_pool=DataPool::create(gstr);
+
+   orig_doc_type=UNKNOWN_TYPE;
+   orig_doc_pages=0;
+
+   initialized=true;
+
+   DjVuDocument::init(doc_url, this);
+}
+
+void
+DjVuDocEditor::init(const GURL &url)
+{
+   DEBUG_MSG("DjVuDocEditor::init() called: url='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // If you remove this check be sure to delete thumb_map
+   if (initialized)
+     G_THROW( ERR_MSG("DjVuDocEditor.init") );
+
+      // First - create a temporary DjVuDocument and check its type
+   doc_pool=DataPool::create(url);
+   doc_url=url;
+   const GP<DjVuDocument> tmp_doc(DjVuDocument::create_wait(doc_url,this));
+   if (!tmp_doc->is_init_ok())
+      G_THROW( ERR_MSG("DjVuDocEditor.open_fail") "\t" +url.get_string());
+
+   orig_doc_type=tmp_doc->get_doc_type();
+   orig_doc_pages=tmp_doc->get_pages_num();
+   if (orig_doc_type==OLD_BUNDLED ||
+       orig_doc_type==OLD_INDEXED ||
+       orig_doc_type==SINGLE_PAGE)
+   {
+     // Suxx. I need to convert it now.
+     GP<ByteStream> gstr = ByteStream::create();  // Convert in memory.
+     tmp_doc->write(gstr, true);  // Force DJVM format
+     gstr->seek(0);                     
+     doc_pool=DataPool::create(gstr);
+   }
+
+      // OK. Now doc_pool contains data of the document in one of the
+      // new formats. It will be a lot easier to insert/delete pages now.
+      // 'doc_url' below of course doesn't refer to the file with the converted
+      // data, but we will take care of it by redirecting the request_data().
+   initialized=true;
+   DjVuDocument::init(doc_url, this);
+
+      // Cool. Now extract the thumbnails...
+   GCriticalSectionLock lock(&thumb_lock);
+   int pages_num=get_pages_num();
+   for(int page_num=0;page_num<pages_num;page_num++)
+   {
+	 // Call DjVuDocument::get_thumbnail() here to bypass logic
+	 // of DjVuDocEditor::get_thumbnail(). init() is the only safe
+	 // place where we can still call DjVuDocument::get_thumbnail();
+      const GP<DataPool> pool(DjVuDocument::get_thumbnail(page_num, true));
+      if (pool)
+      {
+        thumb_map[page_to_id(page_num)]=pool;
+      }
+   }
+      // And remove then from DjVmDir so that DjVuDocument
+      // does not try to use them
+   unfile_thumbnails();
+}
+
+GP<DataPool>
+DjVuDocEditor::request_data(const DjVuPort * source, const GURL & url)
+{
+   DEBUG_MSG("DjVuDocEditor::request_data(): url='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // Check if we have either original data or converted (to new format),
+      // if all the story is about the DjVuDocument's data
+   if (url==doc_url)
+     return doc_pool;
+
+      // Now see if we have any file matching the url
+   const GP<DjVmDir::File> frec(djvm_dir->name_to_file(url.fname()));
+   if (frec)
+   {
+      GCriticalSectionLock lock(&files_lock);
+      GPosition pos;
+      if (files_map.contains(frec->get_load_name(), pos))
+      {
+         const GP<File> f(files_map[pos]);
+         if (f->file && f->file->get_init_data_pool())
+            return f->file->get_init_data_pool();// Favor DjVuFile's knowledge
+         else if (f->pool) return f->pool;
+      }
+   }
+
+      // Finally let DjVuDocument cope with it. It may be a connected DataPool
+      // for a BUNDLED format. Or it may be a file. Anyway, it was not
+      // manually included, so it should be in the document.
+   const GP<DataPool> pool(DjVuDocument::request_data(source, url));
+
+      // We do NOT update the 'File' structure, because our rule is that
+      // we keep a separate copy of DataPool in 'File' only if it cannot
+      // be retrieved from DjVuDocument (like it has been "inserted" or
+      // corresponds to a modified file).
+   return pool;
+}
+
+void
+DjVuDocEditor::clean_files_map(void)
+      // Will go thru the map of files looking for unreferenced
+      // files or records w/o DjVuFile and DataPool.
+      // These will be modified and/or removed.
+{
+   DEBUG_MSG("DjVuDocEditor::clean_files_map() called\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock(&files_lock);
+
+      // See if there are too old items in the "cache", which are
+      // not referenced by anyone. If the corresponding DjVuFile has been
+      // modified, obtain the new data and replace the 'pool'. Clear the
+      // DjVuFile anyway. If both DataPool and DjVuFile are zero, remove
+      // the entry.
+   for(GPosition pos=files_map;pos;)
+   {
+      const GP<File> f(files_map[pos]);
+      if (f->file && f->file->get_count()==1)
+      {
+         DEBUG_MSG("ZEROing file '" << f->file->get_url() << "'\n");
+         if (f->file->is_modified())
+            f->pool=f->file->get_djvu_data(false);
+         f->file=0;
+      }
+      if (!f->file && !f->pool)
+      {
+         DEBUG_MSG("Removing record '" << files_map.key(pos) << "'\n");
+         GPosition this_pos=pos;
+         ++pos;
+         files_map.del(this_pos);
+      } else ++pos;
+   }
+}
+
+GP<DjVuFile>
+DjVuDocEditor::url_to_file(const GURL & url, bool dont_create) const
+{
+   DEBUG_MSG("DjVuDocEditor::url_to_file(): url='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // Check if have a DjVuFile with this url cached (created before
+      // and either still active or left because it has been modified)
+   GP<DjVmDir::File> frec;
+   if((const DjVmDir *)djvm_dir)
+     frec=djvm_dir->name_to_file(url.fname());
+   if (frec)
+   {
+      GCriticalSectionLock lock(&(const_cast<DjVuDocEditor *>(this)->files_lock));
+      GPosition pos;
+      if (files_map.contains(frec->get_load_name(), pos))
+      {
+         const GP<File> f(files_map[pos]);
+         if (f->file)
+           return f->file;
+      }
+   }
+
+   const_cast<DjVuDocEditor *>(this)->clean_files_map();
+
+      // We don't have the file cached. Let DjVuDocument create the file.
+   const GP<DjVuFile> file(DjVuDocument::url_to_file(url, dont_create));
+
+      // And add it to our private "cache"
+   if (file && frec)
+   {
+      GCriticalSectionLock lock(&(const_cast<DjVuDocEditor *>(this)->files_lock));
+      GPosition pos;
+      if (files_map.contains(frec->get_load_name(), pos))
+      {
+         files_map[frec->get_load_name()]->file=file;
+      }else
+      {
+         const GP<File> f(new File());
+         f->file=file;
+         const_cast<DjVuDocEditor *>(this)->files_map[frec->get_load_name()]=f;
+      }
+   }
+
+   return file;
+}
+
+GUTF8String
+DjVuDocEditor::page_to_id(int page_num) const
+{
+   if (page_num<0 || page_num>=get_pages_num())
+     G_THROW( ERR_MSG("DjVuDocEditor.page_num") "\t"+GUTF8String(page_num));
+   const GP<DjVmDir::File> f(djvm_dir->page_to_file(page_num));
+   if (! f)
+     G_THROW( ERR_MSG("DjVuDocEditor.page_num") "\t"+GUTF8String(page_num));
+
+   return f->get_load_name();
+}
+
+GUTF8String
+DjVuDocEditor::find_unique_id(GUTF8String id)
+{
+  const GP<DjVmDir> dir(get_djvm_dir());
+
+  GUTF8String base, ext;
+  const int dot=id.rsearch('.');
+  if(dot >= 0)
+  {
+    base=id.substr(0,dot);
+    ext=id.substr(dot+1,(unsigned int)-1);
+  }else
+  {
+    base=id;
+  }
+
+  int cnt=0;
+  while (!(!dir->id_to_file(id) &&
+           !dir->name_to_file(id) &&
+           !dir->title_to_file(id)))
+  {
+     cnt++;
+     id=base+"_"+GUTF8String(cnt);
+     if (ext.length())
+       id+="."+ext;
+  }
+  return id;
+}
+
+GP<DataPool>
+DjVuDocEditor::strip_incl_chunks(const GP<DataPool> & pool_in)
+{
+   DEBUG_MSG("DjVuDocEditor::strip_incl_chunks() called\n");
+   DEBUG_MAKE_INDENT(3);
+
+   const GP<IFFByteStream> giff_in(
+     IFFByteStream::create(pool_in->get_stream()));
+
+   const GP<ByteStream> gbs_out(ByteStream::create());
+   const GP<IFFByteStream> giff_out(IFFByteStream::create(gbs_out));
+
+   IFFByteStream &iff_in=*giff_in;
+   IFFByteStream &iff_out=*giff_out;
+
+   bool have_incl=false;
+   int chksize;
+   GUTF8String chkid;
+   if (iff_in.get_chunk(chkid))
+   {
+      iff_out.put_chunk(chkid);
+      while((chksize=iff_in.get_chunk(chkid)))
+      {
+         if (chkid!="INCL")
+         {
+            iff_out.put_chunk(chkid);
+            iff_out.copy(*iff_in.get_bytestream());
+            iff_out.close_chunk();
+         } else
+         {
+           have_incl=true;
+         }
+         iff_in.close_chunk();
+      }
+      iff_out.close_chunk();
+   }
+
+   if (have_incl)
+   {
+      gbs_out->seek(0,SEEK_SET);
+      return DataPool::create(gbs_out);
+   } else return pool_in;
+}
+
+GUTF8String
+DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id,
+                           int chunk_num, DjVuPort *source)
+      // Will open the 'file_name' and insert it into an existing DjVuFile
+      // with ID 'parent_id'. Will insert the INCL chunk at position chunk_num
+      // Will NOT process ANY files included into the file being inserted.
+      // Moreover it will strip out any INCL chunks in that file...
+{
+   DEBUG_MSG("DjVuDocEditor::insert_file(): fname='" << file_url <<
+             "', parent_id='" << parent_id << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   const GP<DjVmDir> dir(get_djvm_dir());
+
+   if(!source)
+     source=this;
+      // Create DataPool and see if the file exists
+   GP<DataPool> file_pool;
+   if(file_url.is_empty()||file_url.is_local_file_url())
+   {
+     file_pool=DataPool::create(file_url);
+   }else
+   {
+     file_pool=source->request_data(source, file_url);
+     if(source != this)
+     {
+       file_pool=DataPool::create(file_pool->get_stream());
+     }
+   }
+   if(file_pool && file_url && DjVuDocument::djvu_import_codec)
+   {
+     (*DjVuDocument::djvu_import_codec)(file_pool,file_url,needs_compression_flag,can_compress_flag);
+   }
+
+      // Strip any INCL chunks
+   file_pool=strip_incl_chunks(file_pool);
+
+      // Check if parent ID is valid
+   GP<DjVmDir::File> parent_frec(dir->id_to_file(parent_id));
+   if (!parent_frec)
+     parent_frec=dir->name_to_file(parent_id);
+   if (!parent_frec)
+     parent_frec=dir->title_to_file(parent_id);
+   if (!parent_frec)
+     G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t" +parent_id);
+   const GP<DjVuFile> parent_file(get_djvu_file(parent_id));
+   if (!parent_file)
+     G_THROW( ERR_MSG("DjVuDocEditor.create_fail") "\t"+parent_id);
+
+      // Now obtain ID for the new file
+   const GUTF8String id(find_unique_id(file_url.fname()));
+
+      // Add it into the directory
+   const GP<DjVmDir::File> frec(
+     DjVmDir::File::create(id, id, id, DjVmDir::File::INCLUDE));
+   int pos=dir->get_file_pos(parent_frec);
+   if (pos>=0)
+     ++pos;
+   dir->insert_file(frec, pos);
+
+      // Add it to our "cache"
+   {
+      const GP<File> f(new File);
+      f->pool=file_pool;
+      GCriticalSectionLock lock(&files_lock);
+      files_map[id]=f;
+   }
+
+      // And insert it into the parent DjVuFile
+   parent_file->insert_file(id, chunk_num);
+
+   return id;
+}
+
+      // First it will insert the 'file_url' at position 'file_pos'.
+      //
+      // Then it will process all the INCL chunks in the file and try to do
+      // the same thing with the included files. If insertion of an included
+      // file fails, it will proceed with other INCL chunks until it does
+      // them all. In the very end we will throw exception to let the caller
+      // know about problems with included files.
+      //
+      // If the name of a file being inserted conflicts with some other
+      // name, which has been in DjVmDir prior to call to this function,
+      // it will be modified. name2id is the translation table to
+      // keep track of these modifications.
+      //
+      // Also, if a name is in name2id, we will not insert that file again.
+      //
+      // Will return TRUE if the file has been successfully inserted.
+      // FALSE, if the file contains NDIR chunk and has been skipped.
+bool
+DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
+  int & file_pos, GMap<GUTF8String, GUTF8String> & name2id,
+  DjVuPort *source)
+{
+
+  DEBUG_MSG("DjVuDocEditor::insert_file(): file_url='" << file_url <<
+             "', is_page='" << is_page << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  if (refresh_cb)
+    refresh_cb(refresh_cl_data);
+
+
+      // We do not want to insert the same file twice (important when
+      // we insert a group of files at the same time using insert_group())
+      // So we check if we already did that and return if so.
+  if (name2id.contains(file_url.fname()))
+    return true;
+
+  if(!source)
+    source=this;
+
+  GP<DataPool> file_pool;
+  if(file_url.is_empty()||file_url.is_local_file_url())
+  {
+    file_pool=DataPool::create(file_url);
+  }
+  else
+  {
+    file_pool=source->request_data(source, file_url);
+    if(source != this)
+    {
+      file_pool=DataPool::create(file_pool->get_stream());
+    }
+  }
+       // Create DataPool and see if the file exists
+  if(file_pool && !file_url.is_empty() && DjVuDocument::djvu_import_codec)
+  {
+      (*DjVuDocument::djvu_import_codec)(file_pool,file_url,
+                                         needs_compression_flag,
+                                         can_compress_flag);
+  }
+
+  // Oh. It does exist... Check that it has IFF structure
+  {
+    const GP<IFFByteStream> giff(
+       IFFByteStream::create(file_pool->get_stream()));
+    IFFByteStream &iff=*giff;
+    GUTF8String chkid;
+    iff.get_chunk(chkid);
+    if (chkid!="FORM:DJVI" && chkid!="FORM:DJVU" &&
+        chkid!="FORM:BM44" && chkid!="FORM:PM44")
+      G_THROW( ERR_MSG("DjVuDocEditor.not_1_page") "\t"
+               + file_url.get_string());
+    // Wonderful. It's even a DjVu file. Scan for NDIR chunks.
+    // If NDIR chunk is found, ignore the file
+    while(iff.get_chunk(chkid))
+      {
+        if (chkid=="NDIR")
+          return false;
+        iff.close_chunk();
+      }
+  }
+  return insert_file(file_pool,file_url,is_page,file_pos,name2id,source);
+}
+
+bool
+DjVuDocEditor::insert_file(const GP<DataPool> &file_pool,
+  const GURL &file_url, bool is_page,
+  int & file_pos, GMap<GUTF8String, GUTF8String> & name2id,
+  DjVuPort *source)
+{
+  GUTF8String errors;
+  if(file_pool)
+  {
+    const GP<DjVmDir> dir(get_djvm_dir());
+    G_TRY
+    {
+         // Now get a unique name for this file.
+         // Check the name2id first...
+      const GUTF8String name=file_url.fname();
+      GUTF8String id;
+      if (name2id.contains(name))
+      {
+        id=name2id[name];
+      }else
+      {
+           // Check to see if this page exists with a different name.
+        if(!is_page)
+        {
+          GPList<DjVmDir::File> list(dir->get_files_list());
+          for(GPosition pos=list;pos;++pos)
+          {
+            DEBUG_MSG("include " << list[pos]->is_include() 
+                      << " size=" << list[pos]->size << " length=" 
+                      << file_pool->get_length() << "\n");
+            if(list[pos]->is_include() 
+               && (!list[pos]->size 
+                   || (list[pos]->size == file_pool->get_length())))
+            {
+              id=list[pos]->get_load_name();
+              GP<DjVuFile> file(get_djvu_file(id,false));
+              const GP<DataPool> pool(file->get_djvu_data(false));
+              if(file_pool->simple_compare(*pool))
+              {
+                // The files are the same, so just store the alias.
+                name2id[name]=id;
+              }
+              const GP<IFFByteStream> giff_old(IFFByteStream::create(pool->get_stream()));
+              const GP<IFFByteStream> giff_new(IFFByteStream::create(file_pool->get_stream()));
+              file=0;
+              if(giff_old->compare(*giff_new))
+              {
+                // The files are the same, so just store the alias.
+                name2id[name]=id;
+                return true;
+              }
+            } 
+          }
+        }
+        // Otherwise create a new unique ID and remember the translation
+        id=find_unique_id(name);
+        name2id[name]=id;
+      }
+
+         // Good. Before we continue with the included files we want to
+         // complete insertion of this one. Notice, that insertion of
+         // children may fail, in which case we will have to modify
+         // data for this file to get rid of invalid INCL
+
+         // Create a file record with the chosen ID
+      const GP<DjVmDir::File> file(DjVmDir::File::create(id, id, id,
+        is_page ? DjVmDir::File::PAGE : DjVmDir::File::INCLUDE ));
+
+         // And insert it into the directory
+      file_pos=dir->insert_file(file, file_pos);
+
+         // And add the File record (containing the file URL and DataPool)
+      {
+         const GP<File> f(new File);
+         f->pool=file_pool;
+         GCriticalSectionLock lock(&files_lock);
+         files_map[id]=f;
+      }
+
+         // The file has been added. If it doesn't include anything else,
+         // that will be enough. Otherwise repeat what we just did for every
+         // included child. Don't forget to modify the contents of INCL
+         // chunks due to name2id translation.
+         // We also want to include here our file with shared annotations,
+         // if it exists.
+      GUTF8String chkid;
+      const GP<IFFByteStream> giff_in(
+        IFFByteStream::create(file_pool->get_stream()));
+      IFFByteStream &iff_in=*giff_in;
+      const GP<ByteStream> gstr_out(ByteStream::create());
+      const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+      IFFByteStream &iff_out=*giff_out;
+
+      const GP<DjVmDir::File> shared_frec(djvm_dir->get_shared_anno_file());
+
+      iff_in.get_chunk(chkid);
+      iff_out.put_chunk(chkid);
+      while(iff_in.get_chunk(chkid))
+      {
+         if (chkid!="INCL")
+         {
+            iff_out.put_chunk(chkid);
+            iff_out.copy(*iff_in.get_bytestream());
+            iff_in.close_chunk();
+            iff_out.close_chunk();
+            if (shared_frec && chkid=="INFO")
+            {
+               iff_out.put_chunk("INCL");
+               iff_out.get_bytestream()->writestring(shared_frec->get_load_name());
+               iff_out.close_chunk();
+            }
+         } else
+         {
+            GUTF8String name;
+            char buffer[1024];
+            int length;
+            while((length=iff_in.read(buffer, 1024)))
+               name+=GUTF8String(buffer, length);
+            while(isspace(name[0]))
+            {
+              name=name.substr(1,(unsigned int)-1);
+            }
+            while(isspace(name[(int)name.length()-1]))
+            {
+              name.setat(name.length()-1, 0);
+            }
+            const GURL::UTF8 full_url(name,file_url.base());
+            iff_in.close_chunk();
+
+            G_TRY {
+               if (insert_file(full_url, false, file_pos, name2id, source))
+               {
+                     // If the child file has been inserted (doesn't
+                     // contain NDIR chunk), add INCL chunk.
+                  GUTF8String id=name2id[name];
+                  iff_out.put_chunk("INCL");
+                  iff_out.get_bytestream()->writestring(id);
+                  iff_out.close_chunk();
+               }
+            } G_CATCH(exc) {
+                  // Should an error occur, we move on. INCL chunk will
+                  // not be copied.
+               if (errors.length())
+                 errors+="\n\n";
+               errors+=exc.get_cause();
+            } G_ENDCATCH;
+         }
+      } // while(iff_in.get_chunk(chkid))
+      iff_out.close_chunk();
+
+      // Increment the file_pos past the page inserted.
+      if (file_pos>=0) file_pos++;
+
+         // We have just inserted every included file. We may have modified
+         // contents of the INCL chunks. So we need to update the DataPool...
+      gstr_out->seek(0);
+      const GP<DataPool> new_file_pool(DataPool::create(gstr_out));
+      {
+            // It's important that we replace the pool here anyway.
+            // By doing this we load the file into memory. And this is
+            // exactly what insert_group() wants us to do because
+            // it creates temporary files.
+         GCriticalSectionLock lock(&files_lock);
+         files_map[id]->pool=new_file_pool;
+      }
+    } G_CATCH(exc) {
+      if (errors.length())
+        errors+="\n\n";
+      errors+=exc.get_cause();
+      G_THROW(errors);
+    } G_ENDCATCH;
+
+      // The only place where we intercept exceptions is when we process
+      // included files. We want to process all of them even if we failed to
+      // process one. But here we need to let the exception propagate...
+    if (errors.length())
+      G_THROW(errors);
+
+    return true;
+  }
+  return false;
+}
+
+void
+DjVuDocEditor::insert_group(const GList<GURL> & file_urls, int page_num,
+                             void (* _refresh_cb)(void *), void * _cl_data)
+      // The function will insert every file from the list at position
+      // corresponding to page_num. If page_num is negative, concatenation
+      // will occur. Included files will be processed as well
+{
+  refresh_cb=_refresh_cb;
+  refresh_cl_data=_cl_data;
+
+  G_TRY
+  {
+
+     // First translate the page_num to file_pos.
+    const GP<DjVmDir> dir(get_djvm_dir());
+    int file_pos;
+    if (page_num<0 || page_num>=dir->get_pages_num())
+    {
+      file_pos=-1;
+    }
+    else
+    {
+      file_pos=dir->get_page_pos(page_num);
+    }
+
+       // Now call the insert_file() for every page. We will remember the
+       // name2id translation table. Thus insert_file() will remember IDs
+       // it assigned to shared files
+    GMap<GUTF8String, GUTF8String> name2id;
+
+    GUTF8String errors;
+    for(GPosition pos=file_urls;pos;++pos)
+    {
+      const GURL &furl=file_urls[pos];
+      DEBUG_MSG( "Inserting file '" << furl << "'\n" );
+      G_TRY
+      {
+               // Check if it's a multipage document...
+        GP<DataPool> xdata_pool(DataPool::create(furl));
+        if(xdata_pool && furl.is_valid()
+           && furl.is_local_file_url() && DjVuDocument::djvu_import_codec)
+        {
+          (*DjVuDocument::djvu_import_codec)(xdata_pool,furl,
+                                             needs_compression_flag,
+                                             can_compress_flag);
+        }
+        GUTF8String chkid;
+        IFFByteStream::create(xdata_pool->get_stream())->get_chunk(chkid);
+        if (name2id.contains(furl.fname())||(chkid=="FORM:DJVM"))
+        {
+          GMap<GUTF8String,void *> map;
+          map_ids(map);
+          DEBUG_MSG("Read DjVuDocument furl='" << furl << "'\n");
+          GP<ByteStream> gbs(ByteStream::create());
+          GP<DjVuDocument> doca(DjVuDocument::create_noinit());
+          doca->set_verbose_eof(verbose_eof);
+          doca->set_recover_errors(recover_errors);
+          doca->init(furl /* ,this */ );
+          doca->wait_for_complete_init();
+          get_portcaster()->add_route(doca,this);
+          DEBUG_MSG("Saving DjVuDocument url='" << furl << "' with unique names\n");
+          doca->write(gbs,map);
+          gbs->seek(0L);
+          DEBUG_MSG("Loading unique names\n");
+          GP<DjVuDocument> doc(DjVuDocument::create(gbs));
+          doc->set_verbose_eof(verbose_eof);
+          doc->set_recover_errors(recover_errors);
+          doc->wait_for_complete_init();
+          get_portcaster()->add_route(doc,this);
+          gbs=0;
+          DEBUG_MSG("Inserting pages\n");
+          int pages_num=doc->get_pages_num();
+          for(int page_num=0;page_num<pages_num;page_num++)
+          {
+            const GURL url(doc->page_to_url(page_num));
+            insert_file(url, true, file_pos, name2id, doc);
+          }
+        }
+        else
+        {
+          insert_file(furl, true, file_pos, name2id, this);
+        }
+      } G_CATCH(exc)
+      {
+        if (errors.length())
+        {
+          errors+="\n\n";
+        }
+        errors+=exc.get_cause();
+      }
+      G_ENDCATCH;
+    }
+    if (errors.length())
+    {
+      G_THROW(errors);
+    }
+  } G_CATCH_ALL
+  {
+    refresh_cb=0;
+    refresh_cl_data=0;
+    G_RETHROW;
+  } G_ENDCATCH;
+  refresh_cb=0;
+  refresh_cl_data=0;
+}
+
+void
+DjVuDocEditor::insert_page(const GURL &file_url, int page_num)
+{
+   DEBUG_MSG("DjVuDocEditor::insert_page(): furl='" << file_url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GList<GURL> list;
+   list.append(file_url);
+
+   insert_group(list, page_num);
+}
+
+void
+DjVuDocEditor::insert_page(GP<DataPool> & _file_pool,
+			   const GURL & file_url, int page_num)
+      // Use _file_pool as source of data, create a new DjVuFile
+      // with name file_name, and insert it as page number page_num
+{
+   DEBUG_MSG("DjVuDocEditor::insert_page(): pool size='" <<
+	     _file_pool->get_size() << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   const GP<DjVmDir> dir(get_djvm_dir());
+
+      // Strip any INCL chunks (we do not allow to insert hierarchies
+      // using this function)
+   const GP<DataPool> file_pool(strip_incl_chunks(_file_pool));
+   
+      // Now obtain ID for the new file
+   const GUTF8String id(find_unique_id(file_url.fname()));
+
+      // Add it into the directory
+   const GP<DjVmDir::File> frec(DjVmDir::File::create(
+     id, id, id, DjVmDir::File::PAGE));
+   int pos=dir->get_page_pos(page_num);
+   dir->insert_file(frec, pos);
+
+      // Add it to our "cache"
+   {
+      GP<File> f=new File;
+      f->pool=file_pool;
+      GCriticalSectionLock lock(&files_lock);
+      files_map[id]=f;
+   }
+}
+
+void
+DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
+				GMap<GUTF8String, void *> & ref_map,
+				GMap<GURL, void *> & visit_map)
+      // This private function is used to generate a list (implemented as map)
+      // of files referencing the given file. To get list of all parents
+      // for file with ID 'id' iterate map obtained as
+      // *((GMap<GUTF8String, void *> *) ref_map[id])
+{
+   const GURL url=file->get_url();
+   const GUTF8String id(djvm_dir->name_to_file(url.fname())->get_load_name());
+   if (!visit_map.contains(url))
+   {
+      visit_map[url]=0;
+
+      GPList<DjVuFile> files_list=file->get_included_files(false);
+      for(GPosition pos=files_list;pos;++pos)
+      {
+         GP<DjVuFile> child_file=files_list[pos];
+            // First: add the current file to the list of parents for
+            // the child being processed
+         GURL child_url=child_file->get_url();
+         const GUTF8String child_id(
+           djvm_dir->name_to_file(child_url.fname())->get_load_name());
+         GMap<GUTF8String, void *> * parents=0;
+         if (ref_map.contains(child_id))
+            parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
+         else
+            ref_map[child_id]=parents=new GMap<GUTF8String, void *>();
+         (*parents)[id]=0;
+            // Second: go recursively
+         generate_ref_map(child_file, ref_map, visit_map);
+      }
+   }
+}
+
+void
+DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
+                           GMap<GUTF8String, void *> & ref_map)
+      // Private function, which will remove file with ID id.
+      //
+      // If will also remove all INCL chunks in parent files pointing
+      // to this one
+      //
+      // Finally, if remove_unref is TRUE, we will go down the files
+      // hierarchy removing every file, which becomes unreferenced.
+      //
+      // ref_map will be used to find out list of parents referencing
+      // this file (required when removing INCL chunks)
+{
+      // First get rid of INCL chunks in parents
+   GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[id];
+   if (parents)
+   {
+      for(GPosition pos=*parents;pos;++pos)
+      {
+         const GUTF8String parent_id((*parents).key(pos));
+         const GP<DjVuFile> parent(get_djvu_file(parent_id));
+         if (parent)
+           parent->unlink_file(id);
+      }
+      delete parents;
+      parents=0;
+      ref_map.del(id);
+   }
+
+      // We will accumulate errors here.
+   GUTF8String errors;
+
+      // Now modify the ref_map and process children if necessary
+   GP<DjVuFile> file=get_djvu_file(id);
+   if (file)
+   {
+      G_TRY {
+         GPList<DjVuFile> files_list=file->get_included_files(false);
+         for(GPosition pos=files_list;pos;++pos)
+         {
+            GP<DjVuFile> child_file=files_list[pos];
+            GURL child_url=child_file->get_url();
+            const GUTF8String child_id(
+              djvm_dir->name_to_file(child_url.fname())->get_load_name());
+            GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
+            if (parents) parents->del(id);
+
+            if (remove_unref && (!parents || !parents->size()))
+               remove_file(child_id, remove_unref, ref_map);
+         }
+      } G_CATCH(exc) {
+         if (errors.length()) errors+="\n\n";
+         errors+=exc.get_cause();
+      } G_ENDCATCH;
+   }
+
+      // Finally remove this file from the directory.
+   djvm_dir->delete_file(id);
+
+      // And get rid of its thumbnail, if any
+   GCriticalSectionLock lock(&thumb_lock);
+   GPosition pos(thumb_map.contains(id));
+   if (pos)
+   {
+     thumb_map.del(pos);
+   }
+   if (errors.length())
+     G_THROW(errors);
+}
+
+void
+DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref)
+{
+   DEBUG_MSG("DjVuDocEditor::remove_file(): id='" << id << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (!djvm_dir->id_to_file(id))
+      G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t"+id);
+
+      // First generate a map of references (containing the list of parents
+      // including this particular file. This will speed things up
+      // significatly.
+   GMap<GUTF8String, void *> ref_map;        // GMap<GUTF8String, GMap<GUTF8String, void *> *> in fact
+   GMap<GURL, void *> visit_map;        // To avoid loops
+
+   int pages_num=djvm_dir->get_pages_num();
+   for(int page_num=0;page_num<pages_num;page_num++)
+      generate_ref_map(get_djvu_file(page_num), ref_map, visit_map);
+
+      // Now call the function, which will do the removal recursively
+   remove_file(id, remove_unref, ref_map);
+
+      // And clear the ref_map
+   GPosition pos;
+   while((pos=ref_map))
+   {
+      GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[pos];
+      delete parents;
+      ref_map.del(pos);
+   }
+}
+
+void
+DjVuDocEditor::remove_page(int page_num, bool remove_unref)
+{
+   DEBUG_MSG("DjVuDocEditor::remove_page(): page_num=" << page_num << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // Translate the page_num to ID
+   GP<DjVmDir> djvm_dir=get_djvm_dir();
+   if (page_num<0 || page_num>=djvm_dir->get_pages_num())
+      G_THROW( ERR_MSG("DjVuDocEditor.bad_page") "\t"+GUTF8String(page_num));
+
+      // And call general remove_file()
+   remove_file(djvm_dir->page_to_file(page_num)->get_load_name(), remove_unref);
+}
+
+void
+DjVuDocEditor::remove_pages(const GList<int> & page_list, bool remove_unref)
+{
+   DEBUG_MSG("DjVuDocEditor::remove_pages() called\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // First we need to translate page numbers to IDs (they will
+      // obviously be changing while we're removing pages one after another)
+   GP<DjVmDir> djvm_dir=get_djvm_dir();
+   GPosition pos ;
+   if (djvm_dir)
+   {
+      GList<GUTF8String> id_list;
+      for(pos=page_list;pos;++pos)
+      {
+         GP<DjVmDir::File> frec=djvm_dir->page_to_file(page_list[pos]);
+         if (frec)
+            id_list.append(frec->get_load_name());
+      }
+
+      for(pos=id_list;pos;++pos)
+      {
+         GP<DjVmDir::File> frec=djvm_dir->id_to_file(id_list[pos]);
+         if (frec)
+            remove_page(frec->get_page_num(), remove_unref);
+      }
+   }
+}
+
+void
+DjVuDocEditor::move_file(const GUTF8String &id, int & file_pos,
+                         GMap<GUTF8String, void *> & map)
+      // NOTE! file_pos here is the desired position in DjVmDir *after*
+      // the record with ID 'id' is removed.
+{
+   if (!map.contains(id))
+   {
+      map[id]=0;
+
+      GP<DjVmDir::File> file_rec=djvm_dir->id_to_file(id);
+      if (file_rec)
+      {
+         file_rec=new DjVmDir::File(*file_rec);
+         djvm_dir->delete_file(id);
+         djvm_dir->insert_file(file_rec, file_pos);
+
+         if (file_pos>=0)
+         {
+            file_pos++;
+        
+               // We care to move included files only if we do not append
+               // This is because the only reason why we move included
+               // files is to made them available sooner than they would
+               // be available if we didn't move them. By appending files
+               // we delay the moment when the data for the file becomes
+               // available, of course.
+            GP<DjVuFile> djvu_file=get_djvu_file(id);
+            if (djvu_file)
+            {
+               GPList<DjVuFile> files_list=djvu_file->get_included_files(false);
+               for(GPosition pos=files_list;pos;++pos)
+               {
+                  const GUTF8String name(files_list[pos]->get_url().fname());
+                  GP<DjVmDir::File> child_frec=djvm_dir->name_to_file(name);
+
+                     // If the child is positioned in DjVmDir AFTER the
+                     // file being processed (position is file_pos or greater),
+                     // move it to file_pos position
+                  if (child_frec)
+                     if (djvm_dir->get_file_pos(child_frec)>file_pos)
+                        move_file(child_frec->get_load_name(), file_pos, map);
+               }
+            }
+         }
+      }
+   }
+}
+
+void
+DjVuDocEditor::move_page(int page_num, int new_page_num)
+{
+  DEBUG_MSG("DjVuDocEditor::move_page(): page_num=" << page_num <<
+	    ", new_page_num=" << new_page_num << "\n");
+  DEBUG_MAKE_INDENT(3);
+
+  if (page_num==new_page_num) return;
+
+  int pages_num=get_pages_num();
+  if (page_num<0 || page_num>=pages_num)
+    G_THROW( ERR_MSG("DjVuDocEditor.bad_page") "\t"+GUTF8String(page_num));
+
+  const GUTF8String id(page_to_id(page_num));
+  int file_pos=-1;
+  if (new_page_num>=0 && new_page_num<pages_num)
+    {
+      if (new_page_num>page_num)        // Moving toward the end
+	{
+	  if (new_page_num<pages_num-1)
+	    file_pos=djvm_dir->get_page_pos(new_page_num+1)-1;
+	}
+      else
+	file_pos=djvm_dir->get_page_pos(new_page_num);
+    }
+
+  GMap<GUTF8String, void *> map;
+  move_file(id, file_pos, map);
+}
+
+#ifdef _WIN32_WCE_EMULATION         // Work around odd behavior under WCE Emulation
+#define CALLINGCONVENTION __cdecl
+#else
+#define CALLINGCONVENTION  /* */
+#endif
+
+static int
+CALLINGCONVENTION
+cmp(const void * ptr1, const void * ptr2)
+{
+   int num1=*(int *) ptr1;
+   int num2=*(int *) ptr2;
+   return num1<num2 ? -1 : num1>num2 ? 1 : 0;
+}
+
+static GList<int>
+sortList(const GList<int> & list)
+{
+   GArray<int> a(list.size()-1);
+   int cnt;
+   GPosition pos;
+   for(pos=list, cnt=0;pos;++pos, cnt++)
+      a[cnt]=list[pos];
+
+   qsort((int *) a, a.size(), sizeof(int), cmp);
+
+   GList<int> l;
+   for(int i=0;i<a.size();i++)
+      l.append(a[i]);
+
+   return l;
+}
+
+void
+DjVuDocEditor::move_pages(const GList<int> & _page_list, int shift)
+{
+   if (!shift) return;
+
+   GList<int> page_list=sortList(_page_list);
+
+   GList<GUTF8String> id_list;
+   for(GPosition pos=page_list;pos;++pos)
+   {
+      GP<DjVmDir::File> frec=djvm_dir->page_to_file(page_list[pos]);
+      if (frec)
+         id_list.append(frec->get_load_name());
+   }
+
+   if (shift<0)
+   {
+         // We have to start here from the smallest page number
+         // We will move it according to the 'shift', and all
+         // further moves are guaranteed not to affect its page number.
+
+         // We will be changing the 'min_page' to make sure that
+         // pages moved beyond the document will still be in correct order
+      int min_page=0;
+      for(GPosition pos=id_list;pos;++pos)
+      {
+         GP<DjVmDir::File> frec=djvm_dir->id_to_file(id_list[pos]);
+         if (frec)
+         {
+            int page_num=frec->get_page_num();
+            int new_page_num=page_num+shift;
+            if (new_page_num<min_page)
+               new_page_num=min_page++;
+            move_page(page_num, new_page_num);
+         }
+      }
+   } else
+   {
+         // We have to start here from the biggest page number
+         // We will move it according to the 'shift', and all
+         // further moves will not affect its page number.
+
+         // We will be changing the 'max_page' to make sure that
+         // pages moved beyond the document will still be in correct order
+      int max_page=djvm_dir->get_pages_num()-1;
+      for(GPosition pos=id_list.lastpos();pos;--pos)
+      {
+         GP<DjVmDir::File> frec=djvm_dir->id_to_file(id_list[pos]);
+         if (frec)
+         {
+            int page_num=frec->get_page_num();
+            int new_page_num=page_num+shift;
+            if (new_page_num>max_page)
+               new_page_num=max_page--;
+            move_page(page_num, new_page_num);
+         }
+      }
+   }
+}
+
+void
+DjVuDocEditor::set_file_name(const GUTF8String &id, const GUTF8String &name)
+{
+   DEBUG_MSG("DjVuDocEditor::set_file_name(), id='" << id << "', name='" << name << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // It's important to get the URL now, because later (after we
+      // change DjVmDir) id_to_url() will be returning a modified value
+   GURL url=id_to_url(id);
+
+      // Change DjVmDir. It will check if the name is unique
+   djvm_dir->set_file_name(id, name);
+
+      // Now find DjVuFile (if any) and rename it
+   GPosition pos;
+   if (files_map.contains(id, pos))
+   {
+      GP<File> file=files_map[pos];
+      GP<DataPool> pool=file->pool;
+      if (pool) pool->load_file();
+      GP<DjVuFile> djvu_file=file->file;
+      if (djvu_file) djvu_file->set_name(name);
+   }
+}
+
+void
+DjVuDocEditor::set_page_name(int page_num, const GUTF8String &name)
+{
+   DEBUG_MSG("DjVuDocEditor::set_page_name(), page_num='" << page_num << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (page_num<0 || page_num>=get_pages_num())
+      G_THROW( ERR_MSG("DjVuDocEditor.bad_page") "\t"+GUTF8String(page_num));
+
+   set_file_name(page_to_id(page_num), name);
+}
+
+void
+DjVuDocEditor::set_file_title(const GUTF8String &id, const GUTF8String &title)
+{
+   DEBUG_MSG("DjVuDocEditor::set_file_title(), id='" << id << "', title='" << title << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // Just change DjVmDir. It will check if the title is unique
+   djvm_dir->set_file_title(id, title);
+}
+
+void
+DjVuDocEditor::set_page_title(int page_num, const GUTF8String &title)
+{
+   DEBUG_MSG("DjVuDocEditor::set_page_title(), page_num='" << page_num << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (page_num<0 || page_num>=get_pages_num())
+      G_THROW( ERR_MSG("DjVuDocEditor.bad_page") "\t"+GUTF8String(page_num));
+
+   set_file_title(page_to_id(page_num), title);
+}
+
+//****************************************************************************
+//************************** Shared annotations ******************************
+//****************************************************************************
+
+void
+DjVuDocEditor::simplify_anno(void (* progress_cb)(float progress, void *),
+                             void * cl_data)
+      // It's important that no decoding is done while this function
+      // is running. Otherwise the DjVuFile's decoding routines and
+      // this function may attempt to decode/modify a file's
+      // annotations at the same time.
+{
+      // Get the name of the SHARED_ANNO file. We will not
+      // touch that file (will not move annotations from it)
+   GP<DjVmDir::File> shared_file=djvm_dir->get_shared_anno_file();
+   GUTF8String shared_id;
+   if (shared_file)
+      shared_id=shared_file->get_load_name();
+
+   GList<GURL> ignore_list;
+   if (shared_id.length())
+      ignore_list.append(id_to_url(shared_id));
+
+      // First, for every page get merged (or "flatten" or "projected")
+      // annotations and store them inside the top-level page file
+   int pages_num=djvm_dir->get_pages_num();
+   for(int page_num=0;page_num<pages_num;page_num++)
+   {
+      GP<DjVuFile> djvu_file=get_djvu_file(page_num);
+      if (!djvu_file)
+        G_THROW( ERR_MSG("DjVuDocEditor.page_fail") "\t" + GUTF8String(page_num));
+      int max_level=0;
+      GP<ByteStream> anno;
+      anno=djvu_file->get_merged_anno(ignore_list, &max_level);
+      if (anno && max_level>0)
+      {
+            // This is the moment when we try to modify DjVuFile's annotations
+            // Make sure, that it's not being decoded
+         GSafeFlags & file_flags=djvu_file->get_safe_flags();
+         GMonitorLock lock(&file_flags);
+         while(file_flags & DjVuFile::DECODING)
+            file_flags.wait();
+        
+            // Merge all chunks in one by decoding and encoding DjVuAnno
+         const GP<DjVuAnno> dec_anno(DjVuAnno::create());
+         dec_anno->decode(anno);
+         const GP<ByteStream> new_anno(ByteStream::create());
+         dec_anno->encode(new_anno);
+         new_anno->seek(0);
+
+            // And store it in the file
+         djvu_file->anno=new_anno;
+         djvu_file->rebuild_data_pool();
+         if ((file_flags & (DjVuFile::DECODE_OK |
+                            DjVuFile::DECODE_FAILED |
+                            DjVuFile::DECODE_STOPPED))==0)
+            djvu_file->anno=0;
+      }
+      if (progress_cb)
+    progress_cb((float)(page_num/2.0/pages_num), cl_data);
+   }
+
+      // Now remove annotations from every file except for
+      // the top-level page files and SHARED_ANNO file.
+      // Unlink empty files too.
+   GPList<DjVmDir::File> files_list=djvm_dir->get_files_list();
+   int cnt;
+   GPosition pos;
+   for(pos=files_list, cnt=0;pos;++pos, cnt++)
+   {
+      GP<DjVmDir::File> frec=files_list[pos];
+      if (!frec->is_page() && frec->get_load_name()!=shared_id)
+      {
+         GP<DjVuFile> djvu_file=get_djvu_file(frec->get_load_name());
+         if (djvu_file)
+         {
+            djvu_file->remove_anno();
+            if (djvu_file->get_chunks_number()==0)
+               remove_file(frec->get_load_name(), true);
+         }
+      }
+      if (progress_cb)
+         progress_cb((float)(0.5+cnt/2.0/files_list.size()), cl_data);
+   }
+}
+
+void
+DjVuDocEditor::create_shared_anno_file(void (* progress_cb)(float progress, void *),
+                                       void * cl_data)
+{
+   if (djvm_dir->get_shared_anno_file())
+      G_THROW( ERR_MSG("DjVuDocEditor.share_fail") );
+
+      // Prepare file with ANTa chunk inside
+   const GP<ByteStream> gstr(ByteStream::create());
+   const GP<IFFByteStream> giff(IFFByteStream::create(gstr));
+   IFFByteStream &iff=*giff;
+   iff.put_chunk("FORM:DJVI");
+   iff.put_chunk("ANTa");
+   iff.close_chunk();
+   iff.close_chunk();
+   ByteStream &str=*gstr;
+   str.flush();
+   str.seek(0);
+   const GP<DataPool> file_pool(DataPool::create(gstr));
+
+      // Get a unique ID for the new file
+   const GUTF8String id(find_unique_id("shared_anno.iff"));
+
+      // Add it into the directory
+   GP<DjVmDir::File> frec(DjVmDir::File::create(id, id, id,
+     DjVmDir::File::SHARED_ANNO));
+   djvm_dir->insert_file(frec, 1);
+
+      // Add it to our "cache"
+   {
+      GP<File> f=new File;
+      f->pool=file_pool;
+      GCriticalSectionLock lock(&files_lock);
+      files_map[id]=f;
+   }
+
+      // Now include this shared file into every top-level page file
+   int pages_num=djvm_dir->get_pages_num();
+   for(int page_num=0;page_num<pages_num;page_num++)
+   {
+      GP<DjVuFile> djvu_file=get_djvu_file(page_num);
+      djvu_file->insert_file(id, 1);
+
+      if (progress_cb)
+         progress_cb((float) page_num/pages_num, cl_data);
+   }
+}
+
+void 
+DjVuDocEditor::set_djvm_nav(GP<DjVmNav> n)
+{
+  if (n && ! n->isValidBookmark())
+    G_THROW("Invalid bookmark data");
+  djvm_nav = n;
+}
+
+GP<DjVuFile>
+DjVuDocEditor::get_shared_anno_file(void)
+{
+   GP<DjVuFile> djvu_file;
+
+   GP<DjVmDir::File> frec=djvm_dir->get_shared_anno_file();
+   if (frec)
+      djvu_file=get_djvu_file(frec->get_load_name());
+
+   return djvu_file;
+}
+
+GP<DataPool>
+DjVuDocEditor::get_thumbnail(int page_num, bool dont_decode)
+      // We override DjVuDocument::get_thumbnail() here because
+      // pages may have been shuffled and those "thumbnail file records"
+      // from the DjVmDir do not describe things correctly.
+      //
+      // So, first we will check the thumb_map[] if we have a predecoded
+      // thumbnail for the given page. If this is the case, we will
+      // return it. Otherwise we will ask DjVuDocument to generate
+      // this thumbnail for us.
+{
+   const GUTF8String id(page_to_id(page_num));
+
+   GCriticalSectionLock lock(&thumb_lock);
+   const GPosition pos(thumb_map.contains(id));
+   if (pos)
+   {
+         // Get the image from the map
+      return thumb_map[pos];
+   } else
+   {
+      unfile_thumbnails();
+      return DjVuDocument::get_thumbnail(page_num, dont_decode);
+   }
+}
+
+int
+DjVuDocEditor::get_thumbnails_num(void) const
+{
+   GCriticalSectionLock lock((GCriticalSection *) &thumb_lock);
+
+   int cnt=0;
+   int pages_num=get_pages_num();
+   for(int page_num=0;page_num<pages_num;page_num++)
+   {
+     if (thumb_map.contains(page_to_id(page_num)))
+       cnt++;
+   }
+   return cnt;
+}
+
+int
+DjVuDocEditor::get_thumbnails_size(void) const
+{
+   DEBUG_MSG("DjVuDocEditor::remove_thumbnails(): doing it\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock((GCriticalSection *) &thumb_lock);
+
+   int pages_num=get_pages_num();
+   for(int page_num=0;page_num<pages_num;page_num++)
+   {
+     const GPosition pos(thumb_map.contains(page_to_id(page_num)));
+     if (pos)
+     {
+       const GP<ByteStream> gstr(thumb_map[pos]->get_stream());
+       GP<IW44Image> iwpix=IW44Image::create_decode(IW44Image::COLOR);
+       iwpix->decode_chunk(gstr);
+      
+       int width=iwpix->get_width();
+       int height=iwpix->get_height();
+       return width<height ? width : height;
+    }
+  }
+  return -1;
+}
+
+void
+DjVuDocEditor::remove_thumbnails(void)
+{
+   DEBUG_MSG("DjVuDocEditor::remove_thumbnails(): doing it\n");
+   DEBUG_MAKE_INDENT(3);
+
+   unfile_thumbnails();
+
+   DEBUG_MSG("clearing thumb_map\n");
+   GCriticalSectionLock lock(&thumb_lock);
+   thumb_map.empty();
+}
+
+void
+DjVuDocEditor::unfile_thumbnails(void)
+      // Will erase all "THUMBNAILS" files from DjVmDir.
+      // This function is useful when filing thumbnails (to get rid of
+      // those files, which currently exist: they need to be replaced
+      // anyway) and when calling DjVuDocument::get_thumbnail() to
+      // be sure, that it will not use wrong information from DjVmDir
+{
+   DEBUG_MSG("DjVuDocEditor::unfile_thumbnails(): updating DjVmDir\n");
+   DEBUG_MAKE_INDENT(3);
+
+   {
+     GCriticalSectionLock lock(&threqs_lock);
+     threqs_list.empty();
+   }
+   if((const DjVmDir *)djvm_dir)
+   {
+     GPList<DjVmDir::File> xfiles_list=djvm_dir->get_files_list();
+     for(GPosition pos=xfiles_list;pos;++pos)
+     {
+       GP<DjVmDir::File> f=xfiles_list[pos];
+       if (f->is_thumbnails())
+         djvm_dir->delete_file(f->get_load_name());
+     }
+   }
+}
+
+void
+DjVuDocEditor::file_thumbnails(void)
+      // The purpose of this function is to create files containing
+      // thumbnail images and register them in DjVmDir.
+      // If some of the thumbnail images are missing, they'll
+      // be generated with generate_thumbnails()
+{
+   DEBUG_MSG("DjVuDocEditor::file_thumbnails(): updating DjVmDir\n");
+   DEBUG_MAKE_INDENT(3);
+   unfile_thumbnails();
+
+      // Generate thumbnails if they're missing due to some reason.
+   int thumb_num=get_thumbnails_num();
+   int size=thumb_num>0 ? get_thumbnails_size() : 128;
+   if (thumb_num!=get_pages_num())
+   {
+     generate_thumbnails(size);
+   }
+
+   DEBUG_MSG("filing thumbnails\n");
+
+   GCriticalSectionLock lock(&thumb_lock);
+
+      // The first thumbnail file always contains only one thumbnail
+   int ipf=1;
+   int image_num=0;
+   int page_num=0, pages_num=djvm_dir->get_pages_num();
+   GP<ByteStream> str(ByteStream::create());
+   GP<IFFByteStream> iff(IFFByteStream::create(str));
+   iff->put_chunk("FORM:THUM");
+   for(;;)
+   {
+      GUTF8String id(page_to_id(page_num));
+      const GPosition pos(thumb_map.contains(id));
+      if (! pos)
+      {
+        G_THROW( ERR_MSG("DjVuDocEditor.no_thumb") "\t"+GUTF8String(page_num));
+      }
+      iff->put_chunk("TH44");
+      iff->copy(*(thumb_map[pos]->get_stream()));
+      iff->close_chunk();
+      image_num++;
+      page_num++;
+      if (image_num>=ipf || page_num>=pages_num)
+      {
+         int i=id.rsearch('.');
+         if(i<=0)
+         {
+           i=id.length();
+         }
+         id=id.substr(0,i)+".thumb";
+            // Get unique ID for this file
+         id=find_unique_id(id);
+
+            // Create a file record with the chosen ID
+         GP<DjVmDir::File> file(DjVmDir::File::create(id, id, id,
+           DjVmDir::File::THUMBNAILS));
+
+            // Set correct file position (so that it will cover the next
+            // ipf pages)
+         int file_pos=djvm_dir->get_page_pos(page_num-image_num);
+         djvm_dir->insert_file(file, file_pos);
+
+            // Now add the File record (containing the file URL and DataPool)
+            // After we do it a simple save_as() will save the document
+            // with the thumbnails. This is because DjVuDocument will see
+            // the file in DjVmDir and will ask for data. We will intercept
+            // the request for data and will provide this DataPool
+         iff->close_chunk();
+         str->seek(0);
+         const GP<DataPool> file_pool(DataPool::create(str));
+         GP<File> f=new File;
+         f->pool=file_pool;
+         GCriticalSectionLock lock(&files_lock);
+         files_map[id]=f;
+
+            // And create new streams
+         str=ByteStream::create();
+         iff=IFFByteStream::create(str);
+         iff->put_chunk("FORM:THUM");
+         image_num=0;
+
+            // Reset ipf to correct value (after we stored first
+            // "exceptional" file with thumbnail for the first page)
+         if (page_num==1) ipf=thumbnails_per_file;
+         if (page_num>=pages_num) break;
+      }
+   }
+}
+
+int
+DjVuDocEditor::generate_thumbnails(int thumb_size, int page_num)
+{
+   DEBUG_MSG("DjVuDocEditor::generate_thumbnails(): doing it\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if(page_num<(djvm_dir->get_pages_num()))
+   {
+      const GUTF8String id(page_to_id(page_num));
+      if (!thumb_map.contains(id))
+        {
+          const GP<DjVuImage> dimg(get_page(page_num, true));
+         
+          GRect rect(0, 0, thumb_size, dimg->get_height()*thumb_size/dimg->get_width());
+          GP<GPixmap> pm=dimg->get_pixmap(rect, rect, get_thumbnails_gamma());
+          if (!pm)
+            {
+              const GP<GBitmap> bm(dimg->get_bitmap(rect, rect, sizeof(int)));
+              if (bm) 
+                pm = GPixmap::create(*bm);
+              else
+                pm = GPixmap::create(rect.height(), rect.width(), &GPixel::WHITE);
+            }
+          // Store and compress the pixmap
+          const GP<IW44Image> iwpix(IW44Image::create_encode(*pm));
+          const GP<ByteStream> gstr(ByteStream::create());
+          IWEncoderParms parms;
+          parms.slices=97;
+          parms.bytes=0;
+          parms.decibels=0;
+          iwpix->encode_chunk(gstr, parms);
+          gstr->seek(0L);
+          thumb_map[id]=DataPool::create(gstr);
+        }
+      ++page_num;
+   }
+   else
+   {
+     page_num = -1;
+   }
+   return page_num;
+}
+
+void
+DjVuDocEditor::generate_thumbnails(int thumb_size,
+                                   bool (* cb)(int page_num, void *),
+                                   void * cl_data)
+{
+   int page_num=0;
+   do
+   {
+     page_num=generate_thumbnails(thumb_size,page_num);
+     if (cb && page_num>0) if (cb(page_num-1, cl_data)) return;
+   } while(page_num>=0);
+}
+
+static void
+store_file(const GP<DjVmDir> & src_djvm_dir, const GP<DjVmDoc> & djvm_doc,
+           GP<DjVuFile> & djvu_file, GMap<GURL, void *> & map)
+{
+   GURL url=djvu_file->get_url();
+   if (!map.contains(url))
+   {
+      map[url]=0;
+
+         // Store included files first
+      GPList<DjVuFile> djvu_files_list=djvu_file->get_included_files(false);
+      for(GPosition pos=djvu_files_list;pos;++pos)
+         store_file(src_djvm_dir, djvm_doc, djvu_files_list[pos], map);
+
+         // Now store contents of this file
+      GP<DataPool> file_data=djvu_file->get_djvu_data(false);
+      GP<DjVmDir::File> frec=src_djvm_dir->name_to_file(url.name());
+      if (frec)
+      {
+         frec=new DjVmDir::File(*frec);
+         djvm_doc->insert_file(frec, file_data, -1);
+      }
+   }
+}
+
+void
+DjVuDocEditor::save_pages_as(
+  const GP<ByteStream> &str, const GList<int> & _page_list)
+{
+   GList<int> page_list=sortList(_page_list);
+
+   GP<DjVmDoc> djvm_doc=DjVmDoc::create();
+   GMap<GURL, void *> map;
+   for(GPosition pos=page_list;pos;++pos)
+   {
+      GP<DjVmDir::File> frec=djvm_dir->page_to_file(page_list[pos]);
+      if (frec)
+      {
+         GP<DjVuFile> djvu_file=get_djvu_file(frec->get_load_name());
+         if (djvu_file)
+            store_file(djvm_dir, djvm_doc, djvu_file, map);
+      }
+   }
+   djvm_doc->write(str);
+}
+
+void
+DjVuDocEditor::save_file(const GUTF8String &file_id, const GURL &codebase,
+  const bool only_modified, GMap<GUTF8String,GUTF8String> & map)
+{
+  if(only_modified)
+  {
+    for(GPosition pos=files_map;pos;++pos)
+    {
+      const GP<File> file_rec(files_map[pos]);
+      const bool file_modified=file_rec->pool ||
+        (file_rec->file && file_rec->file->is_modified());
+      if(!file_modified)
+      {
+        const GUTF8String id=files_map.key(pos);
+        const GUTF8String save_name(djvm_dir->id_to_file(id)->get_save_name());
+        if(id == save_name)
+        {
+          map[id]=id;
+        }
+      }
+    }
+  }
+  save_file(file_id,codebase,map);
+}
+
+void
+DjVuDocEditor::save_file(
+  const GUTF8String &file_id, const GURL &codebase,
+  GMap<GUTF8String,GUTF8String> & map)
+{
+   DEBUG_MSG("DjVuDocEditor::save_file(): ID='" << file_id << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (!map.contains(file_id))
+   {
+      const GP<DjVmDir::File> file(djvm_dir->id_to_file(file_id));
+
+      GP<DataPool> file_pool;
+      const GPosition pos(files_map.contains(file_id));
+      if (pos)
+      {
+         const GP<File> file_rec(files_map[pos]);
+         if (file_rec->file)
+            file_pool=file_rec->file->get_djvu_data(false);
+         else
+            file_pool=file_rec->pool;
+      }
+
+      if (!file_pool)
+      {
+         DjVuPortcaster * pcaster=DjVuPort::get_portcaster();
+         file_pool=pcaster->request_data(this, id_to_url(file_id));
+      }
+
+      if (file_pool)
+      {
+         GMap<GUTF8String,GUTF8String> incl;
+         map[file_id]=get_djvm_doc()->save_file(codebase,*file,incl,file_pool);
+         for(GPosition pos=incl;pos;++pos)
+         {
+           save_file(incl.key(pos),codebase ,map);
+         }
+      }else
+      {
+        map[file_id]=file->get_save_name();
+      }
+   }
+}
+
+void
+DjVuDocEditor::save(void)
+{
+   DEBUG_MSG("DjVuDocEditor::save(): saving the file\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (!can_be_saved())
+     G_THROW( ERR_MSG("DjVuDocEditor.cant_save") );
+   save_as(GURL(), orig_doc_type!=INDIRECT);
+}
+
+void
+DjVuDocEditor::write(const GP<ByteStream> &gbs, bool force_djvm)
+{
+  DEBUG_MSG("DjVuDocEditor::write()\n");
+  DEBUG_MAKE_INDENT(3);
+  if (get_thumbnails_num()==get_pages_num())
+  {
+    file_thumbnails();
+  }else
+  { 
+    remove_thumbnails();
+  }
+  clean_files_map();
+  DjVuDocument::write(gbs,force_djvm);
+}
+
+void
+DjVuDocEditor::write(
+  const GP<ByteStream> &gbs,const GMap<GUTF8String,void *> &reserved)
+{
+  DEBUG_MSG("DjVuDocEditor::write()\n");
+  DEBUG_MAKE_INDENT(3);
+  if (get_thumbnails_num()==get_pages_num())
+  {
+    file_thumbnails();
+  }else
+  { 
+    remove_thumbnails();
+  }
+  clean_files_map();
+  DjVuDocument::write(gbs,reserved);
+}
+
+void
+DjVuDocEditor::save_as(const GURL &where, bool bundled)
+{
+   DEBUG_MSG("DjVuDocEditor::save_as(): where='" << where << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // First see if we need to generate (or just reshuffle) thumbnails...
+      // If we have an icon for every page, we will just call
+      // file_thumbnails(), which will update DjVmDir and will create
+      // the actual bundles with thumbnails (very fast)
+      // Otherwise we will remove the thumbnails completely because
+      // we really don't want to deal with documents, which have only
+      // some of their pages thumbnailed.
+   if (get_thumbnails_num()==get_pages_num())
+   {
+     file_thumbnails();
+   }else
+   { 
+     remove_thumbnails();
+   }
+
+   GURL save_doc_url;
+
+   if (where.is_empty())
+   {
+         // Assume, that we just want to 'save'. Check, that it's possible
+         // and proceed.
+      bool can_be_saved_bundled =
+	orig_doc_type==BUNDLED ||
+	orig_doc_type==OLD_BUNDLED ||
+	orig_doc_type==SINGLE_PAGE ||
+	(orig_doc_type==OLD_INDEXED && orig_doc_pages==1);
+      if ((bundled ^ can_be_saved_bundled)!=0)
+         G_THROW( ERR_MSG("DjVuDocEditor.cant_save2") );
+      save_doc_url=doc_url;
+   } else
+   {
+      save_doc_url=where;
+   }
+
+   int save_doc_type=bundled ? BUNDLED : INDIRECT;
+
+   clean_files_map();
+
+   GCriticalSectionLock lock(&files_lock);
+
+   DjVuPortcaster * pcaster=DjVuPort::get_portcaster();
+
+      // First consider saving in SINGLE_FILE format (one file)
+   if(needs_compression())
+   {
+     DEBUG_MSG("Compressing on output\n");
+     remove_thumbnails();
+     if(! djvu_compress_codec)
+     {
+       G_THROW( ERR_MSG("DjVuDocEditor.no_codec") );
+     }
+     const GP<DjVmDoc> doc(get_djvm_doc());
+     GP<ByteStream> mbs(ByteStream::create());
+     doc->write(mbs);
+     mbs->flush();
+     mbs->seek(0,SEEK_SET);
+     djvu_compress_codec(mbs,save_doc_url,(!(const DjVmDir *)djvm_dir)||(djvm_dir->get_files_num()==1)||(save_doc_type!=INDIRECT));
+     files_map.empty();
+     doc_url=GURL();
+   }else
+   {
+     bool singlepage = (djvm_dir->get_files_num()==1 && !djvm_nav);
+     if (singlepage)
+     {
+       // maybe save as single page
+       DjVmDir::File *file = djvm_dir->page_to_file(0);
+       if (file->get_title() != file->get_load_name())
+         singlepage = false;
+     }
+     if (singlepage)
+     {
+       // Here 'bundled' has no effect: we will save it as one page.
+       DEBUG_MSG("saving one file...\n");
+       GURL file_url=page_to_url(0);
+       const GUTF8String file_id(djvm_dir->page_to_file(0)->get_load_name());
+       GP<DataPool> file_pool;
+       GPosition pos=files_map.contains(file_id);
+       if (pos)
+       {
+         const GP<File> file_rec(files_map[pos]);
+         if (file_rec->pool && (!file_rec->file ||
+                                !file_rec->file->is_modified()))
+         {
+           file_pool=file_rec->pool;
+         }else if (file_rec->file)
+         {
+           file_pool=file_rec->file->get_djvu_data(false);
+         }
+       }
+       // Even if file has not been modified (pool==0) we still want
+       // to save it.
+       if (!file_pool)
+         file_pool=pcaster->request_data(this, file_url);
+       if (file_pool)
+       {
+         DEBUG_MSG("Saving '" << file_url << "' to '" << save_doc_url << "'\n");
+         DataPool::load_file(save_doc_url);
+         const GP<ByteStream> gstr_out(ByteStream::create(save_doc_url, "wb"));
+         ByteStream &str_out=*gstr_out;
+         str_out.writall(octets, 4);
+         const GP<ByteStream> str_in(file_pool->get_stream());
+         str_out.copy(*str_in);
+       }
+
+       // Update the document's DataPool (to save memory)
+       const GP<DjVmDoc> doc(get_djvm_doc());
+       const GP<ByteStream> gstr=ByteStream::create();// One page: we can do it in the memory
+       doc->write(gstr);
+       gstr->seek(0, SEEK_SET);
+       const GP<DataPool> pool(DataPool::create(gstr));
+       doc_pool=pool;
+       init_data_pool=pool;
+
+         // Also update DjVmDir (to reflect changes in offsets)
+       djvm_dir=doc->get_djvm_dir();
+     } else if (save_doc_type==INDIRECT)
+     {
+       DEBUG_MSG("Saving in INDIRECT format to '" << save_doc_url << "'\n");
+       bool save_only_modified=!(save_doc_url!=doc_url || save_doc_type!=orig_doc_type);
+       GPList<DjVmDir::File> xfiles_list=djvm_dir->resolve_duplicates(false);
+       const GURL codebase=save_doc_url.base();
+       int pages_num=djvm_dir->get_pages_num();
+       GMap<GUTF8String, GUTF8String> map;
+       // First go thru the pages
+       for(int page_num=0;page_num<pages_num;page_num++)
+       {
+         const GUTF8String id(djvm_dir->page_to_file(page_num)->get_load_name());
+         save_file(id, codebase, save_only_modified, map);
+       }
+       // Next go thru thumbnails and similar stuff
+       GPosition pos;
+       for(pos=xfiles_list;pos;++pos)
+         save_file(xfiles_list[pos]->get_load_name(), codebase, save_only_modified, map);
+
+         // Finally - save the top-level index file
+       for(pos=xfiles_list;pos;++pos)
+       {
+         const GP<DjVmDir::File> file(xfiles_list[pos]);
+         file->offset=0;
+         file->size=0;
+       }
+       DataPool::load_file(save_doc_url);
+       const GP<ByteStream> gstr(ByteStream::create(save_doc_url, "wb"));
+       const GP<IFFByteStream> giff(IFFByteStream::create(gstr));
+       IFFByteStream &iff=*giff;
+
+       iff.put_chunk("FORM:DJVM", 1);
+       iff.put_chunk("DIRM");
+       djvm_dir->encode(giff->get_bytestream());
+       iff.close_chunk();
+       if (djvm_nav)
+         {
+           iff.put_chunk("NAVM");
+           djvm_nav->encode(iff.get_bytestream());
+           iff.close_chunk();
+         }
+       iff.close_chunk();
+       iff.flush();
+
+       // Update the document data pool (not required, but will save memory)
+       doc_pool=DataPool::create(save_doc_url);
+       init_data_pool=doc_pool;
+
+       // No reason to update DjVmDir as for this format it doesn't
+       // contain DJVM offsets
+     } else if (save_doc_type==BUNDLED || save_doc_type==OLD_BUNDLED)
+     {
+        DEBUG_MSG("Saving in BUNDLED format to '" << save_doc_url << "'\n");
+
+         // Can't be very smart here. Simply overwrite the file.
+        const GP<DjVmDoc> doc(get_djvm_doc());
+        DataPool::load_file(save_doc_url);
+        const GP<ByteStream> gstr(ByteStream::create(save_doc_url, "wb"));
+        doc->write(gstr);
+        gstr->flush();
+
+         // Update the document data pool (not required, but will save memory)
+        doc_pool=DataPool::create(save_doc_url);
+        init_data_pool=doc_pool;
+
+         // Also update DjVmDir (to reflect changes in offsets)
+        djvm_dir=doc->get_djvm_dir();
+     } else
+     {
+       G_THROW( ERR_MSG("DjVuDocEditor.cant_save") );
+     }
+
+        // Now, after we have saved the document w/o any error, detach DataPools,
+        // which are in the 'File's list to save memory. Detach everything.
+        // Even in the case when File->file is non-zero. If File->file is zero,
+        // remove the item from the list at all. If it's non-zero, it has
+        // to stay there because by definition files_map[] contains the list
+        // of all active files and customized DataPools
+        //
+        // In addition to it, look thru all active files and change their URLs
+        // to reflect changes in the document's URL (if there was a change)
+        // Another reason why file's URLs must be changed is that we may have
+        // saved the document in a different format, which changes the rules
+        // of file url composition.
+     for(GPosition pos=files_map;pos;)
+       {
+	 const GP<File> file_rec(files_map[pos]);
+	 file_rec->pool=0;
+	 if (file_rec->file==0)
+	   {
+	     GPosition this_pos=pos;
+	     ++pos;
+	     files_map.del(this_pos);
+	   } else
+	   {
+	     // Change the file's url;
+	     if (doc_url!=save_doc_url ||
+		 orig_doc_type!=save_doc_type)
+	       {
+		 if (save_doc_type==BUNDLED)
+		   file_rec->file->move(save_doc_url);
+		 else
+		   file_rec->file->move(save_doc_url.base());
+	       }
+	     ++pos;
+	   }
+       }
+   }
+   orig_doc_type=save_doc_type;
+   doc_type=save_doc_type;
+
+   if (doc_url!=save_doc_url)
+   {
+     // Also update document's URL (we moved, didn't we?)
+     doc_url=save_doc_url;
+     init_url=save_doc_url;
+   }
+}
+
+GP<DjVuDocEditor> 
+DjVuDocEditor::create_wait(void)
+{
+  DjVuDocEditor *doc=new DjVuDocEditor();
+  const GP<DjVuDocEditor> retval(doc);
+  doc->init();
+  return retval;
+}
+
+GP<DjVuDocEditor> 
+DjVuDocEditor::create_wait(const GURL &url)
+{
+  DjVuDocEditor *doc=new DjVuDocEditor();
+  const GP<DjVuDocEditor> retval(doc);
+  doc->init(url);
+  return retval;
+}
+
+bool
+DjVuDocEditor::inherits(const GUTF8String &class_name) const
+{
+   return (class_name == "DjVuDocEditor")||DjVuDocument::inherits(class_name);
+}
+
+int
+DjVuDocEditor::get_orig_doc_type(void) const
+{
+   return orig_doc_type;
+}
+
+bool
+DjVuDocEditor::can_be_saved(void) const
+{
+   return !(needs_rename()||needs_compression()||orig_doc_type==UNKNOWN_TYPE ||
+	    orig_doc_type==OLD_INDEXED);
+}
+
+int
+DjVuDocEditor::get_save_doc_type(void) const
+{
+   if (orig_doc_type==SINGLE_PAGE)
+      if (djvm_dir->get_files_num()==1)
+        return SINGLE_PAGE;
+      else
+        return BUNDLED;
+   else if (orig_doc_type==INDIRECT)
+     return INDIRECT;
+   else if (orig_doc_type==OLD_BUNDLED || orig_doc_type==BUNDLED)
+     return BUNDLED;
+   else
+     return UNKNOWN_TYPE;
+}
+
+GURL
+DjVuDocEditor::get_doc_url(void) const
+{
+   return doc_url.is_empty() ? init_url : doc_url;
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuDocEditor.h b/libdjvu/DjVuDocEditor.h
new file mode 100644
index 0000000..86d1747
--- /dev/null
+++ b/libdjvu/DjVuDocEditor.h
@@ -0,0 +1,457 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUDOCEDITOR_H
+#define _DJVUDOCEDITOR_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "DjVuDocument.h"
+#include "DjVmDoc.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+/** @name DjVuDocEditor.h
+    Files #"DjVuDocEditor.h"# and #"DjVuDocEditor.cpp"# contain extension
+    of \Ref{DjVuDocument} class, which can create and modify existing
+    DjVu document, generate thumbnails, etc. It does {\bf not} do
+    compression though.
+
+    @memo DjVu document editor class.
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+/** #DjVuDocEditor# is an extension of \Ref{DjVuDocument} class with
+    additional capabilities for editing the document contents.
+
+    It can be used to:
+    \begin{enumerate}
+       \item Create (compose) new multipage DjVu documents using single
+             page DjVu documents. The class does {\bf not} do compression.
+       \item Insert and remove different pages of multipage DjVu documents.
+       \item Change attributes ({\em names}, {\em IDs} and {\em titles})
+             of files composing the DjVu document.
+       \item Generate thumbnail images and integrate them into the document.
+    \end{enumerate}
+*/
+
+class DJVUAPI DjVuDocEditor : public DjVuDocument
+{
+public:
+   static int	thumbnails_per_file;
+
+protected:
+      /// Default constructor
+   DjVuDocEditor(void);
+
+      /** Initialization function. Initializes an empty document.
+
+	  {\bf Note}: You must call either of the two
+	  available \Ref{init}() function before you start doing
+	  anything else with the #DjVuDocEditor#. */
+   void		init(void);
+
+      /** Initialization function. Opens document with name #filename#.
+
+	  {\bf Note}: You must call either of the two
+	  available \Ref{init}() function before you start doing
+	  anything else with the #DjVuDocEditor#. */
+   void		init(const GURL &url);
+
+public:
+     /** Creates a DjVuDocEditor class and initializes with #fname#. */
+   static GP<DjVuDocEditor> create_wait(const GURL &url);
+
+     /** Creates a DjVuDocEditor class and initializes an empty document. */
+   static GP<DjVuDocEditor> create_wait(void);
+
+
+      /// Destructor
+   virtual ~DjVuDocEditor(void);
+
+      /** Returns type of open document. #DjVuDocEditor# silently
+	  converts any open DjVu document to #BUNDLED# format (see
+	  \Ref{DjVuDocument}. Thus, \Ref{DjVuDocument::get_doc_type}()
+	  will always be returning #BUNDLED#. Use this function to
+	  learn the original format of the document being edited. */
+   int		get_orig_doc_type(void) const;
+
+      /** Returns #TRUE# if the document can be "saved" (sometimes
+	  the only possibility is to do a "save as"). The reason why
+	  we have this function is that #DjVuDocEditor# can save
+	  documents in new formats only (#BUNDLED# and #INDIRECT#).
+	  At the same time it recognizes all DjVu formats (#OLD_BUNDLED#,
+	  #OLD_INDEXED#, #BUNDLED#, and #INDIRECT#).
+
+	  #OLD_BUNDLED# and #BUNDLED# documents occupy only one file,
+	  so in this case "saving" involves the automatic conversion
+	  to #BUNDLED# format and storing data into the same file.
+
+	  #OLD_INDEXED# documents, on the other hand, occupy more
+	  than one file. They could be converted to #INDIRECT# format
+	  if these two formats had the same set of files. Unfortunately,
+	  these formats are too different, and the best thing to do
+	  is to use "save as" capability. */
+   bool		can_be_saved(void) const;
+
+      /** Returns type of the document, which can be created by
+	  \Ref{save}() function. Can be #INDIRECT#, #BUNDLED#,
+	  #SINGLE_PAGE#, or #UNKNOWN_TYPE#. The latter indicates,
+	  that \Ref{save}() will fail, and that \Ref{save_as}()
+	  should be used instead */
+   int		get_save_doc_type(void) const;
+
+      /** Saves the document. May generate exception if the document
+	  can not be saved, and \Ref{save_as}() should be used.
+	  See \Ref{can_be_saved}() for details. */
+   void		save(void);
+
+      /** Saves the document. */
+   virtual void	save_as(const GURL &where, bool bundled);
+
+      /** Saves the document in the {\em new bundled} format. All the data
+	  is "bundled" into one file and this file is written into the
+	  passed stream.
+
+	  If #force_djvm# is #TRUE# then even one page documents will be
+	  saved in the #DJVM BUNDLED# format (inside a #FORM:DJVM#);
+
+	  {\bf Plugin Warning}. This function will read contents of the whole
+	  document. Thus, if you call it from the main thread (the thread,
+	  which transfers data from Netscape), the plugin will block. */
+   virtual void	write(const GP<ByteStream> &str, bool force_djvm=false);
+     /** Always save as bundled, renaming any files conflicting with the
+         the names in the supplied GMap. */
+   virtual void	write(const GP<ByteStream> &str,
+     const GMap<GUTF8String,void *> &reserved);
+
+      /** Saves the specified pages in DjVu #BUNDLED# multipage document. */
+   void		save_pages_as(
+     const GP<ByteStream> &str, const GList<int> & page_list);
+
+      /** Translates page number #page_num# to ID. If #page_num# is invalid,
+	  an exception is thrown. */
+   GUTF8String	page_to_id(int page_num) const;
+   
+   GUTF8String	insert_file(const GURL &url, const GUTF8String &parent_id,
+			    int chunk_num=1, DjVuPort *source=0);
+      /** Inserts the referenced file into this DjVu document.
+
+	  @param fname Name of the top-level file containing the image of
+	  	 the page to be inserted. This file must be a DjVu file and
+		 may include one or more other DjVu files.
+
+		 If it include other DjVu files, the function will try to
+		 insert them into the document too. Should this attempt fail,
+		 the corresponding #INCL# chunk will be removed from the
+		 referencing file and an exception will be thrown.
+
+		 When inserting a file, the function may modify its name
+		 to be unique in the DjVu document.
+	  @param page_num Position where the new page should be inserted at.
+	  	 Negative value means "append" */
+   void insert_page(const GURL &fname, int page_num=-1);
+   /** Inserts a new page with data inside the #data_pool# as page
+       number #page_num.
+
+	  @param data_pool \Ref{DataPool} with data for this page.
+	  @param file_name Name, which will be assigned to this page.
+	  	 If you try to save the document in #INDIRECT# format,
+		 a file with this name will be created to hold the
+		 page's data. If there is already a file in the document
+		 with the same name, the function will derive a new
+		 unique name from file_name, which will be assigned
+		 to the page.
+	  @param page_num Describes where the page should be inserted.
+	  	 Negative number means "append". */
+   void		insert_page(GP<DataPool> & file_pool,
+			    const GURL &fname, int page_num=-1);
+      /** Inserts a group of pages into this DjVu document.
+	  
+	  Like \Ref{insert_page}() it will insert every page into the document.
+	  The main advantage of calling this function once for the whole
+	  group instead of calling \Ref{insert_page}() for every page is
+	  the processing of included files:
+
+	  The group of files may include one or more files, which are thus
+	  shared by them. If you call \Ref{insert_page}() for every page,
+	  this shared file will be inserted into the document more than once
+	  though under different names. This is how \Ref{insert_page}() works:
+	  whenever it inserts something, it checks for duplicate names with
+	  only one purpose: invent a new name if a given one is already in
+	  use.
+
+	  On the other hand, if you call #insert_group#(), it will insert
+	  shared included files only once. This is because it can analyze
+	  the group of files before inserting them and figure out what files
+	  are shared and thus should be inserted only once.
+
+	  @param fname_list List of top-level files for the pages to be inserted
+	  @param page_num Position where the new pages should be inserted at.
+	  	 Negative value means "append" */
+   void		insert_group(const GList<GURL> & furl_list, int page_num=-1,
+			     void (* refresh_cb)(void *)=0, void * cl_data=0);
+      /** Removes the specified page from the document. If #remove_unref#
+	  is #TRUE#, the function will also remove from the document any file,
+	  which became unreferenced due to the page's removal */
+   void		remove_page(int page_num, bool remove_unref=true);
+      /** Removes the specified pages from the document. If #remove_unref#
+	  is #TRUE#, the function will also remove from the document any file,
+	  which became unreferenced due to the pages' removal */
+   void		remove_pages(const GList<int> & page_list, bool remove_unref=true);
+      /** Removes a DjVu file with the specified #id#.
+
+	  If some other files include this file, the corresponding #INCL#
+	  chunks will be removed to avoid dead links.
+
+	  If #remove_unref# is #TRUE#, the function will also remove every
+	  file, which will become unreferenced after the removal of this file. */
+   void		remove_file(const GUTF8String &id, bool remove_unref=true);
+      /** Makes page number #page_num# to be #new_page_num#. If #new_page_num#
+	  is negative or too big, the function will move page #page_num# to
+	  the end of the document. */
+   void		move_page(int page_num, int new_page_num);
+      /** Shifts all pags from the #page_list# according to the #shift#.
+	  The #shift# can be positive (shift toward the end of the document)
+	  or negative (shift toward the beginning of the document).
+
+	  It is OK to make #shift# too big in value. Pages will just be
+	  moved to the end (or to the beginning, depending on the #shift#
+	  sign) of the document. */
+   void		move_pages(const GList<int> & page_list, int shift);
+   
+      /** Changes the name of the file with ID #id# to #name#.
+	  Refer to \Ref{DjVmDir} for the explanation of {\em IDs},
+          {\em names} and {\em titles}. */
+   void		set_file_name(const GUTF8String &id, const GUTF8String &name);
+      /** Changes the name of the page #page_num# to #name#.
+	  Refer to \Ref{DjVmDir} for the explanation of {\em IDs},
+          {\em names} and {\em titles}. */
+   void		set_page_name(int page_num, const GUTF8String &name);
+      /** Changes the title of the file with ID #id# to #title#.
+	  Refer to \Ref{DjVmDir} for the explanation of {\em IDs},
+          {\em names} and {\em titles}. */
+   void		set_file_title(const GUTF8String &id, const GUTF8String &title);
+      /** Changes the title of the page #page_num# to #title#.
+	  Refer to \Ref{DjVmDir} for the explanation of {\em IDs},
+          {\em names} and {\em titles}. */
+   void		set_page_title(int page_num, const GUTF8String &title);
+
+      /** @name Thumbnails */
+      //@{
+      /** Returns the number of thumbnails stored inside this document.
+
+	  It may be #ZERO#, which means, that there are no thumbnails at all.
+
+	  It may be equal to the number of pages, which is what should
+	  normally be.
+
+	  Finally, it may be greater than #ZERO# and less than the number
+	  of pages, in which case thumbnails should be regenerated before
+	  the document can be saved. */
+   int		get_thumbnails_num(void) const;
+
+      /** Returns the size of the first encountered thumbnail image. Since
+	  thumbnails can currently be generated by \Ref{generate_thumbnails}()
+	  only, all thumbnail images should be of the same size. Thus,
+	  the number returned is actually the size of {\em all}
+	  document thumbnails.
+
+	  The function will return #-1# if there are no thumbnails. */
+   int		get_thumbnails_size(void) const;
+
+      /** Removes all thumbnails from the document */
+   void		remove_thumbnails(void);
+
+      /** Generates thumbnails for the specified page, if and only if
+          it does not have a thumbnail yet.  If you want to regenerate
+          thumbnails for all pages, call \Ref{remove_thumbnails}() prior
+          to calling this function.
+
+	  @param thumb_size The size of the thumbnails in pixels. DjVu viewer
+	         is able to rescale the thumbnail images if necessary, so this
+		 parameter affects thumbnails quality only. 128 is a good number.
+	  @param page_num The page number to genate the thumbnail for.  */
+   int		generate_thumbnails(int thumb_size, int page_num);
+
+      /** Generates thumbnails for those pages, which do not have them yet.
+	  If you want to regenerate thumbnails for all pages, call
+	  \Ref{remove_thumbnails}() prior to calling this function.
+
+	  @param thumb_size The size of the thumbnails in pixels. DjVu viewer
+	         is able to rescale the thumbnail images if necessary, so this
+		 parameter affects thumbnails quality only. 128 is a good number.
+	  @param cb The callback, which will be called after thumbnail image
+	         for the next page has been generated. Regardless of if
+		 the document already has thumbnail images for some of its
+		 pages, the callback will be called #pages_num# times, where
+		 #pages_num# is the total number of pages in the document.
+		 The callback should return #FALSE# if thumbnails generating
+		 should proceed. #TRUE# will stop it. */
+   void	generate_thumbnails(int thumb_size,
+                            bool (* cb)(int page_num, void *)=0,
+                            void * cl_data=0);
+      //@}
+      /** Use this function to simplify annotations in the document.
+        The "simplified" format is when annotations are only allowed
+        either in top-level page files or in a special file with
+        #SHARED_ANNO# flag on. This file is supposed to be included into
+        every page. */
+   void simplify_anno(void (* progress_cb)(float progress, void *)=0,
+                      void * cl_data=0);
+
+      /** Will create a file that will be included into every page and
+        marked with the #SHARED_ANNO# flag. This file can be used
+        to store global annotations (annotations applicable to every page).
+
+        {\bf Note:} There may be only one #SHARED_ANNO# file in any
+        DjVu multipage document. */
+   void create_shared_anno_file(void (* progress_cb)(float progress, void *)=0,
+                                void * cl_data=0);
+
+      /** Sets bookmark data */
+   void set_djvm_nav(GP<DjVmNav> nav);
+
+      /** Returns a pointer to the file with #SHARED_ANNO# flag on.
+        This file should be used for storing document-wide annotations.
+
+        {\bf Note:} There may be only one #SHARED_ANNO# file in any
+        DjVu multipage document. */
+   GP<DjVuFile>       get_shared_anno_file(void);
+
+   GURL               get_doc_url(void) const;
+                                                                              
+      /** Returns TRUE if #class_name# is #"DjVuDocEditor"#,
+	  #"DjVuDocument"# or #"DjVuPort"# */
+   virtual bool		inherits(const GUTF8String &class_name) const;
+   virtual GP<DataPool>	request_data(const DjVuPort * source, const GURL & url);
+protected:
+   virtual GP<DjVuFile>	url_to_file(const GURL & url, bool dont_create) const;
+   virtual GP<DataPool> get_thumbnail(int page_num, bool dont_decode);
+   friend class CThumbNails;
+public:
+   class File;
+private:
+   bool		initialized;
+   GURL		doc_url;
+   GP<DataPool>	doc_pool;
+   int		orig_doc_type;
+   int		orig_doc_pages;
+
+   GPMap<GUTF8String, File>	files_map; 	// files_map[id]=GP<File>
+   GCriticalSection	files_lock;
+
+   GPMap<GUTF8String,DataPool> thumb_map;
+   GCriticalSection	thumb_lock;
+
+   void		(* refresh_cb)(void *);
+   void		* refresh_cl_data;
+
+   void		check(void);
+   GUTF8String	find_unique_id(GUTF8String id);
+   GP<DataPool>	strip_incl_chunks(const GP<DataPool> & pool);
+   void		clean_files_map(void);
+   bool		insert_file_type(const GURL &file_url,
+                  DjVmDir::File::FILE_TYPE page_type,
+		  int & file_pos,
+                  GMap<GUTF8String, GUTF8String> & name2id);
+   bool		insert_file( const GP<DataPool> &pool,
+                  const GURL &file_url, bool is_page,
+		  int & file_pos,
+                  GMap<GUTF8String,GUTF8String> & name2id,
+                  DjVuPort *source=0 );
+   bool		insert_file(
+                  const GURL &file_url, bool is_page,
+		  int & file_pos,
+                  GMap<GUTF8String,GUTF8String> & name2id,
+                  DjVuPort *source=0 );
+   void		remove_file(const GUTF8String &id, bool remove_unref,
+			    GMap<GUTF8String, void *> & ref_map);
+   void		generate_ref_map(const GP<DjVuFile> & file,
+				 GMap<GUTF8String, void *> & ref_map,
+				 GMap<GURL, void *> & visit_map);
+   void		move_file(const GUTF8String &id, int & file_pos,
+			  GMap<GUTF8String, void *> & map);
+   void		unfile_thumbnails(void);
+   void		file_thumbnails(void);
+   void	save_file(const GUTF8String &id, const GURL &codebase,
+     const bool only_modified, GMap<GUTF8String, GUTF8String> & map);
+   void	save_file(const GUTF8String &id, const GURL &codebase,
+     GMap<GUTF8String, GUTF8String> & map);
+};
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
diff --git a/libdjvu/DjVuDocument.cpp b/libdjvu/DjVuDocument.cpp
new file mode 100644
index 0000000..80c87ce
--- /dev/null
+++ b/libdjvu/DjVuDocument.cpp
@@ -0,0 +1,1872 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuDocument.h"
+#include "DjVmDoc.h"
+#include "DjVmDir0.h"
+#include "DjVmNav.h"
+#include "DjVuNavDir.h"
+#include "DjVuImage.h"
+#include "DjVuFileCache.h"
+#include "IFFByteStream.h"
+#include "GOS.h"
+#include "DataPool.h"
+#include "IW44Image.h"
+#include "GRect.h"
+
+#include "debug.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+static const char octets[4]={0x41,0x54,0x26,0x54};
+const float	DjVuDocument::thumb_gamma=(float)2.20;
+
+void (* DjVuDocument::djvu_import_codec)(
+  GP<DataPool> &pool, const GURL &url, bool &needs_compression,
+  bool &needs_rename )=0;
+
+void (* DjVuDocument::djvu_compress_codec)(
+  GP<ByteStream> &doc,const GURL &where,bool bundled)=0;
+
+void
+DjVuDocument::set_import_codec(
+  void (*codec)(
+    GP<DataPool> &pool, const GURL &url, bool &needs_compression, bool &needs_rename ))
+{
+  djvu_import_codec=codec;
+}
+
+void
+DjVuDocument::set_compress_codec(
+  void (* codec)(
+    GP<ByteStream> &doc,const GURL &where,bool bundled))
+{
+  djvu_compress_codec=codec;
+}
+
+DjVuDocument::DjVuDocument(void)
+  : doc_type(UNKNOWN_TYPE),
+    needs_compression_flag(false),
+    can_compress_flag(false),
+    needs_rename_flag(false),
+    has_url_names(false),
+    recover_errors(ABORT),
+    verbose_eof(false),
+    init_started(false),
+    cache(0) 
+{
+}
+
+GP<DjVuDocument>
+DjVuDocument::create(
+  GP<DataPool> pool, GP<DjVuPort> xport, DjVuFileCache * const xcache)
+{
+  DjVuDocument *doc=new DjVuDocument;
+  GP<DjVuDocument> retval=doc;
+  doc->init_data_pool=pool;
+  doc->start_init(GURL(),xport,xcache);
+  return retval;
+}
+
+GP<DjVuDocument>
+DjVuDocument::create(
+  const GP<ByteStream> &bs, GP<DjVuPort> xport, DjVuFileCache * const xcache)
+{
+  return create(DataPool::create(bs),xport,xcache);
+}
+
+GP<DjVuDocument>
+DjVuDocument::create_wait(
+  const GURL &url, GP<DjVuPort> xport, DjVuFileCache * const xcache)
+{
+  GP<DjVuDocument> retval=create(url,xport,xcache);
+  retval->wait_for_complete_init();
+  return retval;
+}
+
+void
+DjVuDocument::start_init(
+  const GURL & url, GP<DjVuPort> xport, DjVuFileCache * xcache)
+{
+   DEBUG_MSG("DjVuDocument::start_init(): initializing class...\n");
+   DEBUG_MAKE_INDENT(3);
+   if (init_started)
+      G_THROW( ERR_MSG("DjVuDocument.2nd_init") );
+   if (!get_count())
+      G_THROW( ERR_MSG("DjVuDocument.not_secure") );
+   if(url.is_empty())
+   {
+     if (!init_data_pool)
+       G_THROW( ERR_MSG("DjVuDocument.empty_url") );
+     if(init_url.is_empty())
+     {
+       init_url=invent_url("document.djvu");
+     }
+   }else
+   {
+     init_url=url;
+   }
+   
+      // Initialize
+   cache=xcache;
+   doc_type=UNKNOWN_TYPE;
+   DataPool::close_all();
+   DjVuPortcaster * pcaster=get_portcaster();
+   if (!xport)
+     xport=simple_port=new DjVuSimplePort();
+   pcaster->add_route(this, xport);
+   pcaster->add_route(this, this);
+
+   if(!url.is_empty())
+   {
+     init_data_pool=pcaster->request_data(this, init_url);
+     if(init_data_pool)
+     {
+       if(!init_url.is_empty() && init_url.is_local_file_url() && djvu_import_codec)
+       {
+         djvu_import_codec(init_data_pool,init_url,needs_compression_flag,needs_rename_flag);
+       }
+       if(needs_rename_flag)
+         can_compress_flag=true;
+     }
+     if (!init_data_pool) 
+     {
+       G_THROW( ERR_MSG("DjVuDocument.fail_URL") "\t"+init_url.get_string());
+     }
+   }
+      // Now we say it is ready
+   init_started=true;
+
+   init_thread_flags=STARTED;
+   init_life_saver=this;
+   init_thr.create(static_init_thread, this);
+}
+
+DjVuDocument::~DjVuDocument(void)
+{
+      // No more messages, please. We're being destroyed.
+   get_portcaster()->del_port(this);
+
+      // We want to stop any DjVuFile which has been created by us
+      // and is still being decoded. We have to stop them manually because
+      // they keep the "life saver" in the decoding thread and won't stop
+      // when we clear the last reference to them
+   {
+      GCriticalSectionLock lock(&ufiles_lock);
+      for(GPosition pos=ufiles_list;pos;++pos)
+      {
+          GP<DjVuFile> file=ufiles_list[pos]->file;
+          file->stop_decode(false);
+          file->stop(false);	// Disable any access to data
+      }
+      ufiles_list.empty();
+   }
+
+   GPList<DjVuPort> ports=get_portcaster()->prefix_to_ports(get_int_prefix());
+   for(GPosition pos=ports;pos;++pos)
+   {
+     GP<DjVuPort> port=ports[pos];
+     if (port->inherits("DjVuFile"))
+     {
+       DjVuFile * file=(DjVuFile *) (DjVuPort *) port;
+       file->stop_decode(false);
+       file->stop(false);	// Disable any access to data
+     }
+   }
+   DataPool::close_all();
+}
+
+void
+DjVuDocument::stop_init(void)
+{
+   DEBUG_MSG("DjVuDocument::stop_init(): making sure that the init thread dies.\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GMonitorLock lock(&init_thread_flags);
+   while((init_thread_flags & STARTED) &&
+	 !(init_thread_flags & FINISHED))
+   {
+      if (init_data_pool) init_data_pool->stop(true);	// blocking operation
+
+      if (ndir_file) ndir_file->stop(false);
+
+      {
+	 GCriticalSectionLock lock(&ufiles_lock);
+	 for(GPosition pos=ufiles_list;pos;++pos)
+	    ufiles_list[pos]->file->stop(false);	// Disable any access to data
+	 ufiles_list.empty();
+      }
+
+      init_thread_flags.wait(50);
+   }
+}
+
+void
+DjVuDocument::check() const
+{
+  if (!init_started)
+    G_THROW( ERR_MSG("DjVuDocument.not_init") );
+}
+
+void
+DjVuDocument::static_init_thread(void * cl_data)
+{
+  DjVuDocument * th=(DjVuDocument *) cl_data;
+  GP<DjVuDocument> life_saver=th;
+  th->init_life_saver=0;
+  G_TRY {
+    th->init_thread();
+  } G_CATCH(exc) {
+    G_TRY {
+      int changed = DjVuDocument::DOC_INIT_FAILED;
+      th->flags |= changed;
+      get_portcaster()->notify_doc_flags_changed(th, changed, 0);
+    } G_CATCH_ALL {
+    } G_ENDCATCH;
+    G_TRY {
+      th->check_unnamed_files();
+      if (!exc.cmp_cause(ByteStream::EndOfFile) && th->verbose_eof)
+        get_portcaster()->notify_error(th, ERR_MSG("DjVuDocument.init_eof"));
+      else if (!exc.cmp_cause(DataPool::Stop))
+        get_portcaster()->notify_status(th, ERR_MSG("DjVuDocument.stopped"));
+      else
+        get_portcaster()->notify_error(th, exc.get_cause());
+    } G_CATCH_ALL {
+    } G_ENDCATCH;
+    th->init_thread_flags |= FINISHED;
+  } G_ENDCATCH;
+}
+
+void
+DjVuDocument::init_thread(void)
+      // This function is run in a separate thread.
+      // The goal is to detect the document type (BUNDLED, OLD_INDEXED, etc.)
+      // and decode navigation directory.
+{
+   DEBUG_MSG("DjVuDocument::init_thread(): guessing what we're dealing with\n");
+   DEBUG_MAKE_INDENT(3);
+
+   DjVuPortcaster * pcaster=get_portcaster();
+      
+   GP<ByteStream> stream=init_data_pool->get_stream();
+
+   GP<IFFByteStream> giff=IFFByteStream::create(stream);
+   IFFByteStream &iff=*giff;
+   GUTF8String chkid;
+   int size=iff.get_chunk(chkid);
+   if (!size)
+     G_THROW( ByteStream::EndOfFile );
+   if (size < 0)
+     G_THROW( ERR_MSG("DjVuDocument.no_file") );
+   if (size<8)
+     G_THROW( ERR_MSG("DjVuDocument.not_DjVu") );
+   if (chkid=="FORM:DJVM")
+   {
+     DEBUG_MSG("Got DJVM document here\n");
+     DEBUG_MAKE_INDENT(3);
+     
+     size=iff.get_chunk(chkid);
+     if (chkid=="DIRM")
+       {
+	 djvm_dir=DjVmDir::create();
+	 djvm_dir->decode(iff.get_bytestream());
+	 iff.close_chunk();
+	 if (djvm_dir->is_bundled())
+           {
+             DEBUG_MSG("Got BUNDLED file.\n");
+             doc_type=BUNDLED;
+           } 
+         else
+           {
+             DEBUG_MSG("Got INDIRECT file.\n");
+             doc_type=INDIRECT;
+           }
+	 flags|=DOC_TYPE_KNOWN | DOC_DIR_KNOWN;
+	 pcaster->notify_doc_flags_changed(this, 
+                                           DOC_TYPE_KNOWN | DOC_DIR_KNOWN, 0);
+	 check_unnamed_files();
+         
+         /* Check for NAVM */
+         size=iff.get_chunk(chkid);
+         if (size && chkid=="NAVM")
+           {
+             djvm_nav=DjVmNav::create();
+             djvm_nav->decode(iff.get_bytestream());
+             iff.close_chunk();
+           }
+       }
+     else if (chkid=="DIR0")
+       {
+	 DEBUG_MSG("Got OLD_BUNDLED file.\n");
+	 doc_type=OLD_BUNDLED;
+	 flags|=DOC_TYPE_KNOWN;
+	 pcaster->notify_doc_flags_changed(this, DOC_TYPE_KNOWN, 0);
+	 check_unnamed_files();
+       } 
+     else 
+       G_THROW( ERR_MSG("DjVuDocument.bad_format") );
+     
+     if (doc_type==OLD_BUNDLED)
+       {
+         // Read the DjVmDir0 directory. We are unable to tell what
+         // files are pages and what are included at this point.
+         // We only know that the first file with DJVU (BM44 or PM44)
+         // form *is* the first page. The rest will become known
+         // after we decode DjVuNavDir
+	 djvm_dir0=DjVmDir0::create();
+	 djvm_dir0->decode(*iff.get_bytestream());
+	 iff.close_chunk();
+         // Get offset to the first DJVU, PM44 or BM44 chunk
+	 int first_page_offset=0;
+	 while(!first_page_offset)
+           {
+             int offset;
+             size=iff.get_chunk(chkid, &offset);
+             if (size==0) G_THROW( ERR_MSG("DjVuDocument.no_page") );
+             if (chkid=="FORM:DJVU" || 
+                 chkid=="FORM:PM44" || chkid=="FORM:BM44")
+               {
+                 DEBUG_MSG("Got 1st page offset=" << offset << "\n");
+                 first_page_offset=offset;
+               }
+             iff.close_chunk();
+           }
+         
+         // Now get the name of this file
+	 int file_num;
+	 for(file_num=0;file_num<djvm_dir0->get_files_num();file_num++)
+           {
+             DjVmDir0::FileRec & file=*djvm_dir0->get_file(file_num);
+             if (file.offset==first_page_offset)
+               {
+                 first_page_name=file.name;
+                 break;
+               }
+           }
+	 if (!first_page_name.length())
+           G_THROW( ERR_MSG("DjVuDocument.no_page") );
+	 flags|=DOC_DIR_KNOWN;
+	 pcaster->notify_doc_flags_changed(this, DOC_DIR_KNOWN, 0);
+	 check_unnamed_files();
+       }
+   } 
+   else // chkid!="FORM:DJVM"
+     {
+       // DJVU format
+       DEBUG_MSG("Got DJVU OLD_INDEXED or SINGLE_PAGE document here.\n");
+       doc_type=SINGLE_PAGE;
+       flags |= DOC_TYPE_KNOWN;
+       pcaster->notify_doc_flags_changed(this, DOC_TYPE_KNOWN, 0);
+       check_unnamed_files();
+     }
+   if (doc_type==OLD_BUNDLED || doc_type==SINGLE_PAGE)
+     {
+       DEBUG_MSG("Searching for NDIR chunks...\n");
+       ndir_file=get_djvu_file(-1);
+       if (ndir_file) ndir=ndir_file->decode_ndir();
+       ndir_file=0;	// Otherwise ~DjVuDocument() will stop (=kill) it
+       if (!ndir)
+         {
+           // Seems to be 1-page old-style document. Create dummy NDIR
+           if (doc_type==OLD_BUNDLED)
+             {
+               ndir=DjVuNavDir::create(GURL::UTF8("directory",init_url));
+               ndir->insert_page(-1, first_page_name);
+             } 
+           else
+             {
+               ndir=DjVuNavDir::create(GURL::UTF8("directory",init_url.base()));
+               ndir->insert_page(-1, init_url.fname());
+             }
+         } 
+       else
+         {
+           if (doc_type==SINGLE_PAGE)
+             doc_type=OLD_INDEXED;
+         }
+       flags|=DOC_NDIR_KNOWN;
+       pcaster->notify_doc_flags_changed(this, DOC_NDIR_KNOWN, 0);
+       check_unnamed_files();
+     }
+   
+   flags |= DOC_INIT_OK;
+   pcaster->notify_doc_flags_changed(this, DOC_INIT_OK, 0);
+   check_unnamed_files();
+   init_thread_flags|=FINISHED;
+   DEBUG_MSG("DOCUMENT IS FULLY INITIALIZED now: doc_type='" <<
+	     (doc_type==BUNDLED ? "BUNDLED" :
+	      doc_type==OLD_BUNDLED ? "OLD_BUNDLED" :
+	      doc_type==INDIRECT ? "INDIRECT" :
+	      doc_type==OLD_INDEXED ? "OLD_INDEXED" :
+	      doc_type==SINGLE_PAGE ? "SINGLE_PAGE" :
+	      "UNKNOWN") << "'\n");
+}
+
+bool
+DjVuDocument::wait_for_complete_init(void)
+{
+  flags.enter();
+  while(!(flags & DOC_INIT_FAILED) &&
+        !(flags & DOC_INIT_OK)) flags.wait();
+  flags.leave();
+  init_thread_flags.enter();
+  while (!(init_thread_flags & FINISHED))
+    init_thread_flags.wait();
+  init_thread_flags.leave();
+  return (flags & (DOC_INIT_OK | DOC_INIT_FAILED))!=0;
+}
+
+int
+DjVuDocument::wait_get_pages_num(void) const
+{
+  GSafeFlags &f=const_cast<GSafeFlags &>(flags);
+  f.enter();
+  while(!(f & DOC_TYPE_KNOWN) &&
+        !(f & DOC_INIT_FAILED) &&
+        !(f & DOC_INIT_OK)) f.wait();
+  f.leave();
+  return get_pages_num();
+}
+
+GUTF8String
+DjVuDocument::get_int_prefix(void) const
+{
+      // These NAMEs are used to enable DjVuFile sharing inside the same
+      // DjVuDocument using DjVuPortcaster. Since URLs are unique to the
+      // document, other DjVuDocuments cannot retrieve files until they're
+      // assigned some permanent name. After '?' there should be the real
+      // file's URL. Please note, that output of this function is used only
+      // as name for DjVuPortcaster. Not as a URL.
+   GUTF8String retval;
+   return retval.format("document_%p%d?", this, hash(init_url));
+}
+
+void
+DjVuDocument::set_file_aliases(const DjVuFile * file)
+{
+   DEBUG_MSG("DjVuDocument::set_file_aliases(): setting global aliases for file '"
+	     << file->get_url() << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   DjVuPortcaster * pcaster=DjVuPort::get_portcaster();
+   
+   GMonitorLock lock(&((DjVuFile *) file)->get_safe_flags());
+   pcaster->clear_aliases(file);
+   if (file->is_decode_ok() && cache)
+   {
+	 // If file is successfully decoded and caching is enabled,
+	 // assign a global alias to this file, so that any other
+	 // DjVuDocument will be able to use it.
+      
+      pcaster->add_alias(file, file->get_url().get_string());
+      if (flags & (DOC_NDIR_KNOWN | DOC_DIR_KNOWN))
+      {
+	 int page_num=url_to_page(file->get_url());
+	 if (page_num>=0)
+	 {
+	    if (page_num==0) pcaster->add_alias(file, init_url.get_string()+"#-1");
+	    pcaster->add_alias(file, init_url.get_string()+"#"+GUTF8String(page_num));
+	 }
+      }
+	 // The following line MUST stay here. For OLD_INDEXED documents
+	 // a page may finish decoding before DIR or NDIR becomes known
+	 // (multithreading, remember), so the code above would not execute
+      pcaster->add_alias(file, file->get_url().get_string()+"#-1");
+   } else pcaster->add_alias(file, get_int_prefix()+file->get_url());
+}
+
+void
+DjVuDocument::check_unnamed_files(void)
+{
+  DEBUG_MSG("DjVuDocument::check_unnamed_files(): Seeing if we can fix some...\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  if (flags & DOC_INIT_FAILED)
+  {
+    // Init failed. All unnamed files should be terminated
+    GCriticalSectionLock lock(&ufiles_lock);
+    for(GPosition pos=ufiles_list;pos;++pos)
+    {
+      GP<DjVuFile> file=ufiles_list[pos]->file;
+      file->stop_decode(true);
+      file->stop(false);	// Disable any access to data
+    }
+    ufiles_list.empty();
+    return;
+  }
+  
+  if ((flags & DOC_TYPE_KNOWN)==0)
+    return;
+  
+  // See the list of unnamed files (created when there was insufficient
+  // information about DjVuDocument structure) and try to fix those,
+  // which can be fixed at this time
+  while(true)
+  {
+    DjVuPortcaster * pcaster=get_portcaster();
+    
+    GP<UnnamedFile> ufile;
+    GURL new_url;
+    GPosition pos ;   
+	   GCriticalSectionLock lock(&ufiles_lock);
+     for(pos=ufiles_list;pos;)
+     {
+	G_TRY
+        {
+          GP<UnnamedFile> f=ufiles_list[pos];
+          if (f->id_type==UnnamedFile::ID) 
+            new_url=id_to_url(f->id);
+          else 
+            new_url=page_to_url(f->page_num);
+          if (!new_url.is_empty())
+          {
+            ufile=f;
+            // Don't take it off the list. We want to be
+            // able to stop the init from ~DjVuDocument();
+            //
+            // ufiles_list.del(pos);
+            break;
+          } else if (is_init_complete())
+          {
+            // No empty URLs are allowed at this point.
+            // We now know all information about the document
+            // and can determine if a page is inside it or not
+            f->data_pool->set_eof();
+            GUTF8String msg;
+            if (f->id_type==UnnamedFile::ID)
+              msg= ERR_MSG("DjVuDocument.miss_page_name") "\t"+f->id;
+            else 
+              msg= ERR_MSG("DjVuDocument.miss_page_num") "\t"+GUTF8String(f->page_num);
+            G_THROW(msg);
+          }
+          ++pos;
+        }
+        G_CATCH(exc)
+        {
+          pcaster->notify_error(this, exc.get_cause());
+          GP<DataPool> pool=ufiles_list[pos]->data_pool;
+          if (pool)
+            pool->stop();
+          GPosition this_pos=pos;
+          ++pos;
+          ufiles_list.del(this_pos);
+        }
+        G_ENDCATCH;
+     }
+     
+     if (ufile && !new_url.is_empty())
+       {
+         DEBUG_MSG("Fixing file: '" << ufile->url << "'=>'" << new_url << "'\n");
+         // Now, once we know its real URL we can request a real DataPool and
+         // can connect the DataPool owned by DjVuFile to that real one
+         // Note, that now request_data() will not play fool because
+         // we have enough information
+         
+         G_TRY
+           {
+             if (ufile->data_pool)
+               {
+                 GP<DataPool> new_pool=pcaster->request_data(ufile->file, new_url);
+                 if(!new_pool)
+                   G_THROW( ERR_MSG("DjVuDocument.fail_URL") "\t"+new_url.get_string());
+                 ufile->data_pool->connect(new_pool);
+               }
+             ufile->file->set_name(new_url.fname());
+             ufile->file->move(new_url.base());
+             set_file_aliases(ufile->file);
+           }
+         G_CATCH(exc)
+           {
+             pcaster->notify_error(this, exc.get_cause());
+           }   
+         G_ENDCATCH;
+       }
+     else
+       break;
+     
+     // Remove the 'ufile' from the list
+     for(pos=ufiles_list;pos;++pos)
+       if (ufiles_list[pos]==ufile)
+         {
+           ufiles_list.del(pos);
+           break;
+         }
+  } // while(1)
+}
+
+int
+DjVuDocument::get_pages_num(void) const
+{
+  check();
+  if (flags & DOC_TYPE_KNOWN)
+    {
+      if (doc_type==BUNDLED || doc_type==INDIRECT)
+	return djvm_dir->get_pages_num();
+      else if (flags & DOC_NDIR_KNOWN)
+	return ndir->get_pages_num();
+    }
+  return 1;
+}
+
+GURL
+DjVuDocument::page_to_url(int page_num) const
+{
+   check();
+   DEBUG_MSG("DjVuDocument::page_to_url(): page_num=" << page_num << "\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   GURL url;
+   if (flags & DOC_TYPE_KNOWN)
+      switch(doc_type)
+      {
+	 case SINGLE_PAGE:
+         {
+           if (page_num<1) 
+             url=init_url;
+           else
+             G_THROW( ERR_MSG("DjVuDocument.big_num") );
+           break;
+         }
+	 case OLD_INDEXED:
+	 {
+	    if (page_num<0) 
+              url=init_url;
+	    else if (flags & DOC_NDIR_KNOWN) 
+              url=ndir->page_to_url(page_num);
+	    break;
+	 }
+	 case OLD_BUNDLED:
+	 {
+	    if (page_num<0) 
+              page_num=0;
+	    if (page_num==0 && (flags & DOC_DIR_KNOWN))
+              url=GURL::UTF8(first_page_name,init_url);
+	    else if (flags & DOC_NDIR_KNOWN)
+              url=ndir->page_to_url(page_num);
+	    break;
+	 }
+	 case BUNDLED:
+	 {
+	    if (page_num<0)
+              page_num=0;
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	      GP<DjVmDir::File> file=djvm_dir->page_to_file(page_num);
+	      if (!file) 
+                G_THROW( ERR_MSG("DjVuDocument.big_num") );
+	      url=GURL::UTF8(file->get_load_name(),init_url);
+	    }
+	    break;
+	 }
+	 case INDIRECT:
+	 {
+	    if (page_num<0) page_num=0;
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	       GP<DjVmDir::File> file=djvm_dir->page_to_file(page_num);
+	       if (!file)
+                 G_THROW( ERR_MSG("DjVuDocument.big_num") );
+	       url=GURL::UTF8(file->get_load_name(),init_url.base());
+	    }
+	    break;
+	 }
+	 default:
+	    G_THROW( ERR_MSG("DjVuDocument.unk_type") );
+      }
+   return url;
+}
+
+int
+DjVuDocument::url_to_page(const GURL & url) const
+{
+   check();
+   DEBUG_MSG("DjVuDocument::url_to_page(): url='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   int page_num=-1;
+   if (flags & DOC_TYPE_KNOWN)
+      switch(doc_type)
+      {
+	 case SINGLE_PAGE:
+	 case OLD_BUNDLED:
+	 case OLD_INDEXED:
+	 {
+	    if (flags & DOC_NDIR_KNOWN) page_num=ndir->url_to_page(url);
+	    break;
+	 }
+	 case BUNDLED:
+	 {
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	       GP<DjVmDir::File> file;
+	       if (url.base()==init_url)
+                 file=djvm_dir->id_to_file(url.fname());
+	       if (file)
+                 page_num=file->get_page_num();
+	    }
+	    break;
+	 }
+	 case INDIRECT:
+	 {
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	       GP<DjVmDir::File> file;
+	       if (url.base()==init_url.base())
+                 file=djvm_dir->id_to_file(url.fname());
+	       if (file)
+                 page_num=file->get_page_num();
+	    }
+	    break;
+	 }
+	 default:
+	    G_THROW( ERR_MSG("DjVuDocument.unk_type") );
+      }
+   return page_num;
+}
+
+GURL
+DjVuDocument::id_to_url(const GUTF8String & id) const
+{
+   check();
+   DEBUG_MSG("DjVuDocument::id_to_url(): translating ID='" << id << "' to URL\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (flags & DOC_TYPE_KNOWN)
+      switch(doc_type)
+      {
+	 case BUNDLED:
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	      GP<DjVmDir::File> file=djvm_dir->id_to_file(id);
+	      if (!file)
+              {
+                file=djvm_dir->name_to_file(id);
+	        if (!file)
+                  file=djvm_dir->title_to_file(id);
+              }
+	      if (file)
+	        return GURL::UTF8(file->get_load_name(),init_url);
+	    }
+	    break;
+	 case INDIRECT:
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	       GP<DjVmDir::File> file=djvm_dir->id_to_file(id);
+	       if (!file)
+               {
+                 file=djvm_dir->name_to_file(id);
+	         if (!file)
+                   file=djvm_dir->title_to_file(id);
+               }
+	       if (file)
+	         return GURL::UTF8(file->get_load_name(),init_url.base());
+	    }
+	    break;
+	 case OLD_BUNDLED:
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	       GP<DjVmDir0::FileRec> frec=djvm_dir0->get_file(id);
+	       if (frec)
+                 return GURL::UTF8(id,init_url);
+	    }
+	    break;
+	 case OLD_INDEXED:
+	 case SINGLE_PAGE:
+	    return GURL::UTF8(id,init_url.base());
+	    break;
+      }
+   return GURL();
+}
+
+GURL
+DjVuDocument::id_to_url(const DjVuPort * source, const GUTF8String &id)
+{
+   return id_to_url(id);
+}
+
+GP<DjVuFile>
+DjVuDocument::url_to_file(const GURL & url, bool dont_create) const
+      // This function is private and is called from two places:
+      // id_to_file() and get_djvu_file() ONLY when the structure is known
+{
+   check();
+   DEBUG_MSG("DjVuDocument::url_to_file(): url='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+      // Try DjVuPortcaster to find existing files.
+   DjVuPortcaster * pcaster=DjVuPort::get_portcaster();
+   GP<DjVuPort> port;
+
+   if (cache)
+   {
+	 // First - fully decoded files
+      port=pcaster->alias_to_port(url.get_string());
+      if (port && port->inherits("DjVuFile"))
+      {
+	 DEBUG_MSG("found fully decoded file using DjVuPortcaster\n");
+	 return (DjVuFile *) (DjVuPort *) port;
+      }
+   }
+
+      // Second - internal files
+   port=pcaster->alias_to_port(get_int_prefix()+url);
+   if (port && port->inherits("DjVuFile"))
+   {
+      DEBUG_MSG("found internal file using DjVuPortcaster\n");
+      return (DjVuFile *) (DjVuPort *) port;
+   }
+
+   GP<DjVuFile> file;
+   
+   if (!dont_create)
+   {
+      DEBUG_MSG("creating a new file\n");
+      file=DjVuFile::create(url,const_cast<DjVuDocument *>(this),recover_errors,verbose_eof);
+      const_cast<DjVuDocument *>(this)->set_file_aliases(file);
+   }
+
+   return file;
+}
+
+GP<DjVuFile>
+DjVuDocument::get_djvu_file(int page_num, bool dont_create) const
+{
+   check();
+   DEBUG_MSG("DjVuDocument::get_djvu_file(): request for page " << page_num << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   DjVuPortcaster * pcaster=DjVuPort::get_portcaster();
+   
+   GURL url;
+   {
+	 // I'm locking the flags because depending on what page_to_url()
+	 // returns me, I'll be creating DjVuFile in different ways.
+	 // And I don't want the situation to change between the moment I call
+	 // id_to_url() and I actually create DjVuFile
+      GMonitorLock lock(&(const_cast<DjVuDocument *>(this)->flags));
+      url=page_to_url(page_num);
+      if (url.is_empty())
+      {
+	    // If init is complete and url is empty, we know for sure, that
+	    // smth is wrong with the page_num. So we can return ZERO.
+	    // Otherwise we create a temporary file and wait for init to finish
+	 if (is_init_complete()) return 0;
+	 
+	 DEBUG_MSG("Structure is not known => check <doc_url>#<page_num> alias...\n");
+	 GP<DjVuPort> port;
+	 if (cache)
+	    port=pcaster->alias_to_port(init_url.get_string()+"#"+GUTF8String(page_num));
+	 if (!port || !port->inherits("DjVuFile"))
+	 {
+	    DEBUG_MSG("failed => invent dummy URL and proceed\n");
+	 
+	       // Invent some dummy temporary URL. I don't care what it will
+	       // be. I'll remember the page_num and will generate the correct URL
+	       // after I learn what the document is
+            GUTF8String name("page");
+            name+=GUTF8String(page_num);
+            name+=".djvu";
+            url=invent_url(name);
+
+            GCriticalSectionLock(&(const_cast<DjVuDocument *>(this)->ufiles_lock));
+	    for(GPosition pos=ufiles_list;pos;++pos)
+	    {
+	       GP<UnnamedFile> f=ufiles_list[pos];
+	       if (f->url==url) return f->file;
+	    }
+	    GP<UnnamedFile> ufile=new UnnamedFile(UnnamedFile::PAGE_NUM, 0,
+						  page_num, url, 0);
+
+	       // We're adding the record to the list before creating the DjVuFile
+	       // because DjVuFile::init() will call request_data(), and the
+	       // latter should be able to find the record.
+	       //
+	       // We also want to keep ufiles_lock to make sure that when
+	       // request_data() is called, the record is still there
+	    const_cast<DjVuDocument *>(this)->ufiles_list.append(ufile);
+      
+	    GP<DjVuFile> file=
+              DjVuFile::create(url,const_cast<DjVuDocument *>(this),recover_errors,verbose_eof);
+	    ufile->file=file;
+	    return file;
+	 } else url=((DjVuFile *) (DjVuPort *) port)->get_url();
+      }
+   }
+   
+   GP<DjVuFile> file=url_to_file(url, dont_create);
+   if (file) 
+     pcaster->add_route(file, const_cast<DjVuDocument *>(this));
+   return file;
+}
+
+GURL
+DjVuDocument::invent_url(const GUTF8String &name) const
+{
+   GUTF8String buffer;
+   buffer.format("djvufileurl://%p/%s", this, (const char *)name);
+   return GURL::UTF8(buffer);
+}
+
+GP<DjVuFile>
+DjVuDocument::get_djvu_file(const GUTF8String& id, bool dont_create)
+{
+  check();
+  DEBUG_MSG("DjVuDocument::get_djvu_file(): ID='" << id << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  if (!id.length())
+    return get_djvu_file(-1);
+
+// Integers are not supported, only ID's  
+//  if (id.is_int())
+//     return get_djvu_file(id.toInt(),dont_create);
+  
+  GURL url;
+  // I'm locking the flags because depending on what id_to_url()
+  // returns me, I'll be creating DjVuFile in different ways.
+  // And I don't want the situation to change between the moment I call
+  // id_to_url() and I actually create DjVuFile
+  {
+    GMonitorLock lock(&flags);
+    url=id_to_url(id);
+    if(url.is_empty() && !id.is_int())
+    {
+      // If init is complete, we know for sure, that there is no such
+      // file with ID 'id' in the document. Otherwise we have to
+      // create a temporary file and wait for the init to finish
+      if (is_init_complete())
+        return 0;
+      // Invent some dummy temporary URL. I don't care what it will
+      // be. I'll remember the ID and will generate the correct URL
+      // after I learn what the document is
+      url=invent_url(id);
+      DEBUG_MSG("Invented url='" << url << "'\n");
+
+      GCriticalSectionLock lock(&ufiles_lock);
+      for(GPosition pos=ufiles_list;pos;++pos)
+      {
+        GP<UnnamedFile> f=ufiles_list[pos];
+        if (f->url==url)
+          return f->file;
+      }
+      GP<UnnamedFile> ufile=new UnnamedFile(UnnamedFile::ID, id, 0, url, 0);
+
+      // We're adding the record to the list before creating the DjVuFile
+      // because DjVuFile::init() will call request_data(), and the
+      // latter should be able to find the record.
+      //
+      // We also want to keep ufiles_lock to make sure that when
+      // request_data() is called, the record is still there
+      ufiles_list.append(ufile);
+      
+      GP<DjVuFile> file=DjVuFile::create(url,this,recover_errors,verbose_eof);
+      ufile->file=file;
+      return file;
+    }
+  }
+     
+  return get_djvu_file(url,dont_create);
+}
+
+GP<DjVuFile>
+DjVuDocument::get_djvu_file(const GURL& url, bool dont_create)
+{
+   check();
+   DEBUG_MSG("DjVuDocument::get_djvu_file(): URL='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (url.is_empty())
+     return 0;
+
+   const GP<DjVuFile> file(url_to_file(url, dont_create));
+
+   if (file)
+     get_portcaster()->add_route(file, this);
+
+   return file;
+}
+
+GP<DjVuImage>
+DjVuDocument::get_page(int page_num, bool sync, DjVuPort * port) const
+{
+   check();
+   DEBUG_MSG("DjVuDocument::get_page(): request for page " << page_num << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GP<DjVuImage> dimg;
+   const GP<DjVuFile> file(get_djvu_file(page_num));
+   if (file)
+   {
+     dimg=DjVuImage::create(file);
+     if (port)
+       DjVuPort::get_portcaster()->add_route(dimg, port);
+   
+     file->resume_decode();
+     if (dimg && sync)
+       dimg->wait_for_complete_decode();
+   }
+   return dimg;
+}
+
+GP<DjVuImage>
+DjVuDocument::get_page(const GUTF8String &id, bool sync, DjVuPort * port)
+{
+   check();
+   DEBUG_MSG("DjVuDocument::get_page(): ID='" << id << "'\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GP<DjVuImage> dimg;
+   const GP<DjVuFile> file(get_djvu_file(id));
+   if(file)
+   {
+     dimg=DjVuImage::create(file);
+     if (port)
+       DjVuPort::get_portcaster()->add_route(dimg, port);
+   
+     file->resume_decode();
+     if (dimg && sync)
+       dimg->wait_for_complete_decode();
+   }
+   return dimg;
+}
+
+void
+DjVuDocument::process_threqs(void)
+      // Will look thru threqs_list and try to fulfil every request
+{
+  GCriticalSectionLock lock(&threqs_lock);
+  for(GPosition pos=threqs_list;pos;)
+  {
+    GP<ThumbReq> req=threqs_list[pos];
+    bool remove=false;
+    if (req->thumb_file)
+    {
+      G_TRY {
+	       // There is supposed to be a file with thumbnails
+        if (req->thumb_file->is_data_present())
+        {
+          // Cool, we can extract the thumbnail now
+          GP<ByteStream> str=req->thumb_file->get_init_data_pool()->get_stream();
+          GP<IFFByteStream> giff=IFFByteStream::create(str);
+          IFFByteStream &iff=*giff;
+          GUTF8String chkid;
+          if (!iff.get_chunk(chkid) || chkid!="FORM:THUM")
+            G_THROW( ERR_MSG("DjVuDocument.bad_thumb") );          
+          for(int i=0;i<req->thumb_chunk;i++)
+          {
+            if (!iff.get_chunk(chkid)) 
+              G_THROW( ERR_MSG("DjVuDocument.bad_thumb") );
+            iff.close_chunk();
+          }
+          if (!iff.get_chunk(chkid) || chkid!="TH44")
+            G_THROW( ERR_MSG("DjVuDocument.bad_thumb") );
+          
+          // Copy the data
+          char buffer[1024];
+          int length;
+          while((length=iff.read(buffer, 1024)))
+            req->data_pool->add_data(buffer, length);
+          req->data_pool->set_eof();
+          
+          // Also add this file to cache so that we won't have
+          // to download it next time
+          add_to_cache(req->thumb_file);
+          req->thumb_file=0;
+          req->image_file=0;
+          remove=true;
+        }
+      } G_CATCH(exc) {
+        GUTF8String msg= ERR_MSG("DjVuDocument.cant_extract") "\n";
+        msg+=exc.get_cause();
+        get_portcaster()->notify_error(this, msg);
+	       // Switch this request to the "decoding" mode
+        req->image_file=get_djvu_file(req->page_num);
+        req->thumb_file=0;
+        req->data_pool->set_eof();
+        remove=true;
+      } G_ENDCATCH;
+    } // if (req->thumb_file)
+    
+    if (req->image_file)
+    {
+      G_TRY {
+	       // Decode the file if necessary. Or just used predecoded image.
+        GSafeFlags & file_flags=req->image_file->get_safe_flags();
+        {
+          GMonitorLock lock(&file_flags);
+          if (!req->image_file->is_decoding())
+          {
+            if (req->image_file->is_decode_ok())
+            {
+              // We can generate it now
+              const GP<DjVuImage> dimg(DjVuImage::create(req->image_file));
+              
+              dimg->wait_for_complete_decode();
+              
+              int width = 160;
+              int height = 160;
+              
+              if( dimg->get_width() )
+                width = dimg->get_width();
+              if( dimg->get_height() )
+                height = dimg->get_height();
+              
+              GRect rect(0, 0, 160, height*160/width);
+              GP<GPixmap> pm=dimg->get_pixmap(rect, rect, thumb_gamma);
+              if (!pm)
+              {
+                GP<GBitmap> bm=dimg->get_bitmap(rect, rect, sizeof(int));
+                if(bm)
+                  pm=GPixmap::create(*bm);
+                else
+                  pm = GPixmap::create(rect.height(), rect.width(), 
+                                       &GPixel::WHITE);
+              }
+              
+              // Store and compress the pixmap
+              GP<IW44Image> iwpix=IW44Image::create_encode(*pm);
+              GP<ByteStream> gstr=ByteStream::create();
+              IWEncoderParms parms;
+              parms.slices=97;
+              parms.bytes=0;
+              parms.decibels=0;
+              iwpix->encode_chunk(gstr, parms);
+              TArray<char> data=gstr->get_data();
+              
+              req->data_pool->add_data((const char *) data, data.size());
+              req->data_pool->set_eof();
+              
+              req->thumb_file=0;
+              req->image_file=0;
+              remove=true;
+            } else if (req->image_file->is_decode_failed())
+            {
+              // Unfortunately we cannot decode it
+              req->thumb_file=0;
+              req->image_file=0;
+              req->data_pool->set_eof();
+              remove=true;
+            } else
+            {
+              req->image_file->start_decode();
+            }
+          }
+        }
+      } G_CATCH(exc) {
+        GUTF8String msg="Failed to decode thumbnails:\n";
+        msg+=exc.get_cause();
+        get_portcaster()->notify_error(this, msg);
+        
+	       // Get rid of this request
+        req->image_file=0;
+        req->thumb_file=0;
+        req->data_pool->set_eof();
+        remove=true;
+      } G_ENDCATCH;
+    }
+    
+    if (remove)
+    {
+      GPosition this_pos=pos;
+      ++pos;
+      threqs_list.del(this_pos);
+    } else ++pos;
+  }
+}
+
+GP<DjVuDocument::ThumbReq>
+DjVuDocument::add_thumb_req(const GP<ThumbReq> & thumb_req)
+      // Will look through the list of pending requests for thumbnails
+      // and try to add the specified request. If a duplicate is found,
+      // it will be returned and the list will not be modified
+{
+   GCriticalSectionLock lock(&threqs_lock);
+   for(GPosition pos=threqs_list;pos;++pos)
+   {
+      GP<ThumbReq> req=threqs_list[pos];
+      if (req->page_num==thumb_req->page_num)
+	 return req;
+   }
+   threqs_list.append(thumb_req);
+   return thumb_req;
+}
+
+GList<GUTF8String>
+DjVuDocument::get_id_list(void)
+{
+  GList<GUTF8String> ids;
+  if (is_init_complete())
+  {
+    if(djvm_dir)
+    {
+      GPList<DjVmDir::File> files_list=djvm_dir->get_files_list();
+      for(GPosition pos=files_list;pos;++pos)
+      {
+        ids.append(files_list[pos]->get_load_name());
+      }
+    }else
+    {
+      const int page_num=get_pages_num();
+      for(int page=0;page<page_num;page++)
+      { 
+        ids.append(page_to_url(page).fname());
+      }
+    }
+  }
+  return ids;
+}
+
+void
+DjVuDocument::map_ids(GMap<GUTF8String,void *> &map)
+{
+  GList<GUTF8String> ids=get_id_list();
+  for(GPosition pos=ids;pos;++pos)
+  {
+    map[ids[pos]]=0;
+  }
+}
+
+GP<DataPool>
+DjVuDocument::get_thumbnail(int page_num, bool dont_decode)
+{
+   DEBUG_MSG("DjVuDocument::get_thumbnail(): page_num=" << page_num << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (!is_init_complete()) return 0;
+   
+   {
+	 // See if we already have request for this thumbnail pending
+      GCriticalSectionLock lock(&threqs_lock);
+      for(GPosition pos=threqs_list;pos;++pos)
+      {
+	 GP<ThumbReq> req=threqs_list[pos];
+	 if (req->page_num==page_num)
+	    return req->data_pool;	// That's it. Just return it.
+      }
+   }
+
+      // No pending request for this page... Create one
+   GP<ThumbReq> thumb_req=new ThumbReq(page_num, DataPool::create());
+   
+      // First try to find predecoded thumbnail
+   if (get_doc_type()==INDIRECT || get_doc_type()==BUNDLED)
+   {
+	 // Predecoded thumbnails exist for new formats only
+      GPList<DjVmDir::File> files_list=djvm_dir->get_files_list();
+      GP<DjVmDir::File> thumb_file;
+      int thumb_start=0;
+      int page_cnt=-1;
+      for(GPosition pos=files_list;pos;++pos)
+      {
+	 GP<DjVmDir::File> f=files_list[pos];
+	 if (f->is_thumbnails())
+	 {
+	    thumb_file=f;
+	    thumb_start=page_cnt+1;
+	 } else if (f->is_page())
+         {
+           page_cnt++;
+         }
+	 if (page_cnt==page_num) break;
+      }
+      if (thumb_file)
+      {
+	    // That's the file with the desired thumbnail image
+	 thumb_req->thumb_file=get_djvu_file(thumb_file->get_load_name());
+	 thumb_req->thumb_chunk=page_num-thumb_start;
+	 thumb_req=add_thumb_req(thumb_req);
+	 process_threqs();
+	 return thumb_req->data_pool;
+      }
+   }
+
+      // Apparently we're out of luck and need to decode the requested
+      // page (unless it's already done and if it's allowed) and render
+      // it into the thumbnail. If dont_decode is true, do not attempt
+      // to create this file (because this will result in a request for data)
+   GP<DjVuFile> file=get_djvu_file(page_num, dont_decode);
+   if (file)
+   {
+      thumb_req->image_file=file;
+
+	 // I'm locking the flags here to make sure, that DjVuFile will not
+	 // change its state in between of the checks.
+      GSafeFlags & file_flags=file->get_safe_flags();
+      {
+	 GMonitorLock lock(&file_flags);
+	 if (thumb_req->image_file->is_decode_ok() || !dont_decode)
+	 {
+	       // Just add it to the list and call process_threqs(). It
+	       // will start decoding if necessary
+	    thumb_req=add_thumb_req(thumb_req);
+	    process_threqs();
+	 } else
+	 {
+	       // Nothing can be done return ZERO
+	    thumb_req=0;
+	 }
+      }
+   } else thumb_req=0;
+   
+   if (thumb_req) return thumb_req->data_pool;
+   else return 0;
+}
+
+static void
+add_to_cache(const GP<DjVuFile> & f, GMap<GURL, void *> & map,
+	     DjVuFileCache * cache)
+{
+   GURL url=f->get_url();
+   DEBUG_MSG("DjVuDocument::add_to_cache(): url='" << url << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   if (!map.contains(url))
+   {
+      map[url]=0;
+      cache->add_file(f);
+      
+      GPList<DjVuFile> list;
+      for(GPosition pos=list;pos;++pos)
+	 add_to_cache(list[pos], map, cache);
+   }
+}
+
+void
+DjVuDocument::add_to_cache(const GP<DjVuFile> & f)
+{
+   if (cache)
+   {
+      GMap<GURL, void *> map;
+      ::add_to_cache(f, map, cache);
+   }
+}
+
+void
+DjVuDocument::notify_file_flags_changed(const DjVuFile * source,
+					long set_mask, long clr_mask)
+{
+      // Don't check here if the document is initialized or not.
+      // This function may be called when it's not.
+      // check();
+   if (set_mask & DjVuFile::DECODE_OK)
+   {
+      set_file_aliases(source);
+      if (cache) add_to_cache((DjVuFile *) source);
+      if(!needs_compression_flag)
+      {
+        if(source->needs_compression())
+        {
+          can_compress_flag=true;
+          needs_compression_flag=true;
+        }else if(source->can_compress())
+        {
+          can_compress_flag=true;
+        }
+      }
+   }
+   process_threqs();
+}
+
+GP<DjVuFile>
+DjVuDocument::id_to_file(const DjVuPort * source, const GUTF8String &id)
+{
+   return (DjVuFile *) get_djvu_file(id);
+}
+
+GP<DataPool>
+DjVuDocument::request_data(const DjVuPort * source, const GURL & url)
+{
+   DEBUG_MSG("DjVuDocument::request_data(): seeing if we can do it\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (url==init_url)
+     return init_data_pool;
+
+   check();	// Don't put it before 'init_data_pool'
+
+   {
+	 // See if there is a file in the "UnnamedFiles" list.
+	 // If it's there, then create an empty DataPool and store its
+	 // pointer in the list. The "init thread" will eventually
+	 // do smth with it.
+      GCriticalSectionLock lock(&ufiles_lock);
+      for(GPosition pos=ufiles_list;pos;++pos)
+      {
+	 GP<UnnamedFile> f=ufiles_list[pos];
+	 if (f->url==url)
+	 {
+	    DEBUG_MSG("Found tmp unnamed DjVuFile. Return empty DataPool\n");
+	       // Remember the DataPool. We will connect it to the
+	       // actual data after the document structure becomes known
+	    f->data_pool=DataPool::create();
+	    return f->data_pool;
+	 }
+      }
+   }
+
+      // Well, the url is not in the "UnnamedFiles" list, but it doesn't
+      // mean, that it's not "artificial". Stay alert!
+   GP<DataPool> data_pool;
+   if (flags & DOC_TYPE_KNOWN)
+      switch(doc_type)
+      {
+	 case OLD_BUNDLED:
+	 {
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	       DEBUG_MSG("The document is in OLD_BUNDLED format\n");
+	       if (url.base()!=init_url)
+		        G_THROW( ERR_MSG("DjVuDocument.URL_outside") "\t"+url.get_string());
+	 
+	       GP<DjVmDir0::FileRec> file=djvm_dir0->get_file(url.fname());
+	       if (!file)
+               {
+                 G_THROW( ERR_MSG("DjVuDocument.file_outside") "\t"+url.fname());
+               }
+	       data_pool=DataPool::create(init_data_pool, file->offset, file->size);
+	    }
+	    break;
+	 }
+	 case BUNDLED:
+	 {
+	    if (flags & DOC_DIR_KNOWN)
+	    {
+	       DEBUG_MSG("The document is in new BUNDLED format\n");
+	       if (url.base()!=init_url)
+               {
+		 G_THROW( ERR_MSG("DjVuDocument.URL_outside") "\t"
+                   +url.get_string());
+               }
+	 
+	       GP<DjVmDir::File> file=djvm_dir->id_to_file(url.fname());
+	       if (!file)
+               {
+                 G_THROW( ERR_MSG("DjVuDocument.file_outside") "\t"+url.fname());
+               }
+	       data_pool=DataPool::create(init_data_pool, file->offset, file->size);
+	    }
+	    break;
+	 }
+	 case SINGLE_PAGE:
+	 case OLD_INDEXED:
+	 case INDIRECT:
+	 {
+	    DEBUG_MSG("The document is in SINGLE_PAGE or OLD_INDEXED or INDIRECT format\n");
+	    if (flags & DOC_DIR_KNOWN)
+	       if (doc_type==INDIRECT && !djvm_dir->id_to_file(url.fname()))
+		        G_THROW( ERR_MSG("DjVuDocument.URL_outside2") "\t"+url.get_string());
+	 
+	    if (url.is_local_file_url())
+	    {
+//	       GUTF8String fname=GOS::url_to_filename(url);
+//	       if (GOS::basename(fname)=="-") fname="-";
+	       DEBUG_MSG("url=" << url << "\n");
+
+	       data_pool=DataPool::create(url);
+	    }
+	 }
+      }
+   return data_pool;
+}
+
+
+static void
+add_file_to_djvm(const GP<DjVuFile> & file, bool page,
+		 DjVmDoc & doc, GMap<GURL, void *> & map)
+      // This function is used only for obsolete formats.
+      // For new formats there is no need to process files recursively.
+      // All information is already available from the DJVM chunk
+{
+   GURL url=file->get_url();
+
+   if (!map.contains(url))
+   {
+      map[url]=0;
+
+      if (file->get_chunks_number()>0 && !file->contains_chunk("NDIR"))
+      {
+	    // Get the data and unlink any file containing NDIR chunk.
+	    // Yes. We're lazy. We don't check if those files contain
+	    // anything else.
+	 GPosition pos;
+	 GPList<DjVuFile> files_list=file->get_included_files(false);
+	 GP<DataPool> data=file->get_djvu_data(false);
+	 for(pos=files_list;pos;++pos)
+	 {
+	    GP<DjVuFile> f=files_list[pos];
+	    if (f->contains_chunk("NDIR"))
+	       data=DjVuFile::unlink_file(data, f->get_url().fname());
+	 }
+	 
+	    // Finally add it to the document
+	 GUTF8String name=file->get_url().fname();
+	 GP<DjVmDir::File> file_rec=DjVmDir::File::create(
+           name, name, name,
+           page ? DjVmDir::File::PAGE : DjVmDir::File::INCLUDE );
+	 doc.insert_file(file_rec, data, -1);
+
+	    // And repeat for all included files
+	 for(pos=files_list;pos;++pos)
+	    add_file_to_djvm(files_list[pos], false, doc, map);
+      }
+   }
+}
+
+static void
+add_file_to_djvm(const GP<DjVuFile> & file, bool page,
+		 DjVmDoc & doc, GMap<GURL, void *> & map, 
+                 bool &needs_compression_flag, bool &can_compress_flag )
+{
+  if(!needs_compression_flag)
+  {
+    if(file->needs_compression())
+    {
+      can_compress_flag=true;
+      needs_compression_flag=true;
+    }else if(file->can_compress())
+    {
+      can_compress_flag=true;
+    }
+  }
+  add_file_to_djvm(file,page,doc,map);
+}
+
+static void
+local_get_url_names(DjVuFile * f,const GMap<GURL, void *> & map,GMap<GURL,void *> &tmpmap)
+{
+   GURL url=f->get_url();
+   if (!map.contains(url) && !tmpmap.contains(url))
+   {
+      tmpmap[url]=0;
+      f->process_incl_chunks();
+      GPList<DjVuFile> files_list=f->get_included_files(false);
+      for(GPosition pos=files_list;pos;++pos)
+         local_get_url_names(files_list[pos], map, tmpmap);
+   }
+}
+
+static void
+local_get_url_names(DjVuFile * f, GMap<GURL, void *> & map)
+{
+   GMap<GURL,void *> tmpmap;
+   local_get_url_names(f,map,tmpmap);
+   for(GPosition pos=tmpmap;pos;++pos)
+     map[tmpmap.key(pos)]=0;
+}
+
+GList<GURL>
+DjVuDocument::get_url_names(void)
+{
+  check();
+
+  GCriticalSectionLock lock(&url_names_lock);
+  if(has_url_names)
+    return url_names;
+
+  GMap<GURL, void *> map;
+  int i;
+  if (doc_type==BUNDLED || doc_type==INDIRECT)
+  {
+    GPList<DjVmDir::File> files_list=djvm_dir->get_files_list();
+    for(GPosition pos=files_list;pos;++pos)
+    {
+      GURL url=id_to_url(files_list[pos]->get_load_name());
+      map[url]=0;
+    }
+  }else
+  {
+    int pages_num=get_pages_num();
+    for(i=0;i<pages_num;i++)
+    {
+      G_TRY
+      {
+        local_get_url_names(get_djvu_file(i), map);
+      }
+      G_CATCH(ex)
+      {
+        // Why is this try/catch block here?
+        G_TRY { 
+          get_portcaster()->notify_error(this, ex.get_cause()); 
+          GUTF8String emsg = ERR_MSG("DjVuDocument.exclude_page") "\t" + GUTF8String(i+1);
+          get_portcaster()->notify_error(this, emsg);
+        }
+        G_CATCH_ALL
+        {
+          G_RETHROW;
+        }
+        G_ENDCATCH;
+      }
+      G_ENDCATCH;
+    }
+  }
+  for(GPosition j=map;j;++j)
+  {
+    if (map.key(j).is_local_file_url())
+    {
+      url_names.append(map.key(j));
+    }
+  }
+  has_url_names=true;
+  return url_names;
+}
+
+GP<DjVmDoc>
+DjVuDocument::get_djvm_doc()
+      // This function may block for data
+{
+   check();
+   DEBUG_MSG("DjVuDocument::get_djvm_doc(): creating the DjVmDoc\n");
+   DEBUG_MAKE_INDENT(3);
+
+   if (!is_init_complete())
+     G_THROW( ERR_MSG("DjVuDocument.init_not_done") );
+
+   GP<DjVmDoc> doc=DjVmDoc::create();
+
+   if (doc_type==BUNDLED || doc_type==INDIRECT)
+     {
+       GPList<DjVmDir::File> files_list=djvm_dir->get_files_list();
+       for(GPosition pos=files_list;pos;++pos)
+         {
+           GP<DjVmDir::File> f=new DjVmDir::File(*files_list[pos]);
+           GP<DjVuFile> file=url_to_file(id_to_url(f->get_load_name()));
+           GP<DataPool> data;
+           if (file->is_modified()) 
+             data=file->get_djvu_data(false);
+           else 
+             data=file->get_init_data_pool();
+           doc->insert_file(f, data);
+         }
+       if (djvm_nav)
+         doc->set_djvm_nav(djvm_nav);
+     } 
+   else if (doc_type==SINGLE_PAGE)
+     {
+       DEBUG_MSG("Creating: djvm for a single page document.\n");
+       GMap<GURL, void *> map_add;
+       GP<DjVuFile> file=get_djvu_file(0);
+       add_file_to_djvm(file, true, *doc, map_add,
+                        needs_compression_flag,can_compress_flag);
+     } 
+   else
+     {
+       DEBUG_MSG("Converting: the document is in an old format.\n");
+       GMap<GURL, void *> map_add;
+       if(recover_errors == ABORT)
+         {
+           for(int page_num=0;page_num<ndir->get_pages_num();page_num++)
+             {
+               GP<DjVuFile> file=url_to_file(ndir->page_to_url(page_num));
+               add_file_to_djvm(file, true, *doc, map_add,
+                                needs_compression_flag,can_compress_flag);
+             }
+         }
+       else
+         {
+           for(int page_num=0;page_num<ndir->get_pages_num();page_num++)
+             {
+               G_TRY
+                 {
+                   GP<DjVuFile> file=url_to_file(ndir->page_to_url(page_num));
+                   add_file_to_djvm(file, true, *doc, map_add,
+                                    needs_compression_flag,can_compress_flag);
+                 }
+               G_CATCH(ex)
+                 {
+                   G_TRY { 
+                     get_portcaster()->notify_error(this, ex.get_cause());
+                     GUTF8String emsg = ERR_MSG("DjVuDocument.skip_page") "\t" 
+                                      + GUTF8String(page_num+1);
+                     get_portcaster()->notify_error(this, emsg);
+                   }
+                   G_CATCH_ALL
+                     {
+                       G_RETHROW;
+                     }
+                   G_ENDCATCH;
+                 }
+               G_ENDCATCH;
+             }
+         }
+     }
+   return doc;
+}
+
+void
+DjVuDocument::write( const GP<ByteStream> &gstr,
+  const GMap<GUTF8String,void *> &reserved)
+{
+  DEBUG_MSG("DjVuDocument::write(): storing DjVmDoc into ByteStream\n");
+  DEBUG_MAKE_INDENT(3);
+  get_djvm_doc()->write(gstr,reserved); 
+}
+
+void
+DjVuDocument::write(const GP<ByteStream> &gstr, bool force_djvm)
+{
+  DEBUG_MSG("DjVuDocument::write(): storing DjVmDoc into ByteStream\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  GP<DjVmDoc> doc=get_djvm_doc();
+  GP<DjVmDir> dir=doc->get_djvm_dir();
+
+  bool singlepage = (dir->get_files_num()==1 && !djvm_nav && !force_djvm);
+  if (singlepage)
+  {
+    // maybe save as single page
+    DjVmDir::File *file = dir->page_to_file(0);
+    if (file->get_title() != file->get_load_name())
+      singlepage = false;
+  }
+  if (! singlepage)
+  {
+    doc->write(gstr);
+  }
+  else
+  {
+    GPList<DjVmDir::File> files_list=dir->resolve_duplicates(false);
+    GP<DataPool> pool=doc->get_data(files_list[files_list]->get_load_name());
+    GP<ByteStream> pool_str=pool->get_stream();
+    ByteStream &str=*gstr;
+    str.writall(octets,4);
+    str.copy(*pool_str);
+  }
+}
+
+void
+DjVuDocument::expand(const GURL &codebase, const GUTF8String &idx_name)
+{
+   DEBUG_MSG("DjVuDocument::expand(): codebase='" << codebase << "'\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   GP<DjVmDoc> doc=get_djvm_doc();
+   doc->expand(codebase, idx_name);
+}
+
+void
+DjVuDocument::save_as(const GURL &where, bool bundled)
+{
+   DEBUG_MSG("DjVuDocument::save_as(): where='" << where <<
+	     "', bundled=" << bundled << "\n");
+   DEBUG_MAKE_INDENT(3);
+   
+   if (needs_compression())
+   { 
+     if(!djvu_compress_codec)
+     {
+       G_THROW( ERR_MSG("DjVuDocument.comp_codec") );
+     }
+     GP<ByteStream> gmbs=ByteStream::create();
+     write(gmbs);
+     ByteStream &mbs=*gmbs;
+     mbs.flush();
+     mbs.seek(0,SEEK_SET);
+     (*djvu_compress_codec)(gmbs,where,bundled);
+   }else if (bundled)
+   {
+      DataPool::load_file(where);
+      write(ByteStream::create(where, "wb"));
+   } else 
+   {
+     expand(where.base(), where.fname());
+   }
+}
+
+static const char prolog[]="<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE DjVuXML PUBLIC \"-//W3C//DTD DjVuXML 1.1//EN\" \"pubtext/DjVuXML-s.dtd\">\n<DjVuXML>\n<HEAD>";
+static const char start_xml[]="</HEAD>\n<BODY>\n";
+static const char end_xml[]="</BODY>\n</DjVuXML>\n";
+
+void
+DjVuDocument::writeDjVuXML(const GP<ByteStream> &gstr_out,
+                           int flags, int page) const
+{
+  ByteStream &str_out=*gstr_out;
+  str_out.writestring(
+    prolog+get_init_url().get_string().toEscaped()+start_xml);
+  const int pages=wait_get_pages_num();
+  int pstart = (page < 0) ? 0 : page;
+  int pend = (page < 0) ? pages : page+1;
+  for(int page_num=pstart; page_num<pend; ++page_num)
+  {
+    const GP<DjVuImage> dimg(get_page(page_num,true));
+    if(!dimg)
+    {
+      G_THROW( ERR_MSG("DjVuToText.decode_failed") );
+    }
+    dimg->writeXML(str_out,get_init_url(),flags);
+  }
+  str_out.writestring(GUTF8String(end_xml));
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuDocument.h b/libdjvu/DjVuDocument.h
new file mode 100644
index 0000000..5f720b5
--- /dev/null
+++ b/libdjvu/DjVuDocument.h
@@ -0,0 +1,1070 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUDOCUMENT_H
+#define _DJVUDOCUMENT_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "DjVuPort.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class DjVmDoc;
+class DjVmDir;
+class DjVmDir0;
+class DjVmNav;
+class DjVuImage;
+class DjVuFile;
+class DjVuFileCache;
+class DjVuNavDir;
+class ByteStream;
+
+/** @name DjVuDocument.h
+    Files #"DjVuDocument.h"# and #"DjVuDocument.cpp"# contain implementation
+    of the \Ref{DjVuDocument} class - the ideal tool for opening, decoding
+    and saving DjVu single page and multi page documents.
+
+    @memo DjVu document class.
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+/** #DjVuDocument# provides convenient interface for opening, decoding
+    and saving back DjVu documents in single page and multi page formats.
+
+    {\bf Input formats}
+    It can read multi page DjVu documents in either of the 4 formats: 2
+    obsolete ({\em old bundled} and {\em old indexed}) and two new
+    ({\em new bundled} and {\em new indirect}).
+
+    {\bf Output formats}
+    To encourage users to switch to the new formats, the #DjVuDocument# can
+    save documents back only in the new formats: {\em bundled} and
+    {\em indirect}.
+
+    {\bf Conversion.} Since #DjVuDocument# can open DjVu documents in
+    an obsolete format and save it in any of the two new formats
+    ({\em new bundled} and {\em new indirect}), this class can be used for
+    conversion from obsolete formats to the new ones. Although it can also
+    do conversion between the new two formats, it's not the best way to
+    do it. Please refer to \Ref{DjVmDoc} for details.
+
+    {\bf Decoding.} #DjVuDocument# provides convenient interface for obtaining
+    \Ref{DjVuImage} corresponding to any page of the document. It uses
+    \Ref{DjVuFileCache} to do caching thus avoiding unnecessary multiple decoding of
+    the same page. The real decoding though is accomplished by \Ref{DjVuFile}.
+
+    {\bf Messenging.} Being derived from \Ref{DjVuPort}, #DjVuDocument#
+    takes an active part in exchanging messages (requests and notifications)
+    between different parties involved in decoding. It reports (relays)
+    errors, progress information and even handles some requests for data (when
+    these requests deal with local files).
+
+    Typical usage of #DjVuDocument# class in a threadless command line
+    program would be the following:
+    \begin{verbatim}
+    static const char file_name[]="/tmp/document.djvu";
+    GP<DjVuDocument> doc=DjVuDocument::create_wait(file_name);
+    const int pages=doc->get_pages_num();
+    for(int page=0;page<pages;page++)
+    {
+       GP<DjVuImage> dimg=doc->get_page(page);
+       // Do something
+    };
+    \end{verbatim}
+    
+    {\bf Comments for the code above}
+    \begin{enumerate}
+       \item Since the document is assumed to be stored on the hard drive,
+             we don't have to cope with \Ref{DjVuPort}s and can pass
+	     #ZERO# pointer to the \Ref{init}() function. #DjVuDocument#
+	     can access local data itself. In the case of a plugin though,
+	     one would have to implement his own \Ref{DjVuPort}, which
+	     would handle requests for data arising when the document
+	     is being decoded.
+       \item In a threaded program instead of calling the \Ref{init}()
+             function one can call \Ref{start_init}() and \Ref{stop_init}()
+	     to initiate and interrupt initialization carried out in
+	     another thread. This possibility of initializing the document
+	     in another thread has been added specially for the plugin
+	     because the initialization itself requires data, which is
+	     not immediately available in the plugin. Thus, to prevent the
+	     main thread from blocking, we perform initialization in a
+	     separate thread. To check if the class is completely and
+	     successfully initialized, use \Ref{is_init_ok}(). To see if
+	     there was an error, use \Ref{is_init_failed}(). To
+	     know when initialization is over (whether successfully or not),
+	     use \Ref{is_init_complete}(). To wait for this to happen use
+	     \Ref{wait_for_complete_init}(). Once again, all these things are
+	     not required for single-threaded program.
+
+	     Another difference between single-threaded and multi-threaded
+	     environments is that in a single-threaded program, the image is
+	     fully decoded before it's returned. In a multi-threaded
+	     application decoding starts in a separate thread, and the pointer
+	     to the \Ref{DjVuImage} being decoded is returned immediately.
+	     This has been done to enable progressive redisplay
+	     in the DjVu plugin. Use communication mechanism provided by
+	     \Ref{DjVuPort} and \Ref{DjVuPortcaster} to learn about progress
+	     of decoding.  Or try #dimg->wait_for_complete_decode()# to wait
+	     until the decoding ends.
+       \item See Also: \Ref{DjVuFile}, \Ref{DjVuImage}, \Ref{GOS}.
+    \end{enumerate}
+
+    {\bf Initialization}
+    As mentioned above, the #DjVuDocument# can go through several stages
+    of initialization. The functionality is gradually added while it passes
+    one stage after another:
+    \begin{enumerate}
+       \item First of all, immediately after the object is created \Ref{init}()
+             or \Ref{start_init}() functions must be called. {\bf Nothing}
+	     will work until this is done. \Ref{init}() function will not
+	     return until the initialization is complete. You need to make
+	     sure, that enough data is available. {\bf Do not call \Ref{init}()
+	     in the plugin}. \Ref{start_init}() will start initialization
+	     in another thread. Use \Ref{stop_init}() to interrupt it.
+	     Use \Ref{is_init_complete}() to check the initialization progress.
+	     Use \Ref{wait_for_complete_init}() to wait for init to finish.
+       \item The first thing the initializing code learns about the document
+	     is its type (#BUNDLED#, #INDIRECT#, #OLD_BUNDLED# or #OLD_INDEXED#).
+	     As soon as it happens, document flags are changed and
+	     #notify_doc_flags_changed()# request is sent through the
+	     communication mechanism provided by \Ref{DjVuPortcaster}.
+       \item After the document type becomes known, the initializing code
+             proceeds with learning the document structure. Gradually the
+	     flags are updated with values:
+	     \begin{itemize}
+	        \item #DOC_DIR_KNOWN#: Contents of the document became known.
+		      This is meaningful for #BUNDLED#, #OLD_BUNDLED# and
+		      #INDIRECT# documents only.
+		\item #DOC_NDIR_KNOWN#: Contents of the document navigation
+		      directory became known. This is meaningful for old-style
+		      documents (#OLD_BUNDLED# and #OLD_INDEXED#) only
+		\item #DOC_INIT_OK# or #DOC_INIT_FAILED#:
+		      The initializating code finished.
+	     \end{itemize}
+    \end{enumerate} */
+    
+class DJVUAPI DjVuDocument : public DjVuPort
+{
+public:
+      /** Flags describing the document initialization state.
+	  \begin{itemize}
+	     \item #DOC_TYPE_KNOWN#: The type of the document has been learnt.
+	     \item #DOC_DIR_KNOWN#: Contents of the document became known.
+		   This is meaningful for #BUNDLED#, #OLD_BUNDLED# and
+		   #INDIRECT# documents only.
+	     \item #DOC_NDIR_KNOWN#: Contents of the document navigation
+		   directory became known. This is meaningful for old-style
+		   documents (#OLD_BUNDLED# and #OLD_INDEXED#) only
+	     \item #DOC_INIT_OK#: The initialization has completed successfully.
+	     \item #DOC_INIT_FAILED#: The initialization failed.
+	  \end{itemize} */
+   enum DOC_FLAGS { DOC_TYPE_KNOWN=1, DOC_DIR_KNOWN=2,
+		    DOC_NDIR_KNOWN=4, DOC_INIT_OK=8,
+		    DOC_INIT_FAILED=16 };
+      /** Specifies the format of #DjVuDocument#. There are currently 4 DjVu
+	  multipage formats recognized by the library. Two of them are obsolete
+	  and should not be used.
+	  \begin{enumerate}
+	     \item #OLD_BUNDLED# - Obsolete bundled format
+	     \item #OLD_INDEXED# - Obsolete multipage format where every page
+	           is stored in a separate file and "includes" (by means
+		   of an #INCL# chunk) the file with the document directory.
+	     \item #SINGLE_PAGE# - Single page document. Basically a file
+	     	   with either #FORM:DJVU# or #FORM:IW44# and no multipage
+		   information. For example, #OLD_INDEXED# documents with
+		   document directory do not qualify even if they contain only
+		   one page.
+	     \item #BUNDLED# - Currently supported bundled format
+	     \item #INDIRECT# - Currently supported "expanded" format, where
+	           every page and component is stored in a separate file. There
+		   is also a {\em top-level} file with the document directory.
+          \end{enumerate} */
+   enum DOC_TYPE { OLD_BUNDLED=1, OLD_INDEXED, BUNDLED, INDIRECT,
+		   SINGLE_PAGE, UNKNOWN_TYPE };
+   enum THREAD_FLAGS { STARTED=1, FINISHED=2 };
+
+protected:
+      /** Default creator. Please call functions \Ref{init}() or
+	  \Ref{start_init}() before you start working with the #DjVuDocument#.
+        */
+   DjVuDocument(void);
+public:
+
+     /// Virtual Destructor
+   virtual ~DjVuDocument(void);
+
+      /** Initializes the #DjVuDocument# object using an existing document.
+          This function should be called once after creating the object.
+	  The #url# should point to the real data, and the creator of the
+	  document should be ready to return this data to the document
+	  if it's not stored locally (in which case #DjVuDocument# can
+	  access it itself).
+
+	  {\bf Initializing thread}
+	  In a single-threaded application, the #start_init()# function performs
+	  the complete initialization of the #DjVuDocument# before it returns.
+	  In a multi-threaded application, though, it initializes some internal
+	  variables, requests data for the document and starts a new
+	  {\em initializing} thread, which is responsible for determining the
+	  document type and structure and completing the initialization
+	  process. This additional complication is justified in the case of
+	  the DjVu plugin because performing initialization requires data and
+	  in the plugin the data can be supplied by the main thread only.
+	  Thus, if the initialization was completed by the main thread, the
+	  plugin would run out of data and block.
+
+	  {\bf Stages of initialization}
+	  Immediately after the #start_init()# function terminates, the
+	  #DjVuDocument# object is ready for use. Its functionality will
+	  not be complete (until the initializing thread finishes), but
+	  the object is still very useful. Such functions as \Ref{get_page}()
+	  or \Ref{get_djvu_file}() or \Ref{id_to_url}() may be called
+	  before the initializing thread completes. This allows the DjVu
+	  plugin start decoding as soon as possible without waiting for
+	  all data to arrive.
+
+	  To query the current stage of initialization you can use
+	  \Ref{get_doc_flags}() function or listen to the
+	  #notify_doc_flags_changed()# notifications distributed with the help
+	  of \Ref{DjVuPortcaster}. To wait for the initialization to
+	  complete use \Ref{wait_for_complete_init}(). To stop initialization
+	  call \Ref{stop_init}().
+
+	  {\bf Querying data}
+	  The query for data is done using the communication mechanism
+	  provided by \Ref{DjVuPort} and \Ref{DjVuPortcaster}. If #port#
+	  is not #ZERO#, then the request for data will be forwarded to it.
+	  If it {\bf is} #ZERO# then #DjVuDocument# will create an internal
+	  instance of \Ref{DjVuSimplePort} and will use it to access local
+	  files and report errors to #stderr#. In short, if the document
+	  file is stored on the local hard disk, and you're OK about reporting
+	  errors to #stderr#, you may pass #ZERO# pointer to \Ref{DjVuPort}
+	  as #DjVuDocument# can take care of this situation by itself.
+
+	  {\bf The URL}
+	  Depending on the document type the #url# should point to:
+	  \begin{itemize}
+	     \item {\bf Old bundled} and {\bf New bundled} formats: to the
+	           document itself.
+	     \item {\bf Old indexed} format: to any page of the document.
+	     \item {\bf New indirect} format: to the top-level file of the
+	           document. If (like in the {\em old indexed} format) you
+		   point the #url# to a page, the page {\em will} be decoded,
+		   but it will {\em not} be recognized to be part of the
+		   document.
+	  \end{itemize}
+
+	  @param url The URL pointing to the document. If the document is
+	         in a {\em bundled} format then the URL should point to it.
+		 If the document is in the {\em old indexed} format then
+		 URL may point to any page of this document. For {\em new
+		 indirect} format the URL should point to the top-level
+		 file of the document.
+	  @param port If not #ZERO#, all requests and notifications will
+	         be sent to it. Otherwise #DjVuDocument# will create an internal
+		 instance of \Ref{DjVuSimplePort} for these purposes.
+		 It's OK to make it #ZERO# if you're writing a command line
+		 tool, which should work with files on the hard disk only
+		 because #DjVuDocument# can access such files itself.
+	  @param cache It's used to cache decoded \Ref{DjVuFile}s and
+	         is actually useful in the plugin only.  */
+   void		start_init(const GURL & url, GP<DjVuPort> port=0,
+			   DjVuFileCache * cache=0);
+
+   /** This creates a DjVuDocument without initializing it. */
+   static GP<DjVuDocument> create_noinit(void) {return new DjVuDocument;}
+
+   /** Create a version of DjVuDocument which has finished initializing. */
+   static GP<DjVuDocument> create_wait(
+     const GURL &url, GP<DjVuPort> xport=0, DjVuFileCache * const xcache=0);
+
+   /** Create a version of DjVuDocument which has begun initializing. */
+   static GP<DjVuDocument> create(
+     const GURL &url, GP<DjVuPort> xport=0, DjVuFileCache * const xcache=0);
+
+   /** Create a version of DjVuDocument which has begun initializing. */
+   static GP<DjVuDocument> create(
+     GP<DataPool> pool, GP<DjVuPort> xport=0, DjVuFileCache * const xcache=0);
+
+   /** Create a version of DjVuDocument which has begun initializing. */
+   static GP<DjVuDocument> create(
+     const GP<ByteStream> &bs, GP<DjVuPort> xport=0,
+     DjVuFileCache * const xcache=0);
+
+      /** Call this function when you don't need the #DjVuDocument# any more.
+	  In a multi-threaded environment it will stop initialization
+	  thread, if it is currently running. {\bf You will not be able
+	  to start the initialization again. Thus, after calling this
+          function the document should not be used any more}. */
+   void		stop_init(void);
+
+      /** Initializes the document.
+
+	  Contrary to \Ref{start_init}(), which just starts the initialization
+	  thread in a multi-threaded environment, this function does not
+	  return until the initialization completes (either successfully or
+	  not). Basically, it calls \Ref{start_init}() and then
+	  \Ref{wait_for_complete_init}().
+	  */
+   void		init(const GURL & url, GP<DjVuPort> port=0,
+		     DjVuFileCache * cache=0);
+
+      /** Returns #TRUE# if the initialization thread finished (does not
+	  matter successfully or not). As soon as it happens, the document
+	  becomes completely initialized and its every function should work
+	  properly. Please refer to the description of \Ref{init}() function
+	  and of the #DjVuDocument# class to learn about the initializing
+	  stages.
+
+	  To wait for the initialization to complete use
+	  \Ref{wait_for_complete_init}() function.
+
+	  To query the initialization stage use \Ref{get_flags}() function.
+
+	  To learn whether initialization was successful or not,
+	  use \Ref{is_init_ok}() and \Ref{is_init_failed}().
+
+	  {\bf Note:} In a single threaded application the initialization
+	  completes before the \Ref{init}() function returns. */
+   bool		is_init_complete(void) const;
+
+      /** Returns #TRUE# is the initialization thread finished successfully.
+
+	  See \Ref{is_init_complete}() and \Ref{wait_for_complete_init}()
+	  for more details. */
+   bool		is_init_ok(void) const;
+      /** Forces compression with the next save_as function. */
+   void		set_needs_compression(void);
+      /** Returns #TRUE# if there are uncompressed pages in this document. */
+   bool		needs_compression(void) const;
+      /** Returns #TRUE# if this file must be renamed before saving. */
+   bool		needs_rename(void) const;
+      /** Returns #TRUE# if this file must be renamed before saving. */
+   bool		can_compress(void) const;
+
+      /** Returns #TRUE# is the initialization thread failed.
+
+	  See \Ref{is_init_complete}() and \Ref{wait_for_complete_init}()
+	  for more details. */
+   bool		is_init_failed(void) const;
+
+      /** If the document has already learnt its type, the function will
+	  returns it: #DjVuDocument::OLD_BUNDLED# or
+	  #DjVuDocument::OLD_INDEXED# or #DjVuDocument::SINGLE_PAGE# or
+	  #DjVuDocument:BUNDLED# or #DjVuDocument::INDIRECT#. The first
+	  two formats are obsolete. Otherwise (if the type is unknown yet),
+	  #UNKNOWN_TYPE# will be returned.
+
+	  {\bf Note:} To check the stage of the document initialization
+	  use \Ref{get_flags}() or \Ref{is_init_complete}() functions. To
+	  wait for the initialization to complete use \Ref{wait_for_complete_init}().
+	  For single threaded applications the initialization completes
+	  before the \Ref{init}() function returns. */
+   int		get_doc_type(void) const;
+
+      /** Returns the document flags. The flags describe the degree in which
+	  the #DjVuDocument# object is initialized. Every time the flags
+	  are changed, a #notify_doc_flags_changed()# notification is
+	  distributed using the \Ref{DjVuPortcaster} communication
+	  mechanism.
+
+	  {\bf Note:} To wait for the initialization to complete use
+	  \Ref{wait_for_complete_init}(). For single threaded applications
+	  the initialization completes before the \Ref{init}() function
+	  returns. */
+   long		get_doc_flags(void) const;
+
+      /** Returns #TRUE# if the document is in bundled format (either in
+	  #DjVuDocument::OLD_BUNDLED# or #DjVuDocument::BUNDLED# formats). */
+   bool		is_bundled(void) const;
+
+      /// Returns the URL passed to the \Ref{init}() function
+   GURL		get_init_url(void) const;
+
+      /// Returns a listing of id's used by this document.
+   GList<GUTF8String> get_id_list(void);
+
+      /// Fill the id's into a GMap.
+   void map_ids( GMap<GUTF8String,void *> &map);
+
+      /** Returns data corresponding to the URL passed to the \Ref{init}()
+	  function.
+
+	  {\bf Note:} The pointer returned is guaranteed to be non-#ZERO#
+	  only after the #DjVuDocument# learns its type (passes through
+	  the first stage of initialization process). Please refer to
+	  \Ref{init}() for details. */
+   GP<DataPool>	get_init_data_pool(void) const;
+
+      /** @name Accessing pages */
+      //@{
+      /** Returns the number of pages in the document. If there is still
+	  insufficient information about the document structure (initialization
+	  has not finished yet), #1# will be returned. Please refer to
+          \Ref{init}() for details. */
+   int		get_pages_num(void) const;
+
+      /** Translates the page number to the full URL of the page. This URL
+	  is "artificial" for the {\em bundled} formats and is obtained
+	  by appending the page name to the document's URL honoring possible
+	  #;# and #?# in it. Negative page number has a special meaning for
+	  #OLD_INDEXED# documents: it points to the URL, which the
+	  #DjVuDocument# has been initialized with. For other formats this
+	  is the same as page #0#.
+
+	  The function tries it best to map the page number to the URL.
+	  Although, if the document structure has not been fully discovered
+	  yet, an empty URL will be returned. Use \Ref{wait_for_complete_init}()
+	  to wait until the document initialization completes. Refer to
+	  \Ref{init}() for details.
+
+	  Depending on the document format, the function assumes, that there
+	  is enough information to complete the request when:
+	  \begin{itemize}
+	     \item #OLD_INDEXED#: If #page_num<0#, #DOC_TYPE_KNOWN# flag must
+		   be set. Otherwise #DOC_NDIR_KNOWN# must be set.
+	     \item #OLD_BUNDLED#: If #page_num=0#, #DOC_DIR_KNOWN# flag must
+		   be set. Otherwise #DOC_NDIR_KNOWN# flag must be set.
+	     \item #INDIRECT# and #BUNDLED#: #DOC_DIR_KNOWN# flag must be set.
+	  \end{itemize} */
+   GURL		page_to_url(int page_num) const;
+   /// Tranlate the page number to id...
+   GUTF8String page_to_id(int page_num) const
+   { return url_to_id(page_to_url(page_num)); }
+      /** Translates the page URL back to page number. Returns #-1# if the
+	  page is not in the document or the document's structure
+          has not been learnt yet.
+
+	  Depending on the document format, the function starts working
+	  properly as soon as:
+	  \begin{itemize}
+	     \item #OLD_INDEXED# and #OLD_BUNDLED# and #SINGLE_PAGE#:
+	           #DOC_NDIR_KNOWN# is set
+	     \item #INDIRECT# and #BUNDLED#: #DOC_DIR_KNOWN# is set.
+	  \end{itemize} */
+   int		url_to_page(const GURL & url) const;
+   /// Map the specified url to it's id.
+   GUTF8String  url_to_id(const GURL &url) const
+   { return url.fname(); }
+
+      /** Translates the textual ID to the complete URL if possible.
+	  
+	  Depending on the document format the translation is done in the
+	  following way:
+	  \begin{itemize}
+	     \item For #BUNDLED# and #INDIRECT# documents the function
+		   scans the \Ref{DjVmDir} (the document directory) and
+		   matches the ID against:
+		   \begin{enumerate}
+		      \item File ID from the \Ref{DjVmDir}
+		      \item File name from the \Ref{DjVmDir}
+		      \item File title from the \Ref{DjVmDir}
+		   \end{enumerate}
+		   Then for #BUNDLED# document the URL is obtained by
+		   appending the #name# of the found file to the document's
+		   URL.
+
+		   For #INDIRECT# documents the URL is obtained by
+		   appending the #name# of the found file to the URL of
+		   the directory containing the document.
+	     \item For #OLD_BUNDLED# documents the function compares the ID
+		   with internal name of every file inside the bundle and
+		   composes an artificial URL by appending the file name to
+		   the document's URL.
+	     \item For #OLD_INDEXED# or #SINGLE_PAGE# documents the function
+		   composes the URL by appending the ID to the URL of the
+		   directory containing the document.
+	  \end{itemize}
+
+	  If information obtained by the initialization thread is not
+	  sufficient yet, the #id_to_url()# may return an empty URL.
+	  Depending on the document type, the information is sufficient when
+	  \begin{itemize}
+	     \item #BUNDLED# and #INDIRECT#: #DOC_DIR_KNOWN# flag is set.
+	     \item #OLD_BUNDLED# and #OLD_INDEXED# and #SINGLE_PAGE#:
+	           #DOC_TYPE_KNOWN# flag is set.
+	  \end{itemize} */
+   GURL		id_to_url(const GUTF8String &id) const;
+   /// Find out which page this id is...
+   int		id_to_page(const GUTF8String &id) const
+   {  return url_to_page(id_to_url(id)); }
+
+      /** Returns \Ref{GP} pointer to \Ref{DjVuImage} corresponding to page
+          #page_num#. If caching is enabled, and there is a {\em fully decoded}
+	  \Ref{DjVuFile} in the cache, the image will be reused and will
+	  be returned fully decoded. Otherwise, if multi-threaded behavior
+	  is allowed, and #sync# is set to #FALSE#, the decoding will be
+	  started in a separate thread, which enables to do progressive
+	  redisplay. Thus, in this case the image returned may be partially
+	  decoded.
+
+	  Negative #page_num# has a special meaning for the {\em old indexed}
+	  multipage documents: the #DjVuDocument# will start decoding of the
+	  URL with which it has been initialized. For other formats page
+	  #-1# is the same as page #0#.
+
+	  #DjVuDocument# can also connect the created page to the specified
+	  #port# {\em before starting decoding}. This option will allow
+	  the future owner of \Ref{DjVuImage} to receive all messages and
+	  requests generated during its decoding.
+
+	  If this function is called before the document's structure becomes
+	  known (the initialization process completes), the \Ref{DjVuFile},
+	  which the returned image will be attached to, will be assigned a
+	  temporary artificial URL, which will be corrected as soon as enough
+	  information becomes available. The trick prevents the main thread
+	  from blocking and in some cases helps to start decoding earlier.
+	  The URL is corrected and decoding will start as soon as
+	  #DjVuDocument# passes some given stages of initialization and
+	  \Ref{page_to_url}(), \Ref{id_to_url}() functions start working
+	  properly. Please look through their description for details.
+
+	  {\bf Note:} To wait for the initialization to complete use
+	  \Ref{wait_for_complete_init}(). For single threaded applications
+	  the initialization completes before the \Ref{init}() function
+	  returns.
+
+	  @param page_num Number of the page to be decoded
+	  @param sync When set to #TRUE# the function will not return
+	  	      until the page is completely decoded. Otherwise,
+		      in a multi-threaded program, this function will
+		      start decoding in a new thread and will return
+		      a partially decoded image. Refer to
+		      \Ref{DjVuImage::wait_for_complete_decode}() and
+		      \Ref{DjVuFile::is_decode_ok}().
+	  @param port A pointer to \Ref{DjVuPort}, that the created image
+	  	      will be connected to. */
+   GP<DjVuImage> get_page(int page_num, bool sync=true, DjVuPort * port=0) const;
+   GP<DjVuImage> get_page(int page_num, bool sync=true, DjVuPort * port=0)
+   { return const_cast<const DjVuDocument *>(this)->get_page(page_num,sync,port); }
+
+      /** Returns \Ref{GP} pointer to \Ref{DjVuImage} corresponding to the
+	  specified ID. This function behaves exactly as the #get_page()#
+	  function above. The only thing worth mentioning here is how the #ID#
+	  parameter is treated.
+
+	  First of all the function checks, if the ID contains a number.
+	  If so, it just calls the #get_page()# function above. If ID is
+	  #ZERO# or just empty, page number #-1# is assumed. Otherwise
+	  the ID is translated to the URL using \Ref{id_to_url}(). */
+   GP<DjVuImage> get_page(const GUTF8String &id, bool sync=true, DjVuPort * port=0);
+   
+      /** Returns \Ref{DjVuFile} corresponding to the specified page.
+	  Normally it translates the page number to the URL using
+	  \Ref{page_to_url}() and then creates \Ref{DjVuFile} initializing
+	  it with data from the URL.
+
+	  The behavior becomes different, though in the case when the
+	  document structure is unknown at the moment this function is called.
+	  In this situations it invents a temporary URL, creates a
+	  \Ref{DjVuFile}, initializes it with this URL and returns
+	  immediately. The caller may start decoding the file right away
+	  (if necessary). The decoding will block but will automatically
+	  continue as soon as enough information is collected about the
+	  document. This trick should be quite transparent to the user and
+	  helps to prevent the main thread from blocking. The decoding will
+	  unblock and this function will stop using this "trick" as soon
+	  as #DjVuDocument# passes some given stages of initialization and
+	  \Ref{page_to_url}(), \Ref{id_to_url}() functions start working
+	  properly.
+
+	  If #dont_create# is #FALSE# the function will return the file
+	  only if it already exists.
+
+	  {\bf Note:} To wait for the initialization to complete use
+	  \Ref{wait_for_complete_init}(). For single threaded applications
+	  the initialization completes before the \Ref{init}() function
+	  returns. */
+   GP<DjVuFile>	get_djvu_file(int page_num, bool dont_create=false) const;
+   GP<DjVuFile> get_djvu_file(int page_num, bool dont_create=false)
+   { return const_cast<const DjVuDocument *>(this)->get_djvu_file(page_num,dont_create); }
+
+
+      /** Returns \Ref{DjVuFile} corresponding to the specified ID.
+          This function behaves exactly as the #get_djvu_file()# function
+	  above. The only thing worth mentioning here is how the #ID#
+	  parameter is treated.
+
+          First off, \Ref{id_to_url}() is called.  If not successfull,
+	  the function checks, if the ID contains a number.
+	  If so, it just calls the #get_djvu_file()# function above. If ID is
+	  #ZERO# or just empty, page number #-1# is assumed.
+
+	  If #dont_create# is #FALSE# the function will return the file
+	  only if it already exists. */
+   GP<DjVuFile>	get_djvu_file(const GUTF8String &id, bool dont_create=false);
+   GP<DjVuFile>	get_djvu_file(const GURL &url, bool dont_create=false);
+      /** Returns a \Ref{DataPool} containing one chunk #TH44# with
+	  the encoded thumbnail for the specified page. The function
+	  first looks for thumbnails enclosed into the document and if
+	  it fails to find one, it decodes the required page and creates
+	  the thumbnail on the fly (unless #dont_decode# is true).
+
+	  {\bf Note:} It may happen that the returned \Ref{DataPool} will
+	  not contain all the data you need. In this case you will need
+	  to install a trigger into the \Ref{DataPool} to learn when the
+	  data actually arrives. */
+   virtual GP<DataPool> get_thumbnail(int page_num, bool dont_decode);
+      /* Will return gamma correction, which was used when creating
+	 thumbnail images. If you need other gamma correction, you will
+	 need to correct the thumbnails again. */
+   float	get_thumbnails_gamma(void) const;
+      //@}
+
+      /** Waits until the document initialization process finishes.
+	  It can finish either successfully or not. Use \Ref{is_init_ok}()
+	  and \Ref{is_init_failed}() to learn the result code.
+	  
+	  As described in \Ref{start_init}(), for multi-threaded applications the
+	  initialization is carried out in parallel with the main thread.
+	  This function blocks the calling thread until the initializing
+	  thread reads enough data, receives information about the document
+	  format and exits.  This function returns #true# if the
+	  initialization is successful. You can use \Ref{get_flags}() or
+	  \Ref{is_init_complete}() to check more precisely the degree of
+	  initialization. Use \Ref{stop_init}() to interrupt initialization. */
+   bool    	   wait_for_complete_init(void);
+
+          /** Wait until we known the number of pages and return. */
+   int wait_get_pages_num(void) const;
+   
+      /// Returns cache being used.
+   DjVuFileCache * get_cache(void) const;
+
+      /** @name Saving document to disk */
+      //@{
+      /** Returns pointer to the \Ref{DjVmDoc} class, which can save the
+	  document contents on the hard disk in one of the two new formats:
+	  {\em bundled} and {\em indirect}. You may also want to look
+	  at \Ref{write}() and \Ref{expand}() if you are interested in
+	  how to save the document.
+
+	  {\bf Plugin Warning}. This function will read contents of the whole
+	  document. Thus, if you call it from the main thread (the thread,
+	  which transfers data from Netscape), the plugin will block. */
+   GP<DjVmDoc>		get_djvm_doc(void);
+      /** Saves the document in the {\em new bundled} format. All the data
+	  is "bundled" into one file and this file is written into the
+	  passed stream.
+
+	  If #force_djvm# is #TRUE# then even one page documents will be
+	  saved in the #DJVM BUNDLED# format (inside a #FORM:DJVM#);
+
+	  {\bf Plugin Warning}. This function will read contents of the whole
+	  document. Thus, if you call it from the main thread (the thread,
+	  which transfers data from Netscape), the plugin will block. */
+   virtual void write(const GP<ByteStream> &str, bool force_djvm=false);
+     /** Always save as bundled, renaming any files conflicting with the
+         the names in the supplied GMap. */
+   virtual void write(const GP<ByteStream> &str,
+     const GMap<GUTF8String,void *> &reserved);
+      /** Saves the document in the {\em new indirect} format when every
+	  page and component are stored in separate files. This format
+	  is ideal for web publishing because it allows direct access to
+	  any page and component. In addition to it, a top-level file
+	  containing the list of all components will be created. To view
+	  the document later in the plugin or in the viewer one should
+	  load the top-level file.
+
+	  {\bf Plugin Warning}. This function will read contents of the whole
+	  document. Thus, if you call it from the main thread (the thread,
+	  which transfers data from Netscape), the plugin will block.
+	  
+	  @param codebase - Name of the directory which the document should
+	         be expanded into.
+	  @param idx_name - Name of the top-level file containing the document
+	         directory (basically, list of all files composing the document).
+      */
+   void			expand(const GURL &codebase, const GUTF8String &idx_name);
+      /** This function can be used instead of \Ref{write}() and \Ref{expand}().
+	  It allows to save the document either in the new #BUNDLED# format
+	  or in the new #INDIRECT# format depending on the value of parameter
+	  #bundled#.
+
+	  Depending on the document's type, the meaning of #where# is:
+	  \begin{itemize}
+	     \item For #BUNDLED# documents this is the name of the file
+	     \item For #INDIRECT# documents this is the name of top-level
+	           index file. All document files will be saved into the
+		   save directory where the index file will resize. */
+   virtual void		save_as(const GURL &where, bool bundled=0);
+      //@}
+      /** Returns pointer to the internal directory of the document, if it
+	  is in one of the new formats: #BUNDLED# or #INDIRECT#.
+	  Otherwise (if the format of the input document is obsolete),
+	  #ZERO# is returned.
+
+	  #ZERO# will also be returned if the initializing thread has not
+	  learnt enough information about the document (#DOC_DIR_KNOWN# has
+	  not been set yet). Check \Ref{is_init_complete}() and \Ref{init}()
+          for details. */
+   GP<DjVmDir>		get_djvm_dir(void) const;
+      /** Returns pointer to the document bookmarks.
+          This applies to #BUNDLED# and #INDIRECT# documents.
+
+	  #ZERO# will also be returned if the initializing thread has not
+	  learnt enough information about the document (#DOC_DIR_KNOWN# has
+	  not been set yet). Check \Ref{is_init_complete}() and \Ref{init}()
+          for details. */
+   GP<DjVmNav>		get_djvm_nav(void) const;
+      /** Returns pointer to the internal directory of the document, if it
+	  is in obsolete #OLD_BUNDLED# format.
+
+	  #ZERO# will also be returned if the initializing thread has not
+	  learnt enough information about the document (#DOC_DIR_KNOWN# has
+	  not been set yet). Check \Ref{is_init_complete}() and \Ref{init}()
+          for details. */
+   GP<DjVmDir0>		get_djvm_dir0(void) const;
+      /** Returns pointer to {\em navigation directory} of the document.
+	  The navigation directory is a DjVu file containing only one
+	  chunk #NDIR# inside a #FORM:DJVI# with the list of all
+	  document pages. */
+   GP<DjVuNavDir>	get_nav_dir(void) const;
+
+   /// Create a complete DjVuXML file.
+   void writeDjVuXML(const GP<ByteStream> &gstr_out,
+                     int flags, int page = -1) const;
+
+      /// Returns TRUE if #class_name# is #"DjVuDocument"# or #"DjVuPort"#
+   virtual bool		inherits(const GUTF8String &class_name) const;
+
+      /// Converts the specified id to a URL.
+   virtual GURL		id_to_url(const DjVuPort * source, const GUTF8String &id);
+   virtual GP<DjVuFile>	id_to_file(const DjVuPort * source, const GUTF8String &id);
+   virtual GP<DataPool>	request_data(const DjVuPort * source, const GURL & url);
+   virtual void		notify_file_flags_changed(const DjVuFile * source,
+ 			long set_mask, long clr_mask);
+
+   virtual GList<GURL>	get_url_names(void);
+   virtual void 	set_recover_errors(ErrorRecoveryAction=ABORT);
+   virtual void 	set_verbose_eof(bool=true);
+
+   static void set_compress_codec(
+     void (*codec)(GP<ByteStream> &, const GURL &where, bool bundled));
+
+   static void set_import_codec(
+     void (*codec)(GP<DataPool> &,const GURL &url,bool &, bool &));
+
+protected:
+   static void (*djvu_import_codec) (
+     GP<DataPool> &pool, const GURL &url,bool &needs_compression, bool &needs_rename );
+   static void (*djvu_compress_codec) (
+     GP<ByteStream> &bs, const GURL &where, bool bundled);
+   virtual GP<DjVuFile>	url_to_file(const GURL & url, bool dont_create=false) const;
+   GURL			init_url;
+   GP<DataPool>		init_data_pool;
+   GP<DjVmDir>		djvm_dir;	// New-style DjVm directory
+   GP<DjVmNav>          djvm_nav;
+   int	doc_type;
+   bool needs_compression_flag;
+   bool can_compress_flag;
+   bool needs_rename_flag;
+
+   
+
+   bool			has_url_names;
+   GCriticalSection	url_names_lock;
+   GList<GURL>	url_names;
+   ErrorRecoveryAction	recover_errors;
+   bool			verbose_eof;
+public:
+   class UnnamedFile; // This really should be protected ...
+   class ThumbReq; // This really should be protected ...
+protected:
+   bool                 init_started;
+   GSafeFlags		flags;
+   GSafeFlags		init_thread_flags;
+   DjVuFileCache	* cache;
+   GP<DjVuSimplePort>	simple_port;
+
+   GP<DjVmDir0>		djvm_dir0;	// Old-style DjVm directory
+   GP<DjVuNavDir>	ndir;		// Old-style navigation directory
+   GUTF8String		first_page_name;// For OLD_BUNDLED docs only
+
+      // The following is used in init() and destructor to query NDIR
+      // DO NOT USE FOR ANYTHING ELSE. THE FILE IS ZEROED IMMEDIATELY
+      // AFTER IT'S NO LONGER NEEDED. If you don't zero it, ~DjVuDocument()
+      // will kill it, which is a BAD thing if the file's already in cache.
+   GP<DjVuFile>		ndir_file;
+   
+   GPList<UnnamedFile>	ufiles_list;
+   GCriticalSection	ufiles_lock;
+
+   GPList<ThumbReq>	threqs_list;
+   GCriticalSection	threqs_lock;
+
+   GP<DjVuDocument>	init_life_saver;
+
+   static const float	thumb_gamma;
+
+      // Reads document contents in another thread trying to determine
+      // its type and structure
+   GThread		init_thr;
+   static void		static_init_thread(void *);
+   void			init_thread(void);
+
+   void                 check() const;
+
+   void			process_threqs(void);
+   GP<ThumbReq>		add_thumb_req(const GP<ThumbReq> & thumb_req);
+      
+   void			add_to_cache(const GP<DjVuFile> & f);
+   void			check_unnamed_files(void);
+   GUTF8String		get_int_prefix(void) const;
+   void			set_file_aliases(const DjVuFile * file);
+   GURL			invent_url(const GUTF8String &name) const;
+};
+
+class DjVuDocument::UnnamedFile : public GPEnabled
+{
+public:
+   enum { ID, PAGE_NUM };
+   int		id_type;
+   GUTF8String		id;
+   int		page_num;
+   GURL		url;
+   GP<DjVuFile>	file;
+   GP<DataPool>	data_pool;
+protected:
+   UnnamedFile(int xid_type, const GUTF8String &xid, int xpage_num, const GURL & xurl,
+		  const GP<DjVuFile> & xfile) :
+      id_type(xid_type), id(xid), page_num(xpage_num), url(xurl), file(xfile) {}
+   friend class DjVuDocument;
+};
+
+class DjVuDocument::ThumbReq : public GPEnabled
+{
+public:
+   int		page_num;
+   GP<DataPool>	data_pool;
+
+	 // Either of the next two blocks should present
+   GP<DjVuFile>	image_file;
+
+   int		thumb_chunk;
+   GP<DjVuFile>	thumb_file;
+protected:
+   ThumbReq(int xpage_num, const GP<DataPool> & xdata_pool) :
+      page_num(xpage_num), data_pool(xdata_pool) {}
+   friend class DjVuDocument;
+};
+
+inline void
+DjVuDocument::init(const GURL &url, GP<DjVuPort> port, DjVuFileCache *cache)
+{
+  start_init(url,port,cache);
+  wait_for_complete_init();
+}
+
+inline GP<DjVuDocument>
+DjVuDocument::create(
+  const GURL &url, GP<DjVuPort> xport, DjVuFileCache * const xcache)
+{
+  DjVuDocument *doc=new DjVuDocument;
+  GP<DjVuDocument> retval=doc;
+  doc->start_init(url,xport,xcache);
+  return retval;
+}
+
+inline bool
+DjVuDocument::is_init_complete(void) const
+{
+   return (flags & (DOC_INIT_OK | DOC_INIT_FAILED))!=0;
+}
+
+inline bool
+DjVuDocument::is_init_ok(void) const
+{
+   return (flags & DOC_INIT_OK)!=0;
+}
+
+inline void
+DjVuDocument::set_needs_compression(void)
+{
+   needs_compression_flag=true;
+}
+
+inline bool
+DjVuDocument::needs_compression(void) const
+{
+   return needs_compression_flag;
+}
+
+inline bool
+DjVuDocument::needs_rename(void) const
+{
+   return needs_rename_flag;
+}
+
+inline bool
+DjVuDocument::can_compress(void) const
+{
+   return can_compress_flag;
+}
+
+inline bool
+DjVuDocument::is_init_failed(void) const
+{
+   return (flags & DOC_INIT_FAILED)!=0;
+}
+
+inline int
+DjVuDocument::get_doc_type(void) const { return doc_type; }
+
+inline long
+DjVuDocument::get_doc_flags(void) const { return flags; }
+
+inline bool
+DjVuDocument::is_bundled(void) const
+{
+   return doc_type==BUNDLED || doc_type==OLD_BUNDLED;
+}
+
+inline GURL
+DjVuDocument::get_init_url(void) const { return init_url; }
+
+inline GP<DataPool>
+DjVuDocument::get_init_data_pool(void) const { return init_data_pool; }
+
+inline bool
+DjVuDocument::inherits(const GUTF8String &class_name) const
+{
+   return
+      (GUTF8String("DjVuDocument") == class_name) ||
+      DjVuPort::inherits(class_name);
+//      !strcmp("DjVuDocument", class_name) ||
+//      DjVuPort::inherits(class_name);
+}
+
+inline float
+DjVuDocument::get_thumbnails_gamma(void) const
+{
+   return thumb_gamma;
+}
+
+inline DjVuFileCache *
+DjVuDocument::get_cache(void) const
+{
+   return cache;
+}
+
+inline GP<DjVmDir>
+DjVuDocument::get_djvm_dir(void) const
+{
+   if (doc_type==SINGLE_PAGE)
+      G_THROW( ERR_MSG("DjVuDocument.no_dir") );
+   if (doc_type!=BUNDLED && doc_type!=INDIRECT)
+      G_THROW( ERR_MSG("DjVuDocument.obsolete") );
+   return djvm_dir;
+}
+
+inline GP<DjVmNav>
+DjVuDocument::get_djvm_nav(void) const
+{
+  if (doc_type==BUNDLED || doc_type==INDIRECT)
+    return djvm_nav;
+  return 0;
+}
+
+inline GP<DjVmDir0>
+DjVuDocument::get_djvm_dir0(void) const
+{
+   if (doc_type!=OLD_BUNDLED)
+      G_THROW( ERR_MSG("DjVuDocument.old_bundle") );
+   return djvm_dir0;
+}
+
+inline GP<DjVuNavDir>
+DjVuDocument::get_nav_dir(void) const
+{
+   return ndir;
+}
+
+inline void
+DjVuDocument::set_recover_errors(ErrorRecoveryAction recover)
+{
+  recover_errors=recover;
+}
+
+inline void
+DjVuDocument::set_verbose_eof(bool verbose)
+{
+  verbose_eof=verbose;
+}
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuDumpHelper.cpp b/libdjvu/DjVuDumpHelper.cpp
new file mode 100644
index 0000000..ef69bb6
--- /dev/null
+++ b/libdjvu/DjVuDumpHelper.cpp
@@ -0,0 +1,371 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuDumpHelper.h"
+#include "DataPool.h"
+#include "DjVmDir.h"
+#include "DjVuInfo.h"
+#include "IFFByteStream.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+#ifdef putchar
+#undef putchar
+#endif
+
+struct DjVmInfo
+{
+  GP<DjVmDir> dir;
+  GPMap<int,DjVmDir::File> map;
+};
+
+inline static void
+putchar(ByteStream & str, char ch)
+{
+   str.write(&ch, 1);
+}
+
+// ---------- ROUTINES FOR SUMMARIZING CHUNK DATA
+
+static void
+display_djvu_info(ByteStream & out_str, IFFByteStream &iff,
+		  GUTF8String, size_t size, DjVmInfo&, int)
+{
+  GP<DjVuInfo> ginfo=DjVuInfo::create();
+  DjVuInfo &info=*ginfo;
+  info.decode(*iff.get_bytestream());
+  if (size >= 4)
+    out_str.format( "DjVu %dx%d", info.width, info.height);
+  if (size >= 5)
+    out_str.format( ", v%d", info.version);
+  if (size >= 8)
+    out_str.format( ", %d dpi", info.dpi);
+  if (size >= 9)
+    out_str.format( ", gamma=%3.1f", info.gamma);
+}
+
+static void
+display_djbz(ByteStream & out_str, IFFByteStream &iff,
+	     GUTF8String, size_t, DjVmInfo&, int)
+{
+  out_str.format( "JB2 shared dictionary");
+}
+
+static void
+display_fgbz(ByteStream & out_str, IFFByteStream &iff,
+	     GUTF8String, size_t, DjVmInfo&, int)
+{
+  GP<ByteStream> gbs = iff.get_bytestream();
+  int version = gbs->read8();
+  int size = gbs->read16();
+  out_str.format( "JB2 colors data, v%d, %d colors", 
+                  version & 0x7f, size);
+}
+
+static void
+display_sjbz(ByteStream & out_str, IFFByteStream &iff,
+	     GUTF8String, size_t, DjVmInfo&, int)
+{
+  out_str.format( "JB2 bilevel data");
+}
+
+static void
+display_smmr(ByteStream & out_str, IFFByteStream &iff,
+	     GUTF8String, size_t, DjVmInfo&, int)
+{
+  out_str.format( "G4/MMR stencil data");
+}
+
+static void
+display_iw4(ByteStream & out_str, IFFByteStream &iff,
+	    GUTF8String, size_t, DjVmInfo&, int)
+{
+  GP<ByteStream> gbs = iff.get_bytestream();
+  unsigned char serial = gbs->read8();
+  unsigned char slices = gbs->read8();
+  out_str.format( "IW4 data #%d, %d slices", serial+1, slices);
+  if (serial == 0)
+    {
+      unsigned char major = gbs->read8();
+      unsigned char minor = gbs->read8();
+      unsigned char xhi = gbs->read8();
+      unsigned char xlo = gbs->read8();
+      unsigned char yhi = gbs->read8();
+      unsigned char ylo = gbs->read8();
+      out_str.format( ", v%d.%d (%s), %dx%d", major & 0x7f, minor,
+                      (major & 0x80 ? "b&w" : "color"), 
+                      (xhi<<8)+xlo, (yhi<<8)+ylo );
+    }
+}
+
+static void
+display_djvm_dirm(ByteStream & out_str, IFFByteStream & iff,
+		  GUTF8String head, size_t, DjVmInfo& djvminfo, int)
+{
+  GP<DjVmDir> dir = DjVmDir::create();
+  dir->decode(iff.get_bytestream());
+  GPList<DjVmDir::File> list = dir->get_files_list();
+  if (dir->is_indirect())
+  {
+    out_str.format( "Document directory (indirect, %d files %d pages)", 
+	                  dir->get_files_num(), dir->get_pages_num());
+    for (GPosition p=list; p; ++p)
+      out_str.format( "\n%s%s -> %s", (const char*)head, 
+                      (const char*)list[p]->get_load_name(), (const char*)list[p]->get_save_name() );
+  }
+  else
+  {
+    out_str.format( "Document directory (bundled, %d files %d pages)", 
+	                  dir->get_files_num(), dir->get_pages_num());
+    djvminfo.dir = dir;
+    djvminfo.map.empty();
+    for (GPosition p=list; p; ++p)
+      djvminfo.map[list[p]->offset] = list[p];
+  }
+}
+
+static void
+display_th44(ByteStream & out_str, IFFByteStream & iff,
+	     GUTF8String, size_t, DjVmInfo & djvminfo, int counter)
+{
+   int start_page=-1;
+   if (djvminfo.dir)
+   {
+      GPList<DjVmDir::File> files_list=djvminfo.dir->get_files_list();
+      for(GPosition pos=files_list;pos;++pos)
+      {
+	 GP<DjVmDir::File> frec=files_list[pos];
+	 if (iff.tell()>=frec->offset &&
+	     iff.tell()<frec->offset+frec->size)
+	 {
+	    while(pos && !files_list[pos]->is_page())
+	       ++pos;
+	    if (pos)
+	       start_page=files_list[pos]->get_page_num();
+	    break;
+	 }
+      }
+   }
+   if (start_page>=0)
+      out_str.format( "Thumbnail icon for page %d", start_page+counter+1);
+   else
+      out_str.format( "Thumbnail icon");
+}
+
+static void
+display_incl(ByteStream & out_str, IFFByteStream & iff,
+	     GUTF8String, size_t, DjVmInfo&, int)
+{
+   GUTF8String name;
+   char ch;
+   while(iff.read(&ch, 1) && ch!='\n')
+     name += ch;
+   out_str.format( "Indirection chunk --> {%s}", (const char *) name);
+}
+
+static void
+display_anno(ByteStream & out_str, IFFByteStream &iff,
+	     GUTF8String, size_t, DjVmInfo&, int)
+{
+   out_str.format( "Page annotation");
+   GUTF8String id;
+   iff.short_id(id);
+   out_str.format( " (hyperlinks, etc.)");
+}
+
+static void
+display_text(ByteStream & out_str, IFFByteStream &iff,
+	     GUTF8String, size_t, DjVmInfo&, int)
+{
+   out_str.format( "Hidden text");
+   GUTF8String id;
+   iff.short_id(id);
+   out_str.format( " (text, etc.)");
+}
+
+struct displaysubr
+{
+  const char *id;
+  void (*subr)(ByteStream &, IFFByteStream &, GUTF8String,
+	       size_t, DjVmInfo&, int counter);
+};
+ 
+static displaysubr disproutines[] = 
+{
+  { "DJVU.INFO", display_djvu_info },
+  { "DJVU.Smmr", display_smmr },
+  { "DJVU.Sjbz", display_sjbz },
+  { "DJVU.Djbz", display_djbz },
+  { "DJVU.FG44", display_iw4 },
+  { "DJVU.BG44", display_iw4 },
+  { "DJVU.FGbz", display_fgbz },
+  { "DJVI.Sjbz", display_sjbz },
+  { "DJVI.Djbz", display_djbz },
+  { "DJVI.FGbz", display_fgbz },
+  { "DJVI.FG44", display_iw4 },
+  { "DJVI.BG44", display_iw4 },
+  { "BM44.BM44", display_iw4 },
+  { "PM44.PM44", display_iw4 },
+  { "DJVM.DIRM", display_djvm_dirm },
+  { "THUM.TH44", display_th44 },
+  { "INCL", display_incl },
+  { "ANTa", display_anno },
+  { "ANTz", display_anno },
+  { "TXTa", display_text },
+  { "TXTz", display_text },
+  { 0, 0 },
+};
+
+// ---------- ROUTINES FOR DISPLAYING CHUNK STRUCTURE
+
+static void
+display_chunks(ByteStream & out_str, IFFByteStream &iff,
+	       const GUTF8String &head, DjVmInfo djvminfo)
+{
+  size_t size;
+  GUTF8String id, fullid;
+  GUTF8String head2 = head + "  ";
+  GPMap<int,DjVmDir::File> djvmmap;
+  int rawoffset;
+  GMap<GUTF8String, int> counters;
+  
+  while ((size = iff.get_chunk(id, &rawoffset)))
+  {
+    if (!counters.contains(id)) counters[id]=0;
+    else counters[id]++;
+    
+    GUTF8String msg;
+    msg.format("%s%s [%d] ", (const char *)head, (const char *)id, size);
+    out_str.format( "%s", (const char *)msg);
+    // Display DJVM is when adequate
+    if (djvminfo.dir)
+    {
+      GP<DjVmDir::File> rec = djvminfo.map[rawoffset];
+      if (rec)
+        {
+          GUTF8String id = rec->get_load_name();
+          GUTF8String title = rec->get_title();
+          out_str.format( "{%s}", (const char*) id);
+          if (rec->is_include())
+            out_str.format(" [I]");
+          if (rec->is_thumbnails())
+            out_str.format(" [T]");
+          if (rec->is_shared_anno())
+            out_str.format(" [S]");
+          if (rec->is_page())
+            out_str.format(" [P%d]", rec->get_page_num()+1);
+          if (id != title)
+            out_str.format(" (%s)", (const char*)title);
+        }
+    }
+    // Test chunk type
+    iff.full_id(fullid);
+    for (int i=0; disproutines[i].id; i++)
+      if (fullid == disproutines[i].id || id == disproutines[i].id)
+      {
+        int n = msg.length();
+        while (n++ < 14+(int) head.length()) putchar(out_str, ' ');
+        if (!iff.composite()) out_str.format( "    ");
+        (*disproutines[i].subr)(out_str, iff, head2,
+                                size, djvminfo, counters[id]);
+        break;
+      }
+      // Default display of composite chunk
+      out_str.format( "\n");
+      if (iff.composite())
+        display_chunks(out_str, iff, head2, djvminfo);
+      // Terminate
+      iff.close_chunk();
+  }
+}
+
+GP<ByteStream>
+DjVuDumpHelper::dump(const GP<DataPool> & pool)
+{
+   return dump(pool->get_stream());
+}
+
+GP<ByteStream>
+DjVuDumpHelper::dump(GP<ByteStream> gstr)
+{
+   GP<ByteStream> out_str=ByteStream::create();
+   GUTF8String head="  ";
+   GP<IFFByteStream> iff=IFFByteStream::create(gstr);
+   DjVmInfo djvminfo;
+   display_chunks(*out_str, *iff, head, djvminfo);
+   return out_str;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuDumpHelper.h b/libdjvu/DjVuDumpHelper.h
new file mode 100644
index 0000000..51cb638
--- /dev/null
+++ b/libdjvu/DjVuDumpHelper.h
@@ -0,0 +1,124 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUDUMPHELPER_H
+#define _DJVUDUMPHELPER_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name DjVuDupmHelper.h
+    This file contains code capable of generating information on
+    DjVu documents without actually decoding them. The code has
+    been extracted from a command line utility \Ref{djvudump.cpp}
+    for use in the DjVu plugin.
+    @memo
+    DjVu Dump Helper.
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- as a separate program.\\
+    Andrei Erofeev <eaf@geocities.com> -- as a class.
+*/
+//@{
+
+
+
+#include "GSmartPointer.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class DataPool;
+class ByteStream;
+
+/** DjVuDumpHelper.
+    This class can dump information on any DjVu file without decoding it.
+    Based upon old \Ref{djvudump.cpp} code.
+ */
+
+class DJVUAPI DjVuDumpHelper
+{
+public:
+      /// Default constructor
+   DjVuDumpHelper(void) {}
+      /// Destructor
+   ~DjVuDumpHelper(void) {}
+      /** Interprets the file passed in the \Ref{DataPool}, and returns
+	  the results in \Ref{ByteStream}. */
+   GP<ByteStream>	dump(const GP<DataPool> & pool);
+      /** Interprets the file passed in the \Ref{ByteStream}, and returns
+	  the results in \Ref{ByteStream}. */
+   GP<ByteStream>	dump(GP<ByteStream> str);
+};
+
+
+//@}
+
+// ----- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuErrorList.cpp b/libdjvu/DjVuErrorList.cpp
new file mode 100644
index 0000000..2b85034
--- /dev/null
+++ b/libdjvu/DjVuErrorList.cpp
@@ -0,0 +1,173 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuErrorList.h"
+#include "DjVmDoc.h"
+#include "GException.h"
+#include "GContainer.h"
+#include "GOS.h"
+#include "DataPool.h"
+#include <string.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+DjVuErrorList::DjVuErrorList() {}
+
+GURL
+DjVuErrorList::set_stream(GP<ByteStream> xibs)
+{
+  GUTF8String name;
+  static unsigned long serial=0;
+  pool=DataPool::create(xibs);
+  name.format("data://%08lx/%08lx.djvu",
+    ++serial,(unsigned long)(size_t)((const ByteStream *)xibs));
+  pool_url=GURL::UTF8(name);
+  return pool_url;
+}
+
+bool
+DjVuErrorList::notify_error(const DjVuPort * source, const GUTF8String & msg)
+{
+  Errors.append(msg);
+  return 1;
+}
+
+bool
+DjVuErrorList::notify_status(const DjVuPort * source, const GUTF8String &msg)
+{
+  Status.append(msg);
+  return 1;
+}  
+
+GUTF8String
+DjVuErrorList::GetError(void)
+{
+  GUTF8String PrevError;
+  GPosition pos;
+  if((pos=Errors))
+  {
+    PrevError=Errors[pos];
+    Errors.del(pos);
+  }
+  return PrevError;
+}
+
+GUTF8String
+DjVuErrorList::GetStatus(void)
+{
+  GUTF8String PrevStatus;
+  GPosition pos;
+  if((pos=Status))
+  {
+    PrevStatus=Status[pos];
+    Status.del(pos);
+  }
+  return PrevStatus;
+}
+
+GP<DataPool>
+DjVuErrorList::request_data(const DjVuPort * source, const GURL & url)
+{
+   GP<DataPool> retval;
+   G_TRY
+   {
+     if (pool && url.protocol().downcase() == "data")
+     {
+       if(url == pool_url)
+       {
+         retval=pool;
+       }else if(url.base() == pool_url)
+       {
+         GUTF8String name=url.fname();
+         GP<DjVmDoc> doc=DjVmDoc::create();
+         GP<ByteStream> bs=pool->get_stream();
+         doc->read(*bs);
+         retval=doc->get_data(name);
+       }
+     }else if (url.is_local_file_url())
+     {
+//       GUTF8String fname=GOS::url_to_filename(url);
+//       if (GOS::basename(fname)=="-") fname="-";
+       retval=DataPool::create(url);
+     }
+   }
+   G_CATCH_ALL
+   {
+     retval=0;
+   } G_ENDCATCH;
+   return retval;
+}
+ 
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuErrorList.h b/libdjvu/DjVuErrorList.h
new file mode 100644
index 0000000..ed7fdd5
--- /dev/null
+++ b/libdjvu/DjVuErrorList.h
@@ -0,0 +1,192 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUERRORLIST_H
+#define _DJVUERRORLIST_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "DjVuPort.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+
+/** @name DjVuErrorList.h
+    This file implements a very simple class for redirecting port caster
+    messages that would normally end up on stderr to a double linked list.
+
+    @memo DjVuErrorList class.
+    @author Bill C Riemers <docbill@sourceforge.net>
+*/
+
+//@{
+
+/** #DjVuErrorList# provides a convenient way to redirect error messages
+    from classes derived from DjVuPort to a list that can be accessed at
+    any time. */
+
+class DjVuErrorList : public DjVuSimplePort
+{
+protected:
+     /// The normal port caster constructor. 
+  DjVuErrorList(void);
+public:
+  static GP<DjVuErrorList> create(void) {return new DjVuErrorList();}
+
+     /// This constructor allows the user to specify the ByteStream.
+  GURL set_stream(GP<ByteStream>);
+
+     /// Append all error messages to the list
+  virtual bool notify_error(const DjVuPort * source, const GUTF8String & msg);
+
+     /// Append all status messages to the list
+  virtual bool notify_status(const DjVuPort * source, const GUTF8String & msg);
+
+     /// Add a new class to have its messages redirected here.
+  inline void connect( const DjVuPort &port);
+
+     /// Get the listing of errors, and clear the list.
+  inline GList<GUTF8String> GetErrorList(void);
+
+     /// Just clear the list.
+  inline void ClearError(void);
+
+     /// Get one error message and clear that message from the list.
+  GUTF8String GetError(void);
+
+     /// Check if there are anymore error messages.
+  inline bool HasError(void) const;
+
+     /// Get the listing of status messages, and clear the list.
+  inline GList<GUTF8String> GetStatusList(void);
+
+     /// Just clear the list.
+  inline void ClearStatus(void);
+
+     /// Get one status message and clear that message from the list.
+  GUTF8String GetStatus(void);
+
+     /// Check if there are any more status messages.
+  inline bool HasStatus(void) const;
+
+     /** This gets the data.  We can't use the simple port's request
+       data since we want to allow the user to specify the ByteStream. */
+  virtual GP<DataPool> request_data (
+    const DjVuPort * source, const GURL & url );
+
+private:
+  GURL pool_url;
+  GP<DataPool> pool;
+  GList<GUTF8String> Errors;
+  GList<GUTF8String> Status;
+private: //dummy stuff
+  static GURL set_stream(ByteStream *);
+};
+
+inline void
+DjVuErrorList::connect( const DjVuPort &port )
+{ get_portcaster()->add_route(&port, this); }
+
+inline GList<GUTF8String>
+DjVuErrorList::GetErrorList(void)
+{
+  GList<GUTF8String> retval=(const GList<GUTF8String>)Errors;
+  Errors.empty();
+  return retval;
+}
+
+inline void
+DjVuErrorList::ClearError(void)
+{ Errors.empty(); }
+
+inline GList<GUTF8String>
+DjVuErrorList::GetStatusList(void)
+{
+  GList<GUTF8String> retval=(const GList<GUTF8String>)Status;
+  Status.empty();
+  return retval;
+}
+
+inline void
+DjVuErrorList::ClearStatus(void)
+{ Status.empty(); }
+
+inline bool
+DjVuErrorList::HasError(void) const
+{ return !Errors.isempty(); }
+
+inline bool
+DjVuErrorList::HasStatus(void) const
+{ return !Status.isempty(); }
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuFile.cpp b/libdjvu/DjVuFile.cpp
new file mode 100644
index 0000000..d5be2e5
--- /dev/null
+++ b/libdjvu/DjVuFile.cpp
@@ -0,0 +1,2831 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuFile.h"
+#include "IFFByteStream.h"
+#include "GOS.h"
+#include "MMRDecoder.h"
+#ifdef NEED_JPEG_DECODER
+#include "JPEGDecoder.h"
+#endif
+#include "DjVuAnno.h"
+#include "DjVuText.h"
+#include "DataPool.h"
+#include "JB2Image.h"
+#include "IW44Image.h"
+#include "DjVuNavDir.h"
+#ifndef NEED_DECODER_ONLY
+#include "BSByteStream.h"
+#endif // NEED_DECODER_ONLY
+
+#include "debug.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+#define STRINGIFY(x) STRINGIFY_(x)
+#define STRINGIFY_(x) #x
+
+
+#define REPORT_EOF(x) \
+  {G_TRY{G_THROW( ByteStream::EndOfFile );}G_CATCH(ex){report_error(ex,(x));}G_ENDCATCH;}
+
+static GP<GPixmap> (*djvu_decode_codec)(ByteStream &bs)=0;
+
+class ProgressByteStream : public ByteStream
+{
+public:
+  ProgressByteStream(const GP<ByteStream> & xstr) : str(xstr),
+    last_call_pos(0) {}
+  virtual ~ProgressByteStream() {}
+
+  virtual size_t read(void *buffer, size_t size)
+  {
+    int rc=0;
+	   // G_TRY {} CATCH; block here is merely to avoid egcs internal error
+    G_TRY {
+      int cur_pos=str->tell();
+      if (progress_cb && (last_call_pos/256!=cur_pos/256))
+      {
+        progress_cb(cur_pos, progress_cl_data);
+        last_call_pos=cur_pos;
+      }
+      rc=str->read(buffer, size);
+    } G_CATCH_ALL {
+      G_RETHROW;
+    } G_ENDCATCH;
+    return rc;
+  }
+  virtual size_t write(const void *buffer, size_t size)
+  {
+    return str->write(buffer, size);
+  }
+  virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false)
+  {
+    return str->seek(offset, whence);
+  }
+  virtual long tell(void ) const { return str->tell(); }
+
+  void		set_progress_cb(void (* xprogress_cb)(int, void *),
+  void * xprogress_cl_data)
+  {
+    progress_cb=xprogress_cb;
+    progress_cl_data=xprogress_cl_data;
+  }
+private:
+  GP<ByteStream> str;
+  void		* progress_cl_data;
+  void		(* progress_cb)(int pos, void *);
+  int		last_call_pos;
+  
+  // Cancel C++ default stuff
+  ProgressByteStream & operator=(const ProgressByteStream &);
+};
+
+
+DjVuFile::DjVuFile()
+: file_size(0), recover_errors(ABORT), verbose_eof(false), chunks_number(-1),
+initialized(false)
+{
+}
+
+void
+DjVuFile::check() const
+{
+  if (!initialized)
+    G_THROW( ERR_MSG("DjVuFile.not_init") );
+}
+
+GP<DjVuFile>
+DjVuFile::create(
+  const GP<ByteStream> & str, const ErrorRecoveryAction recover_errors,
+  const bool verbose_eof )
+{
+  DjVuFile *file=new DjVuFile();
+  GP<DjVuFile> retval=file;
+  file->set_recover_errors(recover_errors);
+  file->set_verbose_eof(verbose_eof);
+  file->init(str);
+  return retval;
+}
+
+void 
+DjVuFile::init(const GP<ByteStream> & str)
+{
+  DEBUG_MSG("DjVuFile::DjVuFile(): ByteStream constructor\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  if (initialized)
+    G_THROW( ERR_MSG("DjVuFile.2nd_init") );
+  if (!get_count())
+    G_THROW( ERR_MSG("DjVuFile.not_secured") );
+  
+  file_size=0;
+  decode_thread=0;
+  
+  // Read the data from the stream
+  data_pool=DataPool::create(str);
+  
+  // Construct some dummy URL
+  GUTF8String buffer;
+  buffer.format("djvufile:/%p.djvu", this);
+  DEBUG_MSG("DjVuFile::DjVuFile(): url is "<<(const char *)buffer<<"\n");
+  url=GURL::UTF8(buffer);
+  
+  // Set it here because trigger will call other DjVuFile's functions
+  initialized=true;
+  
+  // Add (basically - call) the trigger
+  data_pool->add_trigger(-1, static_trigger_cb, this);
+}
+
+GP<DjVuFile>
+DjVuFile::create(
+  const GURL & xurl, GP<DjVuPort> port, 
+  const ErrorRecoveryAction recover_errors, const bool verbose_eof ) 
+{
+  DjVuFile *file=new DjVuFile();
+  GP<DjVuFile> retval=file;
+  file->set_recover_errors(recover_errors);
+  file->set_verbose_eof(verbose_eof);
+  file->init(xurl,port);
+  return retval;
+}
+
+void
+DjVuFile::init(const GURL & xurl, GP<DjVuPort> port) 
+{
+  DEBUG_MSG("DjVuFile::init(): url='" << xurl << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  if (initialized)
+    G_THROW( ERR_MSG("DjVuFile.2nd_init") );
+  if (!get_count())
+    G_THROW( ERR_MSG("DjVuFile.not_secured") );
+  if (xurl.is_empty())
+    G_THROW( ERR_MSG("DjVuFile.empty_URL") );
+  
+  url = xurl;
+  DEBUG_MSG("DjVuFile::DjVuFile(): url is "<<(const char *)url<<"\n");
+  file_size=0;
+  decode_thread=0;
+  
+  DjVuPortcaster * pcaster=get_portcaster();
+  
+  // We need it 'cause we're waiting for our own termination in stop_decode()
+  pcaster->add_route(this, this);
+  if (!port)
+    port = simple_port = new DjVuSimplePort();
+  pcaster->add_route(this, port);
+  
+  // Set it here because trigger will call other DjVuFile's functions
+  initialized=true;
+  
+  if (!(data_pool=DataPool::create(pcaster->request_data(this, url))))
+    G_THROW( ERR_MSG("DjVuFile.no_data") "\t"+url.get_string());
+  data_pool->add_trigger(-1, static_trigger_cb, this);
+}
+
+DjVuFile::~DjVuFile(void)
+{
+  DEBUG_MSG("DjVuFile::~DjVuFile(): destroying...\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  // No more messages. They may result in adding this file to a cache
+  // which will be very-very bad as we're being destroyed
+  get_portcaster()->del_port(this);
+  
+  // Unregister the trigger (we don't want it to be called and attempt
+  // to access the destroyed object)
+  if (data_pool)
+    data_pool->del_trigger(static_trigger_cb, this);
+  
+  // We don't have to wait for decoding to finish here. It's already
+  // finished (we know it because there is a "life saver" in the
+  // thread function)  -- but we need to delete it
+  delete decode_thread; decode_thread=0;
+}
+
+void
+DjVuFile::reset(void)
+{
+   flags.enter();
+   info = 0; 
+   anno = 0; 
+   text = 0; 
+   meta = 0; 
+   bg44 = 0; 
+   fgbc = 0;
+   fgjb = 0; 
+   fgjd = 0;
+   fgpm = 0;
+   dir  = 0; 
+   description = ""; 
+   mimetype = "";
+   flags=(flags&(ALL_DATA_PRESENT|DECODE_STOPPED|DECODE_FAILED));
+   flags.leave();
+}
+
+unsigned int
+DjVuFile::get_memory_usage(void) const
+{
+   unsigned int size=sizeof(*this);
+   if (info) size+=info->get_memory_usage();
+   if (bg44) size+=bg44->get_memory_usage();
+   if (fgjb) size+=fgjb->get_memory_usage();
+   if (fgpm) size+=fgpm->get_memory_usage();
+   if (fgbc) size+=fgbc->size()*sizeof(int);
+   if (anno) size+=anno->size();
+   if (meta) size+=meta->size();
+   if (dir) size+=dir->get_memory_usage();
+   return size;
+}
+
+GPList<DjVuFile>
+DjVuFile::get_included_files(bool only_created)
+{
+  check();
+  if (!only_created && !are_incl_files_created())
+    process_incl_chunks();
+  
+  GCriticalSectionLock lock(&inc_files_lock);
+  GPList<DjVuFile> list=inc_files_list;	// Get a copy when locked
+  return list;
+}
+
+void
+DjVuFile::wait_for_chunk(void)
+// Will return after a chunk has been decoded
+{
+  check();
+  DEBUG_MSG("DjVuFile::wait_for_chunk() called\n");
+  DEBUG_MAKE_INDENT(3);
+  chunk_mon.enter();
+  chunk_mon.wait();
+  chunk_mon.leave();
+}
+
+bool
+DjVuFile::wait_for_finish(bool self)
+// if self==TRUE, will block until decoding of this file is over
+// if self==FALSE, will block until decoding of a child (direct
+// or indirect) is over.
+// Will return FALSE if there is nothing to wait for. TRUE otherwise
+{
+  DEBUG_MSG("DjVuFile::wait_for_finish():  self=" << self <<"\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  check();
+  
+  if (self)
+  {
+    // It's best to check for self termination using flags. The reason
+    // is that finish_mon is updated in a DjVuPort function, which
+    // will not be called if the object is being destroyed
+    GMonitorLock lock(&flags);
+    if (is_decoding())
+    {
+      while(is_decoding()) flags.wait();
+      DEBUG_MSG("got it\n");
+      return 1;
+    }
+  } else
+  {
+    // By locking the monitor, we guarantee that situation doesn't change
+    // between the moments when we check for pending finish events
+    // and when we actually run wait(). If we don't lock, the last child
+    // may terminate in between, and we'll wait forever.
+    //
+    // Locking is required by GMonitor interface too, btw.
+    GMonitorLock lock(&finish_mon);
+    GP<DjVuFile> file;
+    {
+      GCriticalSectionLock lock(&inc_files_lock);
+      for(GPosition pos=inc_files_list;pos;++pos)
+      {
+        GP<DjVuFile> & f=inc_files_list[pos];
+        if (f->is_decoding())
+        {
+          file=f; break;
+        }
+      }
+    }
+    if (file)
+    {
+      finish_mon.wait();
+      DEBUG_MSG("got it\n");
+      return 1;
+    }
+  }
+  DEBUG_MSG("nothing to wait for\n");
+  return 0;
+}
+
+void
+DjVuFile::notify_chunk_done(const DjVuPort *, const GUTF8String &)
+{
+  check();
+  chunk_mon.enter();
+  chunk_mon.broadcast();
+  chunk_mon.leave();
+}
+
+void
+DjVuFile::notify_file_flags_changed(const DjVuFile * src,
+                                    long set_mask, long clr_mask)
+{
+  check();
+  if (set_mask & (DECODE_OK | DECODE_FAILED | DECODE_STOPPED))
+  {
+    // Signal threads waiting for file termination
+    finish_mon.enter();
+    finish_mon.broadcast();
+    finish_mon.leave();
+    
+    // In case a thread is still waiting for a chunk
+    chunk_mon.enter();
+    chunk_mon.broadcast();
+    chunk_mon.leave();
+  }
+  
+  if ((set_mask & ALL_DATA_PRESENT) && src!=this &&
+    are_incl_files_created() && is_data_present())
+  {
+    if (src!=this && are_incl_files_created() && is_data_present())
+    {
+      // Check if all children have data
+      bool all=true;
+      {
+        GCriticalSectionLock lock(&inc_files_lock);
+        for(GPosition pos=inc_files_list;pos;++pos)
+          if (!inc_files_list[pos]->is_all_data_present())
+          {
+            all=false;
+            break;
+          }
+      }
+      if (all)
+      {
+        DEBUG_MSG("Just got ALL data for '" << url << "'\n");
+        flags|=ALL_DATA_PRESENT;
+        get_portcaster()->notify_file_flags_changed(this, ALL_DATA_PRESENT, 0);
+      }
+    }
+  }
+}
+
+void
+DjVuFile::static_decode_func(void * cl_data)
+{
+  DjVuFile * th=(DjVuFile *) cl_data;
+  
+  /* Please do not undo this life saver. If you do then try to resolve the
+  following conflict first:
+  1. Decoding starts and there is only one external reference
+  to the DjVuFile.
+  2. Decoding proceeds and calls DjVuPortcaster::notify_error(),
+  which creates inside a temporary GP<DjVuFile>.
+  3. While notify_error() is running, the only external reference
+  is lost, but the DjVuFile is still alive (remember the
+  temporary GP<>?)
+  4. The notify_error() returns, the temporary GP<> gets destroyed
+  and the DjVuFile is attempting to destroy right in the middle
+  of the decoding thread. This is either a dead block (waiting
+  for the termination of the decoding from the ~DjVuFile() called
+  from the decoding thread) or coredump. */
+  GP<DjVuFile> life_saver=th;
+  th->decode_life_saver=0;
+  G_TRY {
+    th->decode_func();
+  } G_CATCH_ALL {
+  } G_ENDCATCH;
+}
+
+void
+DjVuFile::decode_func(void)
+{
+  check();
+  DEBUG_MSG("DjVuFile::decode_func() called, url='" << url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  DjVuPortcaster * pcaster=get_portcaster();
+  
+  G_TRY {
+    const GP<ByteStream> decode_stream(decode_data_pool->get_stream());
+    ProgressByteStream *pstr=new ProgressByteStream(decode_stream);
+    const GP<ByteStream> gpstr(pstr);
+    pstr->set_progress_cb(progress_cb, this);
+    
+    decode(gpstr);
+    
+    // Wait for all child files to finish
+    while(wait_for_finish(0))
+    	continue;
+    
+    DEBUG_MSG("waiting for children termination\n");
+    // Check for termination status
+    GCriticalSectionLock lock(&inc_files_lock);
+    for(GPosition pos=inc_files_list;pos;++pos)
+    {
+      GP<DjVuFile> & f=inc_files_list[pos];
+      if (f->is_decode_failed())
+	G_THROW( ERR_MSG("DjVuFile.decode_fail") );
+      if (f->is_decode_stopped())
+	G_THROW( DataPool::Stop );
+      if (!f->is_decode_ok())
+	{
+	  DEBUG_MSG("this_url='" << url << "'\n");
+	  DEBUG_MSG("incl_url='" << f->get_url() << "'\n");
+	  DEBUG_MSG("decoding=" << f->is_decoding() << "\n");
+	  DEBUG_MSG("status='" << f->get_flags() << "\n");
+	  G_THROW( ERR_MSG("DjVuFile.not_finished") );
+	}
+    }
+  } G_CATCH(exc) {
+    G_TRY {
+      if (!exc.cmp_cause(DataPool::Stop))
+	{
+	  flags.enter();
+	  flags = (flags & ~DECODING) | DECODE_STOPPED;
+	  flags.leave();
+	  pcaster->notify_status(this, GUTF8String(ERR_MSG("DjVuFile.stopped"))
+				 + GUTF8String("\t") + GUTF8String(url));
+	  pcaster->notify_file_flags_changed(this, DECODE_STOPPED, DECODING);
+	} else
+	{
+	  flags.enter();
+	  flags = (flags & ~DECODING) | DECODE_FAILED;
+	  flags.leave();
+	  pcaster->notify_status(this, GUTF8String(ERR_MSG("DjVuFile.failed"))
+				 + GUTF8String("\t") + GUTF8String(url));
+	  pcaster->notify_error(this, exc.get_cause());
+	  pcaster->notify_file_flags_changed(this, DECODE_FAILED, DECODING);
+	}
+    } G_CATCH_ALL
+	{
+	  DEBUG_MSG("******* Oops. Almost missed an exception\n");
+	} G_ENDCATCH;
+  } G_ENDCATCH;
+
+  decode_data_pool->clear_stream();
+  G_TRY {
+    if (flags.test_and_modify(DECODING, 0, DECODE_OK | INCL_FILES_CREATED, DECODING))
+      pcaster->notify_file_flags_changed(this, DECODE_OK | INCL_FILES_CREATED, 
+                                         DECODING);
+  } G_CATCH_ALL {} G_ENDCATCH;
+  DEBUG_MSG("decoding thread for url='" << url << "' ended\n");
+}
+
+GP<DjVuFile>
+DjVuFile::process_incl_chunk(ByteStream & str, int file_num)
+{
+  check();
+  DEBUG_MSG("DjVuFile::process_incl_chunk(): processing INCL chunk...\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  DjVuPortcaster * pcaster=get_portcaster();
+  
+  GUTF8String incl_str;
+  char buffer[1024];
+  int length;
+  while((length=str.read(buffer, 1024)))
+    incl_str+=GUTF8String(buffer, length);
+  
+  // Eat '\n' in the beginning and at the end
+  while(incl_str.length() && incl_str[0]=='\n')
+  {
+    incl_str=incl_str.substr(1,(unsigned int)(-1));
+  }
+  while(incl_str.length()>0 && incl_str[(int)incl_str.length()-1]=='\n')
+  {
+    incl_str.setat(incl_str.length()-1, 0);
+  }
+  
+  if (incl_str.length()>0)
+  {
+    if (strchr(incl_str, '/'))
+      G_THROW( ERR_MSG("DjVuFile.malformed") );
+    
+    DEBUG_MSG("incl_str='" << incl_str << "'\n");
+    
+    GURL incl_url=pcaster->id_to_url(this, incl_str);
+    if (incl_url.is_empty())	// Fallback. Should never be used.
+      incl_url=GURL::UTF8(incl_str,url.base());
+    
+    // Now see if there is already a file with this *name* created
+    {
+      GCriticalSectionLock lock(&inc_files_lock);
+      GPosition pos;
+      for(pos=inc_files_list;pos;++pos)
+      {
+        if (inc_files_list[pos]->url.fname()==incl_url.fname())
+           break;
+      }
+      if (pos)
+        return inc_files_list[pos];
+    }
+    
+    // No. We have to request a new file
+    GP<DjVuFile> file;
+    G_TRY
+    {
+      file=pcaster->id_to_file(this, incl_str);
+    }
+    G_CATCH(ex)
+    {
+      unlink_file(incl_str);
+      // In order to keep compatibility with the previous
+      // release of the DjVu plugin, we will not interrupt
+      // decoding here. We will just report the error.
+      // NOTE, that it's now the responsibility of the
+      // decoder to resolve all chunk dependencies, and
+      // abort decoding if necessary.
+      
+      get_portcaster()->notify_error(this,ex.get_cause());
+      return 0;
+    }
+    G_ENDCATCH;
+    if (!file)
+    {
+      G_THROW( ERR_MSG("DjVuFile.no_create") "\t"+incl_str);
+    }
+    if (recover_errors!=ABORT)
+      file->set_recover_errors(recover_errors);
+    if (verbose_eof)
+      file->set_verbose_eof(verbose_eof);
+    pcaster->add_route(file, this);
+    
+    // We may have been stopped. Make sure the child will be stopped too.
+    if (flags & STOPPED)
+      file->stop(false);
+    if (flags & BLOCKED_STOPPED)
+      file->stop(true);
+    
+    // Lock the list again and check if the file has already been
+    // added by someone else
+    {
+      GCriticalSectionLock lock(&inc_files_lock);
+      GPosition pos;
+      for(pos=inc_files_list;pos;++pos)
+      {
+        if (inc_files_list[pos]->url.fname()==incl_url.fname())
+          break;
+      }
+      if (pos)
+      {
+        file=inc_files_list[pos];
+      } else if (file_num<0 || !(pos=inc_files_list.nth(file_num)))
+      {
+        inc_files_list.append(file);
+      } else 
+      {
+        inc_files_list.insert_before(pos, file);
+      }
+    }
+    return file;
+  }
+  return 0;
+}
+
+
+void
+DjVuFile::report_error(const GException &ex,bool throw_errors)
+{
+  data_pool->clear_stream();
+  if((!verbose_eof)|| (ex.cmp_cause(ByteStream::EndOfFile)))
+    {
+      if(throw_errors)
+        G_RETHROW(ex);
+      else
+        get_portcaster()->notify_error(this,ex.get_cause());
+    }
+  else
+    {
+      GURL url=get_url();
+      GUTF8String url_str=url.get_string();
+      GUTF8String msg = GUTF8String( ERR_MSG("DjVuFile.EOF") "\t") + url;
+      if(throw_errors)
+        G_RETHROW(GException(msg,ex.get_file(),ex.get_line(),ex.get_function()));
+      else
+        get_portcaster()->notify_error(this,msg);
+    }
+}
+
+void
+DjVuFile::process_incl_chunks(void)
+// This function may block for data
+// NOTE: It may be called again when INCL_FILES_CREATED is set.
+// It happens in insert_file() when it has modified the data
+// and wants to create the actual file
+{
+  DEBUG_MSG("DjVuFile::process_incl_chunks(void)\n");
+  DEBUG_MAKE_INDENT(3);
+  check();
+  
+  int incl_cnt=0;
+  
+  const GP<ByteStream> str(data_pool->get_stream());
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(str));
+  IFFByteStream &iff=*giff;
+  if (iff.get_chunk(chkid))
+  {
+    int chunks=0;
+    int last_chunk=0;
+    G_TRY
+    {
+      int chunks_left=(recover_errors>SKIP_PAGES)?chunks_number:(-1);
+      int chksize;
+      for(;(chunks_left--)&&(chksize=iff.get_chunk(chkid));last_chunk=chunks)
+      {
+        chunks++;
+        if (chkid=="INCL")
+        {
+          G_TRY
+          {
+            process_incl_chunk(*iff.get_bytestream(), incl_cnt++);
+          }
+          G_CATCH(ex);
+          {
+            report_error(ex,(recover_errors <= SKIP_PAGES));
+          }
+          G_ENDCATCH;
+        }else if(chkid=="FAKE")
+        {
+          set_needs_compression(true);
+          set_can_compress(true);
+        }else if(chkid=="BGjp")
+        {
+          set_can_compress(true);
+        }else if(chkid=="Smmr")
+        {
+          set_can_compress(true);
+        }
+        iff.seek_close_chunk();
+      }
+      if (chunks_number < 0) chunks_number=last_chunk;
+    }
+    G_CATCH(ex)
+    {	
+      if (chunks_number < 0)
+        chunks_number=(recover_errors>SKIP_CHUNKS)?chunks:last_chunk;
+      report_error(ex,(recover_errors <= SKIP_PAGES));
+    }
+    G_ENDCATCH;
+  }
+  flags|=INCL_FILES_CREATED;
+  data_pool->clear_stream();
+}
+
+GP<JB2Dict>
+DjVuFile::static_get_fgjd(void *arg)
+{
+  DjVuFile *file = (DjVuFile*)arg;
+  return file->get_fgjd(1);
+}
+
+GP<JB2Dict>
+DjVuFile::get_fgjd(int block)
+{
+  check();
+  
+  // Simplest case
+  if (fgjd)
+    return fgjd;
+  // Check wether included files
+  chunk_mon.enter();
+  G_TRY {
+    for(;;)
+    {
+      int active = 0;
+      GPList<DjVuFile> incs = get_included_files();
+      for (GPosition pos=incs.firstpos(); pos; ++pos)
+      {
+        GP<DjVuFile> file = incs[pos];
+        if (file->is_decoding())
+          active = 1;
+        GP<JB2Dict> fgjd = file->get_fgjd();
+        if (fgjd)
+        {
+          chunk_mon.leave();
+          return fgjd;
+        }
+      }
+      // Exit if non-blocking mode
+      if (! block)
+        break;
+      // Exit if there is no decoding activity
+      if (! active)
+        break;
+      // Wait until a new chunk gets decoded
+      wait_for_chunk();
+    }
+  } G_CATCH_ALL {
+    chunk_mon.leave();
+    G_RETHROW;
+  } G_ENDCATCH;
+  chunk_mon.leave();
+  if (is_decode_stopped()) G_THROW( DataPool::Stop );
+  return 0;
+}
+
+int
+DjVuFile::get_dpi(int w, int h)
+{
+  int dpi=0, red=1;
+  if (info)
+  {
+    for(red=1; red<=12; red++)
+      if ((info->width+red-1)/red==w)
+        if ((info->height+red-1)/red==h)
+          break;
+    if (red>12)
+      G_THROW( ERR_MSG("DjVuFile.corrupt_BG44") );
+    dpi=info->dpi;
+  }
+  return (dpi ? dpi : 300)/red;
+}
+
+static inline bool
+is_info(const GUTF8String &chkid)
+{
+  return (chkid=="INFO");
+}
+
+static inline bool
+is_annotation(const GUTF8String &chkid)
+{
+  return (chkid=="ANTa" ||
+    chkid=="ANTz" ||
+    chkid=="FORM:ANNO" ); 
+}
+
+static inline bool
+is_text(const GUTF8String &chkid)
+{
+  return (chkid=="TXTa" || chkid=="TXTz");
+}
+
+static inline bool
+is_meta(const GUTF8String &chkid)
+{
+  return (chkid=="METa" || chkid=="METz");
+}
+
+
+GUTF8String
+DjVuFile::decode_chunk( const GUTF8String &id, const GP<ByteStream> &gbs,
+  bool djvi, bool djvu, bool iw44)
+{
+  DEBUG_MSG("DjVuFile::decode_chunk()\n");
+  ByteStream &bs=*gbs;
+  check();
+  
+  // If this object is referenced by only one GP<> pointer, this
+  // pointer should be the "life_saver" created by the decoding thread.
+  // If it is the only GP<> pointer, then nobody is interested in the
+  // results of the decoding and we can abort now with #DataPool::Stop#
+  if (get_count()==1)
+    G_THROW( DataPool::Stop );
+  
+  GUTF8String desc = ERR_MSG("DjVuFile.unrecog_chunk");
+  GUTF8String chkid = id;
+  DEBUG_MSG("DjVuFile::decode_chunk() : decoding " << id << "\n");
+  
+  // INFO  (information chunk for djvu page)
+  if (is_info(chkid) && (djvu || djvi))
+  {
+    if (info)
+      G_THROW( ERR_MSG("DjVuFile.corrupt_dupl") );
+    if (djvi)
+      G_THROW( ERR_MSG("DjVuFile.corrupt_INFO") );
+    // DjVuInfo::decode no longer throws version exceptions
+    GP<DjVuInfo> xinfo=DjVuInfo::create();
+    xinfo->decode(bs);
+    info = xinfo;
+    desc.format( ERR_MSG("DjVuFile.page_info") );
+    // Consistency checks (previously in DjVuInfo::decode)
+    if (info->width<0 || info->height<0)
+      G_THROW( ERR_MSG("DjVuFile.corrupt_zero") );
+    if (info->version >= DJVUVERSION_TOO_NEW)
+      G_THROW( ERR_MSG("DjVuFile.new_version") "\t" 
+               STRINGIFY(DJVUVERSION_TOO_NEW) );
+  }
+  
+  // INCL (inclusion chunk)
+  else if (chkid == "INCL" && (djvi || djvu || iw44))
+  {
+    GP<DjVuFile> file=process_incl_chunk(bs);
+    if (file)
+    {
+      int decode_was_already_started = 1;
+      {
+        GMonitorLock lock(&file->flags);
+          // Start decoding
+        if(file->resume_decode())
+        {
+          decode_was_already_started = 0;
+        }
+      }
+      // Send file notifications if previously started
+      if (decode_was_already_started)
+      {
+        // May send duplicate notifications...
+        if (file->is_decode_ok())
+          get_portcaster()->notify_file_flags_changed(file, DECODE_OK, 0);
+        else if (file->is_decode_failed())
+          get_portcaster()->notify_file_flags_changed(file, DECODE_FAILED, 0);
+      }
+      desc.format( ERR_MSG("DjVuFile.indir_chunk1") "\t" + file->get_url().fname() );
+    } else
+      desc.format( ERR_MSG("DjVuFile.indir_chunk2") );
+  }
+  
+  // Djbz (JB2 Dictionary)
+  else if (chkid == "Djbz" && (djvu || djvi))
+  {
+    if (this->fgjd)
+      G_THROW( ERR_MSG("DjVuFile.dupl_Dxxx") );
+    if (this->fgjd)
+      G_THROW( ERR_MSG("DjVuFile.Dxxx_after_Sxxx") );
+    GP<JB2Dict> fgjd = JB2Dict::create();
+    fgjd->decode(gbs);
+    this->fgjd = fgjd;
+    desc.format( ERR_MSG("DjVuFile.shape_dict") "\t%d", fgjd->get_shape_count() );
+  } 
+  
+  // Sjbz (JB2 encoded mask)
+  else if (chkid=="Sjbz" && (djvu || djvi))
+  {
+    if (this->fgjb)
+      G_THROW( ERR_MSG("DjVuFile.dupl_Sxxx") );
+    GP<JB2Image> fgjb=JB2Image::create();
+    // ---- begin hack
+    if (info && info->version <=18)
+      fgjb->reproduce_old_bug = true;
+    // ---- end hack
+    fgjb->decode(gbs, static_get_fgjd, (void*)this);
+    this->fgjb = fgjb;
+    desc.format( ERR_MSG("DjVuFile.fg_mask") "\t%d\t%d\t%d",
+      fgjb->get_width(), fgjb->get_height(),
+      get_dpi(fgjb->get_width(), fgjb->get_height()));
+  }
+  
+  // Smmr (MMR-G4 encoded mask)
+  else if (chkid=="Smmr" && (djvu || djvi))
+  {
+    if (this->fgjb)
+      G_THROW( ERR_MSG("DjVuFile.dupl_Sxxx") );
+    set_can_compress(true);
+    this->fgjb = MMRDecoder::decode(gbs);
+    desc.format( ERR_MSG("DjVuFile.G4_mask") "\t%d\t%d\t%d",
+      fgjb->get_width(), fgjb->get_height(),
+      get_dpi(fgjb->get_width(), fgjb->get_height()));
+  }
+  
+  // BG44 (background wavelets)
+  else if (chkid == "BG44" && (djvu || djvi))
+  {
+    if (!bg44)
+    {
+      if (bgpm)
+        G_THROW( ERR_MSG("DjVuFile.dupl_backgrnd") );
+      // First chunk
+      GP<IW44Image> bg44=IW44Image::create_decode(IW44Image::COLOR);
+      bg44->decode_chunk(gbs);
+      this->bg44 = bg44;
+      desc.format( ERR_MSG("DjVuFile.IW44_bg1") "\t%d\t%d\t%d",
+		      bg44->get_width(), bg44->get_height(),
+          get_dpi(bg44->get_width(), bg44->get_height()));
+    } 
+    else
+    {
+      // Refinement chunks
+      GP<IW44Image> bg44 = this->bg44;
+      bg44->decode_chunk(gbs);
+      desc.format( ERR_MSG("DjVuFile.IW44_bg2") "\t%d\t%d",
+		      bg44->get_serial(), get_dpi(bg44->get_width(), bg44->get_height()));
+    }
+  }
+  
+  // FG44 (foreground wavelets)
+  else if (chkid == "FG44" && (djvu || djvi))
+  {
+    if (fgpm || fgbc)
+      G_THROW( ERR_MSG("DjVuFile.dupl_foregrnd") );
+    GP<IW44Image> gfg44=IW44Image::create_decode(IW44Image::COLOR);
+    IW44Image &fg44=*gfg44;
+    fg44.decode_chunk(gbs);
+    fgpm=fg44.get_pixmap();
+    desc.format( ERR_MSG("DjVuFile.IW44_fg") "\t%d\t%d\t%d",
+      fg44.get_width(), fg44.get_height(),
+      get_dpi(fg44.get_width(), fg44.get_height()));
+  } 
+  
+  // LINK (background LINK)
+  else if (chkid == "LINK" && (djvu || djvi))
+  {
+    if (bg44 || bgpm)
+      G_THROW( ERR_MSG("DjVuFile.dupl_backgrnd") );
+    if(djvu_decode_codec)
+    {
+      set_modified(true);
+      set_can_compress(true);
+      set_needs_compression(true);
+      this->bgpm = djvu_decode_codec(bs);
+      desc.format( ERR_MSG("DjVuFile.color_import1") "\t%d\t%d\t%d",
+        bgpm->columns(), bgpm->rows(),
+        get_dpi(bgpm->columns(), bgpm->rows()));
+    }else
+    {
+      desc.format( ERR_MSG("DjVuFile.color_import2") );
+    }
+  } 
+  
+  // BGjp (background JPEG)
+  else if (chkid == "BGjp" && (djvu || djvi))
+  {
+    if (bg44 || bgpm)
+      G_THROW( ERR_MSG("DjVuFile.dupl_backgrnd") );
+    set_can_compress(true);
+#ifdef NEED_JPEG_DECODER
+    this->bgpm = JPEGDecoder::decode(bs);
+    desc.format( ERR_MSG("DjVuFile.JPEG_bg1") "\t%d\t%d\t%d",
+      bgpm->columns(), bgpm->rows(),
+      get_dpi(bgpm->columns(), bgpm->rows()));
+#else
+    desc.format( ERR_MSG("DjVuFile.JPEG_bg2") );
+#endif
+  } 
+  
+  // FGjp (foreground JPEG)
+  else if (chkid == "FGjp" && (djvu || djvi))
+  {
+    if (fgpm || fgbc)
+      G_THROW( ERR_MSG("DjVuFile.dupl_foregrnd") );
+#ifdef NEED_JPEG_DECODER
+    this->fgpm = JPEGDecoder::decode(bs);
+    desc.format( ERR_MSG("DjVuFile.JPEG_fg1") "\t%d\t%d\t%d",
+      fgpm->columns(), fgpm->rows(),
+      get_dpi(fgpm->columns(), fgpm->rows()));
+#else
+    desc.format( ERR_MSG("DjVuFile.JPEG_fg2") );
+#endif
+  } 
+  
+  // BG2k (background JPEG-2000) Note: JPEG2K bitstream not finalized.
+  else if (chkid == "BG2k" && (djvu || djvi))
+  {
+    if (bg44)
+      G_THROW( ERR_MSG("DjVuFile.dupl_backgrnd") );
+    desc.format( ERR_MSG("DjVuFile.JPEG2K_bg") );
+  } 
+  
+  // FG2k (foreground JPEG-2000) Note: JPEG2K bitstream not finalized.
+  else if (chkid == "FG2k" && (djvu || djvi))
+  {
+    if (fgpm || fgbc)
+      G_THROW( ERR_MSG("DjVuFile.dupl_foregrnd") );
+    desc.format( ERR_MSG("DjVuFile.JPEG2K_fg") );
+  } 
+  
+  // FGbz (foreground color vector)
+  else if (chkid == "FGbz" && (djvu || djvi))
+  {
+    if (fgpm || fgbc)
+      G_THROW( ERR_MSG("DjVuFile.dupl_foregrnd") );
+    GP<DjVuPalette> fgbc = DjVuPalette::create();
+    fgbc->decode(gbs);
+    this->fgbc = fgbc;
+    desc.format( ERR_MSG("DjVuFile.JB2_fg") "\t%d\t%d",
+      fgbc->size(), fgbc->colordata.size());
+  }
+  
+  // BM44/PM44 (IW44 data)
+  else if ((chkid == "PM44" || chkid=="BM44") && iw44)
+  {
+    if (!bg44)
+    {
+      // First chunk
+      GP<IW44Image> bg44 = IW44Image::create_decode(IW44Image::COLOR);
+      bg44->decode_chunk(gbs);
+      GP<DjVuInfo> info = DjVuInfo::create();
+      info->width = bg44->get_width();
+      info->height = bg44->get_height();
+      info->dpi = 100;
+      this->bg44 = bg44;
+      this->info = info;
+      desc.format( ERR_MSG("DjVuFile.IW44_data1") "\t%d\t%d\t%d",
+                   bg44->get_width(), bg44->get_height(),
+                   get_dpi(bg44->get_width(), bg44->get_height()));
+    } 
+    else
+    {
+      // Refinement chunks
+      GP<IW44Image> bg44 = this->bg44;
+      bg44->decode_chunk(gbs);
+      desc.format( ERR_MSG("DjVuFile.IW44_data2") "\t%d\t%d",
+                   bg44->get_serial(),
+                   get_dpi(bg44->get_width(), bg44->get_height()));
+    }
+  }
+  
+  // NDIR (obsolete navigation chunk)
+  else if (chkid == "NDIR")
+  {
+    GP<DjVuNavDir> dir=DjVuNavDir::create(url);
+    dir->decode(bs);
+    this->dir=dir;
+    desc.format( ERR_MSG("DjVuFile.nav_dir") );
+  }
+  
+  // FORM:ANNO (obsolete) (must be before other annotations)
+  else if (chkid == "FORM:ANNO") 
+    {
+      const GP<ByteStream> gachunk(ByteStream::create());
+      ByteStream &achunk=*gachunk;
+      achunk.copy(bs);
+      achunk.seek(0);
+      GCriticalSectionLock lock(&anno_lock);
+      if (! anno)
+      {
+        anno=ByteStream::create();
+      }
+      anno->seek(0,SEEK_END);
+      if (anno->tell())
+      {
+        anno->write((void*)"", 1);
+      }
+      // Copy data
+      anno->copy(achunk);
+      desc.format( ERR_MSG("DjVuFile.anno1") );
+    }
+  
+  // ANTa/ANTx/TXTa/TXTz annotations
+  else if (is_annotation(chkid))  // but not FORM:ANNO
+    {
+      const GP<ByteStream> gachunk(ByteStream::create());
+      ByteStream &achunk=*gachunk;
+      achunk.copy(bs);
+      achunk.seek(0);
+      GCriticalSectionLock lock(&anno_lock);
+      if (! anno)
+      {
+        anno = ByteStream::create();
+      }
+      anno->seek(0,SEEK_END);
+      if (anno->tell() & 1)
+      {
+        anno->write((const void*)"", 1);
+      }
+      // Recreate chunk header
+      const GP<IFFByteStream> giffout(IFFByteStream::create(anno));
+      IFFByteStream &iffout=*giffout;
+      iffout.put_chunk(id);
+      iffout.copy(achunk);
+      iffout.close_chunk();
+      desc.format( ERR_MSG("DjVuFile.anno2") );
+    }
+  else if (is_text(chkid))
+    {
+      const GP<ByteStream> gachunk(ByteStream::create());
+      ByteStream &achunk=*gachunk;
+      achunk.copy(bs);
+      achunk.seek(0);
+      GCriticalSectionLock lock(&text_lock);
+      if (! text)
+      {
+        text = ByteStream::create();
+      }
+      text->seek(0,SEEK_END);
+      if (text->tell())
+      {
+        text->write((const void*)"", 1);
+      }
+      // Recreate chunk header
+      const GP<IFFByteStream> giffout(IFFByteStream::create(text));
+      IFFByteStream &iffout=*giffout;
+      iffout.put_chunk(id);
+      iffout.copy(achunk);
+      iffout.close_chunk();
+      desc.format( ERR_MSG("DjVuFile.text") );
+    }
+  else if (is_meta(chkid))
+    {
+      const GP<ByteStream> gachunk(ByteStream::create());
+      ByteStream &achunk=*gachunk;
+      achunk.copy(bs);
+      achunk.seek(0);
+      GCriticalSectionLock lock(&meta_lock);
+      if (! meta)
+      {
+        meta = ByteStream::create();
+      }
+      meta->seek(0,SEEK_END);
+      if (meta->tell())
+      {
+        meta->write((const void*)"", 1);
+      }
+      // Recreate chunk header
+      const GP<IFFByteStream> giffout(IFFByteStream::create(meta));
+      IFFByteStream &iffout=*giffout;
+      iffout.put_chunk(id);
+      iffout.copy(achunk);
+      iffout.close_chunk();
+    }
+  else if (chkid == "CELX" || chkid == "SINF")
+    {
+      G_THROW( ERR_MSG("DjVuFile.securedjvu") );
+    }
+  
+  // Return description
+  return desc;
+}
+
+void
+DjVuFile::set_decode_codec(GP<GPixmap> (*codec)(ByteStream &bs))
+{
+  djvu_decode_codec=codec;
+}
+
+void
+DjVuFile::decode(const GP<ByteStream> &gbs)
+{
+  check();
+  DEBUG_MSG("DjVuFile::decode(), url='" << url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  DjVuPortcaster * pcaster=get_portcaster();
+  
+  // Get form chunk
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(gbs));
+  IFFByteStream &iff=*giff;
+  if (!iff.get_chunk(chkid)) 
+    REPORT_EOF(true)
+    
+    // Check file format
+  bool djvi = (chkid=="FORM:DJVI")?true:false;
+  bool djvu = (chkid=="FORM:DJVU")?true:false;
+  bool iw44 = ((chkid=="FORM:PM44") || (chkid=="FORM:BM44"));
+  if (djvi || djvu)
+    mimetype = "image/x.djvu";
+  else if (iw44)
+    mimetype = "image/x-iw44";
+  else
+    G_THROW( ERR_MSG("DjVuFile.unexp_image") );
+  
+  // Process chunks
+  int size_so_far=iff.tell();
+  int chunks=0;
+  int last_chunk=0;
+  G_TRY
+  {
+    int chunks_left=(recover_errors>SKIP_PAGES)?chunks_number:(-1);
+    int chksize;
+    for(;(chunks_left--)&&(chksize = iff.get_chunk(chkid));last_chunk=chunks)
+    {
+      chunks++;
+
+      // Decode and get chunk description
+      GUTF8String str = decode_chunk(chkid, iff.get_bytestream(), djvi, djvu, iw44);
+      // Add parameters to the chunk description to give the size and chunk id
+      GUTF8String desc;
+      desc.format("\t%5.1f\t%s", chksize/1024.0, (const char*)chkid);
+      // Append the whole thing to the growing file description
+      description = description + str + desc + "\n";
+
+      pcaster->notify_chunk_done(this, chkid);
+      // Close chunk
+      iff.seek_close_chunk();
+      // Record file size
+      size_so_far=iff.tell();
+    }
+    if (chunks_number < 0) chunks_number=last_chunk;
+  }
+  G_CATCH(ex)
+  {
+    if(!ex.cmp_cause(ByteStream::EndOfFile))
+    {
+      if (chunks_number < 0)
+        chunks_number=(recover_errors>SKIP_CHUNKS)?chunks:last_chunk;
+      report_error(ex,(recover_errors <= SKIP_PAGES));
+    }else
+    {
+      report_error(ex,true);
+    }
+  }
+  G_ENDCATCH;
+  
+  // Record file size
+  file_size=size_so_far;
+  // Close form chunk
+  iff.close_chunk();
+  // Close BG44 codec
+  if (bg44) 
+    bg44->close_codec();
+  
+  // Complete description
+  if (djvu && !info)
+    G_THROW( ERR_MSG("DjVuFile.corrupt_missing_info") );
+  if (iw44 && !info)
+    G_THROW( ERR_MSG("DjVuFile.corrupt_missing_IW44") );
+  if (info)
+  {
+    GUTF8String desc;
+    if (djvu || djvi)
+      desc.format( ERR_MSG("DjVuFile.djvu_header") "\t%d\t%d\t%d\t%d", 
+        info->width, info->height,
+        info->dpi, info->version);
+    else if (iw44)
+      desc.format( ERR_MSG("DjVuFile.IW44_header") "\t%d\t%d\t%d", 
+        info->width, info->height, info->dpi);
+    description=desc + "\n" + description;
+    int rawsize=info->width*info->height*3;
+    desc.format( ERR_MSG("DjVuFile.ratio") "\t%0.1f\t%0.1f",
+      (double)rawsize/file_size, file_size/1024.0 );
+    description=description+desc;
+  }
+}
+
+void
+DjVuFile::start_decode(void)
+{
+  check();
+  DEBUG_MSG("DjVuFile::start_decode(), url='" << url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  GThread * thread_to_delete=0;
+  flags.enter();
+  G_TRY {
+    if (!(flags & DONT_START_DECODE) && !is_decoding())
+    {
+      if (flags & DECODE_STOPPED) reset();
+      flags&=~(DECODE_OK | DECODE_STOPPED | DECODE_FAILED);
+      flags|=DECODING;
+      
+      // Don't delete the thread while you're owning the flags lock
+      // Beware of deadlock!
+      thread_to_delete=decode_thread; decode_thread=0;
+      
+      // We want to create it right here to be able to stop the
+      // decoding thread even before its function is called (it starts)
+      decode_data_pool=DataPool::create(data_pool);
+      decode_life_saver=this;
+      
+      decode_thread=new GThread();
+      decode_thread->create(static_decode_func, this);
+    }
+  }
+  G_CATCH_ALL
+  {
+    flags&=~DECODING;
+    flags|=DECODE_FAILED;
+    flags.leave();
+    get_portcaster()->notify_file_flags_changed(this, DECODE_FAILED, DECODING);
+    delete thread_to_delete;
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+  flags.leave();
+  delete thread_to_delete;
+}
+
+bool
+DjVuFile::resume_decode(const bool sync)
+{
+  bool retval=false;
+  {
+    GMonitorLock lock(&flags);
+    if( !is_decoding() && !is_decode_ok() && !is_decode_failed() )
+    {
+      start_decode();
+      retval=true;
+    }
+  }
+  if(sync)
+  {
+    wait_for_finish();
+  }
+  return retval;
+}
+
+void
+DjVuFile::stop_decode(bool sync)
+{
+  check();
+  
+  DEBUG_MSG("DjVuFile::stop_decode(), url='" << url <<
+    "', sync=" << (int) sync << "\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  G_TRY
+  {
+    flags|=DONT_START_DECODE;
+    
+    // Don't stop SYNCHRONOUSLY from the thread where the decoding is going!!!
+    {
+      // First - ask every included child to stop in async mode
+      GCriticalSectionLock lock(&inc_files_lock);
+      for(GPosition pos=inc_files_list;pos;++pos)
+        inc_files_list[pos]->stop_decode(0);
+      
+//      if (decode_data_pool) decode_data_pool->stop();
+    }
+    
+    if (sync)
+    {
+      while(1)
+      {
+        GP<DjVuFile> file;
+        {
+          GCriticalSectionLock lock(&inc_files_lock);
+          for(GPosition pos=inc_files_list;pos;++pos)
+          {
+            GP<DjVuFile> & f=inc_files_list[pos];
+            if (f->is_decoding())
+            {
+              file=f; break;
+            }
+          }
+        }
+        if (!file) break;
+        
+        file->stop_decode(1);
+      }
+      
+      wait_for_finish(1);	// Wait for self termination
+      
+      // Don't delete the thread here. Until GPBase::preserve() is
+      // reimplemented somehow at the GThread level.
+      // delete decode_thread; decode_thread=0;
+    }
+    flags&=~(DONT_START_DECODE);
+  } G_CATCH_ALL {
+    flags&=~(DONT_START_DECODE);
+    G_RETHROW;
+  } G_ENDCATCH;
+}
+
+void
+DjVuFile::stop(bool only_blocked)
+// This is a one-way function. There is no way to undo the stop()
+// command.
+{
+  DEBUG_MSG("DjVuFile::stop(): Stopping everything\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  flags|=only_blocked ? BLOCKED_STOPPED : STOPPED;
+  if (data_pool) data_pool->stop(only_blocked);
+  GCriticalSectionLock lock(&inc_files_lock);
+  for(GPosition pos=inc_files_list;pos;++pos)
+    inc_files_list[pos]->stop(only_blocked);
+}
+
+GP<DjVuNavDir>
+DjVuFile::find_ndir(GMap<GURL, void *> & map)
+{
+  check();
+  
+  DEBUG_MSG("DjVuFile::find_ndir(): looking for NDIR in '" << url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  if (dir) return dir;
+  
+  if (!map.contains(url))
+  {
+    map[url]=0;
+    
+    GPList<DjVuFile> list=get_included_files(false);
+    for(GPosition pos=list;pos;++pos)
+    {
+      GP<DjVuNavDir> d=list[pos]->find_ndir(map);
+      if (d) return d;
+    }
+  }
+  return 0;
+}
+
+GP<DjVuNavDir>
+DjVuFile::find_ndir(void)
+{
+  GMap<GURL, void *> map;
+  return find_ndir(map);
+}
+
+GP<DjVuNavDir>
+DjVuFile::decode_ndir(GMap<GURL, void *> & map)
+{
+  check();
+  
+  DEBUG_MSG("DjVuFile::decode_ndir(): decoding for NDIR in '" << url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  if (dir) return dir;
+  
+  if (!map.contains(url))
+  {
+    map[url]=0;
+    
+    const GP<ByteStream> str(data_pool->get_stream());
+    
+    GUTF8String chkid;
+    const GP<IFFByteStream> giff(IFFByteStream::create(str));
+    IFFByteStream &iff=*giff;
+    if (!iff.get_chunk(chkid)) 
+      REPORT_EOF(true)
+
+    int chunks=0;
+    int last_chunk=0;
+#ifndef SLOW_BUT_EXACT_DETECTION_OF_NDIR
+    int found_incl=0;
+#endif
+    G_TRY
+    {
+      int chunks_left=(recover_errors>SKIP_PAGES)?chunks_number:(-1);
+      int chksize;
+      for(;(chunks_left--)&&(chksize=iff.get_chunk(chkid));last_chunk=chunks)
+      {
+        chunks++;
+        if (chkid=="NDIR")
+        {
+          GP<DjVuNavDir> d=DjVuNavDir::create(url);
+          d->decode(*iff.get_bytestream());
+          dir=d;
+          break;
+        }
+#ifndef SLOW_BUT_EXACT_DETECTION_OF_NDIR
+        if (chkid=="INCL")
+          found_incl = 1;
+        if (chunks>2 && !found_incl && !data_pool->is_eof())
+          return 0;
+#endif
+        iff.seek_close_chunk();
+      }
+      if ((!dir)&&(chunks_number < 0)) chunks_number=last_chunk;
+    }
+    G_CATCH(ex)
+    {
+       if(!ex.cmp_cause(ByteStream::EndOfFile))
+       {
+          if (chunks_number < 0)
+             chunks_number=(recover_errors>SKIP_CHUNKS)?chunks:last_chunk;
+          report_error(ex,(recover_errors<=SKIP_PAGES));
+       }else
+       {
+          report_error(ex,true);
+       }
+    }
+    G_ENDCATCH;
+    
+    data_pool->clear_stream();
+    if (dir) return dir;
+    
+    GPList<DjVuFile> list=get_included_files(false);
+    for(GPosition pos=list;pos;++pos)
+    {
+      GP<DjVuNavDir> d=list[pos]->decode_ndir(map);
+      if (d) return d;
+    }
+    data_pool->clear_stream();
+  }
+  return 0;
+}
+
+GP<DjVuNavDir>
+DjVuFile::decode_ndir(void)
+{
+  GMap<GURL, void *> map;
+  return decode_ndir(map);
+}
+
+void
+DjVuFile::get_merged_anno(const GP<DjVuFile> & file,
+  const GP<ByteStream> &gstr_out, const GList<GURL> & ignore_list,
+  int level, int & max_level, GMap<GURL, void *> & map)
+{
+  DEBUG_MSG("DjVuFile::get_merged_anno()\n");
+  GURL url=file->get_url();
+  if (!map.contains(url))
+  {
+    ByteStream &str_out=*gstr_out;
+    map[url]=0;
+
+    // Do the included files first (To make sure that they have
+    // less precedence)
+    // Depending on if we have all data present, we will
+    // either create all included files or will use only
+    // those that have already been created
+    GPList<DjVuFile> list=file->get_included_files(!file->is_data_present());
+    for(GPosition pos=list;pos;++pos)
+      get_merged_anno(list[pos], gstr_out, ignore_list, level+1, max_level, map);
+
+    // Now process the DjVuFile's own annotations
+    if (!ignore_list.contains(file->get_url()))
+      {
+	if (!file->is_data_present() ||
+	    (file->is_modified() && file->anno))
+	  {
+	    // Process the decoded (?) anno
+	    GCriticalSectionLock lock(&file->anno_lock);
+	    if (file->anno && file->anno->size())
+	      {
+		if (str_out.tell())
+		  {
+		    str_out.write((void *) "", 1);
+		  }
+		file->anno->seek(0);
+		str_out.copy(*file->anno);
+	      }
+	  } else if (file->is_data_present())
+	  {
+	    // Copy all annotations chunks, but do NOT modify
+	    // this->anno (to avoid correlation with DjVuFile::decode())
+	    const GP<ByteStream> str(file->data_pool->get_stream());
+	    const GP<IFFByteStream> giff(IFFByteStream::create(str));
+	    IFFByteStream &iff=*giff;
+	    GUTF8String chkid;
+	    if (iff.get_chunk(chkid))
+	      while(iff.get_chunk(chkid))
+		{
+		  if (chkid=="FORM:ANNO")
+		    {
+		      if (max_level<level)
+			max_level=level;
+		      if (str_out.tell())
+			{
+			  str_out.write((void *) "", 1);
+			}
+		      str_out.copy(*iff.get_bytestream());
+		    }
+		  else if (is_annotation(chkid)) // but not FORM:ANNO
+		    {
+		      if (max_level<level)
+			max_level=level;
+		      if (str_out.tell()&&chkid != "ANTz")
+			{
+			  str_out.write((void *) "", 1);
+			}
+		      const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+		      IFFByteStream &iff_out=*giff_out;
+		      iff_out.put_chunk(chkid);
+		      iff_out.copy(*iff.get_bytestream());
+		      iff_out.close_chunk();
+		    }
+		  iff.close_chunk();
+		}
+	    file->data_pool->clear_stream();
+	  }
+      }
+  }
+}
+
+GP<ByteStream>
+DjVuFile::get_merged_anno(const GList<GURL> & ignore_list,
+                          int * max_level_ptr)
+                          // Will do the same thing as get_merged_anno(int *), but will
+                          // ignore DjVuFiles with URLs from the ignore_list
+{
+  DEBUG_MSG("DjVuFile::get_merged_anno()\n");
+  GP<ByteStream> gstr(ByteStream::create());
+  GMap<GURL, void *> map;
+  int max_level=0;
+  get_merged_anno(this, gstr, ignore_list, 0, max_level, map);
+  if (max_level_ptr)
+    *max_level_ptr=max_level;
+  ByteStream &str=*gstr;
+  if (!str.tell()) 
+  {
+    gstr=0;
+  }else
+  {
+    str.seek(0);
+  }
+  return gstr;
+}
+
+GP<ByteStream>
+DjVuFile::get_merged_anno(int * max_level_ptr)
+// Will go down the DjVuFile's hierarchy and decode all DjVuAnno even
+// when the DjVuFile is not fully decoded yet. To avoid correlations
+// with DjVuFile::decode(), we do not modify DjVuFile::anno data.
+//
+// Files deeper in the hierarchy have less influence on the
+// results. It means, for example, that the if annotations are
+// specified in the top level page file and in a shared file,
+// the top level page file settings will take precedence.
+//
+// NOTE! This function guarantees correct results only if the
+// DjVuFile has all data
+{
+  GList<GURL> ignore_list;
+  return get_merged_anno(ignore_list, max_level_ptr);
+}
+
+
+// [LB->BCR] The following six functions get_anno, get_text, get_meta 
+// contain the same code in triplicate!!!
+
+void
+DjVuFile::get_anno(
+  const GP<DjVuFile> & file, const GP<ByteStream> &gstr_out)
+{
+  DEBUG_MSG("DjVuFile::get_anno()\n");
+  ByteStream &str_out=*gstr_out;
+  if (!file->is_data_present() ||
+      (file->is_modified() && file->anno))
+    {
+      // Process the decoded (?) anno
+      GCriticalSectionLock lock(&file->anno_lock);
+      if (file->anno && file->anno->size())
+	{
+	  if (str_out.tell())
+	    {
+	      str_out.write((void *) "", 1);
+	    }
+	  file->anno->seek(0);
+	  str_out.copy(*file->anno);
+	}
+    } else if (file->is_data_present())
+    {
+      // Copy all anno chunks, but do NOT modify
+      // DjVuFile::anno (to avoid correlation with DjVuFile::decode())
+      const GP<ByteStream> str=file->data_pool->get_stream();
+      const GP<IFFByteStream> giff=IFFByteStream::create(str);
+      IFFByteStream &iff=*giff;
+      GUTF8String chkid;
+      if (iff.get_chunk(chkid))
+	{
+	  while(iff.get_chunk(chkid))
+	    {
+	      if (is_annotation(chkid))
+		{
+		  if (str_out.tell())
+		    {
+		      str_out.write((void *) "", 1);
+		    }
+		  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+		  IFFByteStream &iff_out=*giff_out;
+		  iff_out.put_chunk(chkid);
+		  iff_out.copy(*iff.get_bytestream());
+		  iff_out.close_chunk();
+		}
+	      iff.close_chunk();
+	    }
+	}
+      file->data_pool->clear_stream();
+    }
+}
+
+void
+DjVuFile::get_text(
+  const GP<DjVuFile> & file, const GP<ByteStream> &gstr_out)
+{
+  DEBUG_MSG("DjVuFile::get_text()\n");
+  ByteStream &str_out=*gstr_out;
+  if (!file->is_data_present() ||
+      (file->is_modified() && file->text))
+    {
+      // Process the decoded (?) text
+      GCriticalSectionLock lock(&file->text_lock);
+      if (file->text && file->text->size())
+	{
+	  if (str_out.tell())
+	    {
+	      str_out.write((void *) "", 1);
+	    }
+	  file->text->seek(0);
+	  str_out.copy(*file->text);
+	}
+    } else if (file->is_data_present())
+    {
+      // Copy all text chunks, but do NOT modify
+      // DjVuFile::text (to avoid correlation with DjVuFile::decode())
+      const GP<ByteStream> str=file->data_pool->get_stream();
+      const GP<IFFByteStream> giff=IFFByteStream::create(str);
+      IFFByteStream &iff=*giff;
+      GUTF8String chkid;
+      if (iff.get_chunk(chkid))
+	{
+	  while(iff.get_chunk(chkid))
+	    {
+	      if (is_text(chkid))
+		{
+		  if (str_out.tell())
+		    {
+		      str_out.write((void *) "", 1);
+		    }
+		  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+		  IFFByteStream &iff_out=*giff_out;
+		  iff_out.put_chunk(chkid);
+		  iff_out.copy(*iff.get_bytestream());
+		  iff_out.close_chunk();
+		}
+	      iff.close_chunk();
+	    }
+	}
+      file->data_pool->clear_stream();
+    }
+}
+
+void
+DjVuFile::get_meta(
+  const GP<DjVuFile> & file, const GP<ByteStream> &gstr_out)
+{
+  DEBUG_MSG("DjVuFile::get_meta()\n");
+  ByteStream &str_out=*gstr_out;
+  if (!file->is_data_present() ||
+      (file->is_modified() && file->meta))
+    {
+      // Process the decoded (?) meta
+      GCriticalSectionLock lock(&file->meta_lock);
+      if (file->meta && file->meta->size())
+	{
+	  if (str_out.tell())
+	    {
+	      str_out.write((void *) "", 1);
+	    }
+	  file->meta->seek(0);
+	  str_out.copy(*file->meta);
+	}
+    } else if (file->is_data_present())
+    {
+      // Copy all meta chunks, but do NOT modify
+      // DjVuFile::meta (to avoid correlation with DjVuFile::decode())
+      const GP<ByteStream> str=file->data_pool->get_stream();
+      const GP<IFFByteStream> giff=IFFByteStream::create(str);
+      IFFByteStream &iff=*giff;
+      GUTF8String chkid;
+      if (iff.get_chunk(chkid))
+	{
+	  while(iff.get_chunk(chkid))
+	    {
+	      if (is_meta(chkid))
+		{
+		  if (str_out.tell())
+		    {
+		      str_out.write((void *) "", 1);
+		    }
+		  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+		  IFFByteStream &iff_out=*giff_out;
+		  iff_out.put_chunk(chkid);
+		  iff_out.copy(*iff.get_bytestream());
+		  iff_out.close_chunk();
+		}
+	      iff.close_chunk();
+	    }
+	}
+      file->data_pool->clear_stream();
+    }
+}
+
+GP<ByteStream>
+DjVuFile::get_anno(void)
+{
+  DEBUG_MSG("DjVuFile::get_text(void)\n");
+  GP<ByteStream> gstr(ByteStream::create());
+  get_anno(this, gstr);
+  ByteStream &str=*gstr;
+  if (!str.tell())
+  { 
+    gstr=0;
+  }else
+  {
+    str.seek(0);
+  }
+  return gstr;
+}
+
+GP<ByteStream>
+DjVuFile::get_text(void)
+{
+  DEBUG_MSG("DjVuFile::get_text(void)\n");
+  GP<ByteStream> gstr(ByteStream::create());
+  get_text(this, gstr);
+  ByteStream &str=*gstr;
+  if (!str.tell())
+  { 
+    gstr=0;
+  }else
+  {
+    str.seek(0);
+  }
+  return gstr;
+}
+
+GP<ByteStream>
+DjVuFile::get_meta(void)
+{
+  DEBUG_MSG("DjVuFile::get_meta(void)\n");
+  GP<ByteStream> gstr(ByteStream::create());
+  get_meta(this, gstr);
+  ByteStream &str=*gstr;
+  if (!str.tell())
+  { 
+    gstr=0;
+  }else
+  {
+    str.seek(0);
+  }
+  return gstr;
+}
+
+void
+DjVuFile::static_trigger_cb(void * cl_data)
+{
+  DjVuFile * th=(DjVuFile *) cl_data;
+  G_TRY {
+    GP<DjVuPort> port=DjVuPort::get_portcaster()->is_port_alive(th);
+    if (port && port->inherits("DjVuFile"))
+      ((DjVuFile *) (DjVuPort *) port)->trigger_cb();
+  } G_CATCH(exc) {
+    G_TRY {
+      get_portcaster()->notify_error(th, exc.get_cause());
+    } G_CATCH_ALL {} G_ENDCATCH;
+  } G_ENDCATCH;
+}
+
+void
+DjVuFile::trigger_cb(void)
+{
+  GP<DjVuFile> life_saver=this;
+  
+  DEBUG_MSG("DjVuFile::trigger_cb(): got data for '" << url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  file_size=data_pool->get_length();
+  flags|=DATA_PRESENT;
+  get_portcaster()->notify_file_flags_changed(this, DATA_PRESENT, 0);
+  
+  if (!are_incl_files_created())
+    process_incl_chunks();
+  
+  bool all=true;
+  inc_files_lock.lock();
+  GPList<DjVuFile> files_list=inc_files_list;
+  inc_files_lock.unlock();
+  for(GPosition pos=files_list;pos&&(all=files_list[pos]->is_all_data_present());++pos)
+    EMPTY_LOOP;
+  if (all)
+  {
+    DEBUG_MSG("DjVuFile::trigger_cb(): We have ALL data for '" << url << "'\n");
+    flags|=ALL_DATA_PRESENT;
+    get_portcaster()->notify_file_flags_changed(this, ALL_DATA_PRESENT, 0);
+  }
+}
+
+void
+DjVuFile::progress_cb(int pos, void * cl_data)
+{
+  DEBUG_MSG("DjVuFile::progress_cb() called\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  DjVuFile * th=(DjVuFile *) cl_data;
+  
+  int length=th->decode_data_pool->get_length();
+  if (length>0)
+  {
+    float progress=(float) pos/length;
+    DEBUG_MSG("progress=" << progress << "\n");
+    get_portcaster()->notify_decode_progress(th, progress);
+  } else
+  {
+    DEBUG_MSG("DataPool size is still unknown => ignoring\n");
+  }
+}
+
+//*****************************************************************************
+//******************************** Utilities **********************************
+//*****************************************************************************
+
+void
+DjVuFile::move(GMap<GURL, void *> & map, const GURL & dir_url)
+// This function may block for data.
+{
+  if (!map.contains(url))
+  {
+    map[url]=0;
+    
+    url=GURL::UTF8(url.name(),dir_url);
+    
+    
+    // Leave the lock here!
+    GCriticalSectionLock lock(&inc_files_lock);
+    for(GPosition pos=inc_files_list;pos;++pos)
+      inc_files_list[pos]->move(map, dir_url);
+  }
+}
+
+void
+DjVuFile::move(const GURL & dir_url)
+// This function may block for data.
+{
+  check();
+  DEBUG_MSG("DjVuFile::move(): dir_url='" << dir_url << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  GMap<GURL, void *> map;
+  move(map, dir_url);
+}
+
+void
+DjVuFile::set_name(const GUTF8String &name)
+{
+  DEBUG_MSG("DjVuFile::set_name(): name='" << name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  url=GURL::UTF8(name,url.base());
+}
+
+//*****************************************************************************
+//****************************** Data routines ********************************
+//*****************************************************************************
+
+int
+DjVuFile::get_chunks_number(void)
+{
+  if(chunks_number < 0)
+  {
+    const GP<ByteStream> str(data_pool->get_stream());
+    GUTF8String chkid;
+    const GP<IFFByteStream> giff(IFFByteStream::create(str));
+    IFFByteStream &iff=*giff;
+    if (!iff.get_chunk(chkid))
+      REPORT_EOF(true)
+      
+      int chunks=0;
+    int last_chunk=0;
+    G_TRY
+    {
+      int chksize;
+      for(;(chksize=iff.get_chunk(chkid));last_chunk=chunks)
+      {
+        chunks++;
+        iff.seek_close_chunk();
+      }
+      chunks_number=last_chunk;
+    }
+    G_CATCH(ex)
+    {
+      chunks_number=(recover_errors>SKIP_CHUNKS)?chunks:last_chunk;
+      report_error(ex,(recover_errors<=SKIP_PAGES));
+    }
+    G_ENDCATCH;
+    data_pool->clear_stream();
+  }
+  return chunks_number;
+}
+
+GUTF8String
+DjVuFile::get_chunk_name(int chunk_num)
+{
+  if(chunk_num < 0)
+  {
+    G_THROW( ERR_MSG("DjVuFile.illegal_chunk") );
+  }
+  if((chunks_number >= 0)&&(chunk_num > chunks_number))
+  {
+    G_THROW( ERR_MSG("DjVuFile.missing_chunk") );
+  }
+  check();
+  
+  GUTF8String name;
+  const GP<ByteStream> str(data_pool->get_stream());
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(str));
+  IFFByteStream &iff=*giff;
+  if (!iff.get_chunk(chkid)) 
+    REPORT_EOF(true)
+    
+    int chunks=0;
+  int last_chunk=0;
+  G_TRY
+  {
+    int chunks_left=(recover_errors>SKIP_PAGES)?chunks_number:(-1);
+    int chksize;
+    for(;(chunks_left--)&&(chksize=iff.get_chunk(chkid));last_chunk=chunks)
+    {
+      if (chunks++==chunk_num) { name=chkid; break; }
+      iff.seek_close_chunk();
+    }
+  }
+  G_CATCH(ex)
+  {
+    if (chunks_number < 0)
+      chunks_number=(recover_errors>SKIP_CHUNKS)?chunks:last_chunk;
+    report_error(ex,(recover_errors <= SKIP_PAGES));
+  }
+  G_ENDCATCH;
+  if (!name.length())
+  {
+    if (chunks_number < 0) chunks_number=chunks;
+    G_THROW( ERR_MSG("DjVuFile.missing_chunk") );
+  }
+  return name;
+}
+
+bool
+DjVuFile::contains_chunk(const GUTF8String &chunk_name)
+{
+  check();
+  DEBUG_MSG("DjVuFile::contains_chunk(): url='" << url << "', chunk_name='" <<
+    chunk_name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  bool contains=0;
+  const GP<ByteStream> str(data_pool->get_stream());
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(str));
+  IFFByteStream &iff=*giff;
+  if (!iff.get_chunk(chkid)) 
+    REPORT_EOF((recover_errors<=SKIP_PAGES))
+    
+    int chunks=0;
+  int last_chunk=0;
+  G_TRY
+  {
+    int chunks_left=(recover_errors>SKIP_PAGES)?chunks_number:(-1);
+    int chksize;
+    for(;(chunks_left--)&&(chksize=iff.get_chunk(chkid));last_chunk=chunks)
+    {
+      chunks++;
+      if (chkid==chunk_name) { contains=1; break; }
+      iff.seek_close_chunk();
+    }
+    if (!contains &&(chunks_number < 0)) chunks_number=last_chunk;
+  }
+  G_CATCH(ex)
+  {
+    if (chunks_number < 0)
+      chunks_number=(recover_errors>SKIP_CHUNKS)?chunks:last_chunk;
+    report_error(ex,(recover_errors <= SKIP_PAGES));
+  }
+  G_ENDCATCH;
+  data_pool->clear_stream();
+  return contains;
+}
+
+bool
+DjVuFile::contains_anno(void)
+{
+  const GP<ByteStream> str(data_pool->get_stream());
+  
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(str));
+  IFFByteStream &iff=*giff;
+  if (!iff.get_chunk(chkid))
+    G_THROW( ByteStream::EndOfFile );
+  
+  while(iff.get_chunk(chkid))
+  {
+    if (is_annotation(chkid))
+      return true;
+    iff.close_chunk();
+  }
+  
+  data_pool->clear_stream();
+  return false;
+}
+
+bool
+DjVuFile::contains_text(void)
+{
+  const GP<ByteStream> str(data_pool->get_stream());
+  
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(str));
+  IFFByteStream &iff=*giff;
+  if (!iff.get_chunk(chkid))
+    G_THROW( ByteStream::EndOfFile );
+  
+  while(iff.get_chunk(chkid))
+  {
+    if (is_text(chkid))
+      return true;
+    iff.close_chunk();
+  }
+  
+  data_pool->clear_stream();
+  return false;
+}
+
+bool
+DjVuFile::contains_meta(void)
+{
+  const GP<ByteStream> str(data_pool->get_stream());
+  
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(str));
+  IFFByteStream &iff=*giff;
+  if (!iff.get_chunk(chkid))
+    G_THROW( ByteStream::EndOfFile );
+  
+  while(iff.get_chunk(chkid))
+  {
+    if (is_meta(chkid))
+      return true;
+    iff.close_chunk();
+  }
+  
+  data_pool->clear_stream();
+  return false;
+}
+
+//*****************************************************************************
+//****************************** Save routines ********************************
+//*****************************************************************************
+
+static void
+copy_chunks(const GP<ByteStream> &from, IFFByteStream &ostr)
+{
+  from->seek(0);
+  const GP<IFFByteStream> giff(IFFByteStream::create(from));
+  IFFByteStream &iff=*giff;
+  GUTF8String chkid;
+  int chksize;
+  while ((chksize=iff.get_chunk(chkid)))
+  {
+    ostr.put_chunk(chkid);
+    int ochksize=ostr.copy(*iff.get_bytestream());
+    ostr.close_chunk();
+    iff.seek_close_chunk();
+    if(ochksize != chksize)
+    {
+      G_THROW( ByteStream::EndOfFile );
+    }
+  }
+}
+
+
+void
+DjVuFile::add_djvu_data(IFFByteStream & ostr, GMap<GURL, void *> & map,
+                        const bool included_too, const bool no_ndir)
+{
+  check();
+  if (map.contains(url)) return;
+  bool top_level = !map.size();
+  map[url]=0;
+  bool processed_annotation = false;
+  bool processed_text = false;
+  bool processed_meta = false;
+  
+  const GP<ByteStream> str(data_pool->get_stream());
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff(IFFByteStream::create(str));
+  IFFByteStream &iff=*giff;
+  if (!iff.get_chunk(chkid)) 
+    REPORT_EOF(true)
+    
+    // Open toplevel form
+    if (top_level) 
+      ostr.put_chunk(chkid);
+    // Process chunks
+    int chunks=0;
+    int last_chunk=0;
+    G_TRY
+    {
+      int chunks_left=(recover_errors>SKIP_PAGES)?chunks_number:(-1);
+      int chksize;
+      for(;(chunks_left--)&&(chksize = iff.get_chunk(chkid));last_chunk=chunks)
+      {
+        chunks++;
+        if (is_info(chkid) && info)
+        {
+          ostr.put_chunk(chkid);
+          info->encode(*ostr.get_bytestream());
+          ostr.close_chunk();
+        }
+        else if (chkid=="INCL" && included_too)
+        {
+          GP<DjVuFile> file = process_incl_chunk(*iff.get_bytestream());
+          if (file)
+          {
+            if(recover_errors!=ABORT)
+              file->set_recover_errors(recover_errors);
+            if(verbose_eof)
+              file->set_verbose_eof(verbose_eof);
+            file->add_djvu_data(ostr, map, included_too, no_ndir);
+          }
+        } 
+        else if (is_annotation(chkid) && anno && anno->size())
+        {
+          if (!processed_annotation)
+          {
+            processed_annotation = true;
+            GCriticalSectionLock lock(&anno_lock);
+            copy_chunks(anno, ostr);
+          }
+        }
+        else if (is_text(chkid) && text && text->size())
+        {
+          if (!processed_text)
+          {
+            processed_text = true;
+            GCriticalSectionLock lock(&text_lock);
+            copy_chunks(text, ostr);
+          }
+        }
+        else if (is_meta(chkid) && meta && meta->size())
+        {
+          if (!processed_meta)
+          {
+            processed_meta = true;
+            GCriticalSectionLock lock(&meta_lock);
+            copy_chunks(meta, ostr);
+          }
+        }
+        else if (chkid!="NDIR"||!(no_ndir || dir))
+        {  // Copy NDIR chunks, but never generate new ones.
+          ostr.put_chunk(chkid);
+          ostr.copy(*iff.get_bytestream());
+          ostr.close_chunk();
+        }
+        iff.seek_close_chunk();
+      }
+      if (chunks_number < 0) chunks_number=last_chunk;
+    }
+    G_CATCH(ex)
+    {
+      if(!ex.cmp_cause(ByteStream::EndOfFile))
+      {
+        if (chunks_number < 0)
+          chunks_number=(recover_errors>SKIP_CHUNKS)?chunks:last_chunk;
+        report_error(ex,(recover_errors<=SKIP_PAGES));
+      }else
+      {
+        report_error(ex,true);
+      }
+    }
+    G_ENDCATCH;
+    
+    // Otherwise, writes annotation at the end (annotations could be big)
+    if (!processed_annotation && anno && anno->size())
+    {
+      processed_annotation = true;
+      GCriticalSectionLock lock(&anno_lock);
+      copy_chunks(anno, ostr);
+    }
+    if (!processed_text && text && text->size())
+    {
+      processed_text = true;
+      GCriticalSectionLock lock(&text_lock);
+      copy_chunks(text, ostr);
+    }
+    if (!processed_meta && meta && meta->size())
+    {
+      processed_meta = true;
+      GCriticalSectionLock lock(&meta_lock);
+      copy_chunks(meta, ostr);
+    }
+    // Close iff
+    if (top_level) 
+      ostr.close_chunk();
+
+  data_pool->clear_stream();
+}
+
+GP<ByteStream>  
+DjVuFile::get_djvu_bytestream(const bool included_too, const bool no_ndir)
+{
+   check();
+   DEBUG_MSG("DjVuFile::get_djvu_bytestream(): creating DjVu raw file\n");
+   DEBUG_MAKE_INDENT(3);
+   const GP<ByteStream> pbs(ByteStream::create());
+   const GP<IFFByteStream> giff=IFFByteStream::create(pbs);
+   IFFByteStream &iff=*giff;
+   GMap<GURL, void *> map;
+   add_djvu_data(iff, map, included_too, no_ndir);
+   iff.flush();
+   pbs->seek(0, SEEK_SET);
+   return pbs;
+}
+
+GP<DataPool>
+DjVuFile::get_djvu_data(const bool included_too, const bool no_ndir)
+{
+  const GP<ByteStream> pbs = get_djvu_bytestream(included_too, no_ndir);
+  return DataPool::create(pbs);
+}
+
+void
+DjVuFile::merge_anno(ByteStream &out)
+{
+  // Reuse get_merged_anno(), which is better than the previous
+  // implementation due to three things:
+  //  1. It works even before the file is completely decoded
+  //  2. It merges annotations taking into account where a child DjVuFile
+  //     is included.
+  //  3. It handles loops in DjVuFile's hierarchy
+  
+  const GP<ByteStream> str(get_merged_anno());
+  if (str)
+  {
+    str->seek(0);
+    if (out.tell())
+    {
+      out.write((void *) "", 1);
+    }
+    out.copy(*str);
+  }
+}
+
+void
+DjVuFile::get_text(ByteStream &out)
+{
+  const GP<ByteStream> str(get_text());
+  if (str)
+  {
+    str->seek(0);
+    if (out.tell())
+    {
+      out.write((void *) "", 1);
+    }
+    out.copy(*str);
+  }
+}
+
+void
+DjVuFile::get_meta(ByteStream &out)
+{
+  const GP<ByteStream> str(get_meta());
+  if (str)
+  {
+    str->seek(0);
+    if (out.tell())
+    {
+      out.write((void *) "", 1);
+    }
+    out.copy(*str);
+  }
+}
+
+
+
+//****************************************************************************
+//******************************* Modifying **********************************
+//****************************************************************************
+
+void
+DjVuFile::remove_anno(void)
+{
+  DEBUG_MSG("DjVuFile::remove_anno()\n");
+  const GP<ByteStream> str_in(data_pool->get_stream());
+  const GP<ByteStream> gstr_out(ByteStream::create());
+  
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff_in(IFFByteStream::create(str_in));
+  IFFByteStream &iff_in=*giff_in;
+  if (!iff_in.get_chunk(chkid))
+    G_THROW( ByteStream::EndOfFile );
+  
+  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+  IFFByteStream &iff_out=*giff_out;
+  iff_out.put_chunk(chkid);
+  
+  while(iff_in.get_chunk(chkid))
+  {
+    if (!is_annotation(chkid))
+    {
+      iff_out.put_chunk(chkid);
+      iff_out.copy(*iff_in.get_bytestream());
+      iff_out.close_chunk();
+    }
+    iff_in.close_chunk();
+  }
+  
+  iff_out.close_chunk();
+  
+  gstr_out->seek(0, SEEK_SET);
+  data_pool=DataPool::create(gstr_out);
+  chunks_number=-1;
+  
+  anno=0;
+  
+  flags|=MODIFIED;
+  data_pool->clear_stream();
+}
+
+void
+DjVuFile::remove_text(void)
+{
+  DEBUG_MSG("DjVuFile::remove_text()\n");
+  const GP<ByteStream> str_in(data_pool->get_stream());
+  const GP<ByteStream> gstr_out(ByteStream::create());
+  
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff_in(IFFByteStream::create(str_in));
+  IFFByteStream &iff_in=*giff_in;
+  if (!iff_in.get_chunk(chkid))
+    G_THROW( ByteStream::EndOfFile );
+  
+  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+  IFFByteStream &iff_out=*giff_out;
+  iff_out.put_chunk(chkid);
+  
+  while(iff_in.get_chunk(chkid))
+  {
+    if (!is_text(chkid))
+    {
+      iff_out.put_chunk(chkid);
+      iff_out.copy(*iff_in.get_bytestream());
+      iff_out.close_chunk();
+    }
+    iff_in.close_chunk();
+  }
+  
+  iff_out.close_chunk();
+  
+  gstr_out->seek(0, SEEK_SET);
+  data_pool=DataPool::create(gstr_out);
+  chunks_number=-1;
+  
+  text=0;
+  
+  flags|=MODIFIED;
+  data_pool->clear_stream();
+}
+
+void
+DjVuFile::remove_meta(void)
+{
+  DEBUG_MSG("DjVuFile::remove_meta()\n");
+  const GP<ByteStream> str_in(data_pool->get_stream());
+  const GP<ByteStream> gstr_out(ByteStream::create());
+  
+  GUTF8String chkid;
+  const GP<IFFByteStream> giff_in(IFFByteStream::create(str_in));
+  IFFByteStream &iff_in=*giff_in;
+  if (!iff_in.get_chunk(chkid))
+    G_THROW( ByteStream::EndOfFile );
+  
+  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+  IFFByteStream &iff_out=*giff_out;
+  iff_out.put_chunk(chkid);
+  
+  while(iff_in.get_chunk(chkid))
+  {
+    if (!is_meta(chkid))
+    {
+      iff_out.put_chunk(chkid);
+      iff_out.copy(*iff_in.get_bytestream());
+      iff_out.close_chunk();
+    }
+    iff_in.close_chunk();
+  }
+  
+  iff_out.close_chunk();
+  
+  gstr_out->seek(0, SEEK_SET);
+  data_pool=DataPool::create(gstr_out);
+  chunks_number=-1;
+  
+  meta=0;
+  
+  flags|=MODIFIED;
+  data_pool->clear_stream();
+}
+
+void
+DjVuFile::rebuild_data_pool(void)
+{
+  data_pool=get_djvu_data(false,false);
+  chunks_number=1;
+  flags|=MODIFIED;
+}
+
+// Do NOT comment this function out. It's used by DjVuDocEditor to convert
+// old-style DjVu documents to BUNDLED format.
+
+GP<DataPool>
+DjVuFile::unlink_file(const GP<DataPool> & data, const GUTF8String &name)
+// Will process contents of data[] and remove any INCL chunk
+// containing 'name'
+{
+  DEBUG_MSG("DjVuFile::unlink_file()\n");
+  const GP<ByteStream> gstr_out(ByteStream::create());
+  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+  IFFByteStream &iff_out=*giff_out;
+  
+  const GP<ByteStream> str_in(data->get_stream());
+  const GP<IFFByteStream> giff_in(IFFByteStream::create(str_in));
+  IFFByteStream &iff_in=*giff_in;
+  
+  int chksize;
+  GUTF8String chkid;
+  if (!iff_in.get_chunk(chkid)) return data;
+  
+  iff_out.put_chunk(chkid);
+  
+  while((chksize=iff_in.get_chunk(chkid)))
+  {
+    if (chkid=="INCL")
+    {
+      GUTF8String incl_str;
+      char buffer[1024];
+      int length;
+      while((length=iff_in.read(buffer, 1024)))
+        incl_str+=GUTF8String(buffer, length);
+      
+      // Eat '\n' in the beginning and at the end
+      while(incl_str.length() && incl_str[0]=='\n')
+      {
+        incl_str=incl_str.substr(1,(unsigned int)(-1));
+      }
+      while(incl_str.length()>0 && incl_str[(int)incl_str.length()-1]=='\n')
+      {
+        incl_str.setat(incl_str.length()-1, 0);
+      }
+      if (incl_str!=name)
+      {
+        iff_out.put_chunk(chkid);
+        iff_out.get_bytestream()->writestring(incl_str);
+        iff_out.close_chunk();
+      }
+    } else
+    {
+      iff_out.put_chunk(chkid);
+      char buffer[1024];
+      int length;
+      for(const GP<ByteStream> gbs(iff_out.get_bytestream());
+        (length=iff_in.read(buffer, 1024));)
+      {
+        gbs->writall(buffer, length);
+      }
+      iff_out.close_chunk();
+    }
+    iff_in.close_chunk();
+  }
+  iff_out.close_chunk();
+  iff_out.flush();
+  gstr_out->seek(0, SEEK_SET);
+  data->clear_stream();
+  return DataPool::create(gstr_out);
+}
+
+#ifndef NEED_DECODER_ONLY
+void
+DjVuFile::insert_file(const GUTF8String &id, int chunk_num)
+{
+  DEBUG_MSG("DjVuFile::insert_file(): id='" << id << "', chunk_num="
+    << chunk_num << "\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  // First: create new data
+  const GP<ByteStream> str_in(data_pool->get_stream());
+  const GP<IFFByteStream> giff_in(IFFByteStream::create(str_in));
+  IFFByteStream &iff_in=*giff_in;
+  
+  const GP<ByteStream> gstr_out(ByteStream::create());
+  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+  IFFByteStream &iff_out=*giff_out;
+  
+  int chunk_cnt=0;
+  bool done=false;
+  GUTF8String chkid;
+  if (iff_in.get_chunk(chkid))
+  {
+    iff_out.put_chunk(chkid);
+    int chksize;
+    while((chksize=iff_in.get_chunk(chkid)))
+    {
+      if (chunk_cnt++==chunk_num)
+      {
+        iff_out.put_chunk("INCL");
+        iff_out.get_bytestream()->writestring(id);
+        iff_out.close_chunk();
+        done=true;
+      }
+      iff_out.put_chunk(chkid);
+      iff_out.copy(*iff_in.get_bytestream());
+      iff_out.close_chunk();
+      iff_in.close_chunk();
+    }
+    if (!done)
+    {
+      iff_out.put_chunk("INCL");
+      iff_out.get_bytestream()->writestring(id);
+      iff_out.close_chunk();
+    }
+    iff_out.close_chunk();
+  }
+  gstr_out->seek(0, SEEK_SET);
+  data_pool=DataPool::create(gstr_out);
+  chunks_number=-1;
+  
+  // Second: create missing DjVuFiles
+  process_incl_chunks();
+  
+  flags|=MODIFIED;
+  data_pool->clear_stream();
+}
+#endif
+
+void
+DjVuFile::unlink_file(const GUTF8String &id)
+{
+  DEBUG_MSG("DjVuFile::insert_file(): id='" << id << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  
+  // Remove the file from the list of included files
+  {
+    GURL url=DjVuPort::get_portcaster()->id_to_url(this, id);
+    if (url.is_empty()) url=GURL::UTF8(id,this->url.base());
+    GCriticalSectionLock lock(&inc_files_lock);
+    for(GPosition pos=inc_files_list;pos;)
+      if (inc_files_list[pos]->get_url()==url)
+      {
+        GPosition this_pos=pos;
+        ++pos;
+        inc_files_list.del(this_pos);
+      } else ++pos;
+  }
+  
+  // And update the data.
+  const GP<ByteStream> str_in(data_pool->get_stream());
+  const GP<IFFByteStream> giff_in(IFFByteStream::create(str_in));
+  IFFByteStream &iff_in=*giff_in;
+  
+  const GP<ByteStream> gstr_out(ByteStream::create());
+  const GP<IFFByteStream> giff_out(IFFByteStream::create(gstr_out));
+  IFFByteStream &iff_out=*giff_out;
+  
+  GUTF8String chkid;
+  if (iff_in.get_chunk(chkid))
+  {
+    iff_out.put_chunk(chkid);
+    int chksize;
+    while((chksize=iff_in.get_chunk(chkid)))
+    {
+      if (chkid!="INCL")
+      {
+        iff_out.put_chunk(chkid);
+        iff_out.copy(*iff_in.get_bytestream());
+        iff_out.close_chunk();
+      } else
+      {
+        GUTF8String incl_str;
+        char buffer[1024];
+        int length;
+        while((length=iff_in.read(buffer, 1024)))
+          incl_str+=GUTF8String(buffer, length);
+        
+	       // Eat '\n' in the beginning and at the end
+        while(incl_str.length() && incl_str[0]=='\n')
+        {
+          incl_str=incl_str.substr(1,(unsigned int)(-1));
+        }
+        while(incl_str.length()>0 && incl_str[(int)incl_str.length()-1]=='\n')
+          incl_str.setat(incl_str.length()-1, 0);
+        if (incl_str!=id)
+        {
+          iff_out.put_chunk("INCL");
+          iff_out.get_bytestream()->writestring(incl_str);
+          iff_out.close_chunk();
+        }
+      }
+      iff_in.close_chunk();
+    }
+    iff_out.close_chunk();
+  }
+  
+  gstr_out->seek(0, SEEK_SET);
+  data_pool=DataPool::create(gstr_out);
+  chunks_number=-1;
+  
+  flags|=MODIFIED;
+}
+
+void
+DjVuFile::change_info(GP<DjVuInfo> xinfo,const bool do_reset)
+{
+  DEBUG_MSG("DjVuFile::change_text()\n");
+  // Mark this as modified
+  set_modified(true);
+  if(do_reset)
+    reset();
+  info=xinfo;
+}
+
+#ifndef NEED_DECODER_ONLY
+void
+DjVuFile::change_text(GP<DjVuTXT> txt,const bool do_reset)
+{
+  DEBUG_MSG("DjVuFile::change_text()\n");
+  GP<DjVuText> gtext_c=DjVuText::create();
+  DjVuText &text_c=*gtext_c;
+  if(contains_text())
+  {
+    const GP<ByteStream> file_text(get_text());
+    if(file_text)
+    {
+      text_c.decode(file_text);
+    }
+  }
+  GCriticalSectionLock lock(&text_lock);
+  // Mark this as modified
+  set_modified(true);
+  if(do_reset)
+    reset();
+  text_c.txt = txt;
+  text=ByteStream::create();
+  text_c.encode(text);
+}
+
+void
+DjVuFile::change_meta(const GUTF8String &xmeta,const bool do_reset)
+{
+  DEBUG_MSG("DjVuFile::change_meta()\n");
+  // Mark this as modified
+  set_modified(true);
+  if(contains_meta())
+  {
+    (void)get_meta();
+  }
+  if(do_reset)
+    reset();
+  GCriticalSectionLock lock(&meta_lock);
+  meta=ByteStream::create();
+  if(xmeta.length())
+  {
+    const GP<IFFByteStream> giff=IFFByteStream::create(meta);
+    IFFByteStream &iff=*giff;
+    iff.put_chunk("METz");
+    {
+      GP<ByteStream> gbsiff=BSByteStream::create(iff.get_bytestream(),50);
+      gbsiff->writestring(xmeta);
+    }
+    iff.close_chunk();
+  }
+}
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuFile.h b/libdjvu/DjVuFile.h
new file mode 100644
index 0000000..534f828
--- /dev/null
+++ b/libdjvu/DjVuFile.h
@@ -0,0 +1,839 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUFILE_H
+#define _DJVUFILE_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "DjVuInfo.h"
+#include "DjVuPalette.h"
+#include "DjVuPort.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class DjVuTXT;
+class ByteStream;
+class DataPool;
+class JB2Image;
+class JB2Dict;
+class IW44Image;
+class IFFByteStream;
+class GPixmap;
+class DjVuNavDir;
+
+
+/** @name DjVuFile.h
+    Files #"DjVuFile.h"# and #"DjVuFile.cpp"# contain implementation of the
+    \Ref{DjVuFile} class, which takes the leading role in decoding of
+    \Ref{DjVuImage}s.
+
+    In the previous releases of the library the work of decoding has been
+    entirely done in \Ref{DjVuImage}. Now, due to the introduction of multipage
+    documents, the decoding procedure became significantly more complex and
+    has been moved out from \Ref{DjVuImage} into \Ref{DjVuFile}.
+
+    There is not much point though in creating just \Ref{DjVuFile} alone.
+    The maximum power of the decoder is achieved when you create the
+    \Ref{DjVuDocument} and work with {\bf it} when decoding the image.
+
+    @memo Classes representing DjVu files.
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+/** #DjVuFile# plays the central role in decoding \Ref{DjVuImage}s.
+    First of all, it represents a DjVu file whether it's part of a
+    multipage all-in-one-file DjVu document, or part of a multipage
+    DjVu document where every page is in a separate file, or the whole
+    single page document. #DjVuFile# can read its contents from a file
+    and store it back when necessary.
+
+    Second, #DjVuFile# does the greatest part of decoding work. In the
+    past this was the responsibility of \Ref{DjVuImage}. Now, with the
+    introduction of the multipage DjVu formats, the decoding routines
+    have been extracted from the \Ref{DjVuImage} and put into this separate
+    class #DjVuFile#.
+
+    As \Ref{DjVuImage} before, #DjVuFile# now contains public class
+    variables corresponding to every component, that can ever be decoded
+    from a DjVu file (such as #INFO# chunk, #BG44# chunk, #SJBZ# chunk, etc.).
+
+    As before, the decoding is initiated by a single function
+    (\Ref{start_decode}() in this case, and \Ref{DjVuImage::decode}() before).
+    The difference is that #DjVuFile# now handles threads creation itself.
+    When you call the \Ref{start_decode}() function, it creates the decoding
+    thread, which starts decoding, and which can create additional threads:
+    one per each file included into this one.
+
+    {\bf Inclusion} is also a new feature specifically designed for a
+    multipage document. Indeed, inside a given document there can be a lot
+    of things shared between its pages. Examples can be the document
+    annotation (\Ref{DjVuAnno}) and other things like shared shapes and
+    dictionary (to be implemented). To avoid putting these chunks into
+    every page, we have invented new chunk called #INCL# which purpose is
+    to make the decoder open the specified file and decode it.
+    
+    {\bf Source of data.} The #DjVuFile# can be initialized in two ways:
+    \begin{itemize}
+       \item With #URL# and \Ref{DjVuPort}. In this case #DjVuFile# will
+             request its data thru the communication mechanism provided by
+	     \Ref{DjVuPort} in the constructor. If this file references
+	     (includes) any other file, data for them will also be requested
+	     in the same way.
+       \item With \Ref{ByteStream}. In this case the #DjVuFile# will read
+             its data directly from the passed stream. This constructor
+	     has been added to simplify creation of #DjVuFile#s, which do
+	     no include anything else. In this case the \Ref{ByteStream}
+	     is enough for the #DjVuFile# to initialize.
+    \end{itemize}
+	     
+    {\bf Progress information.} #DjVuFile# does not do decoding silently.
+    Instead, it sends a whole set of notifications through the mechanism
+    provided by \Ref{DjVuPort} and \Ref{DjVuPortcaster}. It tells the user
+    of the class about the progress of the decoding, about possible errors,
+    chunk being decoded, etc. The data is requested using this mechanism too.
+
+    {\bf Creating.} Depending on where you have data of the DjVu file, the
+    #DjVuFile# can be initialized in two ways:
+    \begin{itemize}
+       \item By providing #URL# and pointer to \Ref{DjVuPort}. In this case
+             #DjVuFile# will request data using communication mechanism
+	     provided by \Ref{DjVuPort}. This is useful when the data is on
+	     the web or when this file includes other files.
+       \item By providing a \Ref{ByteStream} with the data for the file. Use
+             it only when the file doesn't include other files.
+    \end{itemize}
+    There is also a bunch of functions provided for composing
+    the desired \Ref{DjVuDocument} and modifying #DjVuFile# structure. The
+    examples are \Ref{delete_chunks}(), \Ref{insert_chunk}(),
+    \Ref{include_file}() and \Ref{unlink_file}().
+
+    {\bf Caching.} In the case of plugin it's important to do the caching
+    of decoded images or files. #DjVuFile# appears to be the best candidate
+    for caching, and that's why it supports this procedure. Whenever a
+    #DjVuFile# is successfully decoded, it's added to the cache by
+    \Ref{DjVuDocument}. Next time somebody needs it, it will be extracted
+    from the cache directly by \Ref{DjVuDocument} and won't be decoded again.
+
+    {\bf URLs.} Historically the biggest strain is put on making the decoder
+    available for Netscape and IE plugins where the original files reside
+    somewhere in the net. That is why #DjVuFile# uses {\bf URLs} to
+    identify itself and other files. If you're working with files on the
+    hard disk, you have to use the local URLs instead of file names.
+    A good way to do two way conversion is the \Ref{GOS} class. Sometimes it
+    happens that a given file does not reside anywhere but the memory. No
+    problem in this case either. There is a special port \Ref{DjVuMemoryPort},
+    which can associate any URL with the corresponding data in the memory.
+    All you need to do is to invent your own URL prefix for this case.
+    "#memory:#" will do. The usage of absolute URLs has many advantages among
+    which is the capability to cache files with their URL being the cache key.
+
+    Please note, that the #DjVuFile# class has been designed to work closely
+    with \Ref{DjVuDocument}. So please review the documentation on this class
+    too. */
+
+class DJVUAPI DjVuFile : public DjVuPort
+{
+public:
+   enum { DECODING=1, DECODE_OK=2, DECODE_FAILED=4, DECODE_STOPPED=8,
+	  DATA_PRESENT=16, ALL_DATA_PRESENT=32, INCL_FILES_CREATED=64,
+          MODIFIED=128, DONT_START_DECODE=256, STOPPED=512,
+	  BLOCKED_STOPPED=1024, CAN_COMPRESS=2048, NEEDS_COMPRESSION=4096 };
+   enum { STARTED=1, FINISHED=2 };
+
+      /** @name Decoded file contents */
+      //@{
+      /// Pointer to the DjVu file information component.
+   GP<DjVuInfo>		info;
+      /// Pointer to the background component of DjVu image (IW44 encoded).
+   GP<IW44Image>	bg44;
+      /// Pointer to the background component of DjVu image (Raw).
+   GP<GPixmap>		bgpm;
+      /// Pointer to the mask of foreground component of DjVu image (JB2 encoded).
+   GP<JB2Image>		fgjb;
+      /// Pointer to the optional shape dictionary for the mask (JB2 encoded).
+   GP<JB2Dict>		fgjd;
+      /// Pointer to a colors layer for the foreground component of DjVu image.
+   GP<GPixmap>		fgpm;
+      /// Pointer to a colors vector for the foreground component of DjVu image.
+   GP<DjVuPalette>	fgbc;
+      /// Pointer to collected annotation chunks.
+   GP<ByteStream>	anno;
+      /// Pointer to collected hiddentext chunks.
+   GP<ByteStream>	text;
+      /// Pointer to meta data chunks.
+   GP<ByteStream>	meta;
+      /// Pointer to the *old* navigation directory contained in this file
+   GP<DjVuNavDir>	dir;
+      /// Description of the file formed during decoding
+   GUTF8String		description;
+      /// MIME type string describing the DjVu data.
+   GUTF8String		mimetype;
+      /// Size of the file.
+   int			file_size;
+      //@}
+
+protected:
+      /** Default constructor.  Must follow with an init() */
+   DjVuFile(void);
+public:
+   virtual ~DjVuFile(void);
+
+      /** Initializes a #DjVuFile# object. This is a simplified initializer,
+	  which is not supposed to be used for decoding or creating
+	  #DjVuFile#s, which include other files.
+
+	  If the file is stored on the hard drive, you may also use the
+	  other constructor and pass it the file's URL and #ZERO# #port#.
+	  The #DjVuFile# will read the data itself.
+
+	  If you want to receive error messages and notifications, you
+	  may connect the #DjVuFile# to your own \Ref{DjVuPort} after
+	  it has been constructed.
+
+	  @param str The stream containing data for the file. */
+   void init(const GP<ByteStream> & str);
+
+      /** Creator, does the init(ByteStream &str) */
+   static GP<DjVuFile> create( const GP<ByteStream> & str,
+     const ErrorRecoveryAction recover_action=ABORT,
+     const bool verbose_eof=true);
+   
+      /** Initializes a #DjVuFile# object. As you can notice, the data is not
+	  directly passed to this function. The #DjVuFile# will ask for it
+	  through the \Ref{DjVuPort} mechanism before the constructor
+	  finishes. If the data is stored locally on the hard disk then the
+	  pointer to \Ref{DjVuPort} may be set to #ZERO#, which will make
+	  #DjVuFile# read all data from the hard disk and report all errors
+	  to #stderr#.
+
+	  {\bf Note}. If the file includes (by means of #INCL# chunks) other
+	  files then you should be ready to
+	  \begin{enumerate}
+	     \item Reply to requests \Ref{DjVuPort::id_to_url}() issued to
+	           translate IDs (used in #INCL# chunks) to absolute URLs.
+		   Usually, when the file is created by \Ref{DjVuDocument}
+		   this job is done by it. If you construct such a file
+		   manually, be prepared to do the ID to URL translation
+	     \item Provide data for all included files.
+	  \end{enumerate}
+
+	  @param url The URL assigned to this file. It will be used when
+	         the #DjVuFile# asks for data.
+	  @param port All communication between #DjVuFile#s and \Ref{DjVuDocument}s
+	         is done through the \Ref{DjVuPort} mechanism. If the {\em url}
+		 is not local or the data does not reside on the hard disk,
+		 the {\em port} parameter must not be #ZERO#. If the {\em port}
+		 is #ZERO# then #DjVuFile# will create an internal instance
+		 of \Ref{DjVuSimplePort} for accessing local files and
+		 reporting errors. It can later be disabled by means
+		 of \Ref{disable_standard_port}() function. */
+   void init(const GURL & url, GP<DjVuPort> port=0);
+
+      /** Creator, does the init(const GURL &url, GP<DjVuPort> port=0) */
+   static GP<DjVuFile> create(
+     const GURL & url, GP<DjVuPort> port=0,
+     const ErrorRecoveryAction recover_action=ABORT,
+     const bool verbose_eof=true);
+
+      /** Disables the built-in port for accessing local files, which may
+	  have been created in the case when the #port# argument to
+	  the \Ref{DjVuFile::DjVuFile}() constructor is #ZERO# */
+   void		disable_standard_port(void);
+
+      /** Looks for #decoded# navigation directory (\Ref{DjVuNavDir}) in this
+	  or included files. Returns #ZERO# if nothing could be found.
+
+	  {\bf Note.} This function does {\bf not} attempt to decode #NDIR#
+	  chunks. It is looking for predecoded components. #NDIR# can be
+	  decoded either during regular decoding (initiated by
+	  \Ref{start_decode}() function) or by \Ref{decode_ndir}() function,
+	  which processes this and included files recursively in search
+	  of #NDIR# chunks and decodes them. */
+   GP<DjVuNavDir>	find_ndir(void);
+
+      /** @name #DjVuFile# flags query functions */
+      //@{
+      /** Returns the #DjVuFile# flags. The value returned is the
+	  result of ORing one or more of the following constants:
+	  \begin{itemize}
+	     \item #DECODING# The decoding is in progress
+	     \item #DECODE_OK# The decoding has finished successfully
+	     \item #DECODE_FAILED# The decoding has failed
+	     \item #DECODE_STOPPED# The decoding has been stopped by
+	           \Ref{stop_decode}() function
+	     \item #DATA_PRESENT# All data for this file has been received.
+	           It's especially important in the case of Netscape or IE
+		   plugins when the data is being received while the
+		   decoding is done.
+	     \item #ALL_DATA_PRESENT# Not only data for this file, but also
+	           for all included file has been received.
+	     \item #INCL_FILES_CREATED# All #INCL# and #INCF# chunks have been
+	           processed and the corresponding #DjVuFile#s created. This
+		   is important to know to be sure that the list returned by
+		   \Ref{get_included_files}() is OK.
+	  \end{itemize} */
+   long		get_flags(void) const;
+      /// Returns #TRUE# if the file is being decoded.
+   bool		is_decoding(void) const;
+      /// Returns #TRUE# if decoding of the file has finished successfully.
+   bool		is_decode_ok(void) const;
+      /// Returns #TRUE# if decoding of the file has failed.
+   bool		is_decode_failed(void) const;
+      /** Returns #TRUE# if decoding of the file has been stopped by
+	  \Ref{stop_decode}() function. */
+   bool		is_decode_stopped(void) const;
+      /// Returns #TRUE# if this file has received all data.
+   bool		is_data_present(void) const;
+      /** Returns #TRUE# if this file {\bf and} all included files have
+	  received all data. */
+   bool		is_all_data_present(void) const;
+      /** Returns #TRUE# if all included files have been created. Only when
+	  this function returns 1, the \Ref{get_included_files}() returns
+	  the correct information. */
+   bool		are_incl_files_created(void) const;
+   bool		is_modified(void) const;
+   bool		needs_compression(void) const;
+   bool		can_compress(void) const;
+   void		set_modified(bool m);
+   void		set_needs_compression(bool m);
+   void		set_can_compress(bool m);
+      //@}
+
+      /// Returns the URL assigned to this file
+   GURL		get_url(void) const;
+
+      /** @name Decode control routines */
+      //@{
+      /** Starts decode. If threads are enabled, the decoding will be
+	  done in another thread. Be sure to use \Ref{wait_for_finish}()
+	  or listen for notifications sent through the \Ref{DjVuPortcaster}
+	  to remain in sync. */
+   void		start_decode(void);
+      /** Start the decode iff not already decoded.  If sync is true, wait
+          wait for decode to complete.  Returns true of start_decode is called.
+          */
+   bool   resume_decode(const bool sync=false);
+      /** Stops decode. If #sync# is 1 then the function will not return
+	  until the decoding thread actually dies. Otherwise it will
+	  just signal the thread to stop and will return immediately.
+	  Decoding of all included files will be stopped too. */
+   void		stop_decode(bool sync);
+      /** Recursively stops all data-related operations.
+
+	  Depending on the value of #only_blocked# flag this works as follows:
+	  \begin{itemize}
+	     \item If #only_blocked# is #TRUE#, the function will make sure,
+	           that any further access to the file's data will result
+		   in a #STOP# exception if the desired data is not available
+		   (and the thread would normally block).
+	     \item If #only_blocked# is #FALSE#, then {\bf any} further
+	           access to the file's data will result in immediate
+		   #STOP# exception.
+	  \end{itemize}
+
+	  The action of this function is recursive, meaning that any #DjVuFile#
+	  included into this one will also be stopped.
+
+	  Use this function when you don't need the #DjVuFile# anymore. The
+	  results cannot be undone, and the whole idea is to make all threads
+	  working with this file exit with the #STOP# exception. */
+   void		stop(bool only_blocked);
+      /** Wait for the decoding to finish. This will wait for the
+	  termination of included files too. */
+   void		wait_for_finish(void);
+      /** Looks for #NDIR# chunk (navigation directory), and decodes its
+	  contents. If the #NDIR# chunk has not been found in {\em this} file,
+	  but this file includes others, the procedure will continue
+	  recursively. This function is useful to obtain the document
+	  navigation directory before any page has been decoded. After it
+	  returns the directory can be obtained by calling \Ref{find_ndir}()
+	  function.
+
+	  {\bf Warning.} Contrary to \Ref{start_decode}(), this function
+	  does not return before it completely decodes the directory.
+	  Make sure, that this file and all included files have enough data. */
+   GP<DjVuNavDir>	decode_ndir(void);
+      /// Clears all decoded components.
+   void		reset(void);
+      /** Processes #INCL# chunks and creates included files.
+	  Normally you won't need to call this function because included
+	  files are created automatically when the file is being decoded.
+	  But if due to some reason you'd like to obtain the list of included
+	  files without decoding this file, this is an ideal function to call.
+
+	  {\bf Warning.} This function does not return before it reads the
+	  whole file, which may block your application under some circumstances
+	  if not all data is available. */
+   void		process_incl_chunks(void);
+      //@}
+   
+      // Function needed by the cache
+   unsigned int	get_memory_usage(void) const;
+
+      /** Returns the list of included DjVuFiles.
+	  
+	  {\bf Warning.} Included files are normally created during decoding.
+	  Before that they do not exist.   If you call this function at
+	  that time and set #only_created# to #FALSE# then it will have to
+	  read all the data from this file in order to find #INCL# chunks,
+	  which may block your application, if not all data is available.
+
+	  @param only_created If #TRUE#, the file will not try to process
+	         #INCL# chunks and load referenced files. It will return
+		 just those files, which have already been created during
+		 the decoding procedure. */
+   GPList<DjVuFile>	get_included_files(bool only_created=true);
+
+      /** Includes a #DjVuFile# with the specified #id# into this one.
+	  This function will also insert an #INCL# chunk at position
+	  #chunk_num#. The function will request data for the included
+	  file and will create it before returning. */
+   void		insert_file(const GUTF8String &id, int chunk_num=1);
+      /// Will get rid of included file with the given #id#
+   void		unlink_file(const GUTF8String &id);
+      /** Will find an #INCL# chunk containing #name# in input #data# and
+	  will remove it */
+   static GP<DataPool>	unlink_file(const GP<DataPool> & data, const GUTF8String &name);
+
+      /// Returns the number of chunks in the IFF file data
+   int		get_chunks_number(void);
+      /// Returns the name of chunk number #chunk_num#
+   GUTF8String	get_chunk_name(int chunk_num);
+      /// Returns 1 if this file contains chunk with name #chunk_name#
+   bool		contains_chunk(const GUTF8String &chunk_name);
+
+      /** Processes the included files hierarchy and returns merged
+	  annotations. This function may be used even when the #DjVuFile#
+	  has not been decoded yet. If all data has been received for
+	  this #DjVuFile# and all included #DjVuFile#s, it will will
+	  gather annotations from them and will return the result.
+	  If no annotations have been found, #ZERO# will be returned.
+	  If either this #DjVuFile# or any of the included files do not
+	  have all the data, the function will use the results of
+	  decoding, which may have been started with the \Ref{start_decode}()
+	  function. Otherwise #ZERO# will be returned as well.
+
+	  If #max_level_ptr# pointer is not zero, the function will use
+	  it to store the maximum level number from which annotations
+	  have been obtained. #ZERO# level corresponds to the top-level
+	  page file.
+
+	  {\bf Summary:} This function will return complete annotations only
+	  when the \Ref{is_all_data_present}() returns #TRUE#. */
+   GP<ByteStream>	get_merged_anno(int * max_level_ptr=0);
+
+      /** Returns the annotation chunks (#"ANTa"# and #"ANTz"#).  This
+          function may be used even when the #DjVuFile# has not been decoded
+          yet. If all data has been received for this #DjVuFile#, it will
+          gather hidden text and return the result.  If no hidden text has
+          been found, #ZERO# will be returned.
+
+	  {\bf Summary:} This function will return complete annotations
+	  only when the \Ref{is_all_data_present}() returns #TRUE#. */
+   GP<ByteStream>	get_anno(void);
+
+      /** Returns the text chunks (#"TXTa"# and #"TXTz"#).  This function may
+          be used even when the #DjVuFile# has not been decoded yet. If all
+          data has been received for this #DjVuFile#, it will gather hidden
+          text and return the result.  If no hidden text has been found,
+          #ZERO# will be returned.
+
+	  {\bf Summary:} This function will return complete hidden text layers
+	  only when the \Ref{is_all_data_present}() returns #TRUE#. */
+   GP<ByteStream>	get_text(void);
+
+      /** Returns the meta chunks (#"METa"# and #"METz"#).  This function may
+          be used even when the #DjVuFile# has not been decoded yet. If all
+          data has been received for this #DjVuFile#, it will gather metadata
+          and return the result.  If no hidden text has been found, #ZERO#
+          will be returned.
+
+	  {\bf Summary:} This function will return complete meta data only
+	  when the \Ref{is_all_data_present}() returns #TRUE#. */
+   GP<ByteStream>	get_meta(void);
+
+      /** Goes down the hierarchy of #DjVuFile#s and merges their annotations.
+          (shouldn't this one be private?).
+	  @param max_level_ptr If this pointer is not ZERO, the function
+	         will use it to store the maximum level at which annotations
+		 were found. Top-level page files have ZERO #level#.
+	  @param ignore_list The function will not process included #DjVuFile#s
+	         with URLs matching those mentioned in this #ignore_list#. */
+   GP<ByteStream>	get_merged_anno(const GList<GURL> & ignore_list,
+					int * max_level_ptr);
+
+      /** Clears this file of all annotations. */
+   void	remove_anno(void);
+
+      /** Clears the hidden text. */
+   void	remove_text(void);
+
+      /// Clears the meta data.
+   void remove_meta(void);
+
+      /** Returns #TRUE# if the file contains annotation chunks.
+	  Known annotation chunks at the time of writing this help are:
+	  {\bf ANTa}, {\bf ANTz}, {\bf FORM:ANNO}. */
+   bool		contains_anno(void);
+
+      /** Returns #TRUE# if the file contains hiddentext chunks.
+	  Known hiddentext chunks at the time of writing this help are:
+	  {\bf TXTa}, and {\bf TXTz}. */
+   bool		contains_text(void);
+
+      /** Returns #TRUE# if the file contains metadata chunks.
+	  Known metadata chunks at the time of writing this help are:
+	  {\bf METa}, and {\bf METz}. */
+   bool		contains_meta(void);
+
+     /** Changes the value of the hiddentext. */
+   void change_info(GP<DjVuInfo> info, const bool do_reset=false);
+   
+     /** Changes the value of the hiddentext. */
+   void change_text(GP<DjVuTXT> txt, const bool do_reset=false);
+   
+     /** Changes the value of the metadata. */
+   void change_meta(const GUTF8String &meta, const bool do_reset=false);
+   
+      /** @name Encoding routines */
+      //@{
+      /** The main function that encodes data back into binary stream.
+	  The data returned will reflect possible changes made into the
+	  chunk structure, annotation chunks and navigation directory
+	  chunk #NDIR#.
+
+	  {\bf Note:} The file stream will not have the magic
+          #0x41,0x54,0x26,0x54#
+	  at the beginning.
+	  
+	  @param included_too Process included files too. */
+   GP<ByteStream>	get_djvu_bytestream(const bool included_too, const bool no_ndir=true);
+
+      /** Same as \Ref{get_djvu_bytestream}(), returning a DataPool.
+	  @param included_too Process included files too. */
+   GP<DataPool>		get_djvu_data(const bool included_too, const bool no_ndir=true );
+      //@}
+
+      // Internal. Used by DjVuDocument
+   GP<DataPool>		get_init_data_pool(void) const { return data_pool; };
+
+      // Internal. Used by DjVuDocument. May block for data.
+   void			move(const GURL & dir_url);
+
+      /** Internal. Used by DjVuDocument. The #name# should {\bf not}
+	  be encoded with \Ref{GOS::encode_reserved}(). */
+   void			set_name(const GUTF8String &name);
+
+      // Internal. Used by DjVuDocument
+   GSafeFlags &		get_safe_flags(void);
+
+      // Internal. Used by DjVuImage
+   void                 merge_anno(ByteStream &out);
+
+      // Internal. Used by DjVuImage
+   void                 get_text(ByteStream &out);
+
+      // Internal. Used by DjVuImage
+   void                 get_meta(ByteStream &out);
+
+      // Internal. Used by DjVuDocEditor
+   void			rebuild_data_pool(void);
+
+      // Functions inherited from DjVuPort
+   virtual bool		inherits(const GUTF8String &class_name) const;
+   virtual void		notify_chunk_done(const DjVuPort * source, const GUTF8String &name);
+   virtual void		notify_file_flags_changed(const DjVuFile * source,
+						  long set_mask, long clr_mask);
+   virtual void		set_recover_errors(const ErrorRecoveryAction=ABORT);
+   virtual void		set_verbose_eof(const bool verbose_eof=true);
+   virtual void		report_error(const GException &ex,const bool=true);
+   static void set_decode_codec(GP<GPixmap> (*codec)(ByteStream &bs));
+
+protected:
+   GURL			url;
+   GP<DataPool>		data_pool;
+
+   GPList<DjVuFile>	inc_files_list;
+   GCriticalSection	inc_files_lock;
+   GCriticalSection	anno_lock;
+   GCriticalSection	text_lock;
+   GCriticalSection	meta_lock;
+   ErrorRecoveryAction	recover_errors;
+   bool			verbose_eof;
+   int			chunks_number;
+private:
+   bool                 initialized;
+   GSafeFlags		flags;
+
+   GThread		* decode_thread;
+   GP<DataPool>		decode_data_pool;
+   GP<DjVuFile>		decode_life_saver;
+
+   GP<DjVuPort>		simple_port;
+
+   GMonitor		chunk_mon, finish_mon;
+
+      // Functions called when the decoding thread starts
+   static void	static_decode_func(void *);
+   void	decode_func(void);
+   void	decode(const GP<ByteStream> &str);
+   GUTF8String decode_chunk(const GUTF8String &chkid,
+     const GP<ByteStream> &str, bool djvi, bool djvu, bool iw44);
+   int		get_dpi(int w, int h);
+
+      // Functions dealing with the shape directory (fgjd)
+   static GP<JB2Dict> static_get_fgjd(void *);
+   GP<JB2Dict> get_fgjd(int block=0);
+
+      // Functions used to wait for smth
+   void		wait_for_chunk(void);
+   bool		wait_for_finish(bool self);
+
+      // INCL chunk processor
+   GP<DjVuFile>	process_incl_chunk(ByteStream & str, int file_num=-1);
+
+      // Trigger: called when DataPool has all data
+   static void	static_trigger_cb(void *);
+   void		trigger_cb(void);
+   
+      // Progress callback: called from time to time
+   static void	progress_cb(int pos, void *);
+   static void	get_merged_anno(const GP<DjVuFile> & file,
+     const GP<ByteStream> &str_out, const GList<GURL> & ignore_list,
+     int level, int & max_level, GMap<GURL, void *> & map);
+   static void	get_anno(const GP<DjVuFile> & file,
+     const GP<ByteStream> &str_out);
+   static void	get_text(const GP<DjVuFile> & file,
+     const GP<ByteStream> &str_out);
+   static void	get_meta(const GP<DjVuFile> & file,
+     const GP<ByteStream> &str_out);
+
+   void          check() const;
+   GP<DjVuNavDir>find_ndir(GMap<GURL, void *> & map);
+   GP<DjVuNavDir>decode_ndir(GMap<GURL, void *> & map);
+   void		add_djvu_data(IFFByteStream & str,
+			      GMap<GURL, void *> & map,
+			      const bool included_too, const bool no_ndir=true);
+   void		move(GMap<GURL, void *> & map, const GURL & dir_url);
+private: // dummy stuff
+   static void decode(ByteStream *);
+   static GUTF8String decode_chunk(const GUTF8String &, ByteStream *,bool,bool,bool);
+   static void	get_merged_anno(const GP<DjVuFile> &,ByteStream *,
+     const GList<GURL> &, int, int &, GMap<GURL, void *> &);
+   static void	get_text(const GP<DjVuFile> &,ByteStream *);
+   static void	get_meta(const GP<DjVuFile> &,ByteStream *);
+
+};
+
+inline long
+DjVuFile::get_flags(void) const
+{
+   return flags;
+}
+
+inline GSafeFlags &
+DjVuFile::get_safe_flags(void)
+{
+   return flags;
+}
+
+inline bool
+DjVuFile::is_decoding(void) const
+{
+   return (flags & DECODING)!=0;
+}
+
+inline bool
+DjVuFile::is_decode_ok(void) const
+{
+   return (flags & DECODE_OK)!=0;
+}
+
+inline bool
+DjVuFile::is_decode_failed(void) const
+{
+   return (flags & DECODE_FAILED)!=0;
+}
+
+inline bool
+DjVuFile::is_decode_stopped(void) const
+{
+   return (flags & DECODE_STOPPED)!=0;
+}
+
+inline bool
+DjVuFile::is_data_present(void) const
+{
+   return (flags & DATA_PRESENT)!=0;
+}
+
+inline bool
+DjVuFile::is_all_data_present(void) const
+{
+   return (flags & ALL_DATA_PRESENT)!=0;
+}
+
+inline bool
+DjVuFile::are_incl_files_created(void) const
+{
+   return (flags & INCL_FILES_CREATED)!=0;
+}
+
+inline bool
+DjVuFile::is_modified(void) const
+{
+   return (flags & MODIFIED)!=0;
+}
+
+inline void
+DjVuFile::set_modified(bool m)
+{
+  flags=m ? (flags | MODIFIED) : (flags & ~MODIFIED);
+}
+
+inline bool
+DjVuFile::needs_compression(void) const
+{
+   return (flags & NEEDS_COMPRESSION)!=0;
+}
+
+inline void
+DjVuFile::set_needs_compression(bool m)
+{
+   if (m) flags=flags | NEEDS_COMPRESSION;
+   else flags=flags & ~NEEDS_COMPRESSION;
+}
+
+inline bool
+DjVuFile::can_compress(void) const
+{
+   return (flags & CAN_COMPRESS)!=0;
+}
+
+inline void
+DjVuFile::set_can_compress(bool m)
+{
+   if (m)
+     flags=flags | CAN_COMPRESS;
+   else
+     flags=flags & ~CAN_COMPRESS;
+}
+
+inline void
+DjVuFile::disable_standard_port(void)
+{
+   simple_port=0;
+}
+
+inline bool
+DjVuFile::inherits(const GUTF8String &class_name) const
+{
+   return
+      (GUTF8String("DjVuFile") == class_name) ||
+      DjVuPort::inherits(class_name);
+//      !strcmp("DjVuFile", class_name) ||
+//      DjVuPort::inherits(class_name);
+}
+
+inline void
+DjVuFile::wait_for_finish(void)
+{
+   while(wait_for_finish(1))
+     EMPTY_LOOP;
+}
+
+inline GURL
+DjVuFile::get_url(void) const
+{
+   return url;
+}
+
+inline void
+DjVuFile::set_verbose_eof
+(const bool verbose)
+{
+  verbose_eof=verbose;
+}
+
+inline void
+DjVuFile::set_recover_errors
+(const ErrorRecoveryAction action)
+{
+  recover_errors=action;
+}
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp
new file mode 100644
index 0000000..f4dcc1d
--- /dev/null
+++ b/libdjvu/DjVuFileCache.cpp
@@ -0,0 +1,263 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuFileCache.h"
+#include "debug.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+DjVuFileCache::~DjVuFileCache(void) {}
+
+int
+DjVuFileCache::Item::qsort_func(const void *el1, const void *el2)
+{
+  const Item *item1 = *(Item**)el1;
+  const Item *item2 = *(Item**)el2;
+  time_t time1=item1->get_time();
+  time_t time2=item2->get_time();
+  return time1<time2 ? -1 : time1>time2 ? 1 : 0;
+}
+
+void
+DjVuFileCache::set_max_size(int xmax_size)
+{
+   DEBUG_MSG("DjVuFileCache::set_max_size(): resizing to " << xmax_size << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock(&class_lock);
+   
+   max_size=xmax_size;
+   cur_size=calculate_size();
+
+   if (max_size>=0) clear_to_size(enabled ? max_size : 0);
+}
+
+void
+DjVuFileCache::enable(bool en)
+{
+   enabled=en;
+   set_max_size(max_size);
+}
+
+void
+DjVuFileCache::add_file(const GP<DjVuFile> & file)
+{
+   DEBUG_MSG("DjVuFileCache::add_file(): trying to add a new item\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock(&class_lock);
+
+      // See if the file is already cached
+   GPosition pos;
+   for(pos=list;pos;++pos)
+      if (list[pos]->get_file()==file) break;
+   
+   if (pos) list[pos]->refresh();	// Refresh the timestamp
+   else
+   {
+	 // Doesn't exist in the list yet
+      int _max_size=enabled ? max_size : 0;
+      if (max_size<0) _max_size=max_size;
+
+      int add_size=file->get_memory_usage();
+   
+      if (_max_size>=0 && add_size>_max_size)
+      {
+	 DEBUG_MSG("but this item is way too large => doing nothing\n");
+	 return;
+      }
+
+      if (_max_size>=0) clear_to_size(_max_size-add_size);
+
+      list.append(new Item(file));
+      cur_size+=add_size;
+      file_added(file);
+   }
+}
+
+void
+DjVuFileCache::clear_to_size(int size)
+{
+   DEBUG_MSG("DjVuFileCache::clear_to_size(): dropping cache size to " << size << "\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock(&class_lock);
+   
+   if (size==0)
+     {
+       list.empty();
+       cur_size=0;
+     } 
+   if (list.size() > 20)
+     {
+       // More than 20 elements in the cache: use qsort to
+       // sort them before picking up the oldest
+       GPArray<Item> item_arr(list.size()-1);
+       GPosition pos;
+       int i;
+       for(pos=list, i=0;pos;++pos, i++)
+         item_arr[i] = list[pos];
+       list.empty();
+       qsort(&item_arr[0], item_arr.size(), sizeof(item_arr[0]), Item::qsort_func);
+       for(i=0;i<item_arr.size() && cur_size > (int)size;i++)
+         {
+           Item *item = item_arr[i];
+           cur_size -= item->get_size();
+           file_cleared(item->file);
+           item_arr[i] = 0;
+         }
+       for (; i<item_arr.size(); i++)
+         list.append(item_arr[i]);
+       if (cur_size <= 0) 
+         cur_size = calculate_size();
+     } 
+
+   // Less than 20 elements: no reason to presort
+   while(cur_size > (int)size && list.size() > 0)
+     {
+       // Remove the oldest cache item
+       GPosition oldest_pos=list;
+       GPosition pos=list;
+       for(++pos;pos;++pos)
+         if (list[pos]->get_time()<list[oldest_pos]->get_time())
+           oldest_pos=pos;
+       cur_size -= list[oldest_pos]->get_size();
+       GP<DjVuFile> file=list[oldest_pos]->file;
+       list.del(oldest_pos);
+       file_cleared(file);
+       // cur_size *may* become negative because items may change their
+       // size after they've been added to the cache
+       if (cur_size <= 0) 
+         cur_size = calculate_size();
+     }
+   if (cur_size <= 0) 
+     cur_size = calculate_size();
+   
+   DEBUG_MSG("done: current cache size=" << cur_size << "\n");
+}
+
+int
+DjVuFileCache::calculate_size(void)
+{
+   GCriticalSectionLock lock(&class_lock);
+   
+   int size=0;
+   for(GPosition pos=list;pos;++pos)
+      size+=list[pos]->get_size();
+   return size;
+}
+
+void
+DjVuFileCache::del_file(const DjVuFile * file)
+{
+   DEBUG_MSG("DjVuFileCache::del_file(): Removing an item from cache\n");
+   DEBUG_MAKE_INDENT(3);
+
+   GCriticalSectionLock lock(&class_lock);
+
+   for(GPosition pos=list;pos;++pos)
+      if (list[pos]->get_file()==file)
+      {
+	 GP<DjVuFile> file=list[pos]->get_file();
+	 cur_size-=list[pos]->get_size();
+	 list.del(pos);
+	 file_deleted(file);
+	 break;
+      }
+   if (cur_size<0) cur_size=calculate_size();
+   DEBUG_MSG("current cache size=" << cur_size << "\n");
+}
+
+GPList<DjVuFileCache::Item>
+DjVuFileCache::get_items(void)
+{
+   GCriticalSectionLock lock(&class_lock);
+
+   return list;
+}
+
+void
+DjVuFileCache::file_added(const GP<DjVuFile> &) {}
+
+void
+DjVuFileCache::file_deleted(const GP<DjVuFile> &) {}
+
+void
+DjVuFileCache::file_cleared(const GP<DjVuFile> &) {}
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/DjVuFileCache.h b/libdjvu/DjVuFileCache.h
new file mode 100644
index 0000000..6f1f6d1
--- /dev/null
+++ b/libdjvu/DjVuFileCache.h
@@ -0,0 +1,286 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUFILECACHE_H
+#define _DJVUFILECACHE_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "DjVuFile.h"
+
+#ifndef macintosh //MCW can't compile
+# ifndef UNDER_CE
+#  include <sys/types.h>
+#  include <time.h>
+# endif 
+#else
+# include <time.h>
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+/** @name DjVuFileCache.h
+    Files #"DjVuFileCache.h"# and #"DjVuFileCache.cpp"# implement a simple
+    caching mechanism for keeping a given number of \Ref{DjVuFile} instances
+    alive. The cache estimates the size of its elements and gets rid of
+    the oldest ones when necessary.
+
+    See \Ref{DjVuFileCache} for details.
+    
+    @memo Simple DjVuFile caching class.
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+/** #DjVuFileCache# is a simple list of \Ref{DjVuFile} instances. It keeps
+    track of the total size of all elements and can get rid of the oldest
+    one once the total size becomes over some threshold. Its main purpose
+    is to keep the added \Ref{DjVuFile} instances alive until their size
+    exceeds some given threshold (set by \Ref{set_maximum_size}() function).
+    The user is supposed to use \Ref{DjVuPortcaster::name_to_port}() to
+    find a file corresponding to a given name. The cache provides no
+    naming services */
+#ifdef UNDER_CE
+class DjVuFileCache : public GPEnabled
+{
+protected:
+   DjVuFileCache(const int) {}
+public:
+   static GP<DjVuFileCache> create(const int);
+   virtual ~DjVuFileCache(void);
+   void del_file(const DjVuFile *) {}
+   void add_file(const GP<DjVuFile> &) {}
+   void clear(void) {}
+   void set_max_size(int) {}
+   int get_max_size(void) const {return 0;}
+   void enable(bool en) {}
+   bool is_enabled(void) const {return false;}
+} ;
+#else
+class DjVuFileCache : public GPEnabled
+{
+protected:
+   DjVuFileCache(const int max_size=5*2*1024*1024);
+public:
+      /** Constructs the #DjVuFileCache#
+	  @param max_size Maximum allowed size of the cache in bytes. */
+   static GP<DjVuFileCache> create(const int max_size=5*2*1024*1024);
+
+   virtual ~DjVuFileCache(void);
+
+      /** Removes file #file# from the cache */
+   void		del_file(const DjVuFile * file);
+
+      /** Adds the given file to the cache. It it's already there, its
+	  timestamp will be refreshed. */
+   void		add_file(const GP<DjVuFile> & file);
+
+      /** Clears the cache. All items will be deleted. */
+   void		clear(void);
+      /** Sets new maximum size. If the total size of all items in the cache
+	  is greater than #max_size#, the cache will be deleting the oldest
+	  items until the size is OK. */
+   void		set_max_size(int max_size);
+
+      /** Returns the maximum allowed size of the cache. */
+   int		get_max_size(void) const;
+
+      /** Enables or disables the cache. See \Ref{is_enabled}() for details
+	  @param en - If {\em en} is TRUE, the cache will be enabled.
+	         Otherwise it will be disabled.
+	*/
+   void		enable(bool en);
+
+      /** Returns #TRUE# if the cache is enabled, #FALSE# otherwise.
+	  When a cache is disabled, \Ref{add_file}(), and
+	  \Ref{del_file}() do nothing. But the {\em maximum size} is preserved
+	  inside the class so that next time the cache is enabled, it will
+	  be configured the same way. Clearly this "enable/disable" thing is
+	  for convenience only. One could easily simulate this behavior by
+	  setting the {\em maximum size} of the cache to #ZERO#. */
+   bool		is_enabled(void) const;
+
+public:
+   class Item;
+   
+   class Item : public GPEnabled
+	{
+	public:
+	   virtual ~Item(void);
+	   time_t	get_time(void) const;
+	   GP<DjVuFile>	get_file(void) const;
+	   unsigned int	get_size(void) const;
+	   void		refresh(void);
+
+	public:
+	   GP<DjVuFile>	file;
+	   time_t	time;
+	   static int	qsort_func(const void * el1, const void * el2);
+	   Item(void);
+	   Item(const GP<DjVuFile> & xfile);
+	};
+
+protected:
+   GCriticalSection	class_lock;
+   
+      /** This function is called right after the given file has been added
+	  to the cache for management. */
+   virtual void	file_added(const GP<DjVuFile> & file);
+      /** This function is called when the given file is no longer
+	  managed by the cache. */
+   virtual void	file_deleted(const GP<DjVuFile> & file);
+      /** This function is called when after the cache decides to get rid
+	  of the file. */
+   virtual void	file_cleared(const GP<DjVuFile> & file);
+
+   GPList<Item>	get_items(void);
+private:
+   GPList<Item>	list;
+   bool		enabled;
+   int		max_size;
+   int		cur_size;
+
+   int		calculate_size(void);
+   void		clear_to_size(int size);
+};
+
+
+
+//@}
+   
+inline
+DjVuFileCache::Item::Item(void) : time(::time(0)) {};
+
+inline
+DjVuFileCache::Item::Item(const GP<DjVuFile> & xfile) :
+      file(xfile), time(::time(0)) {}
+
+inline
+DjVuFileCache::Item::~Item(void) {}
+
+inline GP<DjVuFile>
+DjVuFileCache::Item::get_file(void) const
+{
+   return file;
+}
+
+inline unsigned int
+DjVuFileCache::Item::get_size(void) const
+{
+   return file->get_memory_usage();
+}
+
+inline time_t
+DjVuFileCache::Item::get_time(void) const
+{
+   return time;
+}
+
+inline void
+DjVuFileCache::Item::refresh(void)
+{
+   time=::time(0);
+}
+
+inline
+DjVuFileCache::DjVuFileCache(const int xmax_size) :
+      enabled(true), max_size(xmax_size), cur_size(0) {}
+
+inline void
+DjVuFileCache::clear(void)
+{
+   clear_to_size(0);
+}
+
+inline bool
+DjVuFileCache::is_enabled(void) const
+{
+   return enabled;
+}
+
+inline int
+DjVuFileCache::get_max_size(void) const
+{
+   return max_size;
+}
+
+#endif
+
+inline GP<DjVuFileCache>
+DjVuFileCache::create(const int max_size)
+{
+  return new DjVuFileCache(max_size);
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp
new file mode 100644
index 0000000..df9278e
--- /dev/null
+++ b/libdjvu/DjVuGlobal.cpp
@@ -0,0 +1,256 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** This file impliments the DjVuProgressTask elements.  The memory
+    functions are implimented in a separate file, because only the memory
+    functions should be compiled with out overloading of the memory functions.
+ */
+  
+
+#ifdef NEED_DJVU_PROGRESS
+#include "DjVuGlobal.h"
+
+
+// ----------------------------------------
+
+#include "GOS.h"
+#include "GThreads.h"
+#include "GException.h"
+#include "GContainer.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#define INITIAL  500
+#define INTERVAL 250
+
+class DjVuProgressTask::Data : public GPEnabled
+{
+public:
+  djvu_progress_callback *callback;
+  DjVuProgressTask *head;
+  const char *gtask;
+  unsigned long lastsigdate;
+  Data(djvu_progress_callback *_callback):
+    callback(_callback), head(0), gtask(0), lastsigdate(0) {}
+};
+
+  
+static GPMap<void *,DjVuProgressTask::Data> &
+get_map(void)
+{
+  static GPMap<void *,DjVuProgressTask::Data> xmap;
+  return xmap;
+}
+
+djvu_progress_callback *
+DjVuProgressTask::set_callback(djvu_progress_callback *_callback)
+{ 
+  djvu_progress_callback *retval=0;
+  if(_callback)
+  {
+    GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
+    void *threadID=GThread::current();
+    if(map.contains(threadID))
+    {
+      DjVuProgressTask::Data &data=*(map[threadID]);
+      retval=data.callback;
+      data.callback=_callback;
+      data.head=0;
+      data.gtask=0;
+      data.lastsigdate=0;
+    }else
+    {
+      map[threadID]=new Data(_callback);
+    }
+  }else
+  {
+    GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
+    void *threadID=GThread::current();
+    if(map.contains(threadID))
+    {
+      DjVuProgressTask::Data &data=*(map[threadID]);
+      retval=data.callback;
+      data.callback=0;
+      data.head=0;
+      data.gtask=0;
+      data.lastsigdate=0;
+      map.del(threadID);
+    }
+  }
+  return retval;
+}
+
+DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps)
+  : task(xtask),parent(0), nsteps(nsteps), runtostep(0), gdata(0), data(0)
+{
+  //  gtask=task;
+  {
+    GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
+    void *threadID=GThread::current();
+    if(map.contains(threadID))
+    {
+      gdata=new GP<Data>;
+      Data &d=*(data=((*(GP<Data> *)gdata)=map[threadID]));
+      if(d.callback)
+      {
+        unsigned long curdate = GOS::ticks();
+        startdate = curdate;
+        if (!d.head)
+          d.lastsigdate = curdate + INITIAL;
+        parent = d.head;
+        d.head = this;
+      }
+    }
+  }
+}
+
+DjVuProgressTask::~DjVuProgressTask()
+{
+  if (data && data->callback)
+  {
+    if (data->head != this)
+      G_THROW( ERR_MSG("DjVuGlobal.not_compatible") );
+    data->head = parent;
+    if (!parent)
+    {
+      unsigned long curdate = GOS::ticks();
+      if((*(data->callback))(data->gtask?data->gtask:"",curdate-startdate, curdate-startdate))
+      {
+        G_THROW("INTERRUPT");
+      }
+    }
+  }
+  delete (GP<Data> *)gdata;
+}
+
+void
+DjVuProgressTask::run(int tostep)
+{
+  if(data)
+  {
+    data->gtask=task;
+    if ((data->callback)&&(tostep>runtostep))
+    {
+      unsigned long curdate = GOS::ticks();
+      if (curdate > data->lastsigdate + INTERVAL)
+        signal(curdate, curdate);
+      runtostep = tostep;
+    }
+  }
+}
+
+void
+DjVuProgressTask::signal(unsigned long curdate, unsigned long estdate)
+{
+  int inprogress = runtostep;
+  if (inprogress > nsteps)
+    inprogress = nsteps;
+  if (inprogress > 0)
+    {
+      const unsigned long enddate = startdate+
+        (unsigned long)(((float)(estdate-startdate) * (float)nsteps) / (float)inprogress);
+      if (parent)
+      {
+        parent->signal(curdate, enddate);
+      }
+      else if (data && data->callback && curdate<enddate)
+      {
+        if((*(data->callback))(data->gtask?data->gtask:"",curdate-startdate, enddate-startdate))
+        {
+          G_THROW("INTERRUPT");
+        }
+        data->lastsigdate = curdate;
+      }
+    }
+}
+
+// Progress callback
+//
+djvu_progress_callback *
+djvu_set_progress_callback( djvu_progress_callback *callback )
+{
+   return DjVuProgressTask::set_callback(callback);
+}
+
+int djvu_supports_progress_callback(void) {return 1;}
+
+#else
+
+#ifndef HAS_DJVU_PROGRESS_TYPEDEF
+extern "C"
+{
+  void *djvu_set_progress_callback(void *);
+  int djvu_supports_progress_callback(void);
+}
+void *djvu_set_progress_callback(void *) { return 0; }
+int djvu_supports_progress_callback(void) {return 0;}
+#else
+int djvu_supports_progress_callback(void) {return 0;}
+djvu_progress_callback *
+djvu_set_progress_callback( djvu_progress_callback *) { return 0; }
+#endif
+
+#endif
+
diff --git a/libdjvu/DjVuGlobal.h b/libdjvu/DjVuGlobal.h
new file mode 100644
index 0000000..c93d8b8
--- /dev/null
+++ b/libdjvu/DjVuGlobal.h
@@ -0,0 +1,391 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUGLOBAL_H
+#define _DJVUGLOBAL_H
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#if defined(HAVE_STDINCLUDES)
+# include <new>
+#elif defined(HAVE_NEW_H)
+# include <new.h>
+#else
+# include <new> // try standard c++ anyway!
+#endif
+
+#ifdef _WIN32
+# ifdef DJVUAPI_EXPORT
+#  define DJVUAPI __declspec(dllexport)
+# else
+#  define DJVUAPI __declspec(dllimport)
+# endif
+#endif
+#ifndef DJVUAPI
+# define DJVUAPI
+#endif
+
+
+/** @name DjVuGlobal.h 
+
+    This file is included by all include files in the DjVu reference library.
+    
+	If compilation symbols #NEED_DJVU_MEMORY#, #NEED_DJVU_PROGRESS# 
+	or #NEED_DJVU_NAMES# are defined, this file enables 
+	features which are useful for certain applications of the
+    DjVu Reference Library.  These features are still experimental and
+    therefore poorly documented.
+    
+    @memo
+    Global definitions.
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- empty file.\\
+    Bill Riemers <docbill@sourceforge.net> -- real work.  */
+//@{
+
+
+/** @name DjVu Memory 
+
+    This section is enabled when compilation symbol #NEED_DJVU_MEMORY# is
+    defined.  Function #_djvu_memory_callback# can be used to redefine the C++
+    memory allocation operators.  Some operating systems (e.g. Macintoshes)
+    require very peculiar memory allocation in shared objects.  We redefine
+    the operators #new# and #delete# as #STATIC_INLINE# because we do not
+    want to export these redefined versions to other libraries.  */
+//@{
+//@}
+
+#ifdef NEED_DJVU_MEMORY
+
+# include "DjVu.h"
+
+// These define the two callbacks needed for C++
+typedef void djvu_delete_callback(void *);
+typedef void *djvu_new_callback(size_t);
+
+// These functions allow users to set the callbacks.
+int djvu_memoryObject_callback ( djvu_delete_callback*, djvu_new_callback*);
+int djvu_memoryArray_callback ( djvu_delete_callback*, djvu_new_callback*);
+
+// We need to use this inline function in all modules, but we never want it to
+// appear in the symbol table.  It seems different compilers need different
+// directives to do this...
+# ifndef STATIC_INLINE
+#  ifdef __GNUC__
+#   define STATIC_INLINE extern inline
+#  else /* !__GNUC__ */
+#   define STATIC_INLINE static inline
+#  endif /* __GNUC__ */
+# endif /* STATIC_INLINE */
+
+// This clause is used when overriding operator new
+// because the standard has slightly changed.
+# if defined( __GNUC__ ) && ( __GNUC__*1000 + __GNUC_MINOR__ >= 2091 )
+#  ifndef new_throw_spec
+#   define new_throw_spec throw(std::bad_alloc)
+#  endif /* new_throw_spec */
+#  ifndef delete_throw_spec
+#   define delete_throw_spec throw()
+#  endif /* delete_throw_spec */
+# endif /* __GNUC__ ... */
+// Old style
+# ifndef new_throw_spec
+#  define new_throw_spec
+# endif /* new_throw_spec */
+# ifndef delete_throw_spec
+#  define delete_throw_spec
+# endif  /* delete_throw_spec */
+
+# ifdef UNIX
+extern djvu_new_callback *_djvu_new_ptr;
+extern djvu_new_callback *_djvu_newArray_ptr;
+extern djvu_delete_callback *_djvu_delete_ptr;
+extern djvu_delete_callback *_djvu_deleteArray_ptr;
+
+#  ifndef NEED_DJVU_MEMORY_IMPLEMENTATION
+void *operator new (size_t) new_throw_spec;
+void *operator new[] (size_t) new_throw_spec;
+void operator delete (void *) delete_throw_spec;
+void operator delete[] (void *) delete_throw_spec;
+
+STATIC_INLINE void *
+operator new(size_t sz) new_throw_spec
+{ return (*_djvu_new_ptr)(sz); }
+STATIC_INLINE void
+operator delete(void *addr) delete_throw_spec
+{ return (*_djvu_delete_ptr)(addr); }
+STATIC_INLINE void *
+operator new [] (size_t sz) new_throw_spec
+{ return (*_djvu_newArray_ptr)(sz); }
+STATIC_INLINE void
+operator delete [] (void *addr) delete_throw_spec
+{ return (*_djvu_deleteArray_ptr)(addr); }
+#  endif /* NEED_DJVU_MEMORY_IMPLEMENTATION */
+
+# else /* UNIX */
+
+#  ifndef NEED_DJVU_MEMORY_IMPLEMENTATION
+STATIC_INLINE void *
+operator new(size_t sz) new_throw_spec
+{ return _djvu_new(sz); }
+inline_as_macro void
+operator delete(void *addr) delete_throw_spec
+{ return _djvu_delete(addr); }
+inline_as_macro void *
+operator new [] (size_t sz) new_throw_spec
+{ return _djvu_new(sz); }
+inline_as_macro void
+operator delete [] (void *addr) delete_throw_spec
+{ _djvu_deleteArray(addr); }
+#  endif /* !NEED_DJVU_MEMORY_IMPLEMENTATION */
+
+# endif /* UNIX */
+
+#else
+
+# define _djvu_free(ptr) free((ptr))
+# define _djvu_malloc(siz) malloc((siz))
+# define _djvu_realloc(ptr,siz) realloc((ptr),(siz))
+# define _djvu_calloc(siz,items) calloc((siz),(items))
+
+#endif /* NEED_DJVU_MEMORY */
+
+/** @name DjVu Progress  
+
+    This section is enabled when compilation symbol #NEED_DJVU_PROGRESS# is
+    defined.  This macro setups callback function that may be used to
+    implement a progress indicator for the encoding routines.  The decoding
+    routines do not need such a facility because it is sufficient to monitor
+    the calls to function \Ref{ByteStream::read} in class \Ref{ByteStream}.
+    
+    {\bf Code tracing macros} ---
+    Monitoring the progress of such complex algorithms requires significant
+    code support.  This is achieved by inserting {\em code tracing macros}
+    in strategic regions of the code.  
+    \begin{description}
+    \item[DJVU_PROGRESS_TASK(name,task,nsteps)]  indicates that the current
+         scope performs a task roughly divided in #nsteps# equal steps, with
+	       the specified #task# string used in the callback.
+    \item[DJVU_PROGRESS_RUN(name,tostep)] indicates that we are starting
+         an operation which will take us to step #tostep#.  The operation
+         will be considered finished when #DJVU_PROGRESS_RUN# will be called
+         again with an argument greater than #tostep#.  The execution of
+         this operation of course can be described by one subtask and so on.
+    \end{description}
+ 
+    {\bf Progress callback} --- Before defining the outermost task, you can
+    store a callback function pointer into the static member variable
+    #DjVuProgressTask::callback#.  This callback function is called
+    periodically with two unsigned long arguments.  The first argument is the
+    elapsed time. The second argument is the estimated total execution time.
+    Both times are given in milliseconds.
+
+    {\bf Important Note} --- This monitoring mechanism should not be used by
+    multithreaded programs.  */
+//@{
+
+#ifndef HAS_DJVU_PROGRESS_CALLBACKS
+# define HAS_DJVU_PROGRESS_CALLBACKS
+
+# ifdef NEED_DJVU_PROGRESS
+#  include "DjVu.h"
+
+extern djvu_progress_callback *_djvu_progress_ptr;
+
+#  define DJVU_PROGRESS_TASK(name,task,nsteps)  DjVuProgressTask task_##name(task,nsteps)
+#  define DJVU_PROGRESS_RUN(name,tostep)   { task_##name.run(tostep); }
+
+class DjVuProgressTask
+{
+public:
+  class Data;
+  ~DjVuProgressTask();
+  DjVuProgressTask(const char *task,int nsteps);
+  void run(int tostep);
+  const char *task;
+  static djvu_progress_callback *set_callback(djvu_progress_callback *ptr=0);
+private:
+  DjVuProgressTask *parent;
+  int nsteps;
+  int runtostep;
+  unsigned long startdate;
+  // Statics
+  void *gdata;
+  Data *data;
+  // Helpers
+  void signal(unsigned long curdate, unsigned long estdate);
+};
+
+# else  // ! NEED_DJVU_PROGRESS
+
+#  define DJVU_PROGRESS_TASK(name,task,nsteps)
+#  define DJVU_PROGRESS_RUN(name,step)
+
+# endif // ! NEED_DJVU_PROGRESS
+#endif // HAS_DJVU_PROGRESS_CALLBACKS
+//@}
+
+
+/** @name General functions.
+
+    This section contains functions that replace some of the standard
+    system calls without any other header file dependancies.
+ */
+
+#ifdef __cplusplus
+# define DJVUEXTERNCAPI(x) extern "C" DJVUAPI x;
+#else
+# define DJVUEXTERNCAPI(x) extern DJVUAPI x
+#endif
+
+/** This replaces fprintf(stderr,...), but with UTF8 encoded strings. */
+DJVUEXTERNCAPI(void DjVuPrintErrorUTF8(const char *fmt, ...));
+
+/** This replaces fprintf(stderr,...), but with UTF8 encoded strings. */
+DJVUEXTERNCAPI(void DjVuPrintErrorNative(const char *fmt, ...));
+
+/** This replaces printf(...), but requires UTF8 encoded strings. */
+DJVUEXTERNCAPI(void DjVuPrintMessageUTF8(const char *fmt, ...));
+
+/** This replaces printf(...), but requires UTF8 encoded strings. */
+DJVUEXTERNCAPI(void DjVuPrintMessageNative(const char *fmt, ...));
+
+/** The format (fmt) and arguments define a MessageList to be looked
+    up in the external messages and printed to stderr. */
+DJVUEXTERNCAPI(void DjVuFormatErrorUTF8(const char *fmt, ...));
+
+/** The format (fmt) and arguments define a MessageList to be looked
+    up in the external messages and printed to stderr. */
+DJVUEXTERNCAPI(void DjVuFormatErrorNative(const char *fmt, ...));
+
+/** Prints the translation of message to stderr. */
+DJVUEXTERNCAPI(void DjVuWriteError( const char *message ));
+
+/** Prints the translation of message to stdout. */
+DJVUEXTERNCAPI(void DjVuWriteMessage( const char *message ));
+
+/** A C function to perform a message lookup. Arguments are a buffer to
+  received the translated message, a buffer size (bytes), and a
+  message_list. The translated result is returned in msg_buffer encoded
+  in UTF-8. In case of error, msg_buffer is empty
+  (i.e., msg_buffer[0] == '\0').
+*/
+DJVUEXTERNCAPI(void DjVuMessageLookUpUTF8(
+  char *msg_buffer, const unsigned int buffer_size, 
+  const char *message ));
+DJVUEXTERNCAPI(void DjVuMessageLookUpNative(
+  char *msg_buffer, const unsigned int buffer_size, 
+  const char *message ));
+
+/** This function sets the program name used when 
+    searching for language files.
+*/
+DJVUEXTERNCAPI(const char *djvu_programname(const char *programname));
+
+
+/** @name DjVu Names  
+
+    This section is enabled when compilation symbol #NEED_DJVU_NAMES# is
+    defined.  This section redefines class names in order to unclutter the
+    name space of shared objects.  This is useful on systems which
+    automatically export all global symbols when building a shared object.
+    @args */
+//@{
+//@}
+
+#ifdef NEED_DJVU_NAMES
+/* The contents of this section may be generated by this shell command :
+ * % egrep -h '^(class|struct) +[A-Z_][A-Za-z0-9_]*' *.h *.cpp |\
+ *   sed -e 's:[a-z]*  *\([A-Za-z_][A-Za-z0-9_]*\).*:#define \1 DJVU_\1:g' |\
+ *   sort
+ */
+#endif // NEED_DJVU_NAMES
+
+//@}
+
+#if defined(macintosh)
+# define EMPTY_LOOP continue
+#else
+# define EMPTY_LOOP /* nop */
+#endif
+
+//  The ERR_MSG(x) macro is intended to permit automated checking of the
+//  externalized error message names against the source code. It has no
+//  effect on the executed program. It should be used to surround each
+//  message name that will need to be looked up in the external message
+//  files. In particular, it should use on all strings passed to G_THROW.
+#ifndef HAS_CTRL_C_IN_ERR_MSG
+# define HAS_CTRL_C_IN_ERR_MSG 1
+#endif
+#ifndef ERR_MSG
+# if HAS_CTRL_C_IN_ERR_MSG
+// This hack allows for the coexistence of internationalized
+// and non-internationalized code.  All internationalized error
+// message names are prefixed with a ctrl-c.  Only these will
+// be looked for in the message files.  Messages that do no 
+// start with a ctrl-c will remain untranslated.
+#  define ERR_MSG(x) "\003" x
+# else
+#  define ERR_MSG(x) x
+# endif
+#endif
+
+#endif /* _DJVUGLOBAL_H_ */
+
+
diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp
new file mode 100644
index 0000000..23a5e1e
--- /dev/null
+++ b/libdjvu/DjVuGlobalMemory.cpp
@@ -0,0 +1,307 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#ifdef NEED_DJVU_MEMORY
+#ifndef NEED_DJVU_MEMORY_IMPLEMENTATION
+#define NEED_DJVU_MEMORY_IMPLEMENTATION
+#endif /* NEED_DJVU_MEMORY_IMPLEMENTATION */
+
+#include "DjVuGlobal.h"
+#include "GException.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include "debug.h"
+
+#ifdef UNIX
+djvu_delete_callback *
+_djvu_delete_ptr=(djvu_delete_callback *)&(operator delete);
+djvu_delete_callback *
+_djvu_deleteArray_ptr=(djvu_delete_callback *)&(operator delete []);
+djvu_new_callback *
+_djvu_new_ptr=(djvu_new_callback *)&(operator new);
+djvu_new_callback *
+_djvu_newArray_ptr=(djvu_new_callback *)&(operator new []);
+#endif
+
+static djvu_delete_callback *_djvu_delete_handler = 0;
+static djvu_new_callback *_djvu_new_handler = 0;
+static djvu_delete_callback *deleteArray_handler = 0;
+static djvu_new_callback *newArray_handler = 0;
+
+static djvu_free_callback *_djvu_free_handler = 0;
+static djvu_realloc_callback *_djvu_realloc_handler = 0;
+static djvu_calloc_callback *_djvu_calloc_handler = 0;
+static djvu_malloc_callback *_djvu_malloc_handler = 0;
+
+int
+djvu_memoryObject_callback (
+  djvu_delete_callback* delete_handler,
+  djvu_new_callback* new_handler
+) {
+  if(delete_handler && new_handler)
+  {
+#ifdef UNIX
+    _djvu_new_ptr=&_djvu_new;
+    _djvu_delete_ptr=&_djvu_delete;
+#endif
+    _djvu_delete_handler=delete_handler;
+    _djvu_new_handler=new_handler;
+    return 1;
+  }else
+  {
+#ifdef UNIX
+    _djvu_new_ptr=(djvu_new_callback *)&(operator new);
+    _djvu_delete_ptr=(djvu_delete_callback *)&(operator delete);
+#endif
+    _djvu_delete_handler=0;
+    _djvu_new_handler=0;
+    return (delete_handler||new_handler)?0:1;
+  }
+  return 0;
+}
+
+int 
+djvu_set_memory_callbacks
+(
+  djvu_free_callback *free_handler,
+  djvu_realloc_callback *realloc_handler,
+  djvu_malloc_callback *malloc_handler,
+  djvu_calloc_callback *calloc_handler
+)
+{
+  if(free_handler && realloc_handler && malloc_handler)
+  {
+#ifdef UNIX
+    _djvu_new_ptr=(djvu_new_callback *)&_djvu_new;
+    _djvu_delete_ptr=(djvu_delete_callback *)&_djvu_delete;
+#endif
+    _djvu_new_handler=(djvu_new_callback *)malloc_handler;
+    _djvu_delete_handler=(djvu_delete_callback *)free_handler;
+    _djvu_malloc_handler=(djvu_malloc_callback *)malloc_handler;
+    _djvu_free_handler=(djvu_free_callback *)free_handler;
+    _djvu_realloc_handler=(djvu_realloc_callback *)realloc_handler;
+    if(calloc_handler)
+    {
+      _djvu_calloc_handler=(djvu_calloc_callback *)&calloc_handler;
+    }else
+    {
+      _djvu_calloc_handler=0;
+    }
+    return 1;
+  }else
+  {
+#ifdef UNIX
+    _djvu_new_ptr=(djvu_new_callback *)&(operator new);
+    _djvu_delete_ptr=(djvu_delete_callback *)&(operator delete);
+#endif
+    _djvu_delete_handler=0;
+    _djvu_new_handler=0;
+    _djvu_malloc_handler=0;
+    _djvu_free_handler=0;
+    _djvu_realloc_handler=0;
+    _djvu_calloc_handler=0;
+    return !(_djvu_malloc_handler
+      ||_djvu_free_handler
+      ||_djvu_realloc_handler
+      ||_djvu_calloc_handler);
+  }
+}
+
+DJVUAPI void *
+_djvu_new(size_t siz)
+{
+  void *ptr;
+#ifndef UNIX
+  if(_djvu_new_handler)
+  {
+#endif
+    if(!(ptr=(*_djvu_new_handler)(siz?siz:1)))
+    {
+      G_THROW( ERR_MSG("DjVuGlobalMemory.exhausted") );
+    }
+#ifndef UNIX
+  }else
+  {
+      ptr=::operator new(siz?siz:1);
+  }
+#endif
+  return ptr;
+}
+
+void  
+_djvu_delete(void *addr)
+{
+  if(addr)
+  {
+    if(_djvu_delete_handler)
+    {
+      (*_djvu_delete_handler)(addr);
+    }else
+    {
+      operator delete(addr);
+    }
+  }
+}
+
+void *
+_djvu_newArray(size_t siz)
+{
+  void *ptr;
+#ifndef UNIX
+  if(newArray_handler)
+  {
+#endif
+    if(!(ptr=(*newArray_handler)(siz?siz:1)))
+    {
+      G_THROW( ERR_MSG("DjVuGlobalMemory.exhausted") );
+    }
+#ifndef UNIX
+  }else
+  {
+      ptr=::new unsigned char[siz?siz:1];
+  }
+#endif
+  return ptr;
+}
+
+void
+_djvu_deleteArray(void *addr)
+{
+  if(addr)
+  {
+    if(deleteArray_handler)
+    {
+      (*deleteArray_handler)(addr);
+    }else
+    {
+#ifdef _WIN32
+                delete [] (addr) ;
+#else
+        operator delete [] (addr);
+#endif
+    }
+  }
+}
+
+void *
+_djvu_malloc(size_t siz)
+{
+  DEBUG_MSG("_djvu_malloc: siz="<<siz<<"\n");
+  return _djvu_malloc_handler?(*_djvu_malloc_handler)(siz?siz:1):malloc(siz?siz:1);
+}
+
+void *
+_djvu_calloc(size_t siz, size_t items)
+{
+  DEBUG_MSG("_djvu_calloc: siz="<<siz<<" items="<<items<<"\n");
+  void *ptr;
+  if( _djvu_calloc_handler )
+  {
+    ptr = (*_djvu_calloc_handler)(siz?siz:1, items?items:1);
+  }else if( _djvu_malloc_handler )
+  {
+    if((ptr = (*_djvu_malloc_handler)((siz?siz:1)*(items?items:1)))&&siz&&items)
+    {
+      memset(ptr,0,siz*items);
+    }
+  }else
+  { 
+    ptr = calloc(siz?siz:1, items?items:1);
+  }
+  return ptr;    
+}
+
+void *
+_djvu_realloc(void* ptr, size_t siz)
+{
+  DEBUG_MSG("_djvu_realloc: ptr="<<ptr<<" siz="<<siz<<"\n");
+  void *newptr;
+  if( _djvu_realloc_handler )
+  {
+    newptr = (*_djvu_realloc_handler)(ptr, siz);
+  }else
+  {
+    newptr = realloc(ptr, siz?siz:1);
+  }
+  return newptr;
+}
+ 
+void
+_djvu_free(void *ptr)
+{
+  DEBUG_MSG("_djvu_free: ptr="<<ptr<<"\n");
+  if(ptr)
+  {
+    if( _djvu_free_handler )
+    {
+      (*_djvu_free_handler)(ptr);
+    }else
+    {
+      free(ptr);
+    }
+  }
+}
+
+#endif
+
diff --git a/libdjvu/DjVuImage.cpp b/libdjvu/DjVuImage.cpp
new file mode 100644
index 0000000..8eeadb9
--- /dev/null
+++ b/libdjvu/DjVuImage.cpp
@@ -0,0 +1,1534 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuImage.h"
+#include "GScaler.h"
+#include "DjVuDocument.h"
+#include "DjVuPalette.h"
+#include "GContainer.h"
+#include "GSmartPointer.h"
+#include "JB2Image.h"
+#include "IW44Image.h"
+#include "DataPool.h"
+#include "ByteStream.h"
+#include "GMapAreas.h"
+#include "DjVuText.h"
+#include "IFFByteStream.h"
+#include "BSByteStream.h"
+#include "debug.h"
+#include <stdarg.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+//// DJVUIMAGE: CONSTRUCTION
+
+DjVuImage::DjVuImage(void) 
+: rotate_count(-1),relayout_sent(false)
+{
+}
+
+void
+DjVuImage::connect(const GP<DjVuFile> & xfile)
+{
+   file=xfile;
+   DjVuPort::get_portcaster()->add_route(file, this);
+}
+
+
+
+
+//// DJVUIMAGE: DATA COLLECTORS
+
+GP<DjVuInfo>
+DjVuImage::get_info(const GP<DjVuFile> & file) const
+{
+   if (file->info)
+   {
+     if(rotate_count<0)
+     {
+       const_cast<DjVuImage *>(this)->init_rotate(*(file->info));
+     }
+     return file->info;
+   }
+   GPList<DjVuFile> list=file->get_included_files();
+   for(GPosition pos=list;pos;++pos)
+   {
+      GP<DjVuInfo> info=get_info(list[pos]);
+      if (info) 
+      {
+        if(rotate_count<0)
+        {
+          const_cast<DjVuImage *>(this)->init_rotate(*(file->info));
+        }
+        return info;
+      }
+   }
+   return 0;
+}
+
+GP<IW44Image>
+DjVuImage::get_bg44(const GP<DjVuFile> & file) const
+{
+   if (file->bg44)
+     return file->bg44;
+   GPList<DjVuFile> list=file->get_included_files();
+   for(GPosition pos=list;pos;++pos)
+   {
+      GP<IW44Image> bg44=get_bg44(list[pos]);
+      if (bg44)
+        return bg44;
+   }
+   return 0;
+}
+
+GP<GPixmap>
+DjVuImage::get_bgpm(const GP<DjVuFile> & file) const
+{
+   if (file->bgpm)
+     return file->bgpm;
+   GPList<DjVuFile> list=file->get_included_files();
+   for(GPosition pos=list;pos;++pos)
+   {
+      GP<GPixmap> bgpm=get_bgpm(list[pos]);
+      if (bgpm) return bgpm;
+   }
+   return 0;
+}
+
+GP<JB2Image>
+DjVuImage::get_fgjb(const GP<DjVuFile> & file) const
+{
+   if (file->fgjb)
+     return file->fgjb;
+   GPList<DjVuFile> list=file->get_included_files();
+   for(GPosition pos=list;pos;++pos)
+   {
+      GP<JB2Image> fgjb=get_fgjb(list[pos]);
+      if (fgjb)
+        return fgjb;
+   }
+   return 0;
+}
+
+GP<GPixmap>
+DjVuImage::get_fgpm(const GP<DjVuFile> & file) const
+{
+   if (file->fgpm)
+     return file->fgpm;
+   GPList<DjVuFile> list=file->get_included_files();
+   for(GPosition pos=list;pos;++pos)
+   {
+      GP<GPixmap> fgpm=get_fgpm(list[pos]);
+      if (fgpm)
+        return fgpm;
+   }
+   return 0;
+}
+
+GP<DjVuPalette>
+DjVuImage::get_fgbc(const GP<DjVuFile> & file) const
+{
+   if (file->fgbc)
+     return file->fgbc;
+   GPList<DjVuFile> list=file->get_included_files();
+   for(GPosition pos=list;pos;++pos)
+   {
+      GP<DjVuPalette> fgbc=get_fgbc(list[pos]);
+      if (fgbc) return fgbc;
+   }
+   return 0;
+}
+
+GP<DjVuInfo>   
+DjVuImage::get_info() const
+{
+   if (file)
+   {
+     return get_info(file);
+   }else
+   {
+     return 0;
+   }
+}
+
+GP<ByteStream>
+DjVuImage::get_anno() const
+{
+   GP<ByteStream> out = ByteStream::create();
+   ByteStream &mbs = *out;
+   if (file) 
+   {
+     file->merge_anno(mbs);
+   }
+   mbs.seek(0);
+   if(!mbs.size())
+   {
+     out=0;
+   }
+   return out;
+}
+
+GP<ByteStream>
+DjVuImage::get_text() const
+{
+   GP<ByteStream> out = ByteStream::create();
+   ByteStream &mbs = *out;
+   if (file) 
+   {
+     file->get_text(mbs);
+   }
+   mbs.seek(0);
+   if(!mbs.size())
+   {
+     out=0;
+   }
+   return out;
+}
+
+GP<ByteStream>
+DjVuImage::get_meta() const
+{
+   GP<ByteStream> out = ByteStream::create();
+   ByteStream &mbs = *out;
+   if (file) 
+   {
+     file->get_meta(mbs);
+   }
+   mbs.seek(0);
+   if(!mbs.size())
+   {
+     out=0;
+   }
+   return out;
+}
+
+GP<IW44Image>   
+DjVuImage::get_bg44() const
+{
+   if (file)
+     return get_bg44(file);
+   else
+     return 0;
+}
+
+GP<GPixmap>   
+DjVuImage::get_bgpm() const
+{
+   if (file)
+     return get_bgpm(file);
+   else
+     return 0;
+}
+
+GP<JB2Image>   
+DjVuImage::get_fgjb() const
+{
+   if (file)
+     return get_fgjb(file);
+   else
+     return 0;
+}
+
+GP<GPixmap>    
+DjVuImage::get_fgpm() const
+{
+   if (file)
+     return get_fgpm(file);
+   else
+     return 0;
+}
+
+GP<DjVuPalette>    
+DjVuImage::get_fgbc() const
+{
+   if (file)
+     return get_fgbc(file);
+   else
+     return 0;
+}
+
+int
+DjVuImage::get_width() const
+{
+   GP<DjVuInfo> info=get_info();
+   return info?((rotate_count&1)?(info->height):(info->width)):0;
+}
+
+int
+DjVuImage::get_height() const
+{
+   GP<DjVuInfo> info=get_info();
+   return info?((rotate_count&1)?(info->width):(info->height)):0;
+}
+
+int
+DjVuImage::get_real_width() const
+{
+   GP<DjVuInfo> info=get_info();
+   return info ? info->width : 0;
+}
+
+int
+DjVuImage::get_real_height() const
+{
+   GP<DjVuInfo> info=get_info();
+   return info ? info->height : 0;
+}
+
+int
+DjVuImage::get_version() const
+{
+   GP<DjVuInfo> info=get_info();
+   return info ? info->version : DJVUVERSION;
+}
+
+int
+DjVuImage::get_dpi() const
+{
+   GP<DjVuInfo> info=get_info();
+   return info ? info->dpi : 300;
+}
+
+int
+DjVuImage::get_rounded_dpi() const
+{
+   return (get_dpi()+5)/10*10;
+#if 0   
+      /* This code used to round the reported dpi to 25, 50, 75, 100, 150,
+	 300, and 600. Now we just round the dpi to 10ths and return it */
+   int dpi=get_dpi();
+   if (dpi>700) return dpi;
+  
+   const int std_dpi[]={ 25, 50, 75, 100, 150, 300, 600 };
+   const int std_dpis=sizeof(std_dpi)/sizeof(std_dpi[0]);
+   int min_dist=abs(dpi-std_dpi[0]);
+   int min_idx=0;
+   for(int i=1;i<std_dpis;i++)
+      if (abs(std_dpi[i]-dpi)<min_dist)
+      {
+         min_dist=abs(std_dpi[i]-dpi);
+         min_idx=i;
+      };
+   return std_dpi[min_idx];
+#endif
+}
+
+double
+DjVuImage::get_gamma() const
+{
+   GP<DjVuInfo> info=get_info();
+   return info ? info->gamma : 2.2;
+}
+
+GUTF8String
+DjVuImage::get_mimetype() const
+{
+   return file ? file->mimetype : GUTF8String();
+}
+
+
+//// DJVUIMAGE: UTILITIES
+
+GUTF8String
+DjVuImage::get_short_description() const
+{
+  GUTF8String msg = "Empty";
+  int width = get_width();
+  int height = get_height();
+  if (width && height)
+    {
+      if (file && file->file_size>100)
+	//msg.format("%dx%d in %0.1f Kb", width, height, file->file_size/1024.0);
+	msg.format( ERR_MSG("DjVuImage.short1") "\t%d\t%d\t%0.1f",
+		    width, height, file->file_size/1024.0 );
+      else
+	//msg.format("%dx%d", width, height);
+	msg.format( ERR_MSG("DjVuImage.short2") "\t%d\t%d", width, height );
+    }
+  return msg;
+}
+
+GUTF8String
+DjVuImage::get_long_description() const
+{
+  return file?(file->description):GUTF8String();
+}
+
+
+void
+DjVuImage::notify_chunk_done(const DjVuPort *, const GUTF8String & name)
+{
+   if (!relayout_sent &&
+     ( !name.cmp("INFO", 4) ||
+       !name.cmp("PMxx", 2) ||
+       !name.cmp("BMxx", 2)  ) )
+   {
+      DjVuPort::get_portcaster()->notify_relayout(this);
+      relayout_sent=true;
+   } 
+   else if (!name.cmp("Sxxx", 1) ||
+            !name.cmp("BGxx", 2) ||
+            !name.cmp("FGxx", 2) ||
+            !name.cmp("BMxx", 2) ||
+            !name.cmp("PMxx", 2)  )
+     DjVuPort::get_portcaster()->notify_redisplay(this);
+}
+
+
+
+
+
+
+//// DJVUIMAGE: OLD-STYLE DECODING
+
+DjVuInterface::~DjVuInterface() 
+{
+}
+
+class DjVuImageNotifier : public DjVuPort
+{
+  friend class DjVuImage;
+  DjVuInterface  *notifier;
+  GP<DataPool>	  stream_pool;
+  GURL		  stream_url;
+public:
+  DjVuImageNotifier(DjVuInterface *notifier);
+  GP<DataPool> request_data(const DjVuPort *src, const GURL & url);
+  void notify_chunk_done(const DjVuPort *, const GUTF8String &name);
+  void notify_redisplay(const class DjVuImage * source);
+  void notify_relayout(const class DjVuImage * source);
+};
+
+DjVuImageNotifier::DjVuImageNotifier(DjVuInterface *notifier)
+  : notifier(notifier)
+{
+}
+
+GP<DataPool> 
+DjVuImageNotifier::request_data(const DjVuPort *src, const GURL & url)
+{
+  if (url!=stream_url)
+    G_THROW( ERR_MSG("DjVuImage.not_decode") );
+  return stream_pool;
+}
+
+void 
+DjVuImageNotifier::notify_redisplay(const class DjVuImage * source)
+{
+  if (notifier)
+    notifier->notify_redisplay();
+}
+
+void 
+DjVuImageNotifier::notify_relayout(const class DjVuImage * source)
+{
+  if (notifier)
+    notifier->notify_relayout();
+}
+
+void 
+DjVuImageNotifier::notify_chunk_done(const DjVuPort *, const GUTF8String &name)
+{
+  if (notifier)
+    notifier->notify_chunk(name, "" );
+}
+
+void
+DjVuImage::decode(ByteStream & str, DjVuInterface *notifier)
+{
+  DEBUG_MSG("DjVuImage::decode(): decoding old way...\n");
+  DEBUG_MAKE_INDENT(3);
+  if (file) 
+    G_THROW( ERR_MSG("DjVuImage.bad_call") );
+  GP<DjVuImageNotifier> pport = new DjVuImageNotifier(notifier);
+  pport->stream_url=GURL::UTF8("internal://fake/fake.djvu");
+  pport->stream_pool=DataPool::create();
+  // Get all the data first
+  int length;
+  char buffer[1024];
+  while((length=str.read(buffer, 1024)))
+    pport->stream_pool->add_data(buffer, length);
+  pport->stream_pool->set_eof();
+  GP<DjVuDocument> doc = DjVuDocument::create_wait(pport->stream_url, (DjVuImageNotifier*)pport);
+  GP<DjVuImage> dimg=doc->get_page(-1, true, (DjVuImageNotifier*)pport);
+  file=dimg->get_djvu_file();
+  if (file->is_decode_stopped())
+    G_THROW( DataPool::Stop );
+  if (file->is_decode_failed())
+    G_THROW( ByteStream::EndOfFile ); // guess
+  if (!file->is_decode_ok())
+    G_THROW( ERR_MSG("DjVuImage.mult_error") );
+  DEBUG_MSG("decode DONE\n");
+}
+
+
+//// DJVUIMAGE: CHECKING
+
+static int
+compute_red(int w, int h, int rw, int rh)
+{
+  for (int red=1; red<16; red++)
+    if (((w+red-1)/red==rw) && ((h+red-1)/red==rh))
+      return red;
+  return 16;
+}
+
+
+int 
+DjVuImage::is_legal_bilevel() const
+{
+  // Components
+  GP<DjVuInfo> info = get_info();
+  GP<JB2Image> fgjb = get_fgjb();
+  GP<IW44Image> bg44 = get_bg44();
+  GP<GPixmap>  bgpm = get_bgpm();
+  GP<GPixmap>  fgpm = get_fgpm();
+  // Check info
+  if (! info)
+    return 0;
+  int width = info->width;
+  int height = info->height;
+  if (! (width>0 && height>0))
+    return 0;
+  // Check fgjb
+  if (!fgjb)
+    return 0;
+  if (fgjb->get_width()!=width || fgjb->get_height()!=height)
+    return 0;
+  // Check that color information is not present.
+  if (bg44 || bgpm || fgpm)
+    return 0;
+  // Ok.
+  return 1;
+}
+
+int 
+DjVuImage::is_legal_photo() const
+{
+  // Components
+  GP<DjVuInfo> info = get_info();
+  GP<JB2Image> fgjb = get_fgjb(); 
+  GP<IW44Image> bg44 = get_bg44();
+  GP<GPixmap>  bgpm = get_bgpm();
+  GP<GPixmap>  fgpm = get_fgpm();
+  // Check info
+  if (! info)
+    return 0;
+  int width = info->width;
+  int height = info->height;
+  if (! (width>0 && height>0))
+    return 0;
+  // Check that extra information is not present.
+  if (fgjb || fgpm)
+    return 0;
+  // Check bg44
+  if (bg44 && bg44->get_width()==width && bg44->get_height()==height)
+    return 1;
+  // Check bgpm
+  if (bgpm && (int)bgpm->columns()==width && (int)bgpm->rows()==height)
+    return 1;
+  // Ok.
+  return 0;
+}
+
+int 
+DjVuImage::is_legal_compound() const
+{
+  // Components
+  GP<DjVuInfo>     info = get_info();
+  GP<JB2Image>     fgjb = get_fgjb();
+  GP<IW44Image>     bg44 = get_bg44();
+  GP<GPixmap>      bgpm = get_bgpm();
+  GP<GPixmap>      fgpm = get_fgpm();
+  GP<DjVuPalette>  fgbc = get_fgbc();
+  // Check size
+  if (! info)
+    return 0;
+  int width = info->width;
+  int height = info->height;
+  if (! (width>0 && height>0))
+    return 0;
+  // Check fgjb
+  if (!fgjb)
+    return 0;
+  if (fgjb->get_width()!=width || fgjb->get_height()!=height)
+    return 0;
+  // Check background
+  int bgred = 0;
+  if (bg44)
+    bgred = compute_red(width, height, bg44->get_width(), bg44->get_height());
+  else if (bgpm)
+    bgred = compute_red(width, height, bgpm->columns(), bgpm->rows());
+  if (bgred<1 || bgred>12)
+    return 0;
+  // Check foreground colors
+  int fgred = 0;
+  if (fgbc)
+    fgred = 1;
+  else if (fgpm)
+    fgred = compute_red(width, height, fgpm->columns(), fgpm->rows());
+  if (fgred<1 || fgred>12)
+    return 0;
+  // Check that all components are present
+  if (fgjb && bgred && fgred)
+    return 1;
+  // Unrecognized
+  return 0;
+}
+
+
+//// DJVUIMAGE: LOW LEVEL RENDERING
+
+GP<GBitmap>
+DjVuImage::get_bitmap(const GRect &rect, 
+                      int subsample, int align) const
+{
+  // Access image size
+  int width = get_real_width();
+  int height = get_real_height();
+  GP<JB2Image> fgjb = get_fgjb();
+  if ( width && height && fgjb && 
+       (fgjb->get_width() == width) && 
+       (fgjb->get_height() == height) ) 
+    {
+      return fgjb->get_bitmap(rect, subsample, align);
+    }
+  return 0;
+}
+
+GP<GPixmap>
+DjVuImage::get_bg_pixmap(const GRect &rect, 
+                         int subsample, double gamma, GPixel white) const
+{
+  GP<GPixmap> pm = 0;
+  // Access image size
+  
+  GP<DjVuInfo> info = get_info();
+  int width = get_real_width();
+  int height = get_real_height();
+
+
+  if (width<=0 || height<=0 || !info) return 0;
+  // Compute gamma_correction
+  double gamma_correction = 1.0;
+  if (gamma > 0)
+    gamma_correction = gamma / info->gamma;
+  if (gamma_correction < 0.1)
+    gamma_correction = 0.1;
+  else if (gamma_correction > 10)
+    gamma_correction = 10;
+  
+  // CASE1: Incremental BG IW44Image
+  GP<IW44Image> bg44 = get_bg44();
+  if (bg44)
+    {
+      int w = bg44->get_width();
+      int h = bg44->get_height();
+      // Avoid silly cases
+      if (w==0 || h==0 || width==0 || height==0)
+        return 0;
+      // Determine how much bg44 is reduced
+      int red = compute_red(width,height,w,h);
+      if (red<1 || red>12)
+        return 0;
+      // Handle pure downsampling cases
+      if (subsample == red)
+        pm = bg44->get_pixmap(1,rect);
+      else if (subsample == 2*red)
+        pm = bg44->get_pixmap(2,rect);    
+      else if (subsample == 4*red)
+        pm = bg44->get_pixmap(4,rect); 
+      else if (subsample == 8*red)
+        pm = bg44->get_pixmap(8,rect); 
+      // Handle fractional downsampling case
+      else if (red*4 == subsample*3)
+        {
+          GRect nrect = rect;
+          GRect xrect = rect;
+          xrect.xmin = (xrect.xmin/3)*4;
+          xrect.ymin = (xrect.ymin/3)*4;
+          xrect.xmax = ((xrect.xmax+2)/3)*4;
+          xrect.ymax = ((xrect.ymax+2)/3)*4;
+          nrect.translate(-xrect.xmin*3/4, -xrect.ymin*3/4);
+          if (xrect.xmax > w) 
+            xrect.xmax = w;
+          if (xrect.ymax > h) 
+            xrect.ymax = h;
+          GP<GPixmap> ipm = bg44->get_pixmap(1,xrect);
+          pm = GPixmap::create();
+          pm->downsample43(ipm, &nrect);
+        }
+      // Handle all other cases with pixmapscaler
+      else
+        {
+          // find suitable power of two
+          int po2 = 16;
+          while (po2>1 && subsample<po2*red)
+            po2 >>= 1;
+          // setup pixmap scaler
+          int inw = (w+po2-1)/po2;
+          int inh = (h+po2-1)/po2;
+          int outw = (width+subsample-1)/subsample;
+          int outh = (height+subsample-1)/subsample;
+          GP<GPixmapScaler> gps=GPixmapScaler::create(inw, inh, outw, outh);
+          GPixmapScaler &ps=*gps;
+          ps.set_horz_ratio(red*po2, subsample);
+          ps.set_vert_ratio(red*po2, subsample);
+          // run pixmap scaler
+          GRect xrect;
+          ps.get_input_rect(rect,xrect);
+          GP<GPixmap> ipm = bg44->get_pixmap(po2,xrect);
+          pm = GPixmap::create();
+          ps.scale(xrect, *ipm, rect, *pm);
+        }
+      // Apply gamma correction
+      if (pm)
+        if (gamma_correction!=1.0 || white != GPixel::WHITE)
+          pm->color_correct(gamma_correction, white);
+      return pm;
+    }
+
+  // CASE 2: Raw background pixmap
+  GP<GPixmap>  bgpm = get_bgpm();
+  if (bgpm)
+    {
+      int w = bgpm->columns();
+      int h = bgpm->rows();
+      // Avoid silly cases
+      if (w==0 || h==0 || width==0 || height==0)
+        return 0;
+      // Determine how much bgpm is reduced
+      int red = compute_red(width,height,w,h);
+      if (red<1 || red>12)
+        return 0;
+      // Handle pure downsampling cases
+      int ratio = subsample/red;
+      if (subsample==ratio*red && ratio>=1)
+        {
+          pm = GPixmap::create();
+          if (ratio == 1)
+            pm->init(*bgpm, rect);
+          else if (ratio > 1)
+            pm->downsample(bgpm, ratio, &rect);
+        }
+      // Handle all other cases with pixmapscaler
+      else
+        {
+          // setup pixmap scaler
+          int outw = (width+subsample-1)/subsample;
+          int outh = (height+subsample-1)/subsample;
+          GP<GPixmapScaler> gps=GPixmapScaler::create(w, h, outw, outh);
+          GPixmapScaler &ps=*gps;
+          ps.set_horz_ratio(red, subsample);
+          ps.set_vert_ratio(red, subsample);
+          // run pixmap scaler
+          pm = GPixmap::create();
+          GRect xrect(0,0,w,h);
+          ps.scale(xrect, *bgpm, rect, *pm);
+        }
+      // Apply gamma correction
+      if (pm)
+        if (gamma_correction!=1.0 || white != GPixel::WHITE)
+          pm->color_correct(gamma_correction, white);
+      return pm;
+    }
+
+  // FAILURE
+  return 0;
+}
+
+
+GP<GPixmap>
+DjVuImage::get_bg_pixmap(const GRect &rect, int subsample, double gamma) const
+{
+  return get_bg_pixmap(rect, subsample, gamma, GPixel::WHITE);
+}
+
+
+int  
+DjVuImage::stencil(GPixmap *pm, const GRect &rect,
+		   int subsample, double gamma, GPixel white) const
+{
+  // Warping and blending. 
+  if (!pm)
+    return 0;
+  // Access components
+  
+  GP<DjVuInfo> info = get_info();
+  int width = get_real_width();
+  int height = get_real_height();
+
+
+  if (width<=0 || height<=0 || !info) return 0;
+  GP<JB2Image> fgjb = get_fgjb();
+  GP<GPixmap> fgpm = get_fgpm();
+  GP<DjVuPalette> fgbc = get_fgbc();
+  
+  // Compute gamma_correction
+  double gamma_correction = 1.0;
+  if (gamma > 0)
+    gamma_correction = gamma / info->gamma;
+  if (gamma_correction < 0.1)
+    gamma_correction = 0.1;
+  else if (gamma_correction > 10)
+    gamma_correction = 10;
+
+  // Compute alpha map and relevant JB2Image components
+  GList<int> components;
+  GP<GBitmap> bm;
+  if (fgjb)
+    {
+      JB2Image *jimg = fgjb;
+      if (! (width && height && 
+             jimg->get_width() == width && 
+             jimg->get_height() == height ) )
+        return 0;
+      // Decode bitmap
+      bm = GBitmap::create(rect.height(), rect.width());
+      bm->set_grays(1+subsample*subsample);
+      int rxmin = rect.xmin * subsample;
+      int rymin = rect.ymin * subsample;
+      for (int blitno = 0; blitno < jimg->get_blit_count(); blitno++)
+        {
+          const JB2Blit *pblit = jimg->get_blit(blitno);
+          const JB2Shape  &pshape = jimg->get_shape(pblit->shapeno);
+          if (pshape.bits &&
+              pblit->left <= rect.xmax * subsample &&
+              pblit->bottom <= rect.ymax * subsample &&
+              pblit->left+(int)pshape.bits->columns() >= rect.xmin*subsample &&
+              pblit->bottom+(int)pshape.bits->rows() >= rect.ymin*subsample )
+            {
+              // Record component list
+              if (fgbc) components.append(blitno);
+              // Blit
+              bm->blit(pshape.bits, 
+                       pblit->left - rxmin, pblit->bottom - rymin, 
+                       subsample);
+            }
+        }
+    }
+
+
+  // TWO LAYER MODEL
+  if (bm && fgbc)
+    {
+      // Perform attenuation from scratch
+      pm->attenuate(bm, 0, 0);
+      // Check that fgbc has the correct size
+      JB2Image *jimg = fgjb;
+      DjVuPalette *fg = fgbc;
+      if (jimg->get_blit_count() != fg->colordata.size())
+        return 0;
+      // Copy and color correct palette
+      int palettesize = fg->size();
+      GTArray<GPixel> colors(0,palettesize-1);
+      for (int i=0; i<palettesize; i++)
+        fg->index_to_color(i, colors[i]);
+      GPixmap::color_correct(gamma_correction, white, colors, palettesize);
+      // Blit all components (one color at a time)
+      while (components.size() > 0)
+        {
+          GPosition nullpos;
+          GPosition pos = components;
+          int lastx = 0;
+          int colorindex = fg->colordata[components[pos]];
+          if (colorindex >= palettesize)
+            G_THROW( ERR_MSG("DjVuImage.corrupted") );
+          // Gather relevant components and relevant rectangle
+          GList<int> compset;
+          GRect comprect;
+          while (pos)
+            {
+              int blitno = components[pos];
+              const JB2Blit *pblit = jimg->get_blit(blitno);
+              if (pblit->left < lastx) break; 
+              lastx = pblit->left;
+              if (fg->colordata[blitno] == colorindex)
+                {
+                  const JB2Shape  &pshape = jimg->get_shape(pblit->shapeno);
+                  GRect rect(pblit->left, pblit->bottom, 
+                             pshape.bits->columns(), pshape.bits->rows());
+                  comprect.recthull(comprect, rect);
+                  compset.insert_before(nullpos, components, pos);
+                  continue;
+                }
+              ++pos;
+            }
+          // Round alpha map rectangle
+          comprect.xmin = comprect.xmin / subsample;
+          comprect.ymin = comprect.ymin / subsample;
+          comprect.xmax = (comprect.xmax+subsample-1) / subsample;
+          comprect.ymax = (comprect.ymax+subsample-1) / subsample;
+          comprect.intersect(comprect, rect);
+          // Compute alpha map for that color
+          bm = 0;
+          bm = GBitmap::create(comprect.height(), comprect.width());
+          bm->set_grays(1+subsample*subsample);
+          int rxmin = comprect.xmin * subsample;
+          int rymin = comprect.ymin * subsample;
+          for (pos=compset; pos; ++pos)
+            {
+              int blitno = compset[pos];
+              const JB2Blit *pblit = jimg->get_blit(blitno);
+              const JB2Shape  &pshape = jimg->get_shape(pblit->shapeno);
+              bm->blit(pshape.bits, 
+                       pblit->left - rxmin, pblit->bottom - rymin, 
+                       subsample);
+            }
+          // Blend color into background pixmap
+          pm->blit(bm, comprect.xmin-rect.xmin, comprect.ymin-rect.ymin, 
+                   &colors[colorindex]);
+        }
+      return 1;
+    }
+
+
+  // THREE LAYER MODEL
+  if (bm && fgpm)
+    {
+      // This follows fig. 4 in Adelson "Layered representations for image
+      // coding" (1991) http://www-bcs.mit.edu/people/adelson/papers.html.
+      // The properly warped background is already in PM.  The properly warped
+      // alpha map is already in BM.  We just have to warp the foreground and
+      // perform alpha blending.
+#ifdef SIMPLE_THREE_LAYER_RENDERING
+      int w = fgpm->columns();
+      int h = fgpm->rows();
+      // Determine foreground reduction
+      int red = compute_red(width,height, w, h);
+      if (red<1 || red>12)
+        return 0;
+      // Warp foreground pixmap
+      GPixmapScaler ps(w,h,width/subsample+1,height/subsample+1);
+      ps.set_horz_ratio(red,subsample);
+      ps.set_vert_ratio(red,subsample);
+      GP<GPixmap> nfg = new GPixmap;
+      GRect provided(0,0,w,h);
+      ps.scale(provided, *fgpm, rect, *nfg);
+      // Attenuate background and blit
+      nfg->color_correct(gamma_correction, white);
+      pm->blend(bm, 0, 0, nfg); // blend == attenuate + blit
+      return 1;
+#else 
+      // Things are now a little bit more complex because the convenient
+      // function GPixmap::stencil() simultaneously upsamples the foreground 
+      // by an integer factor and performs the alpha blending.  We have
+      // to determine how and when this facility can be used.
+      int w = fgpm->columns();
+      int h = fgpm->rows();
+      // Determine foreground reduction
+      int red = compute_red(width,height,w,h);
+      if (red<1 || red>12)
+        return 0;
+      // Try supersampling foreground pixmap by an integer factor
+      int supersample = ( red>subsample ? red/subsample : 1);
+      int wantedred = supersample*subsample;
+      // Try simple foreground upsampling
+      if (red == wantedred)
+        {
+          // Simple foreground upsampling is enough.
+          pm->stencil(bm, fgpm, supersample, &rect, gamma_correction, white);
+          return 1;
+        }
+      else 
+        {
+          // Must pre-warp foreground pixmap
+          GP<GPixmap> nfg;
+          int desw = (w*red+wantedred-1)/wantedred;
+          int desh = (h*red+wantedred-1)/wantedred;
+          // Cache rescaled fgpm for speed
+          static const DjVuImage *tagimage  = 0;
+          static const GPixmap *tagfgpm   = 0;
+          static GP<GPixmap> cachednfg = 0;
+          // Check whether cached fgpm applies.
+          if ( cachednfg && this==tagimage && fgpm==tagfgpm
+               && desw==(int)cachednfg->columns()
+               && desh==(int)cachednfg->rows() )
+            {
+              nfg = cachednfg;
+            }
+          else
+            {
+              GP<GPixmapScaler> gps=GPixmapScaler::create(w,h,desw,desh);
+              GPixmapScaler &ps=*gps;
+              ps.set_horz_ratio(red, wantedred);
+              ps.set_vert_ratio(red, wantedred);
+              nfg = GPixmap::create();
+              GRect provided(0,0,w,h);
+              GRect desired(0,0,desw,desh);
+              ps.scale(provided, *fgpm, desired, *nfg);
+            }
+          // Use combined warp+blend function
+          pm->stencil(bm, nfg, supersample, &rect, gamma_correction, white);
+          // Cache
+          tagimage = this;
+          tagfgpm = fgpm;
+          cachednfg = nfg;
+          return 1;
+        }
+#endif
+    }
+  
+  // FAILURE
+  return 0;
+}
+
+
+GP<GPixmap>
+DjVuImage::get_fg_pixmap(const GRect &rect, 
+                         int subsample, double gamma, GPixel white) const
+{
+  // Obtain white background pixmap
+  GP<GPixmap> pm;
+  // Access components
+  const int width = get_real_width();
+  const int height = get_real_height();
+  if (width && height)
+  {
+    pm = GPixmap::create(rect.height(),rect.width(), &GPixel::WHITE);
+    if (!stencil(pm, rect, subsample, gamma, white))
+      pm=0;
+  }
+  return pm;
+}
+
+
+GP<GPixmap>
+DjVuImage::get_fg_pixmap(const GRect &rect, 
+                         int subsample, double gamma) const
+{
+  return get_fg_pixmap(rect, subsample, gamma, GPixel::WHITE);
+}
+
+
+GP<GPixmap>
+DjVuImage::get_pixmap(const GRect &rect, int subsample, 
+                      double gamma, GPixel white) const
+{
+  // Get background
+  GP<GPixmap> pm = get_bg_pixmap(rect, subsample, gamma, white);
+  // Superpose foreground
+  if (! stencil(pm, rect, subsample, gamma, white))
+    // Avoid ugly progressive display (hack)
+    if (get_fgjb()) return 0;
+  // Return
+  return pm;
+}
+
+
+GP<GPixmap>
+DjVuImage::get_pixmap(const GRect &rect, int subsample, 
+                      double gamma) const
+{
+  return get_pixmap(rect, subsample, gamma, GPixel::WHITE);
+}
+
+
+//// DJVUIMAGE: RENDERING (ARBITRARY SCALE)
+
+typedef GP<GBitmap>(DjVuImage::*BImager)(const GRect&,int,int) const;
+typedef GP<GPixmap>(DjVuImage::*PImager)(const GRect&,int,double,GPixel) const;
+
+static GP<GBitmap>
+do_bitmap(const DjVuImage &dimg, BImager get,
+          const GRect &inrect, const GRect &inall, int align )
+{
+  GRect rect=inrect;
+  GRect all=inall;
+  if (! dimg.get_info())
+    return 0;
+  if( dimg.get_rotate() )
+    {
+      GRectMapper mapper;
+      mapper.rotate(-dimg.get_rotate());
+      mapper.map(rect);
+      mapper.map(all);
+    }
+  // Sanity
+  if (! ( all.contains(rect.xmin, rect.ymin) &&
+          all.contains(rect.xmax-1, rect.ymax-1) ))
+    G_THROW( ERR_MSG("DjVuImage.bad_rect") );
+  // Check for integral reduction
+  int red;
+  int w = dimg.get_real_width();
+  int h = dimg.get_real_height();
+
+  int rw = all.width();
+  int rh = all.height();
+  GRect zrect = rect; 
+  zrect.translate(-all.xmin, -all.ymin);
+  for (red=1; red<=15; red++)
+    if (rw*red>w-red && rw*red<w+red && rh*red>h-red && rh*red<h+red)
+    {
+        GP<GBitmap> bm=(dimg.*get)(zrect, red, align);
+        if(bm)
+            return bm->rotate(dimg.get_rotate());
+        else
+	        return NULL;
+    }
+  // Find best reduction
+  for (red=15; red>1; red--)
+    if ( (rw*red < w && rh*red < h) ||
+         (rw*red*3 < w || rh*red*3 < h) )
+      break;
+  // Setup bitmap scaler
+  if (w<=0 || h<=0) return 0;
+  GP<GBitmapScaler> gbs=GBitmapScaler::create();
+  GBitmapScaler &bs=*gbs;
+  bs.set_input_size( (w+red-1)/red, (h+red-1)/red );
+  bs.set_output_size( rw, rh );
+  bs.set_horz_ratio( rw*red, w );
+  bs.set_vert_ratio( rh*red, h );
+  // Scale
+  GRect srect;
+  bs.get_input_rect(zrect, srect);
+  GP<GBitmap> sbm = (dimg.*get)(srect, red, 1);
+  if (!sbm) return 0;
+  int border = ((zrect.width() + align - 1) & ~(align - 1)) - zrect.width();
+  GP<GBitmap> bm = GBitmap::create(zrect.height(), zrect.width(), border);
+  bs.scale(srect, *sbm, zrect, *bm);
+  if( bm )
+      return bm->rotate(dimg.get_rotate());
+  else
+      return NULL;
+}
+
+static GP<GPixmap>
+do_pixmap(const DjVuImage &dimg, PImager get,
+          const GRect &inrect, const GRect &inall, 
+          double gamma, GPixel white )
+{
+  GRect rect=inrect;
+  GRect all=inall;
+  if (! dimg.get_info())
+    return 0;
+  if( dimg.get_rotate()%4 )
+    {
+      GRectMapper mapper;
+      mapper.rotate(-dimg.get_rotate());
+      mapper.map(rect);
+      mapper.map(all);
+    }
+  
+  // Sanity
+  if (! ( all.contains(rect.xmin, rect.ymin) &&
+          all.contains(rect.xmax-1, rect.ymax-1) ))
+    G_THROW( ERR_MSG("DjVuImage.bad_rect2") );
+  // Check for integral reduction
+  int red, w=0, h=0, rw=0, rh=0;
+  w = dimg.get_real_width();
+  h = dimg.get_real_height();
+  rw = all.width();
+  rh = all.height();
+  GRect zrect = rect; 
+  zrect.translate(-all.xmin, -all.ymin);
+  for (red=1; red<=15; red++)
+    if (rw*red>w-red && rw*red<w+red && rh*red>h-red && rh*red<h+red)
+    {
+      GP<GPixmap> pm = (dimg.*get)(zrect, red, gamma, white);
+        if( pm ) 
+            return pm->rotate(dimg.get_rotate());
+        else
+            return NULL;
+    }
+  // These reductions usually go faster (improve!)
+  static int fastred[] = { 12,6,4,3,2,1 };
+  // Find best reduction
+  for (int i=0; (red=fastred[i])>1; i++)
+    if ( (rw*red < w && rh*red < h) ||
+         (rw*red*3 < w || rh*red*3 < h) )
+      break;
+  // Setup pixmap scaler
+  if (w<=0 || h<=0) return 0;
+  GP<GPixmapScaler> gps=GPixmapScaler::create();
+  GPixmapScaler &ps=*gps;
+  ps.set_input_size( (w+red-1)/red, (h+red-1)/red );
+  ps.set_output_size( rw, rh );
+  ps.set_horz_ratio( rw*red, w );
+  ps.set_vert_ratio( rh*red, h );
+  // Scale
+  GRect srect;
+  ps.get_input_rect(zrect, srect);
+  GP<GPixmap> spm = (dimg.*get)(srect, red, gamma, white);
+  if (!spm) return 0;
+  GP<GPixmap> pm = GPixmap::create();
+  ps.scale(srect, *spm, zrect, *pm);
+  if(pm)
+      return pm->rotate(dimg.get_rotate());
+  else
+      return NULL;
+}
+
+GP<GPixmap>  
+DjVuImage::get_pixmap(const GRect &r, const GRect &a, double g, GPixel w) const
+{
+  return do_pixmap(*this, &DjVuImage::get_pixmap, r, a, g, w);
+}
+
+GP<GPixmap>  
+DjVuImage::get_pixmap(const GRect &r, const GRect &a, double g) const
+{
+  return do_pixmap(*this, &DjVuImage::get_pixmap, r, a, g, GPixel::WHITE);
+}
+
+GP<GBitmap>  
+DjVuImage::get_bitmap(const GRect &rect, const GRect &all, int align) const
+{
+  return do_bitmap(*this, &DjVuImage::get_bitmap, rect, all, align);
+}
+
+GP<GPixmap>  
+DjVuImage::get_bg_pixmap(const GRect&r, const GRect&a, double g, GPixel w) const
+{
+  return do_pixmap(*this, &DjVuImage::get_bg_pixmap, r, a, g, w);
+}
+
+GP<GPixmap>  
+DjVuImage::get_bg_pixmap(const GRect&r, const GRect&a, double g) const
+{
+  return do_pixmap(*this, &DjVuImage::get_bg_pixmap, r, a, g, GPixel::WHITE);
+}
+
+GP<GPixmap>  
+DjVuImage::get_fg_pixmap(const GRect&r, const GRect&a, double g, GPixel w) const
+{
+  return do_pixmap(*this, &DjVuImage::get_fg_pixmap, r, a, g, w);
+}
+
+GP<GPixmap>  
+DjVuImage::get_fg_pixmap(const GRect&r, const GRect&a, double g) const
+{
+  return do_pixmap(*this, &DjVuImage::get_fg_pixmap, r, a, g, GPixel::WHITE);
+}
+
+int 
+DjVuImage::get_rotate() const
+{
+  return (rotate_count<0) ? 0 : rotate_count;
+}
+
+void
+DjVuImage::init_rotate(const DjVuInfo &info)
+{ 
+  rotate_count = info.orientation;
+}
+
+void DjVuImage::set_rotate(int count) 
+{ 
+  rotate_count = count % 4;
+}
+
+GP<DjVuAnno> 
+DjVuImage::get_decoded_anno()
+{
+    GP<DjVuInfo> djvuinfo = get_info();
+    GP<DjVuAnno> djvuanno = DjVuAnno::create();
+    GP<ByteStream> bs=get_anno();
+    if( bs )
+    {
+      int rotate_count=get_rotate(); 
+      /// Brain damaged adjustment of annotation 
+      /// coordinates that reflect the orientation
+      /// flag in the info chunk....
+      if (djvuinfo)
+        rotate_count = rotate_count - djvuinfo->orientation;
+      ///decode
+      djvuanno->decode(bs);
+      ///map hyperlinks correctly for rotation           
+      if( rotate_count & 3 )
+        {   
+          GRect input, output;
+          input = GRect(0,0,get_width(),get_height());
+          if (rotate_count & 1)
+            output = GRect(0,0,get_height(),get_width());
+          else
+            output = GRect(0,0,get_width(),get_height());
+          GRectMapper mapper;
+          mapper.clear();
+          mapper.set_input(input);
+          mapper.set_output(output);               
+          mapper.rotate(-rotate_count);
+          GPList<GMapArea> &list=djvuanno->ant->map_areas;
+          for(GPosition pos=list;pos;++pos)
+            list[pos]->unmap(mapper);
+        }
+      return djvuanno;
+    }
+    else
+      return NULL;
+}
+
+
+void
+DjVuImage::map(GRect &rect) const
+{
+    GRect input, output;
+    const int rotate_count=get_rotate(); 
+    if(rotate_count>0)
+    {  
+        input = GRect(0,0,get_width(), get_height());
+        output = GRect(0,0, get_real_width(), get_real_height());
+
+        GRectMapper mapper;
+        mapper.clear();
+        mapper.set_input(input);
+        mapper.set_output(output);               
+        mapper.rotate(-rotate_count);
+        mapper.map(rect);
+    }
+}
+
+void
+DjVuImage::unmap(GRect &rect) const
+{
+    GRect input, output;
+    const int rotate_count=get_rotate(); 
+    if(rotate_count>0)
+    {  
+        input = GRect(0,0,get_width(), get_height());
+        output = GRect(0,0, get_real_width(), get_real_height());
+
+        GRectMapper mapper;
+        mapper.clear();
+        mapper.set_input(input);
+        mapper.set_output(output);               
+        mapper.rotate(-rotate_count);
+        mapper.unmap(rect);
+    }
+}
+
+void
+DjVuImage::map(int &x, int &y) const
+{
+    GRect input, output;
+    const int rotate_count=get_rotate(); 
+    if(rotate_count>0)
+    {  
+        input = GRect(0,0,get_width(), get_height());
+        output = GRect(0,0, get_real_width(), get_real_height());
+
+        GRectMapper mapper;
+        mapper.clear();
+        mapper.set_input(input);
+        mapper.set_output(output);               
+        mapper.rotate(-rotate_count);
+        mapper.map(x, y);
+    }
+}
+
+void
+DjVuImage::unmap(int &x, int &y) const
+{
+    GRect input, output;
+    const int rotate_count=get_rotate(); 
+    if(rotate_count>0)
+    {  
+        input = GRect(0,0,get_width(), get_height());
+        output = GRect(0,0, get_real_width(), get_real_height());
+
+        GRectMapper mapper;
+        mapper.clear();
+        mapper.set_input(input);
+        mapper.set_output(output);               
+        mapper.rotate(-rotate_count);
+        mapper.unmap(x, y);
+    }
+}
+
+bool
+DjVuImage::wait_for_complete_decode(void)
+{
+  if (file) 
+  {
+    file->resume_decode(true);
+    return file->is_decode_ok();
+  }
+  return 0;
+}
+
+// Write out a DjVuXML object tag and map tag.
+void
+DjVuImage::writeXML(ByteStream &str_out,const GURL &doc_url,const int flags) const
+{
+  const int height=get_height();
+  
+  static const char *Object="<OBJECT data=\"";
+  const GURL url(get_djvu_file()->get_url());
+  const GUTF8String pagename(url.fname());
+  GUTF8String page_param;
+  if(doc_url.is_valid() && !doc_url.is_empty() && (doc_url != url))
+  {
+    str_out.writestring(Object+doc_url.get_string());
+    page_param="<PARAM name=\"PAGE\" value=\""+pagename+"\" />\n";
+  }else
+  {
+    str_out.writestring(Object+doc_url.get_string());
+  }
+  str_out.writestring("\" type=\""+get_mimetype()+"\" height=\""
+    +GUTF8String(height)+"\" width=\""+GUTF8String(get_width())
+    +"\" usemap=\""+pagename.toEscaped()+"\" >\n");
+  if(!(flags & NOINFO))
+  {
+    const GP<DjVuInfo> info(get_info());
+    if(info)
+    {
+      info->writeParam(str_out);
+    }
+  }
+  str_out.writestring(page_param);
+  const GP<DjVuAnno> anno(DjVuAnno::create());
+  if(!(flags & NOMAP))
+  {
+    const GP<ByteStream> anno_str(get_anno());
+    if(anno_str)
+    {
+      anno->decode(anno_str);
+    }
+    if(!(flags & NOINFO))
+    {
+      anno->writeParam(str_out);
+    }
+  }
+  if(!(flags & NOTEXT))
+  {
+    const GP<DjVuText> text(DjVuText::create());
+    {
+      const GP<ByteStream> text_str(get_text());
+      if(text_str)
+      {
+        text->decode(text_str);
+      }
+      text->writeText(str_out,height);
+    }
+  }
+  if(!(flags & NOMETA))
+  {
+    const GP<ByteStream> meta_str(get_meta());
+    if(meta_str)
+    {
+      GP<IFFByteStream> giff=IFFByteStream::create(meta_str);
+      IFFByteStream &iff=*giff;
+      GUTF8String chkid;
+      while( iff.get_chunk(chkid))
+      {
+        GP<ByteStream> gbs(iff.get_bytestream());
+        if(chkid == "METa")
+        {
+	   str_out.copy(*gbs);
+          //str_out.writestring(gbs->getAsUTF8());
+        }else if(chkid == "METz")
+        {
+          gbs=BSByteStream::create(gbs);
+          str_out.copy(*gbs);
+          //str_out.writestring(gbs->getAsUTF8());
+        }
+        iff.close_chunk();
+      }
+    }
+  }
+  str_out.writestring(GUTF8String("</OBJECT>\n"));
+  if(!(flags & NOMAP))
+  {
+    anno->writeMap(str_out,pagename,height);
+  }
+}
+
+// Write out a DjVuXML object tag and map tag.
+void
+DjVuImage::writeXML(ByteStream &str_out) const
+{
+  writeXML(str_out,GURL());
+}
+
+// Write out a DjVuXML object tag and map tag.
+GUTF8String
+DjVuImage::get_XML(const GURL &doc_url,const int flags) const
+{
+  GP<ByteStream> gbs(ByteStream::create());
+  ByteStream &bs=*gbs;
+  writeXML(bs,doc_url);
+  bs.seek(0L);
+  return bs.getAsUTF8();
+}
+
+// Write out a DjVuXML object tag and map tag.
+GUTF8String
+DjVuImage::get_XML(void) const
+{
+  return get_XML(GURL());
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuImage.h b/libdjvu/DjVuImage.h
new file mode 100644
index 0000000..5073db3
--- /dev/null
+++ b/libdjvu/DjVuImage.h
@@ -0,0 +1,460 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUIMAGE_H
+#define _DJVUIMAGE_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name DjVuImage.h
+
+    Files #"DjVuImage.h"# and #"DjVuImage.cpp"# implement \Ref{DjVuImage}
+    class produced as a result of decoding of DjVu files. In the previous
+    version of the library both the rendering {\bf and} decoding have been
+    handled by \Ref{DjVuImage}. This is no longer true. Now the
+    \Ref{DjVuDocument} and \Ref{DjVuFile} classes handle decoding of both
+    single page and multi page documents.
+
+    For compatibility reasons though, we still support old-style decoding
+    interface through the \Ref{DjVuImage} class for single page documents
+    {\em only}. As before, the display programs can call the decoding
+    function from a separate thread.  The user interface thread may call
+    the rendering functions at any time. Rendering will be performed using
+    the most recent data generated by the decoding thread. This multithreaded
+    capability enables progressive display of remote images.
+
+    {\bf Creating DjVu images} --- Class \Ref{DjVuImage} does not provide a
+    direct way to create a DjVu image.  The recommended procedure consists of
+    directly writing the required chunks into an \Ref{IFFByteStream} as
+    demonstrated in program \Ref{djvumake}.  Dealing with too many encoding
+    issues (such as chunk ordering and encoding quality) would indeed make the
+    decoder unnecessarily complex.
+
+    {\bf ToDo: Layered structure} --- Class #DjVuImage# currently contains an
+    unstructured collection of smart pointers to various data structures.
+    Although it simplifies the rendering routines, this choice does not
+    reflect the layered structure of DjVu images and does not leave much room
+    for evolution.  We should be able to do better.
+
+    @memo
+    Decoding DjVu and IW44 images.
+    @author
+    L\'eon Bottou <leonb@research.att.com> - initial implementation
+    Andrei Erofeev <eaf@geocities.com> - multipage support
+*/
+//@{
+
+
+
+#include "DjVuFile.h"
+#include "DjVuAnno.h"
+#include "GRect.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+/* Obsolete class included for backward compatibility. */
+
+class DjVuInterface
+{
+public:
+  virtual ~DjVuInterface();
+  virtual void notify_chunk(const char *chkid, const char *msg) = 0;
+  virtual void notify_relayout(void) = 0;
+  virtual void notify_redisplay(void) = 0;
+};
+
+
+/** Main DjVu Image data structure.  This class defines the internal
+    representation of a DjVu image.  This representation consists of a few
+    pointers referencing the various components of the DjVu image.  These
+    components are created and populated by the decoding function.  The
+    rendering functions then can use the available components to compute a
+    pixel representation of the desired segment of the DjVu image. */
+
+class DJVUAPI DjVuImage : public DjVuPort
+{
+protected:
+  DjVuImage(void);
+public:
+  enum { NOINFO, NOTEXT=1, NOMAP=4, NOMETA=8 };
+  // CONSTRUCTION
+  /** @name Construction. */
+  //@{
+  /** Creates an empty DjVu image. After the image has been constructed,
+      it may be connected to an existing \Ref{DjVuFile} or left as is.
+
+      In the former case #DjVuImage# will look for its decoded components
+      (like #Sjbz# or #BG44#) by decending the hierarchy of \Ref{DjVuFile}s
+      starting from the one passed to \Ref{connect}().
+
+      In the latter case you can use \Ref{decode}() function to decode
+      {\bf single-page} DjVu documents in the old-style way. */
+  static GP<DjVuImage> create(void) {return new DjVuImage();}
+
+  /** Connects this #DjVuImage# to the passed \Ref{DjVuFile}. The #DjVuImage#
+      will use this \Ref{DjVuFile} to retrieve components necessary for
+      decoding. It will also connect itself to \Ref{DjVuFile} using the
+      communication mechanism provided by \Ref{DjVuPort} and \Ref{DjVuPortcaster}.
+      This will allow it to receive and relay messages and requests generated
+      by the passed \Ref{DjVuFile} and any file included into it. */
+  void		connect(const GP<DjVuFile> & file);
+
+  /** This combines the above two steps for simplier code operations. */
+  static GP<DjVuImage> create(const GP<DjVuFile> &file)
+  { const GP<DjVuImage> retval=create(); retval->connect(file); return retval; }
+      
+  //@}
+
+  // COMPONENTS
+  /** @name Components. */
+  //@{
+  /** Returns a pointer to a DjVu information component.
+      This function returns a null pointer until the decoder
+      actually processes an #"INFO"# chunk. */
+  GP<DjVuInfo>    get_info() const;
+  /** Returns a pointer to the IW44 encoded background component of a DjVu
+      image.  This function returns a null pointer until the decoder actually
+      processes an #"BG44"# chunk. */
+  GP<IW44Image>    get_bg44() const;
+  /** Returns a pointer to the raw background component of a DjVu image. The
+      background component is used for JPEG encoded backgrounds.  This
+      function returns a null pointer until the decoder actually processes an
+      #"BGjp"# chunk. */
+  GP<GPixmap>     get_bgpm() const;
+  /** Returns a pointer to the mask of the foreground component of a DjVu
+      image. The mask of the foreground component is always a JB2 image in
+      this implementation. This function returns a null pointer until the
+      decoder actually processes an #"Sjbz"# chunk. */
+  GP<JB2Image>    get_fgjb() const;
+  /** Returns a pointer to the colors of the foreground component of a DjVu
+      image. The mask of the foreground component is always a small pixmap in
+      this implementation. This function returns a null pointer until the
+      decoder actually processes an #"FG44"# chunk. */
+  GP<GPixmap>     get_fgpm() const;
+  /** Returns a pointer to a palette object containing colors for the 
+      foreground components of a DjVu image.  These colors are only
+      pertinent with respect to the JB2Image. */
+  GP<DjVuPalette> get_fgbc() const;
+  /** Returns a pointer to a ByteStream containing all the annotation
+      chunks collected so far for this image.  Individual chunks can be
+      retrieved using \Ref{IFFByteStream}. Returns NULL if no chunks have been
+      collected yet. */
+  GP<ByteStream> get_anno() const;
+  /** Returns a pointer to a ByteStream containing all the hidden text.
+      Returns NULL if no chunks have been collected yet. */
+  GP<ByteStream> get_text() const;
+  /** Returns a pointer to a ByteStream containing all the metadata.
+      Returns NULL if no chunks have been collected yet. */
+  GP<ByteStream> get_meta() const;
+  //@}
+
+  // NEW STYLE DECODING
+  /** @name New style decoding. */
+  //@{
+  /** The decoder is now started when the image is created
+      by function \Ref{DjVuDocument::get_page} in \Ref{DjVuDocument}. 
+      This function waits until the decoding thread terminates
+      and returns TRUE if the image has been successfully decoded. */
+  bool wait_for_complete_decode(void);
+  //@}
+  
+  // OLD STYLE DECODING
+  /** @name Old style decoding (backward compatibility). */
+  //@{
+  /** This function is here for backward compatibility. Now, with the
+      introduction of multipage DjVu documents, the decoding is handled
+      by \Ref{DjVuFile} and \Ref{DjVuDocument} classes. For single page
+      documents though, we still have this wrapper. */
+  void decode(ByteStream & str, DjVuInterface *notifier=0);
+  //@}
+  
+  // UTILITIES
+  /** @name Utilities */
+  //@{
+  /** Returns the width of the DjVu image. This function just extracts this
+      information from the DjVu information component. It returns zero if such
+      a component is not yet available. This gives rotated width if there is any
+      rotation of image. If you need real width, use #get_real_width()#.*/
+  int get_width() const;
+  /** Returns the height of the DjVu image. This function just extracts this
+      information from the DjVu information component. It returns zero if such
+      a component is not yet available. This gives rotated height if there is any
+      rotation of image. If you need real width, use #get_real_height()#.*/
+  int get_height() const;
+  /** Returns the width of the DjVu image. This function just extracts this
+      information from the DjVu information component. It returns zero if such
+      a component is not yet available.*/
+  int get_real_width() const;
+  /** Returns the height of the DjVu image. This function just extracts this
+      information from the DjVu information component. It returns zero if such
+      a component is not yet available.*/
+  int get_real_height() const;
+  /** Returns the format version the DjVu data. This function just extracts
+      this information from the DjVu information component. It returns zero if
+      such a component is not yet available.  This version number should
+      be compared with the \Ref{DjVu version constants}. */
+  int get_version() const;
+  /** Returns the resolution of the DjVu image. This information is given in
+      pixels per 2.54 cm.  Display programs can use this information to
+      determine the natural magnification to use for rendering a DjVu
+      image. */
+  int get_dpi() const;
+  /** Same as \Ref{get_dpi}() but instead of precise value returns the closest
+      "standard" one: 25, 50, 75, 100, 150, 300, 600. If dpi is greater than
+      700, it's returned as is. */
+  int get_rounded_dpi() const;
+  /** Returns the gamma coefficient of the display for which the image was
+      designed.  The rendering functions can use this information in order to
+      perform color correction for the intended display device. */
+  double get_gamma() const;
+  /** Returns a MIME type string describing the DjVu data.  This information
+      is auto-sensed by the decoder.  The MIME type can be #"image/djvu"# or
+      #"image/iw44"# depending on the data stream. */
+  GUTF8String get_mimetype() const;
+  /** Returns a short string describing the DjVu image.
+      Example: #"2500x3223 in 23.1 Kb"#. */
+  GUTF8String get_short_description() const;
+  /** Returns a verbose description of the DjVu image.  This description lists
+      all the chunks with their size and a brief comment, as shown in the
+      following example.
+      \begin{verbatim}
+      DJVU Image (2325x3156) version 17:
+       0.0 Kb   'INFO'  Page information.
+       17.3 Kb  'Sjbz'  JB2 foreground mask (2325x3156)
+       2.5 Kb   'BG44'  IW44 background (775x1052)
+       1.0 Kb   'FG44'  IW44 foreground colors (194x263)
+       3.0 Kb   'BG44'  IW44 background (part 2).
+       0.9 Kb   'BG44'  IW44 background (part 3).
+       7.1 Kb   'BG44'  IW44 background (part 4).
+      Compression ratio: 676 (31.8 Kb)
+      \end{verbatim} */
+  GUTF8String get_long_description() const;
+  /** Returns pointer to \Ref{DjVuFile} which contains this image in
+      compressed form. */
+  GP<DjVuFile> get_djvu_file(void) const;
+  /// Write out a DjVuXML object tag and map tag.
+  void writeXML(ByteStream &str_out,const GURL &doc_url, const int flags=0) const;
+  /// Write out a DjVuXML object tag and map tag.
+  void writeXML(ByteStream &str_out) const;
+  /// Get a DjVuXML object tag and map tag.
+  GUTF8String get_XML(const GURL &doc_url, const int flags=0) const;
+  /// Get a DjVuXML object tag and map tag.
+  GUTF8String get_XML(void) const;
+  //@}
+
+  // CHECKING
+  /** @name Checking for legal DjVu files. */
+  //@{
+  /** This function returns true if this object contains a well formed {\em
+      Photo DjVu Image}. Calling function #get_pixmap# on a well formed photo
+      image should always return a non zero value.  Note that function
+      #get_pixmap# works as soon as sufficient information is present,
+      regardless of the fact that the image follows the rules or not. */
+  int is_legal_photo() const;
+  /** This function returns true if this object contains a well formed {\em
+      Bilevel DjVu Image}.  Calling function #get_bitmap# on a well formed
+      bilevel image should always return a non zero value.  Note that function
+      #get_bitmap# works as soon as a foreground mask component is present,
+      regardless of the fact that the image follows the rules or not. */
+  int is_legal_bilevel() const;
+  /** This function returns true if this object contains a well formed {\em
+      Compound DjVu Image}.  Calling function #get_bitmap# or #get_pixmap# on
+      a well formed compound DjVu image should always return a non zero value.
+      Note that functions #get_bitmap# or #get_pixmap# works as soon as
+      sufficient information is present, regardless of the fact that the image
+      follows the rules or not.  */
+  int is_legal_compound() const;
+  //@}
+
+  // RENDERING 
+  /** @name Rendering.  
+      All these functions take two rectangles as argument.  Conceptually,
+      these function first render the whole image into a rectangular area
+      defined by rectangle #all#.  The relation between this rectangle and the
+      image size define the appropriate scaling.  The rendering function then
+      extract the subrectangle #rect# and return the corresponding pixels as a
+      #GPixmap# or #GBitmap# object.  The #all# and #rect# should take the any
+      rotation in to effect, The actual implementation performs these
+      two operation simultaneously for obvious efficiency reasons.  The best
+      rendering speed is achieved by making sure that the size of rectangle
+      #all# and the size of the DjVu image are related by an integer ratio. */
+  //@{
+  /** Renders the image and returns a color pixel image.  Rectangles #rect#
+      and #all# are used as explained above. Color correction is performed
+      according to argument #gamma#, which represents the gamma coefficient of
+      the display device on which the pixmap will be rendered.  The default
+      value, zero, means that no color correction should be performed. 
+      This function returns a null pointer if there is not enough information
+      in the DjVu image to properly render the desired image. */
+  GP<GPixmap>  get_pixmap(const GRect &rect, const GRect &all, 
+                          double gamma, GPixel white) const;
+  GP<GPixmap>  get_pixmap(const GRect &rect, const GRect &all, 
+                          double gamma=0) const;
+  /** Renders the mask of the foreground layer of the DjVu image.  This
+      functions is a wrapper for \Ref{JB2Image::get_bitmap}.  Argument #align#
+      specified the alignment of the rows of the returned images.  Setting
+      #align# to #4#, for instance, will adjust the bitmap border in order to
+      make sure that each row of the returned image starts on a word (four
+      byte) boundary.  This function returns a null pointer if there is not
+      enough information in the DjVu image to properly render the desired
+      image. */
+  GP<GBitmap>  get_bitmap(const GRect &rect, const GRect &all, 
+                          int align = 1) const;
+  /** Renders the background layer of the DjVu image.  Rectangles #rect# and
+      #all# are used as explained above. Color correction is performed
+      according to argument #gamma#, which represents the gamma coefficient of
+      the display device on which the pixmap will be rendered.  The default
+      value, zero, means that no color correction should be performed.  This
+      function returns a null pointer if there is not enough information in
+      the DjVu image to properly render the desired image. */
+  GP<GPixmap>  get_bg_pixmap(const GRect &rect, const GRect &all, 
+                             double gamma, GPixel white) const;
+  GP<GPixmap>  get_bg_pixmap(const GRect &rect, const GRect &all, 
+                             double gamma=0) const;
+  /** Renders the foreground layer of the DjVu image.  Rectangles #rect# and
+      #all# are used as explained above. Color correction is performed
+      according to argument #gamma#, which represents the gamma coefficient of
+      the display device on which the pixmap will be rendered.  The default
+      value, zero, means that no color correction should be performed.  This
+      function returns a null pointer if there is not enough information in
+      the DjVu image to properly render the desired image. */
+  GP<GPixmap>  get_fg_pixmap(const GRect &rect, const GRect &all, 
+                             double gamma, GPixel white) const;
+  GP<GPixmap>  get_fg_pixmap(const GRect &rect, const GRect &all, 
+                             double gamma=0) const;
+
+
+  /** set the rotation count(angle) in counter clock wise for the image
+    values (0,1,2,3) correspond to (0,90,180,270) degree rotation*/
+  void set_rotate(int count=0);
+  /** returns the rotation count*/
+  int get_rotate() const;
+  /** returns decoded annotations in DjVuAnno object in which all hyperlinks
+      and hilighted areas are rotated as per rotation setting*/
+  GP<DjVuAnno> get_decoded_anno();
+  /** maps the given #rect# from rotated co-ordinates to unrotated document 
+      co-ordinates*/
+  void map(GRect &rect) const;
+  /** unmaps the given #rect# from unrotated document co-ordinates to rotated  
+      co-ordinates*/
+  void unmap(GRect &rect) const;
+  /** maps the given #x#, #y# from rotated co-ordinates to unrotated document 
+      co-ordinates*/
+  void map(int &x, int &y) const;
+  /** unmaps the given #x#, #y# from unrotated document co-ordinates to rotated  
+      co-ordinates*/
+  void unmap(int &x, int &y) const;
+
+
+
+  //@}
+
+  // Inherited from DjVuPort.
+  virtual void notify_chunk_done(const DjVuPort *, const GUTF8String &name);
+
+  // SUPERSEDED
+  GP<GPixmap>  get_pixmap(const GRect &r, int s=1, double g=0) const;
+  GP<GPixmap>  get_pixmap(const GRect &r, int s, double g, GPixel w) const;
+  GP<GBitmap>  get_bitmap(const GRect &r, int s=1, int align = 1) const;
+  GP<GPixmap>  get_bg_pixmap(const GRect &r, int s=1, double g=0) const;
+  GP<GPixmap>  get_bg_pixmap(const GRect &r, int s, double g, GPixel w) const;
+  GP<GPixmap>  get_fg_pixmap(const GRect &r, int s=1, double g=0) const;
+  GP<GPixmap>  get_fg_pixmap(const GRect &r, int s, double g, GPixel w) const;
+private:
+  GP<DjVuFile>		file;
+  int			rotate_count;
+  bool			relayout_sent;
+  
+  // HELPERS
+  int stencil(GPixmap *pm, const GRect &rect, int s, double g, GPixel w) const;
+  GP<DjVuInfo>		get_info(const GP<DjVuFile> & file) const;
+  GP<IW44Image>		get_bg44(const GP<DjVuFile> & file) const;
+  GP<GPixmap>		get_bgpm(const GP<DjVuFile> & file) const;
+  GP<JB2Image>		get_fgjb(const GP<DjVuFile> & file) const;
+  GP<GPixmap>		get_fgpm(const GP<DjVuFile> & file) const;
+  GP<DjVuPalette>      get_fgbc(const GP<DjVuFile> & file) const;
+  void init_rotate(const DjVuInfo &info);
+};
+
+
+inline GP<DjVuFile>
+DjVuImage::get_djvu_file(void) const
+{
+   return file;
+}
+
+//@}
+
+
+
+// ----- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuInfo.cpp b/libdjvu/DjVuInfo.cpp
new file mode 100644
index 0000000..8807181
--- /dev/null
+++ b/libdjvu/DjVuInfo.cpp
@@ -0,0 +1,199 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuInfo.h"
+#include "GException.h"
+#include "ByteStream.h"
+#include "GString.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+// ----------------------------------------
+// CLASS DJVUINFO
+
+
+#define STRINGIFY(x) STRINGIFY_(x)
+#define STRINGIFY_(x) #x
+
+
+DjVuInfo::DjVuInfo()
+  : width(0), height(0), 
+#ifdef DJVUVERSION_FOR_OUTPUT
+    version(DJVUVERSION_FOR_OUTPUT),
+#else
+    version(DJVUVERSION),
+#endif
+    dpi(300), gamma(2.2), orientation(0)
+{
+}
+
+void 
+DjVuInfo::decode(ByteStream &bs)
+{
+  // Set to default values
+  width = 0;
+  height = 0;
+  version = DJVUVERSION;
+  dpi = 300;
+  gamma = 2.2;
+  orientation=0;
+  // Read data
+  unsigned char buffer[10];
+  int  size = bs.readall((void*)buffer, sizeof(buffer));
+  if (size == 0)
+    G_THROW( ByteStream::EndOfFile );
+  if (size < 5)
+    G_THROW( ERR_MSG("DjVuInfo.corrupt_file") );
+  // Analyze data with backward compatibility in mind!
+  if (size>=2)
+    width = (buffer[0]<<8) + buffer[1];
+  if (size>=4)
+    height = (buffer[2]<<8) + buffer[3];
+  if (size>=5)
+    version = buffer[4];
+  if (size>=6 && buffer[5]!=0xff)
+    version = (buffer[5]<<8) + buffer[4];
+  if (size>=8 && buffer[7]!=0xff)
+    dpi = (buffer[7]<<8) + buffer[6];
+  if (size>=9)
+    gamma = 0.1 * buffer[8];
+  int flags=0;
+  if (size>=10)
+    flags = buffer[9];
+  // Fixup
+  if (gamma<0.3)
+    gamma=0.3;
+  if (gamma>5.0)
+    gamma=5.0;
+  if (dpi < 25 || dpi > 6000)
+    dpi = 300;
+  switch (flags & 0x7)
+    {
+    case 6:  orientation=1; break; 
+    case 2:  orientation=2; break; 
+    case 5:  orientation=3; break;
+    default: orientation=0; break;
+    }
+}
+
+void 
+DjVuInfo::encode(ByteStream &bs)
+{
+  bs.write16(width);
+  bs.write16(height);
+  bs.write8(version & 0xff);
+  bs.write8(version >> 8);
+  bs.write8(dpi & 0xff);
+  bs.write8(dpi >> 8);
+  bs.write8((int)(10.0*gamma+0.5) );
+  unsigned char flags;
+  switch (orientation) 
+    {
+    default: flags=1; break;
+    case 1:  flags=6; break;
+    case 2:  flags=2; break;
+    case 3:  flags=5; break;
+    }
+  bs.write8(flags);
+}
+
+unsigned int 
+DjVuInfo::get_memory_usage() const
+{
+  return sizeof(DjVuInfo);
+}
+
+GUTF8String
+DjVuInfo::get_paramtags(void) const
+{
+  GUTF8String retval;
+  if(orientation)
+    retval+="<PARAM name=\"ROTATE\" value=\""
+      +GUTF8String(((4-orientation)%4)*90)+"\" />\n";
+  if(dpi)
+    retval+="<PARAM name=\"DPI\" value=\""
+      +GUTF8String(dpi)+"\" />\n";
+  if(gamma)
+    retval+="<PARAM name=\"GAMMA\" value=\""
+      +GUTF8String(gamma)+"\" />\n";
+  return retval;
+}
+
+void
+DjVuInfo::writeParam(ByteStream &str_out) const
+{
+  str_out.writestring(get_paramtags());
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuInfo.h b/libdjvu/DjVuInfo.h
new file mode 100644
index 0000000..e1c9e0d
--- /dev/null
+++ b/libdjvu/DjVuInfo.h
@@ -0,0 +1,187 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUINFO_H
+#define _DJVUINFO_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name DjVuInfo.h
+    Each instance of class #DjVuInfo# represents the information
+    contained in the information chunk of a DjVu file.  This #"INFO"#
+    chunk is always the first chunk of a DjVu file.
+    @memo
+    DjVu information chunk.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+
+
+
+#include "GSmartPointer.h"
+#include "GRect.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+
+/** @name DjVu version constants
+    @memo DjVu file format version. */
+//@{
+/** Current DjVu format version.  The value of this macro represents the
+    version of the DjVu file format implemented by this release of the DjVu
+    Reference Library. */
+#define DJVUVERSION              26
+/** DjVu format version. This is the value used in files produced 
+    with DjVuLibre. This is smaller than DJVUVERSION because version
+    number inflation causes problems with older software. */ 
+#define DJVUVERSION_FOR_OUTPUT   24
+/** This is the version which introduced orientations. */
+#define DJVUVERSION_ORIENTATION  22
+/** Oldest DjVu format version supported by this library.  This release of the
+    library cannot completely decode DjVu files whose version field is less
+    than or equal to this number. */
+#define DJVUVERSION_TOO_OLD      15
+/** Newest DjVu format partially supported by this library.  This release of
+    the library will attempt to decode files whose version field is smaller
+    than this macro.  If the version field is greater than or equal to this
+    number, the decoder will just throw a \Ref{GException}.  */
+#define DJVUVERSION_TOO_NEW      50
+//@}
+
+
+class GUTF8String;
+
+/** Information component.
+    Each instance of class #DjVuInfo# represents the information
+    contained in the information chunk of a DjVu file.  This #"INFO"#
+    chunk is always the first chunk of a DjVu file.
+ */
+
+class DJVUAPI DjVuInfo : public GPEnabled
+{
+protected:
+  DjVuInfo(void);
+public:
+  /** Creates an empty DjVuInfo object.
+      The #width# and #height# fields are set to zero.
+      All other fields are initialized with suitable default values. */
+  static GP<DjVuInfo> create(void) {return new DjVuInfo();}
+
+  /** Decodes the DjVu #"INFO"# chunk.  This function reads binary data from
+      ByteStream #bs# and populates the fields of this DjVuInfo object.  It is
+      normally called after detecting an #"INFO"# chunk header with function
+      \Ref{IFFByteStream::get_chunk}. */
+  void decode(ByteStream &bs);
+  /** Encodes the DjVu #"INFO"# chunk. This function writes the fields of this
+      DjVuInfo object into ByteStream #bs#. It is normally called after
+      creating an #"INFO"# chunk header with function
+      \Ref{IFFByteStream::put_chunk}. */
+  void encode(ByteStream &bs);  
+  /** Returns the number of bytes used by this object. */
+  unsigned int get_memory_usage() const;
+  /** Width of the DjVu image (in pixels). */
+  int width;
+  /** Height of the DjVu image (in pixels). */
+  int height;
+  /** DjVu file version number.  This number characterizes the file format
+      version used by the encoder to generate this DjVu image.  A decoder
+      should compare this version number with the constants described in
+      section "\Ref{DjVu version constants}". */
+  int version;
+  /** Resolution of the DjVu image.  The resolution is given in ``pixels per
+      2.54 centimeters'' (this unit is sometimes called ``pixels per
+      inch''). Display programs can use this information to determine the
+      natural magnification to use for rendering a DjVu image. */
+  int dpi;
+  /** Gamma coefficient of the display for which the image was designed.  The
+      rendering functions can use this information in order to perform color
+      correction for the intended display device. */
+  double gamma;
+
+  /** Image orientation:
+      0: no rotation      1: 90 degrees counter-clockwise
+      2: 180 degrees      3: 270 degrees counter-clockwise */
+  int orientation;
+
+     /// Obtain the flags for the default specifications.
+  GUTF8String get_paramtags(void) const;
+     /// Obtain the flags for the default specifications.
+  void writeParam(ByteStream &out_str) const;
+};
+
+
+//@}
+
+// ----- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp
new file mode 100644
index 0000000..b243771
--- /dev/null
+++ b/libdjvu/DjVuMessage.cpp
@@ -0,0 +1,622 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// All these XML messages are Lizardtech innovations.
+
+#include "DjVuMessage.h"
+#include "GOS.h"
+#include "XMLTags.h"
+#include "ByteStream.h"
+#include "GURL.h"
+#include "debug.h"
+#include <ctype.h>
+#include <string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#ifdef _WIN32
+# include <tchar.h>
+# include <windows.h>
+# include <winreg.h>
+#endif
+#ifdef UNIX
+# include <unistd.h>
+# include <pwd.h>
+# include <sys/types.h>
+#endif
+#include <locale.h>
+#ifndef LC_MESSAGES
+# define LC_MESSAGES LC_ALL
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+GUTF8String &
+DjVuMessage::programname(void)
+{
+  static GUTF8String xprogramname;
+  use_language();
+  return xprogramname;
+}
+
+static const char namestring[]="name";
+static const char srcstring[]="src";
+
+static const char *failed_to_parse_XML=ERR_MSG("DjVuMessage.failed_to_parse_XML");
+static const char bodystring[]="BODY";
+static const char languagestring[]="LANGUAGE";
+static const char headstring[]="HEAD";
+static const char includestring[]="INCLUDE";
+static const char messagestring[]="MESSAGE";
+static const char localestring[]="locale";
+
+
+// directory names for searching messages
+#ifdef AUTOCONF
+static const char DjVuDataDir[] = DIR_DATADIR "/djvu/osi";
+#endif /* AUTOCONF */
+static const char ModuleDjVuDir[] ="share/djvu/osi";
+static const char ProfilesDjVuDir[] ="profiles";
+static const char LocalDjVuDir[] =".DjVu";      // relative to ${HOME}
+#ifdef LT_DEFAULT_PREFIX
+static const char DjVuPrefixDir[] = LT_DEFAULT_PREFIX "/profiles";
+#endif
+#ifndef NDEBUG
+static const char DebugModuleDjVuDir[] ="../TOPDIR/SRCDIR/profiles";
+#endif
+#ifdef _WIN32
+static const char RootDjVuDir[] ="C:/Program Files/LizardTech/Profiles";
+static const TCHAR registrypath[]= TEXT("Software\\LizardTech\\DjVu\\Profile Path");
+#else
+static const char RootDjVuDir[] ="/etc/DjVu/";  // global last resort
+#endif
+
+static const char DjVuEnv[] = "DJVU_CONFIG_DIR";
+
+//  The name of the message file
+static const char MessageFile[]="messages.xml";
+static const char LanguageFile[]="languages.xml";
+
+#ifdef _WIN32
+static GURL
+RegOpenReadConfig ( HKEY hParentKey )
+{
+  GURL retval;
+  LPCTSTR path = registrypath;
+  HKEY hKey = 0;
+  if (RegOpenKeyEx(hParentKey, path, 0,
+		   KEY_READ, &hKey) == ERROR_SUCCESS )
+  {
+    CHAR path[1024];
+    CHAR *szPathValue = path;
+    LPCSTR lpszEntry = "";
+    DWORD dwCount = (sizeof(path)/sizeof(CHAR))-1;
+    DWORD dwType;
+    LONG lResult = RegQueryValueExA(hKey, lpszEntry, NULL,
+			&dwType, (LPBYTE)szPathValue, &dwCount);
+    RegCloseKey(hKey);
+    if ((lResult == ERROR_SUCCESS))
+    {
+      szPathValue[dwCount] = 0;
+      retval=GURL::Filename::Native(path);
+    }
+  } 
+  return retval;
+}
+
+static GURL
+GetModulePath( void )
+{
+  const GUTF8String cwd(GOS::cwd());
+  CHAR path[1024];
+  DWORD dwCount = (sizeof(path)/sizeof(CHAR))-1;
+  GetModuleFileNameA(0, path, dwCount);
+  GURL retval=GURL::Filename::Native(path).base();
+  GOS::cwd(cwd);
+  return retval;
+}
+#elif defined(UNIX)
+
+static GList<GURL>
+parsePATH(void)
+{
+  GList<GURL> retval;
+  const char *path=getenv("PATH");
+  if(path)
+  {
+    GNativeString p(path);
+    int from=0;
+    for(int to;(to=p.search(':',from))>0;from=to+1)
+    {
+      if(to > from)
+      {
+        retval.append(GURL::Filename::Native(p.substr(from,to-from)));
+      }
+    }
+    if((from+1)<(int)p.length())
+    {
+      retval.append(GURL::Filename::Native(p.substr(from,-1)));
+    }
+  }
+  return retval;
+}
+
+static GURL
+GetModulePath( void )
+{
+ GURL retval;
+ GUTF8String &xprogramname=DjVuMessage::programname();
+ if(xprogramname.length())
+ {
+   if(xprogramname[1]=='/'
+     ||!xprogramname.cmp("../",3)
+     ||!xprogramname.cmp("./",2))
+   {
+     retval=GURL::Filename::UTF8(xprogramname);
+   }
+   if(retval.is_empty() || !retval.is_file())
+   {
+     GList<GURL> paths(parsePATH());
+     GMap<GUTF8String,void *> pathMAP;
+     for(GPosition pos=paths;pos;++pos)
+     {
+       retval=GURL::UTF8(xprogramname,paths[pos]);
+       const GUTF8String path(retval.get_string());
+       if(!pathMAP.contains(path))
+       {
+         if(retval.is_file())
+           break;
+         pathMAP[path]=0;
+       }
+     }
+   }
+   if (! retval.is_empty() )
+     retval = retval.follow_symlinks();
+   if (! retval.is_empty() )
+     retval = retval.base();
+ }
+ return retval;
+}
+#endif
+
+static void
+appendPath(const GURL &url, 
+           GMap<GUTF8String,void *> &map,
+           GList<GURL> &list)
+{
+  if( !url.is_empty() && !map.contains(url.get_string()) )
+    {
+      map[url.get_string()]=0;
+      list.append(url);
+    }
+}
+
+GList<GURL>
+DjVuMessage::GetProfilePaths(void)
+{
+  static bool first=true;
+  static GList<GURL> realpaths;
+  if(first)
+  {
+    first=false;
+    GMap<GUTF8String,void *> pathsmap;
+    GList<GURL> paths;
+    GURL path;
+    const GUTF8String envp(GOS::getenv(DjVuEnv));
+    if(envp.length())
+      appendPath(GURL::Filename::UTF8(envp),pathsmap,paths);
+#if defined(_WIN32) || defined(UNIX)
+    GURL mpath(GetModulePath());
+    if(!mpath.is_empty() && mpath.is_dir())
+    {
+#if defined(UNIX) && !defined(AUTOCONF) && !defined(NDEBUG)
+      appendPath(GURL::UTF8(DebugModuleDjVuDir,mpath),pathsmap,paths);
+#endif
+      appendPath(mpath,pathsmap,paths);
+      appendPath(GURL::UTF8(ModuleDjVuDir,mpath),pathsmap,paths);
+      appendPath(GURL::UTF8(ProfilesDjVuDir,mpath),pathsmap,paths);
+      mpath=mpath.base();
+      appendPath(GURL::UTF8(ModuleDjVuDir,mpath),pathsmap,paths);
+      appendPath(GURL::UTF8(ProfilesDjVuDir,mpath),pathsmap,paths);
+      mpath=mpath.base();
+      appendPath(GURL::UTF8(ModuleDjVuDir,mpath),pathsmap,paths);
+      appendPath(GURL::UTF8(ProfilesDjVuDir,mpath),pathsmap,paths);
+      mpath=mpath.base();
+      appendPath(GURL::UTF8(ModuleDjVuDir,mpath),pathsmap,paths);
+      appendPath(GURL::UTF8(ProfilesDjVuDir,mpath),pathsmap,paths);
+    }
+#endif
+#if defined(AUTOCONF)
+    GURL dpath = GURL::Filename::UTF8(DjVuDataDir);
+    appendPath(dpath,pathsmap,paths);
+#endif
+#ifdef _WIN32
+    appendPath(RegOpenReadConfig(HKEY_CURRENT_USER),pathsmap,paths);
+    appendPath(RegOpenReadConfig(HKEY_LOCAL_MACHINE),pathsmap,paths);
+#else
+    GUTF8String home=GOS::getenv("HOME");
+# if HAVE_GETPWUID
+    if (! home.length()) {
+      struct passwd *pw=0;
+      if ((pw = getpwuid(getuid())))
+        home=GNativeString(pw->pw_dir);
+    }
+# endif
+    if (home.length()) {
+      GURL hpath = GURL::UTF8(LocalDjVuDir,GURL::Filename::UTF8(home));
+      appendPath(hpath,pathsmap,paths);
+    }
+#endif
+#ifdef LT_DEFAULT_PREFIX
+    appendPath(GURL::Filename::UTF8(DjVuPrefixDir),pathsmap,paths);
+#endif
+    appendPath(GURL::Filename::UTF8(RootDjVuDir),pathsmap,paths);
+    pathsmap.empty();
+
+    GPosition pos;
+    GList< GMap<GUTF8String,GP<lt_XMLTags> > > localemaps;
+    for(pos=paths;pos;++pos)
+    {
+      path=GURL::UTF8(LanguageFile,paths[pos]);
+      if(path.is_file())
+      {
+        const GP<lt_XMLTags> xml(lt_XMLTags::create(ByteStream::create(path,"rb")));
+        const GPList<lt_XMLTags> Body(xml->get_Tags(bodystring));
+        GPosition pos=Body;
+        if(!pos || (pos != Body.lastpos()))
+        {
+          G_THROW( ERR_MSG("XMLAnno.extra_body") );
+        }
+        const GP<lt_XMLTags> GBody(Body[pos]);
+        if(!GBody)
+        {
+          G_THROW( ERR_MSG("XMLAnno.no_body") );
+        }
+        GMap<GUTF8String,GP<lt_XMLTags> > localemap;
+        lt_XMLTags::get_Maps(languagestring,localestring,Body,localemap);
+        localemaps.append(localemap);
+      }
+    } 
+    GList<GURL> localepaths;
+
+    // Need to do it the right way!
+    GUTF8String defaultlocale = getenv("LANGUAGE");
+    if (! defaultlocale) 
+      {
+        const GUTF8String oldlocale(setlocale(LC_MESSAGES,0));
+        defaultlocale = setlocale(LC_MESSAGES,"");
+        setlocale(LC_MESSAGES,(const char *)oldlocale);
+      }
+    // Unfathomable search.
+    for(int loop=0; loop<2; loop++)
+    {
+      static const char sepchars[]=" _.@";
+      const char *p=sepchars+sizeof(sepchars)-1;
+      do
+      {
+        int sepcharpos=p[0]?defaultlocale.search(p[0]):defaultlocale.length();
+        if(sepcharpos > 0)
+        {
+          const GUTF8String sublocale(defaultlocale,sepcharpos);
+          const GUTF8String downcasesublocale("downcase^"+sublocale.downcase());
+          for(pos=localemaps;pos;++pos) 
+          {
+            const GMap<GUTF8String,GP<lt_XMLTags> > &localemap=localemaps[pos];
+            GPosition pos=localemap.contains(sublocale);
+            if(!pos)
+              pos=localemap.contains(downcasesublocale);
+            if(pos)
+            {
+              const GMap<GUTF8String,GUTF8String>&args
+                = localemap[pos]->get_args();
+              pos = args.contains(srcstring);
+              if (pos)
+              {
+                const GUTF8String src(args[pos]);
+                for(pos=paths;pos;++pos)
+                {
+                  path=GURL::UTF8(src,paths[pos]);
+                  if(path.is_dir())
+                    localepaths.append(path);
+                }
+              }
+              // We don't need to check anymore language files.
+              p=sepchars;
+              break;
+            }
+          }
+          if(!pos)
+            {
+            for(pos=paths;pos;++pos)
+              {
+              path=GURL::UTF8(sublocale,paths[pos]);
+              if(path.is_dir())
+                localepaths.append(path);
+            }
+          }
+        }
+      } while(p-- != sepchars);
+      if((GPosition) localepaths)
+        break;
+      defaultlocale="C";
+    }
+    for(pos=localepaths;pos;++pos)
+      appendPath(localepaths[pos],pathsmap,realpaths);
+    for(pos=paths;pos;++pos)
+      appendPath(paths[pos],pathsmap,realpaths);
+  }
+  return realpaths;
+}
+
+static GUTF8String
+getbodies(
+  GList<GURL> &paths,
+  const GUTF8String &MessageFileName,
+  GPList<lt_XMLTags> &body, 
+  GMap<GUTF8String, void *> & map )
+{
+  GUTF8String errors;
+  bool isdone=false;
+  GPosition firstpathpos=paths;
+  for(GPosition pathpos=firstpathpos;!isdone && pathpos;++pathpos)
+  {
+    const GURL::UTF8 url(MessageFileName,paths[pathpos]);
+    if(url.is_file())
+    {
+      map[MessageFileName]=0;
+      GP<lt_XMLTags> gtags;
+      {
+        GP<ByteStream> bs=ByteStream::create(url,"rb");
+        G_TRY
+        {
+          gtags=lt_XMLTags::create(bs);
+        }
+        G_CATCH(ex)
+        {
+          GUTF8String mesg(failed_to_parse_XML+("\t"+url.get_string()));
+          if(errors.length())
+          {
+            errors+="\n"+mesg;
+          }else
+          {
+            errors=mesg;
+          }
+          errors+="\n"+GUTF8String(ex.get_cause());
+        }
+        G_ENDCATCH;
+      }
+      if(gtags)
+      {
+        lt_XMLTags &tags=*gtags;
+        GPList<lt_XMLTags> Bodies=tags.get_Tags(bodystring);
+        if(! Bodies.isempty())
+        {
+          isdone=true;
+          for(GPosition pos=Bodies;pos;++pos)
+          {
+            body.append(Bodies[pos]);
+          }
+        }
+        GPList<lt_XMLTags> Head=tags.get_Tags(headstring);
+        if(! Head.isempty())
+        {
+          isdone=true;
+          GMap<GUTF8String, GP<lt_XMLTags> > includes;
+          lt_XMLTags::get_Maps(includestring,namestring,Head,includes);
+          for(GPosition pos=includes;pos;++pos)
+          {
+            const GUTF8String file=includes.key(pos);
+            if(! map.contains(file))
+            {
+              GList<GURL> xpaths;
+              xpaths.append(url.base());
+              const GUTF8String err2(getbodies(xpaths,file,body,map));
+              if(err2.length())
+              {
+                if(errors.length())
+                {
+                  errors+="\n"+err2;
+                }else
+                {
+                  errors=err2;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  return errors;
+}
+
+static GUTF8String
+parse(GMap<GUTF8String,GP<lt_XMLTags> > &retval)
+{
+  GUTF8String errors;
+  GPList<lt_XMLTags> body;
+  {
+    GList<GURL> paths=DjVuMessage::GetProfilePaths();
+    GMap<GUTF8String, void *> map;
+    GUTF8String m(MessageFile);
+    errors=getbodies(paths,m,body,map);
+  }
+  if(! body.isempty())
+  {
+    lt_XMLTags::get_Maps(messagestring,namestring,body,retval);
+  }
+  return errors;
+}
+
+
+const DjVuMessageLite &
+DjVuMessage::create_full(void)
+{
+  GP<DjVuMessageLite> &static_message=getDjVuMessageLite();
+  if(!static_message)
+  {
+    DjVuMessage *mesg=new DjVuMessage;
+    static_message=mesg;
+    mesg->init();
+  }
+  return DjVuMessageLite::create_lite();
+}
+
+void
+DjVuMessage::set_programname(const GUTF8String &xprogramname)
+{
+  programname()=xprogramname;
+  DjVuMessageLite::create=create_full; 
+}
+
+void
+DjVuMessage::use_language(void)
+{ 
+  DjVuMessageLite::create=create_full; 
+}
+
+
+// Constructor
+DjVuMessage::DjVuMessage( void ) {}
+
+void
+DjVuMessage::init(void)
+{
+  errors=parse(Map);
+}
+
+// Destructor
+DjVuMessage::~DjVuMessage( )
+{
+}
+
+
+//  A C function to perform a message lookup. Arguments are a buffer to receiv
+//  translated message, a buffer size (bytes), and a message_list. The transla
+//  result is returned in msg_buffer encoded in Native MBS encoding. In case
+// of error, msg_b empty (i.e., msg_buffer[0] == '\0').
+void
+DjVuMessageLookUpNative( 
+  char *msg_buffer, const unsigned int buffer_size, const char *message)
+{
+  const GNativeString converted(DjVuMessage::LookUpNative( message ));
+  if( converted.length() >= buffer_size )
+    msg_buffer[0] = '\0';
+  else
+    strcpy( msg_buffer, converted );
+}
+
+//  A C function to perform a message lookup. Arguments are a buffer to receiv
+//  translated message, a buffer size (bytes), and a message_list. The transla
+//  result is returned in msg_buffer encoded in UTF8 encoding. In case
+// of error, msg_b empty (i.e., msg_buffer[0] == '\0').
+void
+DjVuMessageLookUpUTF8( 
+  char *msg_buffer, const unsigned int buffer_size, const char *message)
+{
+  const GUTF8String converted(DjVuMessage::LookUpUTF8( message ));
+  if( converted.length() >= buffer_size )
+    msg_buffer[0] = '\0';
+  else
+    strcpy( msg_buffer, converted );
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+void
+DjVuFormatErrorUTF8( const char *fmt, ... )
+{
+  va_list args;
+  va_start(args, fmt); 
+  const GUTF8String message(fmt,args);
+  DjVuWriteError( message );
+}
+
+void
+DjVuFormatErrorNative( const char *fmt, ... )
+{
+  va_list args;
+  va_start(args, fmt); 
+  const GNativeString message(fmt,args);
+  DjVuWriteError( message );
+}
+
+const char *
+djvu_programname(const char *xprogramname)
+{
+  if(xprogramname)
+    DjVuMessage::programname()=GNativeString(xprogramname);
+  return DjVuMessage::programname();
+}
diff --git a/libdjvu/DjVuMessage.h b/libdjvu/DjVuMessage.h
new file mode 100644
index 0000000..9a54ae2
--- /dev/null
+++ b/libdjvu/DjVuMessage.h
@@ -0,0 +1,134 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+
+#ifndef __DJVU_MESSAGE_H__
+#define __DJVU_MESSAGE_H__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// All these I18N XML messages are Lizardtech innovations.
+// For DjvuLibre, I changed the path extraction logic
+// and added support for non I18N messages. 
+
+
+#include "DjVuMessageLite.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class GURL;
+
+class DJVUAPI DjVuMessage : public DjVuMessageLite
+{
+protected:
+  void init(void);
+  DjVuMessage(void);
+
+public:
+  /// Use the locale info and find the XML files on disk.
+  static void use_language(void);
+
+  /// Set the program name used when searching for XML files on disk.
+  static void set_programname(const GUTF8String &programname);
+  static GUTF8String &programname(void);
+
+  /// creates this class specifically.
+  static const DjVuMessageLite &create_full(void);
+
+  /** Adds a byte stream to be parsed whenever the next DjVuMessage::create()
+      call is made. */
+  static void AddByteStreamLater(const GP<ByteStream> &bs)
+  { use_language(); DjVuMessageLite::AddByteStreamLater(bs); }
+
+  /** Destructor: Does any necessary cleanup. Actions depend on how the message
+      file is implemented. */
+  ~DjVuMessage();
+
+  //// Same as LookUp, but this is a static method.
+  static GUTF8String LookUpUTF8( const GUTF8String & MessageList )
+  { use_language();return DjVuMessageLite::LookUpUTF8(MessageList); }
+
+  /** Same as Lookup, but returns a multibyte character string in the
+      current locale. */
+  static GNativeString LookUpNative( const GUTF8String & MessageList )
+  { use_language();return DjVuMessageLite::LookUpNative(MessageList); }
+
+  /// This is a simple alias to the above class, but does an fprintf to stderr.
+  static void perror( const GUTF8String & MessageList )
+  { use_language();DjVuMessageLite::perror(MessageList); }
+
+  static GList<GURL> GetProfilePaths(void);
+};
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif /* __DJVU_MESSAGE_H__ */
+
diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp
new file mode 100644
index 0000000..8bba3e0
--- /dev/null
+++ b/libdjvu/DjVuMessageLite.cpp
@@ -0,0 +1,478 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// All these I18N XML messages are Lizardtech innovations.
+// For DjvuLibre, I changed the path extraction logic
+// and added support for non I18N messages. 
+
+#include "DjVuMessageLite.h"
+#include "GOS.h"
+#include "XMLTags.h"
+#include "ByteStream.h"
+#include "GURL.h"
+#include "debug.h"
+#include <ctype.h>
+#include <string.h>
+#include <stddef.h>
+#include <stdlib.h>
+#ifdef _WIN32
+#include <tchar.h>
+#include <windows.h>
+#include <winreg.h>
+#endif
+#ifdef UNIX
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
+#endif
+#include <locale.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+const DjVuMessageLite& (*DjVuMessageLite::create)(void) = 
+  DjVuMessageLite::create_lite; 
+
+static const char *failed_to_parse_XML=
+  ERR_MSG("DjVuMessage.failed_to_parse_XML");
+static const char *unrecognized=
+  ERR_MSG("DjVuMessage.Unrecognized");
+static const char *uparameter=
+  ERR_MSG("DjVuMessage.Parameter");
+#ifdef LIZARDTECH_1_800_NUMBER
+static const char unrecognized_default[] =
+  "** Unrecognized DjVu Message: [Contact LizardTech at " 
+  LIZARDTECH_1_800_NUMBER " \n"
+  "\t** Message name:  %1!s!";
+#else
+static const char unrecognized_default[] =
+  "** Unrecognized DjVu Message:\n"
+  "\t** Message name:  %1!s!";
+#endif
+static const char uparameter_default[] = 
+  "\t   Parameter: %1!s!";
+static const char failed_to_parse_XML_default[]=
+  "Failed to parse XML message file:&#10;&#09;&apos;%1!s!&apos;.";
+
+static const char namestring[]="name";
+static const char valuestring[]="value";
+static const char numberstring[]="number";
+static const char bodystring[]="BODY";
+static const char messagestring[]="MESSAGE";
+
+GPList<ByteStream> &
+DjVuMessageLite::getByteStream(void)
+{
+  static GPList<ByteStream> gbs;
+  return gbs;
+}
+
+GP<DjVuMessageLite> &
+DjVuMessageLite::getDjVuMessageLite(void)
+{
+  static GP<DjVuMessageLite> message;
+  return message;
+}
+
+void
+DjVuMessageLite::AddByteStreamLater(const GP<ByteStream> &bs)
+{
+  getByteStream().append(bs);
+}
+
+//  There is only object of class DjVuMessage in a program, and here it is:
+//DjVuMessage  DjVuMsg;
+const DjVuMessageLite &
+DjVuMessageLite::create_lite(void)
+{
+  GP<DjVuMessageLite> &static_message=getDjVuMessageLite();
+  if(!static_message)
+  {
+    static_message=new DjVuMessageLite;
+  }
+  DjVuMessageLite &m=*static_message;
+  GPList<ByteStream> &bs = getByteStream();
+  for(GPosition pos;(pos=bs);bs.del(pos))
+  {
+    m.AddByteStream(bs[pos]);
+  }
+  return m;
+}
+
+// Constructor
+DjVuMessageLite::DjVuMessageLite( void ) {}
+
+// Destructor
+DjVuMessageLite::~DjVuMessageLite( ) {}
+
+
+void
+DjVuMessageLite::perror( const GUTF8String & MessageList )
+{
+  DjVuPrintErrorUTF8("%s\n",(const char *)DjVuMessageLite::LookUpUTF8(MessageList));
+}
+
+
+//  Expands message lists by looking up the message IDs and inserting
+//  arguments into the retrieved messages.
+//  N.B. The resulting string may be encoded in UTF-8 format (ISO 10646-1 Annex R)
+//       and SHOULD NOT BE ASSUMED TO BE ASCII.
+GUTF8String
+DjVuMessageLite::LookUp( const GUTF8String & MessageList ) const
+{
+//  DEBUG_MSG( "========== DjVuMessageLite::LookUp ==========\n" <<
+//             MessageList <<
+//             "\n========== DjVuMessageLite::LookUp ==========\n" );
+  GUTF8String result;                       // Result string; begins empty
+  if(errors.length())
+  {
+    const GUTF8String err1(errors);
+    (const_cast<GUTF8String &>(errors)).empty();
+    result=LookUp(err1)+"\n";
+  }
+
+  int start = 0;                            // Beginning of next message
+  int end = MessageList.length();           // End of the message string
+
+  //  Isolate single messages and process them
+  while( start < end )
+  {
+    if( MessageList[start] == '\n' )
+    {
+      result += MessageList[start++];       // move the newline to the result
+                                            // and advance to the next message
+    }
+    else
+    {
+      //  Find the end of the next message and process it
+      int next_ending = MessageList.search((unsigned long)'\n', start);
+      if( next_ending < 0 )
+        next_ending = end;
+      result += LookUpSingle( MessageList.substr(start, next_ending-start) );
+      //  Advance to the next message
+      start = next_ending;
+    }
+  }
+
+  //  All done 
+  return result;
+}
+
+
+// Expands a single message and inserts the arguments. Single_Message
+// contains no separators (newlines), but includes all the parameters
+// separated by tabs.
+GUTF8String
+DjVuMessageLite::LookUpSingle( const GUTF8String &Single_Message ) const
+{
+#if HAS_CTRL_C_IN_ERR_MSG
+  if (Single_Message[0] != '\003')
+    return Single_Message;
+#endif
+  //  Isolate the message ID and get the corresponding message text
+  int ending_posn = Single_Message.contains("\t\v");
+  if( ending_posn < 0 )
+    ending_posn = Single_Message.length();
+  GUTF8String msg_text;
+  GUTF8String msg_number;
+  const GUTF8String message=Single_Message.substr(0,ending_posn);
+  LookUpID( message, msg_text, msg_number );
+
+  //  Check whether we found anything
+  if( !msg_text.length())
+  {
+    if(message == unrecognized)
+    {
+      msg_text = unrecognized_default;
+    }else if(message == uparameter)
+    {
+      msg_text = uparameter_default;
+    }else if(message == failed_to_parse_XML)
+    {
+      msg_text = failed_to_parse_XML_default;
+    }else
+    {
+      return LookUpSingle(unrecognized + ("\t" + Single_Message));
+    }
+  }
+    
+  //  Insert the parameters (if any)
+  unsigned int param_num = 0;
+  while( (unsigned int)ending_posn < Single_Message.length() )
+  {
+    GUTF8String arg;
+    const int start_posn = ending_posn+1;
+    if(Single_Message[ending_posn] == '\v')
+    {
+      ending_posn=Single_Message.length();
+      arg=LookUpSingle(Single_Message.substr(start_posn,ending_posn));
+    }else
+    {
+      ending_posn = Single_Message.contains("\v\t",start_posn);
+      if( ending_posn < 0 )
+        ending_posn = Single_Message.length();
+      arg=Single_Message.substr(start_posn, ending_posn-start_posn);
+    }
+    InsertArg( msg_text, ++param_num, arg);
+  }
+  //  Insert the message number
+  InsertArg( msg_text, 0, msg_number );
+
+  return msg_text;
+}
+
+
+// Looks up the msgID in the file of messages and returns a pointer to
+// the beginning of the translated message, if found; and an empty string
+// otherwise.
+void
+DjVuMessageLite::LookUpID( const GUTF8String &xmsgID,
+                       GUTF8String &message_text,
+                       GUTF8String &message_number ) const
+{
+  if(!Map.isempty())
+  {
+    GUTF8String msgID = xmsgID;
+#if HAS_CTRL_C_IN_ERR_MSG
+    int start = 0;
+    while (msgID[start] == '\003') 
+      start ++;
+    if (start > 0)
+      msgID = msgID.substr(start, msgID.length() - start);
+#endif
+    GPosition pos=Map.contains(msgID);
+    if(pos)
+    {
+      const GP<lt_XMLTags> tag=Map[pos];
+      GPosition valuepos=tag->get_args().contains(valuestring);
+      if(valuepos)
+      {
+        message_text=tag->get_args()[valuepos];
+      }else
+      {
+        const GUTF8String raw(tag->get_raw());
+        const int start_line=raw.search((unsigned long)'\n',0);
+      
+        const int start_text=raw.nextNonSpace(0);
+        const int end_text=raw.firstEndSpace(0);
+        if(start_line<0 || start_text<0 || start_text < start_line)
+        {
+          message_text=raw.substr(0,end_text).fromEscaped();
+        }else
+        {
+          message_text=raw.substr(start_line+1,end_text-start_line-1).fromEscaped();
+        }
+      }
+      GPosition numberpos=tag->get_args().contains(numberstring);
+      if(numberpos)
+      {
+        message_number=tag->get_args()[numberpos];
+      }
+    }
+  }
+}
+
+
+// Insert a string into the message text. Will insert into any field
+// description.  Except for an ArgId of zero (message number), if the ArgId
+// is not found, the routine adds a line with the parameter so information
+// will not be lost.
+void
+DjVuMessageLite::InsertArg( GUTF8String &message,
+  const int ArgId, const GUTF8String &arg ) const
+{
+    // argument target string
+  const GUTF8String target= "%"+GUTF8String(ArgId)+"!";
+    // location of target string
+  int format_start = message.search( (const char *)target );
+  if( format_start >= 0 )
+  {
+    do
+    {
+      const int n=format_start+target.length()+1;
+      const int format_end=message.search((unsigned long)'!',n);
+      if(format_end > format_start)
+      { 
+        const int len=1+format_end-n;
+        if(len && isascii(message[n-1]))
+        {
+          GUTF8String narg;
+          GUTF8String format="%"+message.substr(n-1,len);
+          switch(format[len])
+          {
+            case 'd':
+            case 'i':
+              narg.format((const char *)format,arg.toInt());
+              break;
+            case 'u':
+            case 'o':
+            case 'x':
+            case 'X':
+              narg.format((const char *)format,(unsigned int)arg.toInt());
+              break;
+            case 'f':
+            case 'g':
+            case 'e':
+              {
+                int endpos;
+                narg.format((const char *)format, arg.toDouble(0,endpos));
+                if( endpos < 0 )
+                  narg = arg;
+              }
+              break;
+            default:
+              narg.format((const char *)format,(const char *)arg);
+              break;
+          }
+          message = message.substr( 0, format_start )+narg
+            +message.substr( format_end+1, -1 );
+        }else
+        {
+          message = message.substr( 0, format_start )+arg
+            +message.substr( format_end+1, -1 );
+        }
+      }
+      format_start=message.search((const char*)target, format_start+arg.length());
+    } while(format_start >= 0);
+  }
+  else
+  {
+    //  Not found, fake it
+    if( ArgId != 0 )
+    {
+      message += "\n"+LookUpSingle(uparameter+("\t"+arg));
+    }
+  }
+}
+
+
+//  A C function to perform a message lookup. Arguments are a buffer to received the
+//  translated message, a buffer size (bytes), and a message_list. The translated
+//  result is returned in msg_buffer encoded in UTF-8. In case of error, msg_buffer is
+//  empty (i.e., msg_buffer[0] == '\0').
+void 
+DjVuMessageLite_LookUp( char *msg_buffer, const unsigned int buffer_size, const char *message )
+{
+  GUTF8String converted = DjVuMessageLite::LookUpUTF8( message );
+  if( converted.length() >= buffer_size )
+    msg_buffer[0] = '\0';
+  else
+    strcpy( msg_buffer, converted );
+}
+
+void
+DjVuMessageLite::AddByteStream(const GP<ByteStream> &bs)
+{
+  const GP<lt_XMLTags> gtags(lt_XMLTags::create(bs));
+  lt_XMLTags &tags=*gtags;
+  GPList<lt_XMLTags> Bodies=tags.get_Tags(bodystring);
+  if(! Bodies.isempty())
+  {
+    lt_XMLTags::get_Maps(messagestring,namestring,Bodies,Map);
+  }
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+void
+DjVuWriteError( const char *message )
+{
+  G_TRY {
+    GP<ByteStream> errout = ByteStream::get_stderr();
+    if (errout)
+      {
+        const GUTF8String external = DjVuMessageLite::LookUpUTF8( message );
+        errout->writestring(external+"\n");
+      }
+    // Need to catch all exceptions because these might be 
+    // called from an outer exception handler (with prejudice)
+  } G_CATCH_ALL { } G_ENDCATCH;
+}
+
+void
+DjVuWriteMessage( const char *message )
+{
+  G_TRY {
+    GP<ByteStream> strout = ByteStream::get_stdout();
+    if (strout)
+      {
+        const GUTF8String external = DjVuMessageLite::LookUpUTF8( message );
+        strout->writestring(external+"\n");
+      }
+    // Need to catch all exceptions because these might be 
+    // called from an outer exception handler (with prejudice)
+  } G_CATCH_ALL { } G_ENDCATCH;
+}
diff --git a/libdjvu/DjVuMessageLite.h b/libdjvu/DjVuMessageLite.h
new file mode 100644
index 0000000..bebb614
--- /dev/null
+++ b/libdjvu/DjVuMessageLite.h
@@ -0,0 +1,226 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef __DJVU_MESSAGE_LITE_H__
+#define __DJVU_MESSAGE_LITE_H__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// All these I18N XML messages are Lizardtech innovations.
+// For DjvuLibre, I changed the path extraction logic
+// and added support for non I18N messages. 
+
+
+#include "GString.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class lt_XMLTags;
+class ByteStream;
+
+/** Exception causes and external messages are passed as message lists which
+    have the following syntax:
+  
+    message_list ::= single_message |
+                     single_message separator message_list
+    
+    separator ::= newline |
+                  newline | separator
+    
+    single_message ::= message_ID |
+                       message_ID parameters
+    
+    parameters ::= tab string |
+                   tab string parameters
+    
+    Message_IDs are looked up an external file and replaced by the message
+    text strings they are mapped to. The message text may contain the
+    following:
+    
+    Parameter specifications: These are modelled after printf format
+    specifications and have one of the following forms:
+  
+      %n!s! %n!d! %n!i! %n!u! %n!x! %n!X!
+  
+    where n is the parameter number. The parameter number is indicated
+    explicitly to allow for the possibility that the parameter order may
+    change when the message text is translated into another language.
+    The final letter ('s', 'd', 'i', 'u', 'x', or 'X') indicates the form
+    of the parameter (string, integer, integer, unsigned integer, lowercase
+    hexadecimal, or uppercase hexadecimal, respectively).  In addition
+    formating options such as precision available in sprintf, may be used.
+    So, to print the third argument as 5 digit unsigned number, with leading
+    zero's one could use:
+      %3!05u!
+
+    All of the arguments are actually strings.  For forms that don't take
+    string input ('d', 'i', 'u', 'x', or 'X'), and atoi() conversion is done
+    on the string before formatting.  In addition the form indicates to the
+    translater whether to expect a word or a number.
+
+    The strings are read in from XML.  To to format the strings, use the
+    relavent XML escape sequences, such as follows:
+
+            &#10;        [line feed]
+            &#09;        [horizontal tab]
+            &apos;       [single quote]
+            &#34;        [double quote]
+            &lt;         [less than sign]
+            &gt;         [greater than sign]
+  
+    After parameters have been inserted in the message text, the formatting 
+    strings are replaced by their usual equivalents (newline and tab
+    respectively).
+
+    If a message_id cannot be found in the external file, a message text
+    is fabricated giving the message_id and the parameters (if any).
+
+    Separators (newlines) are preserved in the translated message list.
+
+    Expands message lists by looking up the message IDs and inserting
+    arguments into the retrieved messages.
+
+    N.B. The resulting string may be encoded in UTF-8 format (ISO 10646-1
+    Annex R) and SHOULD NOT BE ASSUMED TO BE ASCII.
+  */
+
+class DJVUAPI DjVuMessageLite : public GPEnabled
+{
+protected:
+  // Constructor:
+  DjVuMessageLite( void );
+  GMap<GUTF8String,GP<lt_XMLTags> > Map;
+  GUTF8String errors;
+  /// Creates a DjVuMessage class.
+  static const DjVuMessageLite &real_create(void);
+
+public:
+  /// Creates a DjVuMessage class.
+  static const DjVuMessageLite& (*create)(void);
+
+  /// Creates this class specifically.
+  static const DjVuMessageLite &create_lite(void);
+
+  /** Adds a byte stream to be parsed whenever the next DjVuMessage::create()
+      call is made. */
+  static void AddByteStreamLater(const GP<ByteStream> &bs);
+
+  /** Destructor: Does any necessary cleanup. Actions depend on how the message
+      file is implemented. */
+  ~DjVuMessageLite();
+
+  /// Lookup the relavent string and parse the message.
+  GUTF8String LookUp( const GUTF8String & MessageList ) const;
+
+  //// Same as LookUp, but this is a static method.
+  static GUTF8String LookUpUTF8( const GUTF8String & MessageList )
+  { return create().LookUp(MessageList); }
+
+  /** Same as Lookup, but returns the a multibyte character string in the
+      current locale. */
+  static GNativeString LookUpNative( const GUTF8String & MessageList )
+  { return create().LookUp(MessageList).getUTF82Native(); }
+
+  /// This is a simple alias to the above class, but does an fprintf to stderr.
+  static void perror( const GUTF8String & MessageList );
+
+protected:
+
+  /*  Looks up the msgID in the file of messages. The strings message_text
+      and message_number are returned if found. If not found, these strings
+      are empty. */
+  void LookUpID( const GUTF8String & msgID,
+    GUTF8String &message_text, GUTF8String &message_number ) const;
+
+  /*  Expands a single message and inserts the arguments. Single_Message
+      contains no separators (newlines), but includes all the parameters
+      separated by tabs. */
+  GUTF8String LookUpSingle( const GUTF8String & Single_Message ) const;
+
+  /*  Insert a string into the message text. Will insert into any field
+      description.  Except for an ArgId of zero (message number), if the
+      #ArgId# is not found, the routine adds a line with the parameter
+      so information will not be lost. */
+  void InsertArg(
+    GUTF8String &message, const int ArgId, const GUTF8String &arg ) const;
+
+  void AddByteStream(const GP<ByteStream> &bs);
+
+protected:
+  /*  Static storage of the DjVuMessage class. */
+  static GP<DjVuMessageLite> &getDjVuMessageLite(void);
+  /*  Static storage of the ByteStream list. */
+  static GPList<ByteStream> &getByteStream(void);
+};
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif /* __DJVU_MESSAGE_LITE_H__ */
+
diff --git a/libdjvu/DjVuNavDir.cpp b/libdjvu/DjVuNavDir.cpp
new file mode 100644
index 0000000..0227b3e
--- /dev/null
+++ b/libdjvu/DjVuNavDir.cpp
@@ -0,0 +1,236 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuNavDir.h"
+#include "debug.h"
+#include "GException.h"
+#include "GOS.h"
+#include "ByteStream.h"
+#include "GURL.h"
+#include <ctype.h>
+
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+DjVuNavDir::DjVuNavDir(const GURL &dirURL)
+{
+   if (!dirURL) G_THROW( ERR_MSG("DjVuNavDir.zero_dir") );
+   baseURL=dirURL.base();
+}
+
+DjVuNavDir::DjVuNavDir(ByteStream & str, const GURL &dirURL)
+{
+   if (!dirURL) G_THROW( ERR_MSG("DjVuNavDir.zero_dir") );
+   
+   baseURL=GURL(dirURL).base();
+   
+   decode(str);
+}
+
+void
+DjVuNavDir::decode(ByteStream & str)
+{
+   GCriticalSectionLock lk(&lock);
+   
+   GList<GUTF8String> tmp_page2name;
+   int eof=0;
+   while(!eof)
+   {
+      char buffer[1024];
+      char * ptr;
+      for(ptr=buffer;ptr-buffer<1024;ptr++)
+	 if ((eof=!str.read(ptr, 1)) || *ptr=='\n') break;
+      if (ptr-buffer==1024) G_THROW( ERR_MSG("DjVuNavDir.long_line") );
+      *ptr=0;
+      if (!strlen(buffer)) continue;
+
+      if (!tmp_page2name.contains(buffer))
+	 tmp_page2name.append(buffer);
+   };
+
+   // Now copying lists to arrays for faster access later
+   int pages=tmp_page2name.size();
+   page2name.resize(pages-1);
+
+   int cnt;
+   GPosition pos;
+   for(pos=tmp_page2name, cnt=0;pos;++pos, cnt++)
+      page2name[cnt]=tmp_page2name[pos];
+   
+   // Now creating reverse mapping (strings => numbers)
+   for(cnt=0;cnt<pages;cnt++)
+   {
+      name2page[page2name[cnt]]=cnt;
+      url2page[GURL::UTF8(page2name[cnt],baseURL)]=cnt;
+   }
+}
+
+#ifndef NEED_DECODER_ONLY
+void
+DjVuNavDir::encode(ByteStream & str)
+{
+   GCriticalSectionLock lk(&lock);
+
+   for(int i=0;i<page2name.size();i++)
+   {
+      GUTF8String & name=page2name[i];
+      str.writall((const char*)name, name.length());
+      str.writall("\n", 1);
+   };
+}
+#endif //NEED_DECODER_ONLY
+
+int
+DjVuNavDir::get_pages_num(void) const
+{
+   GCriticalSectionLock lk((GCriticalSection *)&lock);
+   
+   return page2name.size();
+}
+
+int
+DjVuNavDir::name_to_page(const char * name) const
+{
+   GCriticalSectionLock lk((GCriticalSection *)&lock);
+
+   if (!name2page.contains(name)) return -1;
+   return name2page[name];
+}
+
+int
+DjVuNavDir::url_to_page(const GURL & url) const
+{
+   GCriticalSectionLock lk((GCriticalSection *)&lock);
+
+   if (!url2page.contains(url)) return -1;
+   return url2page[url];
+}
+
+GUTF8String
+DjVuNavDir::page_to_name(int page) const
+{
+   GCriticalSectionLock lk((GCriticalSection *)&lock);
+   
+   if (page<0) 
+      G_THROW( ERR_MSG("DjVuNavDir.neg_page") );
+   if (page>=page2name.size())
+      G_THROW( ERR_MSG("DjVuNavDir.large_page") );
+   return page2name[page];
+}
+
+GURL
+DjVuNavDir::page_to_url(int page) const
+{
+   GCriticalSectionLock lk((GCriticalSection *)&lock);
+   
+   return GURL::UTF8(page_to_name(page),baseURL);
+}
+
+void
+DjVuNavDir::insert_page(int where, const char * name)
+{
+   GCriticalSectionLock lk((GCriticalSection *)&lock);
+
+   int pages=page2name.size();
+   if (where<0) where=pages;
+   
+   page2name.resize(pages);
+   for(int i=pages;i>where;i--)
+      page2name[i]=page2name[i-1];
+   page2name[where]=name;
+   name2page[name]=where;
+   url2page[GURL::UTF8(name,baseURL)]=where;
+}
+
+#ifndef NEED_DECODER_ONLY
+void
+DjVuNavDir::delete_page(int page_num)
+{
+   GCriticalSectionLock lk((GCriticalSection *)&lock);
+
+   int pages=page2name.size();
+   
+   if (page_num<0 || page_num>=pages)
+      G_THROW( ERR_MSG("DjVuNavDir.bad_page") );
+
+   for(int i=page_num;i<pages-1;i++)
+      page2name[i]=page2name[i+1];
+   page2name.resize(--pages-1);
+}
+#endif
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/DjVuNavDir.h b/libdjvu/DjVuNavDir.h
new file mode 100644
index 0000000..0505d81
--- /dev/null
+++ b/libdjvu/DjVuNavDir.h
@@ -0,0 +1,190 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUNAVDIR_H
+#define _DJVUNAVDIR_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GString.h"
+#include "GThreads.h"
+#include "GURL.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+
+/** @name DjVuNavDir.h
+    Files #"DjVuNavDir.h"# and #"DjVuNavDir.cpp"# contain implementation of the
+    multipage DjVu navigation directory. This directory lists all the pages,
+    that a given document is composed of. The navigation (switching from page
+    to page in the plugin) is not possible before this directory is decoded.
+
+    Refer to the \Ref{DjVuNavDir} class description for greater details.
+
+    @memo DjVu Navigation Directory
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+
+//@{
+
+//*****************************************************************************
+//********************* Note: this class is thread-safe ***********************
+//*****************************************************************************
+
+/** DjVu Navigation Directory.
+
+    This class implements the {\em navigation directory} of a multipage
+    DjVu document - basically a list of pages that this document is composed
+    of. We would like to emphasize, that this is the list of namely
+    {\bf pages}, not {\bf files}. Any page may include any
+    number of additional files. When you've got an all-in-one-file multipage
+    DjVu document (DjVm archive) you may get the files list from \Ref{DjVmDir0}
+    class.
+
+    The \Ref{DjVuNavDir} class can decode and encode the navigation directory
+    from {\bf NDIR} IFF chunk. It's normally created by the library during
+    decoding procedure and can be accessed like any other component of
+    the \Ref{DjVuImage} being decoded.
+    
+    In a typical multipage DjVu document the navigation directory is stored
+    in a separate IFF file containing only one chunk: {\bf NDIR} chunk.
+    This file should be included (by means of the {\bf INCL} chunk) into
+    every page of the document to enable the navigation. */
+class DjVuNavDir : public GPEnabled
+{
+private:
+   GCriticalSection		lock;
+   GURL				baseURL;
+   GArray<GUTF8String>		page2name;
+   GMap<GUTF8String, int>		name2page;
+   GMap<GURL, int>		url2page;
+protected:
+   DjVuNavDir(const GURL &dir_url);
+   DjVuNavDir(ByteStream & str, const GURL &dir_url);
+
+public:
+   int		get_memory_usage(void) const { return 1024; };
+
+      /** Creates a #DjVuNavDir# object. #dir_url# is the URL of the file
+	  containing the directory source data. It will be used later
+	  in translation by functions like \Ref{url_to_page}() and
+	  \Ref{page_to_url}() */
+   static GP<DjVuNavDir> create(const GURL &dir_url)
+   {return new DjVuNavDir(dir_url);}
+
+      /** Creates #DjVuNavDir# object by decoding its contents from
+	  the stream. #dir_url# is the URL of the file containing the
+	  directory source data. */
+   static GP<DjVuNavDir> create(ByteStream & str, const GURL &dir_url)
+   { return new DjVuNavDir(str,dir_url); }
+
+   virtual ~DjVuNavDir(void) {};
+
+      /// Decodes the directory contents from the given \Ref{ByteStream}
+   void		decode(ByteStream & str);
+
+      /// Encodes the directory contents into the given \Ref{ByteStream}
+   void		encode(ByteStream & str);
+
+      /** Inserts a new page at position #where# pointing to a file
+	  with name #name#.
+
+	  @param where The position where the page should be inserted.
+	  	 #-1# means to append.
+	  @param name The name of the file corresponding to this page.
+	  	 The name may not contain slashes. The file may include
+		 other files. */
+   void		insert_page(int where, const char * name);
+
+      /// Deletes page with number #page_num# from the directory.
+   void		delete_page(int page_num);
+
+      /// Returns the number of pages in the directory.
+   int		get_pages_num(void) const;
+      /** Converts the #url# to page number. Returns #-1# if the #url#
+	  does not correspond to anything in the directory. */
+   int		url_to_page(const GURL & url) const;
+      /** Converts file name #name# to page number. Returns #-1# if file
+	  with given name cannot be found. */
+   int		name_to_page(const char * name) const;
+      /** Converts given #page# to URL. Throws an exception if page number
+	  is invalid. */
+   GURL		page_to_url(int page) const;
+      /** Converts given #page# to URL. Throws an exception if page number
+	  is invalid. */
+   GUTF8String	page_to_name(int page) const;
+};
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp
new file mode 100644
index 0000000..76b0bf4
--- /dev/null
+++ b/libdjvu/DjVuPalette.cpp
@@ -0,0 +1,613 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GException.h"
+#include "ByteStream.h"
+#include "BSByteStream.h"
+#include "DjVuPalette.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <math.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+#define CUBEBITS  4
+#define CUBESIDE  (1<<CUBEBITS)
+#define CUBESIZE  (CUBESIDE*CUBESIDE*CUBESIDE)
+
+#define RMUL 5
+#define GMUL 9
+#define BMUL 2
+#define SMUL (RMUL+GMUL+BMUL)
+
+#define MAXPALETTESIZE 65535 // Limit for a 16 bit unsigned read.
+
+
+inline unsigned char 
+umax(unsigned char a, unsigned char b) 
+{ return (a>b) ? a : b; }
+
+inline unsigned char 
+umin(unsigned char a, unsigned char b) 
+{ return (a>b) ? b : a; }
+
+inline float 
+fmin(float a, float b) 
+{ return (a>b) ? b : a; }
+
+
+
+// ------- DJVUPALETTE
+
+
+DjVuPalette::DjVuPalette()
+  : mask(0), hist(0), pmap(0)
+{
+}
+
+DjVuPalette::~DjVuPalette()
+{
+  delete hist;
+  delete pmap;
+}
+
+DjVuPalette& 
+DjVuPalette::operator=(const DjVuPalette &ref)
+{
+  if (this != &ref)
+    {
+      delete hist;
+      delete pmap;
+      mask = 0;
+      palette = ref.palette;
+      colordata = ref.colordata;
+    }
+  return *this;
+}
+
+DjVuPalette::DjVuPalette(const DjVuPalette &ref)
+  : mask(0), hist(0), pmap(0)
+{
+  this->operator=(ref);
+}
+
+
+
+// -------- HISTOGRAM ALLOCATION
+
+void
+DjVuPalette::allocate_hist()
+{
+  if (! hist)
+    {
+      hist = new GMap<int,int>;
+      mask = 0;
+    }
+  else
+    {
+      GMap<int,int> *old = hist;
+      hist = new GMap<int,int>;
+      mask = (mask<<1)|(0x010101);
+      for (GPosition p = *old; p; ++p)
+        {
+          int k = old->key(p);
+          int w = (*old)[p];
+          (*hist)[k | mask] += w;
+        }
+      delete old;
+    }
+}
+
+
+// -------- PALETTE COMPUTATION
+
+
+#ifndef NEED_DECODER_ONLY
+
+struct PData
+{
+  unsigned char p[3];
+  int w;
+};
+
+struct PBox 
+{
+  PData *data;
+  int colors;
+  int boxsize;
+  int sum;
+};
+int
+DjVuPalette::bcomp (const void *a, const void *b)
+{
+  return ((PData*)a)->p[0] - ((PData*)b)->p[0];
+}
+
+int
+
+DjVuPalette::gcomp (const void *a, const void *b)
+{
+  return ((PData*)a)->p[1] - ((PData*)b)->p[1];
+}
+
+int
+DjVuPalette::rcomp (const void *a, const void *b)
+{
+  return ((PData*)a)->p[2] - ((PData*)b)->p[2];
+}
+
+int
+DjVuPalette::lcomp (const void *a, const void *b)
+{
+  unsigned char *aa = ((PColor*)a)->p;
+  unsigned char *bb = ((PColor*)b)->p;
+  if (aa[3] != bb[3])
+    return aa[3]-bb[3];
+  else if (aa[2] != bb[2])
+    return aa[2]-bb[2];
+  else if (aa[1] != bb[1])
+    return aa[1]=bb[1];
+  else
+    return aa[0]-bb[0];
+}
+
+int
+DjVuPalette::compute_palette(int maxcolors, int minboxsize)
+{
+  if (!hist)
+    G_THROW( ERR_MSG("DjVuPalette.no_color") );
+  if (maxcolors<1 || maxcolors>MAXPALETTESIZE)
+    G_THROW( ERR_MSG("DjVuPalette.many_colors") );
+  
+  // Paul Heckbert: "Color Image Quantization for Frame Buffer Display", 
+  // SIGGRAPH '82 Proceedings, page 297.  (also in ppmquant)
+  
+  // Collect histogram colors
+  int sum = 0;
+  int ncolors = 0;
+  GTArray<PData> pdata;
+  { // extra nesting for windows
+    for (GPosition p = *hist; p; ++p)
+    {
+      pdata.touch(ncolors);
+      PData &data = pdata[ncolors++];
+      int k = hist->key(p);
+      data.p[0] = (k>>16) & 0xff;
+      data.p[1] = (k>>8) & 0xff;
+      data.p[2] = (k) & 0xff;
+      data.w = (*hist)[p];
+      sum += data.w;
+    }
+  }
+  // Create first box
+  GList<PBox> boxes;
+  PBox newbox;
+  newbox.data = pdata;
+  newbox.colors = ncolors;
+  newbox.boxsize = 256;
+  newbox.sum = sum;
+  boxes.append(newbox);
+  // Repeat spliting boxes
+  while (boxes.size() < maxcolors)
+    {
+      // Find suitable box
+      GPosition p;
+      for (p=boxes; p; ++p)
+        if (boxes[p].colors>=2 && boxes[p].boxsize>minboxsize) 
+          break;
+      if (! p)
+        break;
+      // Find box boundaries
+      PBox &splitbox = boxes[p];
+      unsigned char pmax[3];
+      unsigned char pmin[3];
+      pmax[0] = pmin[0] = splitbox.data->p[0];
+      pmax[1] = pmin[1] = splitbox.data->p[1];
+      pmax[2] = pmin[2] = splitbox.data->p[2];
+      { // extra nesting for windows
+        for (int j=1; j<splitbox.colors; j++)
+        {
+          pmax[0] = umax(pmax[0], splitbox.data[j].p[0]);
+          pmax[1] = umax(pmax[1], splitbox.data[j].p[1]);
+          pmax[2] = umax(pmax[2], splitbox.data[j].p[2]);
+          pmin[0] = umin(pmin[0], splitbox.data[j].p[0]);
+          pmin[1] = umin(pmin[1], splitbox.data[j].p[1]);
+          pmin[2] = umin(pmin[2], splitbox.data[j].p[2]);
+        }
+      }
+      // Determine split direction and sort
+      int bl = pmax[0]-pmin[0]; 
+      int gl = pmax[1]-pmin[1];
+      int rl = pmax[2]-pmin[2];
+      splitbox.boxsize = (bl>gl ? (rl>bl ? rl : bl) : (rl>gl ? rl : gl));
+      if (splitbox.boxsize <= minboxsize)
+        continue;
+      if (gl == splitbox.boxsize)
+        qsort(splitbox.data, splitbox.colors, sizeof(PData), gcomp);
+      else if (rl == splitbox.boxsize)
+        qsort(splitbox.data, splitbox.colors, sizeof(PData), rcomp);
+      else
+        qsort(splitbox.data, splitbox.colors, sizeof(PData), bcomp);
+      // Find median
+      int lowercolors = 0;
+      int lowersum = 0;
+      while (lowercolors<splitbox.colors-1 && lowersum+lowersum<splitbox.sum)
+        lowersum += splitbox.data[lowercolors++].w;
+      // Compute new boxes
+      newbox.data = splitbox.data + lowercolors;
+      newbox.colors = splitbox.colors - lowercolors;
+      newbox.sum = splitbox.sum - lowersum;
+      splitbox.colors = lowercolors;
+      splitbox.sum = lowersum;
+      // Insert boxes at proper location
+      GPosition q;
+      for (q=p; q; ++q)
+        if (boxes[q].sum < newbox.sum)
+          break;
+      boxes.insert_before(q, newbox);
+      for (q=p; q; ++q)
+        if (boxes[q].sum < splitbox.sum)
+          break;
+      boxes.insert_before(q, boxes, p);
+    }
+  // Fill palette array
+  ncolors = 0;
+  palette.empty();
+  palette.resize(0,boxes.size()-1);
+  { // extra nesting for windows
+    for (GPosition p=boxes; p; ++p)
+    {
+      PBox &box = boxes[p];
+      // Compute box representative color
+      float bsum = 0;
+      float gsum = 0;
+      float rsum = 0;
+      for (int j=0; j<box.colors; j++)
+        {
+          float w = (float)box.data[j].w;
+          bsum += box.data[j].p[0] * w;
+          gsum += box.data[j].p[1] * w;
+          rsum += box.data[j].p[2] * w;
+        }
+      PColor &color = palette[ncolors++];
+      color.p[0] = (unsigned char) fmin(255, bsum/box.sum);
+      color.p[1] = (unsigned char) fmin(255, gsum/box.sum);
+      color.p[2] = (unsigned char) fmin(255, rsum/box.sum);
+      color.p[3] = ( color.p[0]*BMUL + color.p[1]*GMUL + color.p[2]*RMUL) / SMUL;
+    }
+  }
+  // Save dominant color
+  PColor dcolor = palette[0];
+  // Sort palette colors in luminance order
+  qsort((PColor*)palette, ncolors, sizeof(PColor), lcomp);
+  // Clear invalid data
+  colordata.empty();
+  delete pmap;
+  pmap = 0;
+  // Return dominant color
+  return color_to_index_slow(dcolor.p);
+}
+
+
+
+int 
+DjVuPalette::compute_pixmap_palette(const GPixmap &pm, int ncolors, int minboxsize)
+{
+  // Prepare histogram
+  histogram_clear();
+  { // extra nesting for windows
+    for (int j=0; j<(int)pm.rows(); j++)
+    {
+      const GPixel *p = pm[j];
+      for (int i=0; i<(int)pm.columns(); i++)
+        histogram_add(p[i], 1);
+    }
+  }
+  // Compute palette
+  return compute_palette(ncolors, minboxsize);
+}
+
+
+#endif
+
+
+
+
+// -------- QUANTIZATION
+
+
+void
+DjVuPalette::allocate_pmap()
+{
+  if (! pmap)
+    pmap = new GMap<int,int>;
+}
+
+int 
+DjVuPalette::color_to_index_slow(const unsigned char *bgr)
+{
+  PColor *pal = palette;
+  const int ncolors = palette.size();
+  if (! ncolors)
+    G_THROW( ERR_MSG("DjVuPalette.not_init") );
+  // Should be able to do better
+  int found = 0;
+  int founddist = 3*256*256;
+  { // extra nesting for windows
+    for (int i=0; i<ncolors; i++)
+    {
+      int bd = bgr[0] - pal[i].p[0];
+      int gd = bgr[1] - pal[i].p[1];
+      int rd = bgr[2] - pal[i].p[2];
+      int dist = (bd*bd)+(gd*gd)+(rd*rd);
+      if (dist < founddist)
+        {
+          found = i;
+          founddist = dist;
+        }
+    }
+  }
+  // Store in pmap
+  if (pmap && pmap->size()<0x8000)
+    {
+      int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2]);
+      (*pmap)[key] = found;
+    }
+  // Return
+  return found;
+}
+
+
+#ifndef NEED_DECODER_ONLY
+
+void 
+DjVuPalette::quantize(GPixmap &pm)
+{
+  { // extra nesting for windows
+    for (int j=0; j<(int)pm.rows(); j++)
+    {
+      GPixel *p = pm[j];
+      for (int i=0; i<(int)pm.columns(); i++)
+        index_to_color(color_to_index(p[i]), p[i]);
+    }
+  }
+}
+
+int 
+DjVuPalette::compute_palette_and_quantize(GPixmap &pm, int maxcolors, int minboxsize)
+{
+  int result = compute_pixmap_palette(pm, maxcolors, minboxsize);
+  quantize(pm);
+  return result;
+}
+
+void 
+DjVuPalette::color_correct(double corr)
+{
+  const int palettesize = palette.size();
+  if (palettesize > 0)
+    {
+      // Copy colors
+      int i;
+      GTArray<GPixel> pix(0,palettesize-1);
+      GPixel *r = pix;
+      PColor *q = palette;
+      for (i=0; i<palettesize; i++) 
+        {
+          r[i].b = q[i].p[0];
+          r[i].g = q[i].p[1];
+          r[i].r = q[i].p[2];
+        }
+      // Apply color correction
+      GPixmap::color_correct(corr, r, palettesize);
+      // Restore colors
+      for (i=0; i<palettesize; i++) 
+        {
+          q[i].p[0] = r[i].b;
+          q[i].p[1] = r[i].g;
+          q[i].p[2] = r[i].r;
+        }
+    }
+}
+
+#endif
+
+
+// -------- ENCODE AND DECODE
+
+#define DJVUPALETTEVERSION 0
+
+void
+DjVuPalette::encode_rgb_entries(ByteStream &bs) const
+{
+  const int palettesize = palette.size();
+  { // extra nesting for windows
+    for (int c=0; c<palettesize; c++)
+    {
+      unsigned char p[3];
+      p[2] = palette[c].p[0];
+      p[1] = palette[c].p[1];
+      p[0] = palette[c].p[2];
+      bs.writall((const void*)p, 3);
+    }
+  }
+}
+
+void 
+DjVuPalette::encode(GP<ByteStream> gbs) const
+{
+  ByteStream &bs=*gbs;
+  const int palettesize = palette.size();
+  const int datasize = colordata.size();
+  // Code version number
+  int version = DJVUPALETTEVERSION;
+  if (datasize>0) version |= 0x80;
+  bs.write8(version);
+  // Code palette
+  bs.write16(palettesize);
+  { // extra nesting for windows
+    for (int c=0; c<palettesize; c++)
+    {
+      unsigned char p[3];
+      p[0] = palette[c].p[0];
+      p[1] = palette[c].p[1];
+      p[2] = palette[c].p[2];
+      bs.writall((const void*)p, 3);
+    }
+  }
+  // Code colordata
+  if (datasize > 0)
+    {
+      bs.write24(datasize);
+      GP<ByteStream> gbsb=BSByteStream::create(gbs, 50);
+      ByteStream &bsb=*gbsb;
+      for (int d=0; d<datasize; d++)
+        bsb.write16(colordata[d]);
+    }
+}
+
+void 
+DjVuPalette::decode_rgb_entries(ByteStream &bs, const int palettesize)
+{
+  palette.resize(0,palettesize-1);
+  { // extra nesting for windows
+    for (int c=0; c<palettesize; c++)
+    {
+      unsigned char p[3];
+      bs.readall((void*)p, 3);
+      palette[c].p[0] = p[2];
+      palette[c].p[1] = p[1];
+      palette[c].p[2] = p[0];
+      palette[c].p[3] = (p[0]*BMUL+p[1]*GMUL+p[2]*RMUL)/SMUL;
+    }
+  }
+}
+
+void 
+DjVuPalette::decode(GP<ByteStream> gbs)
+{
+  ByteStream &bs=*gbs;
+  // Make sure that everything is clear
+  delete hist;
+  delete pmap;
+  hist = 0;
+  pmap = 0;
+  mask = 0;
+  // Code version
+  int version = bs.read8();
+  if ( (version & 0x7f) != DJVUPALETTEVERSION)
+    G_THROW( ERR_MSG("DjVuPalette.bad_version") );
+  // Code palette
+  const int palettesize = bs.read16();
+  if (palettesize<0 || palettesize>MAXPALETTESIZE)
+    G_THROW( ERR_MSG("DjVuPalette.bad_palette") );
+  palette.resize(0,palettesize-1);
+  { // extra nesting for windows
+    for (int c=0; c<palettesize; c++)
+    {
+      unsigned char p[3];
+      bs.readall((void*)p, 3);
+      palette[c].p[0] = p[0];
+      palette[c].p[1] = p[1];
+      palette[c].p[2] = p[2];
+      palette[c].p[3] = (p[0]*BMUL+p[1]*GMUL+p[2]*RMUL)/SMUL;
+    }
+  }
+  // Code data
+  if (version & 0x80)
+    {
+      int datasize = bs.read24();
+      if (datasize<0)
+        G_THROW( ERR_MSG("DjVuPalette.bad_palette") );
+      colordata.resize(0,datasize-1);
+      GP<ByteStream> gbsb=BSByteStream::create(gbs);
+      ByteStream &bsb=*gbsb;
+      { // extra nesting for windows
+        for (int d=0; d<datasize; d++)
+        {
+          short s = bsb.read16();
+          if (s<0 || s>=palettesize)
+            G_THROW( ERR_MSG("DjVuPalette.bad_palette") );        
+          colordata[d] = s;
+        }
+      }
+    }
+}
+
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/DjVuPalette.h b/libdjvu/DjVuPalette.h
new file mode 100644
index 0000000..83ce232
--- /dev/null
+++ b/libdjvu/DjVuPalette.h
@@ -0,0 +1,336 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUPALETTE_H_
+#define _DJVUPALETTE_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GContainer.h"
+#include "GPixmap.h"
+#include <string.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/** @name DjVuPalette.h
+    Files #"DjVuPalette.h"# and #"DjVuPalette.cpp"# implement a single class
+    \Ref{DjVuPalette} which provides facilities for computing optimal color
+    palettes, coding color palettes, and coding sequences of color indices.
+    @memo 
+    DjVuPalette header file
+    @author: 
+    L\'eon Bottou <leonb@research.att.com> */
+//@{
+
+
+/** Computing and coding color palettes and index arrays.
+    This class provides facilities for computing optimal color palettes,
+    coding color palettes, and coding sequences of color indices.
+    
+    {\bf Creating a color palette} -- The recipe for creating a color palette
+    consists in (a) creating a DjVuPalette object, (b) constructing a color
+    histogram using \Ref{histogram_add}, and (c) calling function
+    \Ref{compute_palette}.
+
+    {\bf Accessing the color palette} -- Conversion between colors and color
+    palette indices is easily achieved with \Ref{color_to_index} and
+    \Ref{index_to_color}.  There are also functions for computing a palette
+    and quantizing a complete pixmap.
+
+    {\bf Sequences of color indices} -- The DjVuPalette object also contains
+    an array \Ref{colordata} optionally containing a sequence of color
+    indices.  This array will be encoded and decoded by functions \Ref{encode}
+    and \Ref{decode}.  This feature simplifies the implementation of the ``one
+    color per symbol'' model in DjVu.
+
+    {\bf Coding color palettes and color indices} -- Two functions
+    \Ref{encode} and \Ref{decode} are provided for coding the color palette
+    and the array of color indices when appropriate.  */
+#ifdef _WIN32_WCE_EMULATION         // Work around odd behavior under WCE Emulation
+#define CALLINGCONVENTION __cdecl
+#else
+#define CALLINGCONVENTION  /* */
+#endif
+
+class DJVUAPI DjVuPalette : public GPEnabled
+{
+protected:
+  DjVuPalette(void);
+public:
+  /// Generic creator
+  static GP<DjVuPalette> create(void) {return new DjVuPalette();}
+
+  /// Non-virtual destructor
+  ~DjVuPalette();
+  // COPY
+  DjVuPalette(const DjVuPalette &ref);
+  DjVuPalette& operator=(const DjVuPalette &ref);
+  // PALETTE COMPUTATION
+  /** Resets the color histogram to zero. */
+  void histogram_clear();
+  /** Adds the color specified by #p# to the histogram.
+      Argument #weight# represent the number of pixels with this color. */
+  void histogram_add(const GPixel &p, int weight);
+  /** Adds the color specified by the triple #bgr# to the histogram.
+      Argument #weight# represent the number of pixels with this color. */
+  void histogram_add(const unsigned char *bgr, int weight);
+  /** Adds the color specified by the weighted triple #bgr# to the histogram.
+      Argument #weight# represent the number of pixels with this color.  This
+      function will compute the actual color by dividing the elements of the
+      #bgr# array by #weight# and then use the unnormalized values to compute
+      the average color per bucket.  This is all a way to avoid excessive loss
+      of accuracy. */
+  void histogram_norm_and_add(const int *bgr, int weight);
+  /** Computes an optimal palette for representing an image where colors
+      appear according to the histogram.  Argument #maxcolors# is the maximum
+      number of colors allowed in the palette (up to 1024).  Argument
+      #minboxsize# controls the minimal size of the color cube area affected
+      to a color palette entry.  Returns the index of the dominant color. */
+  int compute_palette(int maxcolors, int minboxsize=0);
+  /** Computes the optimal palette for pixmap #pm#.  This function builds the
+      histogram for pixmap #pm# and computes the optimal palette using
+      \Ref{compute_palette}. */
+  int compute_pixmap_palette(const GPixmap &pm, int ncolors, int minboxsize=0);
+  // CONVERSION
+  /** Returns the number of colors in the palette. */
+  int size() const;
+  /** Returns the best palette index for representing color #p#. */
+  int color_to_index(const GPixel &p);
+  /** Returns the best palette index for representing color #bgr#. */
+  int color_to_index(const unsigned char *bgr);
+  /** Overwrites #p# with the color located at position #index# in the palette. */
+  void index_to_color(int index, GPixel &p) const;
+  /** Overwrites #rgb[0..3]# with the color located at 
+      position #index# in the palette. */
+  void index_to_color(int index, unsigned char *bgr) const;
+  /** Quantizes pixmap #pm#. All pixels are replaced by their closest
+      approximation available in the palette. */
+  void quantize(GPixmap &pm);
+  /** Calls \Ref{compute_pixmap_palette} and \Ref{quantize}. */
+  int compute_palette_and_quantize(GPixmap &pm, int maxcolors, int minboxsize=0);
+  // COLOR CORRECTION
+  /** Applies a luminance gamma correction factor of #corr# to the palette
+      entries.  Values greater than #1.0# make the image brighter.  Values
+      smaller than #1.0# make the image darker.  The documentation of program
+      \Ref{ppmcoco} explains how to properly use this function. */
+  void color_correct(double corr);
+  // COLOR INDEX DATA
+  /** Contains an optional sequence of color indices. 
+      Function \Ref{encode} and \Ref{decode} also encode and decode this
+      sequence when such a sequence is provided. */
+  GTArray<short> colordata;
+  /** Returns colors from the color index sequence.  Pixel #out# is
+      overwritten with the color corresponding to the #nth# element of the
+      color sequence \Ref{colordata}. */
+  void get_color(int nth, GPixel &out) const;
+  // CODING
+  /** Writes the palette colors.  This function writes each palette color as a
+      RGB triple into bytestream #bs#. */
+  void encode_rgb_entries(ByteStream &bs) const;
+  /** Reads palette colors.  This function initializes the palette colors by
+      reading #palettesize# RGB triples from bytestream #bs#. */
+  void decode_rgb_entries(ByteStream &bs, const int palettesize);
+  /** Encodes the palette and the color index sequence. This function encodes
+      the a version byte, the palette size, the palette colors and the color
+      index sequence into bytestream #bs#.  Note that the color histogram is
+      never saved. */
+  void encode(GP<ByteStream> bs) const;
+  /** Initializes the object by reading data from bytestream #bs#.  This
+      function reads a version byte, the palette size, the palette and the
+      color index sequence from bytestream #bs#.  Note that the color
+      histogram is never saved. */
+  void decode(GP<ByteStream> bs);
+
+private:
+  // Histogram
+  int mask;
+  GMap<int,int> *hist;
+  // Quantization data
+  struct PColor { unsigned char p[4]; };
+  GTArray<PColor> palette;
+  GMap<int,int> *pmap;
+  // Helpers
+  void allocate_hist();
+  void allocate_pmap();
+  static int CALLINGCONVENTION bcomp (const void*, const void*);
+  static int CALLINGCONVENTION gcomp (const void*, const void*);
+  static int CALLINGCONVENTION rcomp (const void*, const void*);
+  static int CALLINGCONVENTION lcomp (const void*, const void*);
+  int color_to_index_slow(const unsigned char *bgr);
+private: // dummy functions
+  static void encode(ByteStream *);
+  static void decode(ByteStream *);
+};
+
+
+//@}
+
+// ------------ INLINES
+
+
+inline void 
+DjVuPalette::histogram_clear()
+{
+  delete hist;
+  hist = 0;
+  mask = 0;
+}
+
+inline void 
+DjVuPalette::histogram_add(const unsigned char *bgr, int weight)
+{
+  if (weight > 0)
+    {
+      if (!hist || hist->size()>=0x4000) 
+        allocate_hist();
+      int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2])|(mask);
+      (*hist)[key] += weight;
+    }
+}  
+
+inline void 
+DjVuPalette::histogram_add(const GPixel &p, int weight)
+{
+  histogram_add(&p.b, weight);
+}
+
+inline void 
+DjVuPalette::histogram_norm_and_add(const int *bgr, int weight)
+{
+  if (weight > 0)
+    {
+      int p0 = bgr[0]/weight; if (p0>255) p0=255;
+      int p1 = bgr[1]/weight; if (p1>255) p1=255;
+      int p2 = bgr[2]/weight; if (p2>255) p2=255;
+      if (!hist || hist->size()>=0x4000) 
+        allocate_hist();
+      int key = (p0<<16)|(p1<<8)|(p2)|(mask);
+      (*hist)[key] += weight;
+    }
+}
+
+inline int
+DjVuPalette::size() const
+{
+  return palette.size();
+}
+
+inline int 
+DjVuPalette::color_to_index(const unsigned char *bgr)
+{
+  if (! pmap)
+    allocate_pmap();
+  int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2]);
+  GPosition p = pmap->contains(key);
+  if ( p)
+    return (*pmap)[p];
+  return color_to_index_slow(bgr);
+}
+
+inline int 
+DjVuPalette::color_to_index(const GPixel &p)
+{
+  return color_to_index(&p.b);
+}
+
+inline void 
+DjVuPalette::index_to_color(int index, unsigned char *bgr) const
+{
+  const PColor &color = palette[index];
+  bgr[0] = color.p[0];
+  bgr[1] = color.p[1];
+  bgr[2] = color.p[2];
+}
+
+inline void 
+DjVuPalette::index_to_color(int index, GPixel &p) const
+{
+  index_to_color(index, &p.b);
+}
+
+inline void
+DjVuPalette::get_color(int nth, GPixel &p) const
+{
+  index_to_color(colordata[nth], p);
+}
+
+
+
+// ------------ THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+      
+      
+             
+
+    
diff --git a/libdjvu/DjVuPort.cpp b/libdjvu/DjVuPort.cpp
new file mode 100644
index 0000000..926b4b9
--- /dev/null
+++ b/libdjvu/DjVuPort.cpp
@@ -0,0 +1,711 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuPort.h"
+#include "GOS.h"
+#include "DjVuImage.h"
+#include "DjVuDocument.h"
+#include "DjVuFile.h"
+#include "DjVuMessageLite.h"
+#include "DataPool.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+//****************************************************************************
+//******************************* Globals ************************************
+//****************************************************************************
+
+static DjVuPortcaster *pcaster;
+
+DjVuPortcaster *
+DjVuPort::get_portcaster(void)
+{
+   if (!pcaster) pcaster = new DjVuPortcaster();
+   return pcaster;
+}
+
+class DjVuPort::DjVuPortCorpse
+{
+public:
+   DjVuPort		* port;
+   DjVuPortCorpse	* next;
+
+   DjVuPortCorpse(DjVuPort * _port) : port(_port), next(0) {}
+};
+
+//****************************************************************************
+//******************************* DjVuPort ***********************************
+//****************************************************************************
+
+#define MAX_CORPSE_NUM	128
+
+// Last MAX_CORPSE_NUM addresses of dead DjVuPorts. We want to maintain this
+// list because of the way DjVuPort::is_port_alive() works: it accepts an
+// address and runs it thru its internal maps. The problem will occur if
+// a new DjVuPort is created exactly on place of another one, which just
+// died. Here we attempt to remember the last MAX_CORPSE_NUM addresses
+// of dead DjVuPorts, and take them into account in DjVuPort::operator new();
+GCriticalSection * DjVuPort::corpse_lock;
+DjVuPort::DjVuPortCorpse	* DjVuPort::corpse_head;
+DjVuPort::DjVuPortCorpse	* DjVuPort::corpse_tail;
+int		DjVuPort::corpse_num;
+
+void *
+DjVuPort::operator new (size_t sz)
+{
+  if (!corpse_lock) corpse_lock=new GCriticalSection();
+  
+  // Loop until we manage to allocate smth, which is not mentioned in
+  // the 'corpse' list. Thus we will avoid allocating a new DjVuPort
+  // on place of a dead one. Not *absolutely* secure (only 64 items
+  // in the list) but is still better than nothing.
+  void * addr=0;
+  {
+    GCriticalSectionLock lock(corpse_lock);
+    
+    // Store here addresses, which were found in 'corpse' list.
+    // We will free then in the end
+    int addr_num=0;
+    static void * addr_arr[MAX_CORPSE_NUM];
+    
+    // Make at most MAX_CORPSE_NUM attempts. During each attempt
+    // we try to allocate a block of memory for DjVuPort. If
+    // the address of this block is not in the corpse list, we break
+    // All addresses will be recorder, so that we can delete them
+    // after we're done.
+    for(int attempt=0;attempt<MAX_CORPSE_NUM;attempt++)
+    {
+      void * test_addr=::operator new (sz);
+      addr_arr[addr_num++]=test_addr;
+      
+      // See if 'test_addr' is in the 'corpse' list (was recently used)
+      DjVuPortCorpse * corpse;
+      for(corpse=corpse_head;corpse;corpse=corpse->next)
+        if (test_addr==corpse->port) break;
+        if (!corpse)
+        {
+          addr=test_addr;
+          addr_num--;
+          break;
+        }
+    }
+    // If all attempts failed (all addresses generated are already
+    // in the list of corpses, allocate a new one and proceed
+    // w/o additional checks
+    if (!addr) addr=::operator new(sz);
+    
+    // Here 'addr_arr[0<=i<addr_num]' contains addresses, that we
+    // tried to allocate, and which need to be freed now
+    // 'addr' contains address we want to use.
+    addr_num--;
+    while(addr_num>=0) ::operator delete(addr_arr[addr_num--]);
+  }
+  
+  DjVuPortcaster * pcaster=get_portcaster();
+  GCriticalSectionLock lock(&pcaster->map_lock);
+  pcaster->cont_map[addr]=0;
+  return addr;
+}
+
+void
+DjVuPort::operator delete(void * addr)
+{
+  if (corpse_lock)
+  {
+    GCriticalSectionLock lock(corpse_lock);
+    
+    // Add 'addr' to the list of corpses
+    if (corpse_tail)
+    {
+      corpse_tail->next=new DjVuPortCorpse((DjVuPort *) addr);
+      corpse_tail=corpse_tail->next;
+      corpse_tail->next=0;
+    } else
+    {
+      corpse_head=corpse_tail=new DjVuPortCorpse((DjVuPort *) addr);
+      corpse_tail->next=0;
+    }
+    corpse_num++;
+    if (corpse_num>=MAX_CORPSE_NUM)
+    {
+      DjVuPortCorpse * corpse=corpse_head;
+      corpse_head=corpse_head->next;
+      delete corpse;
+      corpse_num--;
+    }
+  }
+  ::operator delete(addr);
+}
+
+DjVuPort::DjVuPort()
+{
+  DjVuPortcaster *pcaster = get_portcaster();
+  GCriticalSectionLock lock(& pcaster->map_lock );
+  GPosition p = pcaster->cont_map.contains(this);
+  if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") );
+  pcaster->cont_map[p] = (void*)this;
+}
+
+DjVuPort::DjVuPort(const DjVuPort & port)
+{
+  DjVuPortcaster *pcaster = get_portcaster();
+  GCriticalSectionLock lock(& pcaster->map_lock );
+  GPosition p = pcaster->cont_map.contains(this);
+  if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") );
+  pcaster->cont_map[p] = (void*)this;
+  pcaster->copy_routes(this, &port);
+}
+
+DjVuPort &
+DjVuPort::operator=(const DjVuPort & port)
+{
+   if (this != &port)
+      get_portcaster()->copy_routes(this, &port);
+   return *this;
+}
+
+DjVuPort::~DjVuPort(void)
+{
+  get_portcaster()->del_port(this);
+}
+
+
+//****************************************************************************
+//**************************** DjVuPortcaster ********************************
+//****************************************************************************
+
+
+
+DjVuPortcaster::DjVuPortcaster(void)
+{
+}
+
+DjVuPortcaster::~DjVuPortcaster(void)
+{
+   GCriticalSectionLock lock(&map_lock);
+   for(GPosition pos=route_map;pos;++pos)
+      delete (GList<void *> *) route_map[pos];
+}
+
+GP<DjVuPort>
+DjVuPortcaster::is_port_alive(DjVuPort *port)
+{
+   GP<DjVuPort> gp_port;
+   GCriticalSectionLock lock(&map_lock);
+   GPosition pos=cont_map.contains(port);
+   if (pos && cont_map[pos] && ((DjVuPort *) port)->get_count()>0)
+      gp_port=port;
+   if (gp_port && gp_port->get_count() <= 0)
+      gp_port = 0;
+   return gp_port;
+}
+
+void
+DjVuPortcaster::add_alias(const DjVuPort * port, const GUTF8String &alias)
+{
+   GCriticalSectionLock lock(&map_lock);
+   a2p_map[alias]=port;
+}
+
+void
+DjVuPortcaster::clear_all_aliases(void)
+{
+  DjVuPortcaster *p=get_portcaster();
+  GCriticalSectionLock lock(&(p->map_lock));
+  GPosition pos;
+  while((pos=p->a2p_map))
+  {
+    p->a2p_map.del(pos);
+  }
+}
+
+void
+DjVuPortcaster::clear_aliases(const DjVuPort * port)
+{
+  GCriticalSectionLock lock(&map_lock);
+  for(GPosition pos=a2p_map;pos;)
+    if (a2p_map[pos]==port)
+    {
+      GPosition this_pos=pos;
+      ++pos;
+      a2p_map.del(this_pos);
+    } else ++pos;
+}
+
+GP<DjVuPort>
+DjVuPortcaster::alias_to_port(const GUTF8String &alias)
+{
+   GCriticalSectionLock lock(&map_lock);
+   GPosition pos;
+   if (a2p_map.contains(alias, pos))
+   {
+      DjVuPort * port=(DjVuPort *) a2p_map[pos];
+      GP<DjVuPort> gp_port=is_port_alive(port);
+      if (gp_port) return gp_port;
+      else a2p_map.del(pos);
+   }
+   return 0;
+}
+
+GPList<DjVuPort>
+DjVuPortcaster::prefix_to_ports(const GUTF8String &prefix)
+{
+  GPList<DjVuPort> list;
+  {
+    int length=prefix.length();
+    if (length)
+    {
+      GCriticalSectionLock lock(&map_lock);
+      for(GPosition pos=a2p_map;pos;++pos)
+        if (!prefix.cmp(a2p_map.key(pos), length))
+        {
+          DjVuPort * port=(DjVuPort *) a2p_map[pos];
+          GP<DjVuPort> gp_port=is_port_alive(port);
+          if (gp_port) list.append(gp_port);
+        }
+    }
+  }
+  return list;
+}
+
+void
+DjVuPortcaster::del_port(const DjVuPort * port)
+{
+  GCriticalSectionLock lock(&map_lock);
+  
+  GPosition pos;
+  
+  // Update the "aliases map"
+  clear_aliases(port);
+  
+  // Update "contents map"
+  if (cont_map.contains(port, pos)) cont_map.del(pos);
+  
+  // Update "route map"
+  if (route_map.contains(port, pos))
+  {
+    delete (GList<void *> *) route_map[pos];
+    route_map.del(pos);
+  }
+  for(pos=route_map;pos;)
+  {
+    GList<void *> & list=*(GList<void *> *) route_map[pos];
+    GPosition list_pos;
+    if (list.search((void *) port, list_pos)) list.del(list_pos);
+    if (!list.size())
+    {
+      delete &list;
+      GPosition tmp_pos=pos;
+      ++pos;
+      route_map.del(tmp_pos);
+    } else ++pos;
+  }
+}
+
+void
+DjVuPortcaster::add_route(const DjVuPort * src, DjVuPort * dst)
+      // Adds route src->dst
+{
+   GCriticalSectionLock lock(&map_lock);
+   if (cont_map.contains(src) && src->get_count()>0 &&
+       cont_map.contains(dst) && dst->get_count()>0)
+   {
+      if (!route_map.contains(src)) route_map[src]=new GList<void *>();
+      GList<void *> & list=*(GList<void *> *) route_map[src];
+      if (!list.contains(dst)) list.append(dst);
+   }
+}
+
+void
+DjVuPortcaster::del_route(const DjVuPort * src, DjVuPort * dst)
+// Deletes route src->dst
+{
+  GCriticalSectionLock lock(&map_lock);
+  
+  if (route_map.contains(src))
+  {
+    GList<void *> & list=*(GList<void *> *) route_map[src];
+    GPosition pos;
+    if (list.search(dst, pos)) list.del(pos);
+    if (!list.size())
+    {
+      delete &list;
+      route_map.del(src);
+    }
+  }
+}
+
+void
+DjVuPortcaster::copy_routes(DjVuPort * dst, const DjVuPort * src)
+      // For every route src->x or x->src, it creates a new one:
+      // dst->x or x->dst respectively. It's useful when you create a copy
+      // of a port and you want the copy to stay connected.
+{
+  GCriticalSectionLock lock(&map_lock);
+  
+  if (!cont_map.contains(src) || src->get_count()<=0 ||
+    !cont_map.contains(dst) || dst->get_count()<=0) return;
+  
+  for(GPosition pos=route_map;pos;++pos)
+  {
+    GList<void *> & list=*(GList<void *> *) route_map[pos];
+    if (route_map.key(pos) == src)
+      for(GPosition pos=list;pos;++pos)
+        add_route(dst, (DjVuPort *) list[pos]);
+    for(GPosition pos=list;pos;++pos)
+      if ((DjVuPort*)(list[pos]) == src)
+        add_route((DjVuPort *) route_map.key(pos), dst);
+  }
+}
+
+void
+DjVuPortcaster::add_to_closure(GMap<const void *, void *> & set,
+			       const DjVuPort * dst, int distance)
+{
+  // Assuming that the map's already locked
+  // GCriticalSectionLock lock(&map_lock);
+  set[dst]= (void*) (size_t) distance;
+  if (route_map.contains(dst))
+    {
+      GList<void *> & list=*(GList<void *> *) route_map[dst];
+      for(GPosition pos=list;pos;++pos)
+        {
+          DjVuPort * new_dst=(DjVuPort *) list[pos];
+          if (!set.contains(new_dst)) 
+            add_to_closure(set, new_dst, distance+1);
+        }
+   }
+}
+
+void
+DjVuPortcaster::compute_closure(const DjVuPort * src, GPList<DjVuPort> &list, bool sorted)
+{
+   GCriticalSectionLock lock(&map_lock);
+   GMap<const void*, void*> set;
+   if (route_map.contains(src))
+   {
+      GList<void *> & list=*(GList<void *> *) route_map[src];
+      for(GPosition pos=list;pos;++pos)
+      {
+	       DjVuPort * dst=(DjVuPort *) list[pos];
+	       if (dst==src) add_to_closure(set, src, 0);
+	       else add_to_closure(set, dst, 1);
+      }
+   }
+
+   // Compute list
+   GPosition pos;
+   if (sorted)
+     {
+       // Sort in depth order
+       int max_dist=0;
+       for(pos=set;pos;++pos)
+         if (max_dist < (int)(size_t)set[pos])
+           max_dist = (int)(size_t)set[pos];
+       GArray<GList<const void*> > lists(0,max_dist);
+       for(pos=set;pos;++pos)
+         lists[(int)(size_t)set[pos]].append(set.key(pos));
+       for(int dist=0;dist<=max_dist;dist++)
+         for(pos=lists[dist];pos;++pos)
+           {
+             GP<DjVuPort> p = is_port_alive((DjVuPort*) lists[dist][pos]);
+             if (p) list.append(p);
+           }
+     }
+   else
+     {
+       // Gather ports without order
+       for(pos=set;pos;++pos)
+         {
+           GP<DjVuPort> p = is_port_alive((DjVuPort*) set.key(pos));
+           if (p) list.append(p);
+         }
+     }
+}
+
+GURL
+DjVuPortcaster::id_to_url(const DjVuPort * source, const GUTF8String &id)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list, true);
+   GURL url;
+   for(GPosition pos=list;pos;++pos)
+   {
+      url=list[pos]->id_to_url(source, id);
+      if (!url.is_empty()) break;
+   }
+   return url;
+}
+
+GP<DjVuFile>
+DjVuPortcaster::id_to_file(const DjVuPort * source, const GUTF8String &id)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list, true);
+   GP<DjVuFile> file;
+   for(GPosition pos=list;pos;++pos)
+      if ((file=list[pos]->id_to_file(source, id))) break;
+   return file;
+}
+
+GP<DataPool>
+DjVuPortcaster::request_data(const DjVuPort * source, const GURL & url)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list, true);
+   GP<DataPool> data;
+   for(GPosition pos=list;pos;++pos)
+     if ((data = list[pos]->request_data(source, url)))
+       break;
+   return data;
+}
+
+bool
+DjVuPortcaster::notify_error(const DjVuPort * source, const GUTF8String &msg)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list, true);
+   for(GPosition pos=list;pos;++pos)
+     if (list[pos]->notify_error(source, msg))
+       return 1;
+   return 0;
+}
+
+bool
+DjVuPortcaster::notify_status(const DjVuPort * source, const GUTF8String &msg)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list, true);
+   for(GPosition pos=list;pos;++pos)
+     if (list[pos]->notify_status(source, msg))
+       return 1;
+   return 0;
+}
+
+void
+DjVuPortcaster::notify_redisplay(const DjVuImage * source)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list);
+   for(GPosition pos=list; pos; ++pos)
+     list[pos]->notify_redisplay(source);
+}
+
+void
+DjVuPortcaster::notify_relayout(const DjVuImage * source)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list);
+   for(GPosition pos=list; pos; ++pos)
+     list[pos]->notify_relayout(source);
+}
+
+void
+DjVuPortcaster::notify_chunk_done(const DjVuPort * source, const GUTF8String &name)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list);
+   for(GPosition pos=list; pos; ++pos)
+     list[pos]->notify_chunk_done(source, name);
+}
+
+void
+DjVuPortcaster::notify_file_flags_changed(const DjVuFile * source,
+					  long set_mask, long clr_mask)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list);
+   for(GPosition pos=list; pos; ++pos)
+     list[pos]->notify_file_flags_changed(source, set_mask, clr_mask);
+}
+
+void
+DjVuPortcaster::notify_doc_flags_changed(const DjVuDocument * source,
+					 long set_mask, long clr_mask)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list);
+   for(GPosition pos=list; pos; ++pos)
+     list[pos]->notify_doc_flags_changed(source, set_mask, clr_mask);
+}
+
+void
+DjVuPortcaster::notify_decode_progress(const DjVuPort * source, float done)
+{
+   GPList<DjVuPort> list;
+   compute_closure(source, list);
+   for(GPosition pos=list; pos; ++pos)
+     list[pos]->notify_decode_progress(source, done);
+}
+
+//****************************************************************************
+//******************************* DjVuPort ***********************************
+//****************************************************************************
+
+GURL
+DjVuPort::id_to_url(const DjVuPort *, const GUTF8String &) { return GURL(); }
+
+GP<DjVuFile>
+DjVuPort::id_to_file(const DjVuPort *, const GUTF8String &) { return 0; }
+
+GP<DataPool>
+DjVuPort::request_data(const DjVuPort *, const GURL &) { return 0; }
+
+bool
+DjVuPort::notify_error(const DjVuPort *, const GUTF8String &) { return 0; }
+
+bool
+DjVuPort::notify_status(const DjVuPort *, const GUTF8String &) { return 0; }
+
+void
+DjVuPort::notify_redisplay(const DjVuImage *) {}
+
+void
+DjVuPort::notify_relayout(const DjVuImage *) {}
+
+void
+DjVuPort::notify_chunk_done(const DjVuPort *, const GUTF8String &) {}
+
+void
+DjVuPort::notify_file_flags_changed(const DjVuFile *, long, long) {}
+
+void
+DjVuPort::notify_doc_flags_changed(const DjVuDocument *, long, long) {}
+
+void
+DjVuPort::notify_decode_progress(const DjVuPort *, float) {}
+
+//****************************************************************************
+//*************************** DjVuSimplePort *********************************
+//****************************************************************************
+
+GP<DataPool>
+DjVuSimplePort::request_data(const DjVuPort * source, const GURL & url)
+{
+  G_TRY {
+    if (url.is_local_file_url())
+    {
+//      GUTF8String fname=GOS::url_to_filename(url);
+//      if (GOS::basename(fname)=="-") fname="-";
+      return DataPool::create(url);
+    }
+  } G_CATCH_ALL {} G_ENDCATCH;
+  return 0;
+}
+
+bool
+DjVuSimplePort::notify_error(const DjVuPort * source, const GUTF8String &msg)
+{
+   DjVuMessageLite::perror(msg);
+   return 1;
+}
+
+bool
+DjVuSimplePort::notify_status(const DjVuPort * source, const GUTF8String &msg)
+{
+   DjVuMessageLite::perror(msg);
+   return 1;
+}
+
+
+
+
+
+//****************************************************************************
+//*************************** DjVuMemoryPort *********************************
+//****************************************************************************
+
+
+
+GP<DataPool>
+DjVuMemoryPort::request_data(const DjVuPort * source, const GURL & url)
+{
+   GCriticalSectionLock lk(&lock);
+   GP<DataPool> pool;
+   GPosition pos;
+   if (map.contains(url, pos))
+      pool=map[pos];
+   return pool;
+}
+
+void
+DjVuMemoryPort::add_data(const GURL & url, const GP<DataPool> & pool)
+{
+   GCriticalSectionLock lk(&lock);
+   map[url]=pool;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h
new file mode 100644
index 0000000..e2b3125
--- /dev/null
+++ b/libdjvu/DjVuPort.h
@@ -0,0 +1,519 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUPORT_H
+#define _DJVUPORT_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GThreads.h"
+#include "GURL.h"
+#include "stddef.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class DataPool;
+
+/** @name DjVuPort.h
+    Files #"DjVuPort.h"# and #"DjVuPort.cpp"# implement a communication
+    mechanism between different parties involved in decoding DjVu files.
+    It should be pretty clear that the creator of \Ref{DjVuDocument} and
+    \Ref{DjVuFile} would like to receive some information about the progress
+    of decoding, errors occurred, etc. It may also want to provide source data
+    for decoders (like it's done in the plugin where the real data is downloaded
+    from the net and is fed into DjVu decoders).
+
+    Normally this functionality is implemented by means of callbacks which are
+    run when a given condition comes true. Unfortunately it's not quite easy
+    to implement this strategy in our case. The reason is that there may be
+    more than one "client" working with the same document, and the document
+    should send the information to each of the clients. This could be done by
+    means of callback {\em lists}, of course, but we want to achieve more
+    bulletproof results: we want to be sure that the client that we're about
+    to contact is still alive, and is not being destroyed by another thread.
+    Besides, we are going to call these "callbacks" from many places, from
+    many different classes.  Maintaining multi-thread safe callback lists is
+    very difficult.
+
+    Finally, we want to provide some default implementation of these
+    "callbacks" in the library, which should attempt to process the requests
+    themselves if they can, and contact the client only if they're unable to
+    do it (like in the case of \Ref{DjVuPort::request_data}() with local URL
+    where \Ref{DjVuDocument} can get the data from the hard drive itself not
+    disturbing the document's creator.
+
+    Two classes implement a general communication mechanism: \Ref{DjVuPort} and
+    \Ref{DjVuPortcaster}. Any sender and recipient of requests should be a
+    subclass of \Ref{DjVuPort}.  \Ref{DjVuPortcaster} maintains a map of
+    routes between \Ref{DjVuPort}s, which should be configured by somebody
+    else. Whenever a port wants to send a request, it calls the corresponding
+    function of \Ref{DjVuPortcaster}, and the portcaster relays the request to
+    all the destinations that it sees in the internal map.
+
+    The \Ref{DjVuPortcaster} is responsible for keeping the map up to date by
+    getting rid of destinations that have been destroyed.  Map updates are
+    performed from a single place and are serialized by a global monitor.
+    
+    @memo DjVu decoder communication mechanism.
+    @author Andrei Erofeev <eaf@geocities.com>\\
+            L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+
+class DjVuPort;
+class DjVuPortcaster;
+class DjVuFile;
+
+/** Base class for notification targets.
+    #DjVuPort# provides base functionality for classes willing to take part in
+    sending and receiving messages generated during decoding process.  You
+    need to derive your class from #DjVuPort# if you want it to be able to
+    send or receive requests. In addition, for receiving requests you should
+    override one or more virtual function.
+
+    {\bf Important remark} --- All ports should be allocated on the heap using
+    #operator new# and immediately secured using a \Ref{GP} smart pointer.
+    Ports which are not secured by a smart-pointer are not considered
+    ``alive'' and never receive notifications! */
+
+class DJVUAPI DjVuPort : public GPEnabled
+{
+public:
+   DjVuPort();
+   virtual ~DjVuPort();
+   static void *operator new (size_t sz);
+   static void operator delete(void *addr);
+
+      /**  Use this function to get a copy of the global \Ref{DjVuPortcaster}. */
+   static DjVuPortcaster *get_portcaster(void);
+
+      /** Copy constructor. When #DjVuPort#s are copied, the portcaster
+          copies all incoming and outgoing routes of the original. */
+   DjVuPort(const DjVuPort & port);
+
+      /** Copy operator. Similarly to the copy constructor, the portcaster
+          copies all incoming and outgoing coming routes of the original. */
+   DjVuPort & operator=(const DjVuPort & port);
+
+      /** Should return 1 if the called class inherits class #class_name#.
+	  When a destination receives a request, it can retrieve the pointer
+	  to the source #DjVuPort#. This virtual function should be able
+	  to help to identify the source of the request. For example,
+	  \Ref{DjVuFile} is also derived from #DjVuPort#. In order for
+	  the receiver to recognize the sender, the \Ref{DjVuFile} should
+	  override this function to return #TRUE# when the #class_name#
+	  is either #DjVuPort# or #DjVuFile# */
+   virtual bool		inherits(const GUTF8String &class_name) const;
+
+      /** @name Notifications. 
+          These virtual functions may be overridden by the subclasses
+          of #DjVuPort#.  They are called by the \Ref{DjVuPortcaster}
+          when the port is alive and when there is a route between the 
+          source of the notification and this port. */
+      //@{
+
+      /** This request is issued to request translation of the ID, used
+	  in an DjVu INCL chunk to a URL, which may be used to request
+	  data associated with included file. \Ref{DjVuDocument} usually
+	  intercepts all such requests, and the user doesn't have to
+	  worry about the translation */
+   virtual GURL		id_to_url(const DjVuPort * source, const GUTF8String &id);
+
+      /** This request is used to get a file corresponding to the
+	  given ID. \Ref{DjVuDocument} is supposed to intercept it
+	  and either create a new instance of \Ref{DjVuFile} or reuse
+	  an existing one from the cache. */
+   virtual GP<DjVuFile>	id_to_file(const DjVuPort * source, const GUTF8String &id);
+
+      /** This request is issued when decoder needs additional data
+	  for decoding.  Both \Ref{DjVuFile} and \Ref{DjVuDocument} are
+	  initialized with a URL, not the document data.  As soon as
+	  they need the data, they call this function, whose responsibility
+	  is to locate the source of the data basing on the #URL# passed
+	  and return it back in the form of the \Ref{DataPool}. If this
+	  particular receiver is unable to fullfil the request, it should
+	  return #0#. */
+   virtual GP<DataPool>	request_data(const DjVuPort * source, const GURL & url);
+
+      /** This notification is sent when an error occurs and the error message
+	  should be shown to the user.  The receiver should return #0# if it is 
+          unable to process the request. Otherwise the receiver should return 1. */
+   virtual bool		notify_error(const DjVuPort * source, const GUTF8String &msg);
+
+      /** This notification is sent to update the decoding status.  The
+          receiver should return #0# if it is unable to process the
+          request. Otherwise the receiver should return 1. */
+   virtual bool		notify_status(const DjVuPort * source, const GUTF8String &msg);
+
+      /** This notification is sent by \Ref{DjVuImage} when it should be
+	  redrawn. It may be used to implement progressive redisplay.
+
+	  @param source The sender of the request */
+   virtual void		notify_redisplay(const class DjVuImage * source);
+
+      /** This notification is sent by \ref{DjVuImage} when its geometry
+	  has been changed as a result of decoding. It may be used to
+	  implement progressive redisplay. */
+   virtual void		notify_relayout(const class DjVuImage * source);
+
+      /** This notification is sent when a new chunk has been decoded. */
+   virtual void		notify_chunk_done(const DjVuPort * source, const GUTF8String &name);
+
+      /** This notification is sent after the \Ref{DjVuFile} flags have
+	  been changed. This happens, for example, when:
+	  \begin{itemize}
+	    \item Decoding succeeded, failed or just stopped
+	    \item All data has been received
+	    \item All included files have been created
+	  \end{itemize}
+	  
+	  @param source \Ref{DjVuFile}, which flags have been changed
+	  @param set_mask bits, which have been set
+	  @param clr_mask bits, which have been cleared */
+   virtual void		notify_file_flags_changed(const class DjVuFile * source,
+						  long set_mask, long clr_mask);
+
+      /** This notification is sent after the \Ref{DjVuDocument} flags have
+	  been changed. This happens, for example, after it receives enough
+	  data and can determine its structure (#BUNDLED#, #OLD_INDEXED#, etc.).
+
+	  @param source \Ref{DjVuDocument}, which flags have been changed
+	  @param set_mask bits, which have been set
+	  @param clr_mask bits, which have been cleared */
+   virtual void		notify_doc_flags_changed(const class DjVuDocument * source,
+						 long set_mask, long clr_mask);
+   
+      /** This notification is sent from time to time while decoding is in
+	  progress. The purpose is obvious: to provide a way to know how much
+	  is done and how long the decoding will continue.  Argument #done# is
+	  a number from 0 to 1 reflecting the progress. */
+   virtual void		notify_decode_progress(const DjVuPort * source, float done);
+
+      /** This is the standard types for defining what to do in case of errors.
+          This is only used by some of the subclasses, but it needs to be 
+          defined here to guarantee all subclasses use the same enum types.
+          In general, many errors are non recoverable.  Using a setting
+          other than ABORT may just result in even more errors. */
+   enum ErrorRecoveryAction {ABORT=0,SKIP_PAGES=1,SKIP_CHUNKS=2,KEEP_ALL=3 }; 
+      //@}
+public:
+   class DjVuPortCorpse;
+private:
+   static GCriticalSection	* corpse_lock;
+   static DjVuPortCorpse	* corpse_head;
+   static DjVuPortCorpse        * corpse_tail;
+   static int			corpse_num;
+};
+
+/** Simple port.  
+    An instance of #DjVuSimplePort# is automatically created when you create a
+    \Ref{DjVuFile} or a \Ref{DjVuDocument} without specifying a port.  This
+    simple port can retrieve data for local urls (i.e. urls referring to local
+    files) and display error messages on #stderr#.  All other notifications
+    are ignored. */
+
+class DJVUAPI DjVuSimplePort : public DjVuPort
+{
+public:
+      /// Returns 1 if #class_name# is #"DjVuPort"# or #"DjVuSimplePort"#.
+   virtual bool		inherits(const GUTF8String &class_name) const;
+
+      /** If #url# is local, it created a \Ref{DataPool}, connects it to the
+	  file with the given name and returns.  Otherwise returns #0#. */
+   virtual GP<DataPool>	request_data(const DjVuPort * source, const GURL & url);
+
+      /// Displays error on #stderr#. Always returns 1.
+   virtual bool		notify_error(const DjVuPort * source, const GUTF8String &msg);
+   
+      /// Displays status on #stderr#. Always returns 1.
+   virtual bool		notify_status(const DjVuPort * source, const GUTF8String &msg);
+};
+
+
+/** Memory based port.
+    This \Ref{DjVuPort} maintains a map associating pseudo urls with data
+    segments.  It processes the #request_data# notifications according to this
+    map.  After initializing the port, you should add as many pairs #<url,
+    pool># as needed need and add a route from a \Ref{DjVuDocument} or
+    \Ref{DjVuFile} to this port. */
+
+class DJVUAPI DjVuMemoryPort : public DjVuPort
+{
+public:
+      /// Returns 1 if #class_name# is #"DjVuPort"# or #"DjVuMemoryPort"#
+   virtual bool		inherits(const GUTF8String &class_name) const;
+
+      /** If #url# is one of those, that have been added before by means
+	  of \Ref{add_data}() function, it will return the associated
+	  \Ref{DataPool}. #ZERO# otherwize. */
+   virtual GP<DataPool>	request_data(const DjVuPort * source, const GURL & url);
+
+      /** Adds #<url, pool># pair to the internal map. From now on, if
+	  somebody asks for data corresponding to the #url#, it will
+	  be returning the #pool# */
+   void		add_data(const GURL & url, const GP<DataPool> & pool);
+private:
+   GCriticalSection	lock;
+   GPMap<GURL, DataPool>map;
+};
+
+
+
+/** Maintains associations between ports.
+    It monitors the status of all ports (have they been destructed yet?),
+    accepts requests and notifications from them and forwards them to
+    destinations according to internally maintained map of routes.
+
+    The caller can modify the route map any way he likes (see
+    \Ref{add_route}(), \Ref{del_route}(), \Ref{copy_routes}(),
+    etc. functions). Any port can be either a sender of a message, an
+    intermediary receiver or a final destination.  
+
+    When a request is sent, the #DjVuPortcaster# computes the list of
+    destinations by consulting with the route map.  Notifications are only
+    sent to ``alive'' ports.  A port is alive if it is referenced by a valid
+    \Ref{GP} smartpointer.  As a consequence, a port usually becomes alive
+    after running the constructor (since the returned pointer is then assigned
+    to a smartpointer) and is no longer alive when the port is destroyed
+    (because it would not be destroyed if a smartpointer was referencing it).
+
+    Destination ports are sorted according to their distance from the source.
+    For example, if port {\bf A} is connected to ports {\bf B} and {\bf C}
+    directly, and port {\bf B} is connected to {\bf D}, then {\bf B} and {\bf
+    C} are assumed to be one hop away from {\bf A}, while {\bf D} is two hops
+    away from {\bf A}.
+
+    In some cases the requests and notifications are sent to every possible
+    destination, and the order is not significant (like it is for
+    \Ref{notify_file_flags_changed}() request). Others should be sent to the closest
+    destinations first, and only then to the farthest, in case if they have
+    not been processed by the closest. The examples are \Ref{request_data}(),
+    \Ref{notify_error}() and \Ref{notify_status}().
+
+    The user is not expected to create the #DjVuPortcaster# itself. He should
+    use \Ref{get_portcaster}() global function instead.  */
+class DJVUAPI DjVuPortcaster
+{
+public:
+      /**  Use this function to get a copy of the global \Ref{DjVuPortcaster}. */
+   static DjVuPortcaster *get_portcaster(void)
+    { return DjVuPort::get_portcaster(); } ;
+
+      /** The default constructor. */
+   DjVuPortcaster(void);
+
+   virtual ~DjVuPortcaster(void);
+
+      /** Removes the specified port from all routes. It will no longer
+	  be able to receive or generate messages and will be considered
+    {\bf "dead"} by \Ref{is_port_alive}() function. */
+   void		del_port(const DjVuPort * port);
+   
+      /** Adds route from #src# to #dst#. Whenever a request is
+	  sent or received by #src#, it will be forwarded to #dst# as well.
+	  @param src The source
+	  @param dst The destination */
+   void		add_route(const DjVuPort *src, DjVuPort *dst);
+
+      /** The opposite of \Ref{add_route}(). Removes the association
+	  between #src# and #dst# */
+   void		del_route(const DjVuPort *src, DjVuPort *dst);
+
+      /** Copies all incoming and outgoing routes from #src# to
+	  #dst#. This function should be called when a \Ref{DjVuPort} is
+	  copied, if you want to preserve the connectivity. */
+   void		copy_routes(DjVuPort *dst, const DjVuPort *src);
+
+      /** Returns a smart pointer to the port if #port# is a valid pointer
+          to an existing #DjVuPort#.  Returns a null pointer otherwise. */
+   GP<DjVuPort> is_port_alive(DjVuPort *port);
+
+      /** Assigns one more {\em alias} for the specified \Ref{DjVuPort}.
+	  {\em Aliases} are names, which can be used later to retrieve this
+	  \Ref{DjVuPort}, if it still exists. Any \Ref{DjVuPort} may have
+	  more than one {\em alias}. But every {\em alias} must correspond
+	  to only one \Ref{DjVuPort}. Thus, if the specified alias is
+	  already associated with another port, this association will be
+	  removed. */
+   void		add_alias(const DjVuPort * port, const GUTF8String &alias);
+
+      /** Removes all the aliases */
+   static void		clear_all_aliases(void);
+
+      /** Removes all aliases associated with the given \Ref{DjVuPort}. */
+   void		clear_aliases(const DjVuPort * port);
+
+      /** Returns \Ref{DjVuPort} associated with the given #alias#. If nothing
+	  is known about name #alias#, or the port associated with it has
+	  already been destroyed #ZERO# pointer will be returned. */
+   GP<DjVuPort>	alias_to_port(const GUTF8String &name);
+
+      /** Returns a list of \Ref{DjVuPort}s with aliases starting with
+	  #prefix#. If no \Ref{DjVuPort}s have been found, empty
+	  list is returned. */
+   GPList<DjVuPort>	prefix_to_ports(const GUTF8String &prefix);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest until one of them returns non-empty \Ref{GURL}. */
+   virtual GURL		id_to_url(const DjVuPort * source, const GUTF8String &id);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest until one of them returns non-zero pointer to
+	  \Ref{DjVuFile}. */
+   virtual GP<DjVuFile>	id_to_file(const DjVuPort * source, const GUTF8String &id);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest until one of them returns non-zero \Ref{DataPool}. */
+   virtual GP<DataPool>	request_data(const DjVuPort * source, const GURL & url);
+
+      /** Computes destination list for #source# and calls the corresponding.
+	  function in each of the ports from the destination starting from
+	  the closest until one of them returns 1. */
+   virtual bool		notify_error(const DjVuPort * source, const GUTF8String &msg);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest until one of them returns 1. */
+   virtual bool		notify_status(const DjVuPort * source, const GUTF8String &msg);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest. */
+   virtual void		notify_redisplay(const class DjVuImage * source);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest. */
+   virtual void		notify_relayout(const class DjVuImage * source);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest. */
+   virtual void		notify_chunk_done(const DjVuPort * source, const GUTF8String &name);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest. */
+   virtual void		notify_file_flags_changed(const class DjVuFile * source,
+						  long set_mask, long clr_mask);
+
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest. */
+   virtual void		notify_doc_flags_changed(const class DjVuDocument * source,
+						 long set_mask, long clr_mask);
+   
+      /** Computes destination list for #source# and calls the corresponding
+	  function in each of the ports from the destination list starting from
+	  the closest. */
+   virtual void		notify_decode_progress(const DjVuPort * source, float done);
+
+private:
+      // We use these 'void *' to minimize template instantiations.
+   friend class DjVuPort;
+   GCriticalSection		map_lock;
+   GMap<const void *, void *>	route_map;	// GMap<DjVuPort *, GList<DjVuPort *> *>
+   GMap<const void *, void *>	cont_map;	// GMap<DjVuPort *, DjVuPort *>
+   GMap<GUTF8String, const void *>	a2p_map;	// GMap<GUTF8String, DjVuPort *>
+   void add_to_closure(GMap<const void*, void*> & set,
+                       const DjVuPort *dst, int distance);
+   void compute_closure(const DjVuPort *src, GPList<DjVuPort> &list,
+                        bool sorted=false);
+};
+
+
+inline bool
+DjVuPort::inherits(const GUTF8String &class_name) const
+{
+   return (class_name == "DjVuPort");
+}
+
+inline bool
+DjVuSimplePort::inherits(const GUTF8String &class_name) const
+{
+   return
+      (class_name == "DjVuSimplePort") || DjVuPort::inherits(class_name);
+}
+
+inline bool
+DjVuMemoryPort::inherits(const GUTF8String &class_name) const
+{
+   return
+      (class_name == "DjVuMemoryPort") || DjVuPort::inherits(class_name);
+}
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/DjVuText.cpp b/libdjvu/DjVuText.cpp
new file mode 100644
index 0000000..60a4f39
--- /dev/null
+++ b/libdjvu/DjVuText.cpp
@@ -0,0 +1,970 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuText.h"
+#include "IFFByteStream.h"
+#include "BSByteStream.h"
+#include "debug.h"
+#include <ctype.h>
+
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+#ifdef min
+#undef min
+#endif
+template<class TYPE>
+static inline TYPE min(TYPE a,TYPE b) { return (a<b)?a:b; }
+
+//***************************************************************************
+//******************************** DjVuTXT **********************************
+//***************************************************************************
+
+const char DjVuTXT::end_of_column    = 013;      // VT: Vertical Tab
+const char DjVuTXT::end_of_region    = 035;      // GS: Group Separator
+const char DjVuTXT::end_of_paragraph = 037;      // US: Unit Separator
+const char DjVuTXT::end_of_line      = 012;      // LF: Line Feed
+
+const int DjVuTXT::Zone::version  = 1;
+
+DjVuTXT::Zone::Zone()
+  : ztype(DjVuTXT::PAGE), text_start(0), text_length(0), zone_parent(0)
+{
+}
+
+DjVuTXT::Zone *
+DjVuTXT::Zone::append_child()
+{
+  Zone empty;
+  empty.ztype = ztype;
+  empty.text_start = 0;
+  empty.text_length = 0;
+  empty.zone_parent=this;
+  children.append(empty);
+  return & children[children.lastpos()];
+}
+
+void
+DjVuTXT::Zone::cleartext()
+{
+  text_start = 0;
+  text_length = 0;
+  for (GPosition i=children; i; ++i)
+    children[i].cleartext();
+}
+
+void
+DjVuTXT::Zone::normtext(const char *instr, GUTF8String &outstr)
+{
+  if (text_length == 0)
+    {
+      // Descend collecting text below
+      text_start = outstr.length();
+      for (GPosition i=children; i; ++i)
+        children[i].normtext(instr, outstr);
+      text_length = outstr.length() - text_start;
+      // Ignore empty zones
+      if (text_length == 0)
+        return;
+    }
+  else
+    {
+      // Collect text at this level
+      int new_start = outstr.length();
+      outstr = outstr + GUTF8String(instr+text_start, text_length);
+      text_start = new_start;
+      // Clear textual information on lower level nodes
+      for (GPosition i=children; i; ++i)
+        children[i].cleartext();
+    }
+  // Determine standard separator
+  char sep;
+  switch (ztype)
+    {
+    case COLUMN:
+      sep = end_of_column; break;
+    case REGION:
+      sep = end_of_region; break;
+    case PARAGRAPH: 
+      sep = end_of_paragraph; break;
+    case LINE:
+      sep = end_of_line; break;
+    case WORD:
+      sep = ' '; break;
+    default:
+      return;
+    }
+  // Add separator if not present yet.
+  if (outstr[text_start+text_length-1] != sep)
+    {
+      outstr = outstr + GUTF8String(&sep, 1);
+      text_length += 1;
+    }
+}
+
+unsigned int 
+DjVuTXT::Zone::memuse() const
+{
+  int memuse = sizeof(*this);
+  for (GPosition i=children; i; ++i)
+    memuse += children[i].memuse();
+  return memuse;
+}
+
+
+#ifndef NEED_DECODER_ONLY
+void 
+DjVuTXT::Zone::encode(
+  const GP<ByteStream> &gbs, const Zone * parent, const Zone * prev) const
+{
+  ByteStream &bs=*gbs;
+  // Encode type
+  bs.write8(ztype);
+  
+  // Modify text_start and bounding rectangle based on the context
+  // (whether there is a previous non-zero same-level-child or parent)
+  int start=text_start;
+  int x=rect.xmin, y=rect.ymin;
+  int width=rect.width(), height=rect.height();
+  if (prev)
+  {
+    if (ztype==PAGE || ztype==PARAGRAPH || ztype==LINE)
+    {
+      // Encode offset from the lower left corner of the previous
+      // child in the coord system in that corner with x to the
+      // right and y down
+      x=x-prev->rect.xmin;
+      y=prev->rect.ymin-(y+height);
+    } else // Either COLUMN or WORD or CHARACTER
+    {
+      // Encode offset from the lower right corner of the previous
+      // child in the coord system in that corner with x to the
+      // right and y up
+      x=x-prev->rect.xmax;
+      y=y-prev->rect.ymin;
+    }
+    start-=prev->text_start+prev->text_length;
+  } else if (parent)
+  {
+    // Encode offset from the upper left corner of the parent
+    // in the coord system in that corner with x to the right and y down
+    x=x-parent->rect.xmin;
+    y=parent->rect.ymax-(y+height);
+    start-=parent->text_start;
+  }
+  // Encode rectangle
+  bs.write16(0x8000+x);
+  bs.write16(0x8000+y);
+  bs.write16(0x8000+width);
+  bs.write16(0x8000+height);
+  // Encode text info
+  bs.write16(0x8000+start);
+  bs.write24(text_length);
+  // Encode number of children
+  bs.write24(children.size());
+  
+  const Zone * prev_child=0;
+  // Encode all children
+  for (GPosition i=children; i; ++i)
+  {
+    children[i].encode(gbs, this, prev_child);
+    prev_child=&children[i];
+  }
+}
+#endif
+
+void 
+DjVuTXT::Zone::decode(const GP<ByteStream> &gbs, int maxtext,
+		      const Zone * parent, const Zone * prev)
+{
+  ByteStream &bs=*gbs;
+  // Decode type
+  ztype = (ZoneType) bs.read8();
+  if ( ztype<PAGE || ztype>CHARACTER )
+    G_THROW( ERR_MSG("DjVuText.corrupt_text") );
+
+  // Decode coordinates
+  int x=(int) bs.read16()-0x8000;
+  int y=(int) bs.read16()-0x8000;
+  int width=(int) bs.read16()-0x8000;
+  int height=(int) bs.read16()-0x8000;
+
+  // Decode text info
+  text_start = (int) bs.read16()-0x8000;
+//  int start=text_start;
+  text_length = bs.read24();
+  if (prev)
+  {
+    if (ztype==PAGE || ztype==PARAGRAPH || ztype==LINE)
+    {
+      x=x+prev->rect.xmin;
+      y=prev->rect.ymin-(y+height);
+    } else // Either COLUMN or WORD or CHARACTER
+    {
+      x=x+prev->rect.xmax;
+      y=y+prev->rect.ymin;
+    }
+    text_start+=prev->text_start+prev->text_length;
+  } else if (parent)
+  {
+    x=x+parent->rect.xmin;
+    y=parent->rect.ymax-(y+height);
+    text_start+=parent->text_start;
+  }
+  rect=GRect(x, y, width, height);
+  // Get children size
+  int size = bs.read24();
+
+  // Checks
+  if (rect.isempty() || text_start<0 || text_start+text_length>maxtext )
+    G_THROW( ERR_MSG("DjVuText.corrupt_text") );
+
+  // Process children
+  const Zone * prev_child=0;
+  children.empty();
+  while (size-- > 0) 
+  {
+    Zone *z = append_child();
+    z->decode(gbs, maxtext, this, prev_child);
+    prev_child=z;
+  }
+}
+
+void 
+DjVuTXT::normalize_text()
+{
+  GUTF8String newtextUTF8;
+  page_zone.normtext( (const char*)textUTF8, newtextUTF8 );
+  textUTF8 = newtextUTF8;
+}
+
+int 
+DjVuTXT::has_valid_zones() const
+{
+  if (!textUTF8)
+    return false;
+  if (page_zone.rect.isempty()) 
+    return false;
+  return true;
+}
+
+
+#ifndef NEED_DECODER_ONLY
+void 
+DjVuTXT::encode(const GP<ByteStream> &gbs) const
+{
+  ByteStream &bs=*gbs;
+  if (! textUTF8 )
+    G_THROW( ERR_MSG("DjVuText.no_text") );
+  // Encode text
+  int textsize = textUTF8.length();
+  bs.write24( textsize );
+  bs.writall( (void*)(const char*)textUTF8, textsize );
+  // Encode zones
+  if (has_valid_zones())
+  {
+    bs.write8(Zone::version);
+    page_zone.encode(gbs);
+  }
+}
+#endif
+
+void 
+DjVuTXT::decode(const GP<ByteStream> &gbs)
+{
+  ByteStream &bs=*gbs;
+  // Read text
+  textUTF8.empty();
+  int textsize = bs.read24();
+  char *buffer = textUTF8.getbuf(textsize);
+  int readsize = bs.read(buffer,textsize);
+  buffer[readsize] = 0;
+  if (readsize < textsize)
+    G_THROW( ERR_MSG("DjVuText.corrupt_chunk") );
+  // Try reading zones
+  unsigned char version;
+  if ( bs.read( (void*) &version, 1 ) == 1) 
+  {
+    if (version != Zone::version)
+      G_THROW( ERR_MSG("DjVuText.bad_version") "\t" + GUTF8String(version) );
+    page_zone.decode(gbs, textsize);
+  }
+}
+
+GP<DjVuTXT> 
+DjVuTXT::copy(void) const
+{
+  return new DjVuTXT(*this);
+}
+
+
+static inline bool
+intersects_zone(GRect box, const GRect &zone)
+{
+  return
+    ((box.xmin < zone.xmin)
+      ?(box.xmax >= zone.xmin)
+      :(box.xmin <= zone.xmax))
+    &&((box.ymin < zone.ymin)
+      ?(box.ymax >= zone.ymin)
+      :(box.ymin <= zone.ymax));
+}
+
+void
+DjVuTXT::Zone::get_text_with_rect(const GRect &box, 
+                                  int &string_start, int &string_end) const
+{
+  GPosition pos=children;
+  if(pos?box.contains(rect):intersects_zone(box,rect))
+  {
+    const int text_end=text_start+text_length;
+    if(string_start == string_end)
+    {
+      string_start=text_start;
+      string_end=text_end;
+    }else
+    {
+      if (string_end < text_end)
+        string_end=text_end;
+      if(text_start < string_start)
+        string_start=text_start;
+    }
+  }else if(pos&&intersects_zone(box,rect))
+  {
+    do
+    {
+      children[pos].get_text_with_rect(box,string_start,string_end);
+    } while(++pos);
+  }
+}
+
+void
+DjVuTXT::Zone::find_zones(GList<Zone *> &list, 
+                          const int string_start, const int string_end) const
+{
+  const int text_end=text_start+text_length;
+  if(text_start >= string_start)
+    {
+      if(text_end <= string_end)
+        {
+          list.append(const_cast<Zone *>(this));
+        }
+      else if(text_start < string_end)
+        {
+          if (children.size())
+            for (GPosition pos=children; pos; ++pos)
+              children[pos].find_zones(list,string_start,string_end);
+          else
+            list.append(const_cast<Zone *>(this));
+        }
+    }
+  else if( text_end > string_start)
+    {
+      if (children.size())
+        for (GPosition pos=children; pos; ++pos)
+          children[pos].find_zones(list,string_start,string_end);
+      else
+        list.append(const_cast<Zone *>(this));
+    }
+}
+
+void
+DjVuTXT::Zone::get_smallest(GList<GRect> &list) const
+{
+  GPosition pos=children;
+  if(pos)
+    {
+      do {
+        children[pos].get_smallest(list);
+      } while (++pos);
+    }
+  else
+    {
+      list.append(rect);
+    }
+}
+
+void
+DjVuTXT::Zone::get_smallest(GList<GRect> &list, const int padding) const
+{
+  GPosition pos=children;
+  if(pos)
+    {
+      do {
+        children[pos].get_smallest(list,padding);
+      } while (++pos);
+    }
+  else if(zone_parent && zone_parent->ztype >= PARAGRAPH)
+    {
+      const GRect &xrect=zone_parent->rect;
+      if(xrect.height() < xrect.width())
+        {
+          list.append(GRect(rect.xmin-padding,xrect.ymin-padding,rect.width()
+                            +2*padding,xrect.height()+2*padding));
+        }
+      else
+        {
+          list.append(GRect(xrect.xmin-padding,rect.ymin-padding,xrect.width()
+                            +2*padding,rect.height()+2*padding));
+        }
+    }
+  else
+    {
+      list.append(GRect(rect.xmin-padding,rect.ymin-padding,rect.width()
+                        +2*padding,rect.height()+2*padding));
+    }
+}
+
+void
+DjVuTXT::get_zones(int zone_type, const Zone *parent, 
+                   GList<Zone *> & zone_list) const 
+   // get all the zones of  type zone_type under zone node parent
+{
+   // search all branches under parent
+   const Zone *zone=parent;
+   for( int cur_ztype=zone->ztype; cur_ztype<zone_type; ++cur_ztype )
+   {
+      GPosition pos;
+      for(pos=zone->children; pos; ++pos)
+      {
+	 Zone *zcur=(Zone *)&zone->children[pos];
+	 if ( zcur->ztype == zone_type )
+	 {
+	    GPosition zpos=zone_list;
+	    if ( !zone_list.search(zcur,zpos) )
+	       zone_list.append(zcur);
+	 }
+	 else if ( zone->children[pos].ztype < zone_type )
+	    get_zones(zone_type, &zone->children[pos], zone_list);
+      }
+   }
+}
+
+GList<GRect>
+DjVuTXT::find_text_with_rect(const GRect &box, GUTF8String &text, 
+                             const int padding) const
+{
+  GList<GRect> retval;
+  int text_start=0;
+  int text_end=0;
+  page_zone.get_text_with_rect(box,text_start,text_end);
+  if(text_start != text_end)
+  {
+    GList<Zone *> zones;
+    page_zone.find_zones(zones,text_start,text_end);
+    GPosition pos=zones;
+    if(pos)
+    {
+      do
+      {
+        if(padding >= 0)
+        {
+          zones[pos]->get_smallest(retval,padding);
+        }else
+        {
+          zones[pos]->get_smallest(retval);
+        }
+      } while(++pos);
+    }
+  }
+  text=textUTF8.substr(text_start,text_end-text_start);
+  return retval;
+}
+
+
+GList<DjVuTXT::Zone *>
+DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const
+   // returns a list of zones of type WORD in the nearest/selected paragraph 
+{
+   GList<Zone *> zone_list;
+   GList<Zone *> lines;
+
+   get_zones((int)PARAGRAPH, &page_zone, zone_list);
+   // it's possible that no paragraph structure exists for reasons that  
+   // 1) ocr engine is not capable 2) file was modified by user. In such case, 
+   // we can only make a rough guess, i.e., select all the lines intersected with
+   // target_rect
+   if (zone_list.isempty())
+   {
+      get_zones((int)LINE, &page_zone, zone_list);
+      GPosition pos;
+      for(pos=zone_list; pos; ++pos)
+      {
+	 GRect rect=zone_list[pos]->rect;
+	 int h0=rect.height()/2;
+	 if(rect.intersect(rect,target_rect) && rect.height()>h0)
+	    lines.append(zone_list[pos]);
+      }
+   } else 
+   {
+      GPosition pos, pos_sel=zone_list;
+      float ar=0;
+      for(pos=zone_list; pos; ++pos)
+      {
+	 GRect rect=zone_list[pos]->rect;
+	 int area=rect.area();
+	 if (rect.intersect(rect, target_rect))
+	 {
+	    float ftmp=rect.area()/(float)area;
+	    if ( !ar || ar<ftmp )
+	    {
+	       ar=ftmp;
+	       pos_sel=pos;
+	    }
+	 }
+      }
+      Zone *parag = 0;
+      if ( ar>0 ) parag=zone_list[pos_sel];
+      zone_list.empty();
+      if ( ar>0 ) 
+      {
+	 get_zones((int)LINE, parag, zone_list);
+	 if ( !zone_list.isempty() )
+	 {
+	    for(GPosition pos=zone_list; pos; ++pos)
+	    {
+	       GRect rect=zone_list[pos]->rect;
+	       int h0=rect.height()/2;
+	       if(rect.intersect(rect,target_rect) && rect.height()>h0)
+		  lines.append(zone_list[pos]);
+	    }
+	 }
+      }
+   }
+
+   zone_list.empty();
+   if (!lines.isempty()) 
+   {
+      int i=1, lsize=lines.size();
+
+      GList<Zone *> words;
+      for (GPosition pos=lines; pos; ++pos, ++i)
+      {
+	 words.empty();
+	 get_zones((int)WORD, lines[pos], words);
+
+	 if ( lsize==1 )
+	 {
+	    for(GPosition p=words;p;++p)
+	    {
+	       GRect rect=words[p]->rect;
+	       if(rect.intersect(rect,target_rect))
+	       //if (target_rect.contains(words[p]->rect))
+		  zone_list.append(words[p]);
+	    }
+	 } else
+	 {
+	    if (i==1)
+	    {
+	       bool start=true;
+	       for(GPosition p=words; p; ++p)
+	       {
+		  if ( start )
+		  {
+		     GRect rect=words[p]->rect;
+		     if(rect.intersect(rect,target_rect))
+			//if (target_rect.contains(words[p]->rect))
+		     {
+			start=false;
+			zone_list.append(words[p]);
+		     }
+		  } else 
+		     zone_list.append(words[p]);
+	       }
+	    } else if (i==lsize)
+	    {
+	       bool end=true;
+	       for(GPosition p=words.lastpos();p;--p)
+	       {
+		  if ( end )
+		  {
+		     GRect rect=words[p]->rect;
+		     if(rect.intersect(rect,target_rect))
+			//if(target_rect.contains(words[p]->rect) )
+		     {
+			end=false;
+			zone_list.append(words[p]);
+		     }
+		  } else 
+		     zone_list.append(words[p]);
+	       }
+	    }
+
+	    if (i!=1 && i!=lsize )
+	    {
+	       for(GPosition p=words;p;++p)
+		  zone_list.append(words[p]);
+	    }
+	 }
+      }
+   } 
+
+   return zone_list;
+}
+
+unsigned int 
+DjVuTXT::get_memory_usage() const
+{
+  return sizeof(*this) + textUTF8.length() + page_zone.memuse() - sizeof(page_zone); 
+}
+
+
+
+//***************************************************************************
+//******************************** DjVuText *********************************
+//***************************************************************************
+
+void
+DjVuText::decode(const GP<ByteStream> &gbs)
+{
+  GUTF8String chkid;
+  GP<IFFByteStream> giff=IFFByteStream::create(gbs);
+  IFFByteStream &iff=*giff;
+  while( iff.get_chunk(chkid) )
+  {
+    if (chkid == "TXTa")
+    {
+      if (txt)
+        G_THROW( ERR_MSG("DjVuText.dupl_text") );
+      txt = DjVuTXT::create();
+      txt->decode(iff.get_bytestream());
+    }
+    else if (chkid == "TXTz")
+    {
+      if (txt)
+        G_THROW( ERR_MSG("DjVuText.dupl_text") );
+      txt = DjVuTXT::create();
+      const GP<ByteStream> gbsiff=BSByteStream::create(iff.get_bytestream());
+      txt->decode(gbsiff);
+    }
+    // Add decoding of other chunks here
+    iff.close_chunk();
+  }
+}
+
+void
+DjVuText::encode(const GP<ByteStream> &gbs)
+{
+  if (txt)
+  {
+    const GP<IFFByteStream> giff=IFFByteStream::create(gbs);
+    IFFByteStream &iff=*giff;
+    iff.put_chunk("TXTz");
+    {
+      GP<ByteStream> gbsiff=BSByteStream::create(iff.get_bytestream(),50);
+      txt->encode(gbsiff);
+    }
+    iff.close_chunk();
+  }
+  // Add encoding of other chunks here
+}
+
+
+GP<DjVuText>
+DjVuText::copy(void) const
+{
+   GP<DjVuText> text= new DjVuText;
+      // Copy any primitives (if any)
+   *text=*this;
+      // Copy each substructure
+   if (txt)
+     text->txt = txt->copy();
+   return text;
+}
+
+static GUTF8String
+indent ( int spaces)
+{
+  GUTF8String ret;
+  for( int i = 0 ; i < spaces ; i++ )
+    ret += ' ';
+  return ret;
+}
+
+static const char *tags[8]=
+{ 0,
+  "HIDDENTEXT",
+  "PAGECOLUMN",
+  "REGION",
+  "PARAGRAPH",
+  "LINE",
+  "WORD",
+  "CHARACTER" };
+static const int tags_size=sizeof(tags)/sizeof(const char *);
+
+static GUTF8String
+start_tag(const DjVuTXT::ZoneType zone)
+{
+  GUTF8String retval;
+  if((tags_size > (int)zone)&&((int)zone > 0))
+  {
+    switch (zone)
+    {
+      case DjVuTXT::CHARACTER:
+        retval="<"+GUTF8String(tags[zone])+">";
+        break;
+      case DjVuTXT::WORD:
+        retval=indent(2*(int)zone+2)+"<"+tags[zone]+">";
+        break;
+      default:
+        retval=indent(2*(int)zone+2)+"<"+tags[zone]+">\n";
+        break;
+    }
+  }
+  return retval;
+}
+
+static GUTF8String
+start_tag(const DjVuTXT::ZoneType zone, const GUTF8String &attributes)
+{
+  GUTF8String retval;
+  if((tags_size > (int)zone)&&((int)zone > 0))
+  {
+    switch (zone)
+    {
+      case DjVuTXT::CHARACTER:
+        retval="<"+GUTF8String(tags[zone])+" "+attributes+">";
+        break;
+      case DjVuTXT::WORD:
+        retval=indent(2*(int)zone+2)+"<"+tags[zone]+" "+attributes+">";
+        break;
+      default:
+        retval=indent(2*(int)zone+2)+"<"+tags[zone]+" "+attributes+">\n";
+        break;
+    }
+  }
+  return retval;
+}
+
+static inline GUTF8String
+start_tag(const int layer)
+{
+  return start_tag((const DjVuTXT::ZoneType)layer);
+}
+
+
+static GUTF8String
+end_tag(const DjVuTXT::ZoneType zone)
+{
+  GUTF8String retval;
+  if((tags_size > (int)zone)&&((int)zone >= 0))
+  {
+    switch (zone)
+    {
+      case DjVuTXT::CHARACTER:
+        retval="</"+GUTF8String(tags[zone])+">";
+        break;
+      case DjVuTXT::WORD:
+        retval="</"+GUTF8String(tags[zone])+">\n";
+        break;
+      default:
+        retval=indent(2*(int)zone+2)+"</"+tags[zone]+">\n";
+        break;
+    }
+  }
+  return retval;
+}
+
+static inline GUTF8String
+end_tag(const int layer)
+{
+  return end_tag((const DjVuTXT::ZoneType)layer);
+}
+
+static GUTF8String
+tolayer(int &layer, const DjVuTXT::ZoneType next_layer)
+{
+  GUTF8String retval;
+  for( ;layer < (int)next_layer;layer++ )
+  {
+    retval+=start_tag(layer);
+  }
+  while (layer > (int)next_layer )
+  {
+    retval+=end_tag(--layer);
+  }
+  return retval;
+}
+
+static void
+writeText( ByteStream & str_out,
+            const GUTF8String &textUTF8,
+            const DjVuTXT::Zone &zone,
+            const int WindowHeight );
+
+static void
+writeText( ByteStream & str_out,
+           const GUTF8String &textUTF8,
+           const DjVuTXT::ZoneType zlayer,
+           const GList<DjVuTXT::Zone> &children,
+           const int WindowHeight )
+{
+//  assert( txt->has_valid_zones() );
+//  DEBUG_MSG( "--zonetype=" << txt->page_zone.ztype << "\n" );
+
+  //  Beginning tags for missing layers
+  int layer=(int)zlayer;
+  //  Output the next layer
+  for(GPosition pos=children ; pos ; ++pos )
+  {
+    str_out.writestring(tolayer(layer,children[pos].ztype));
+    writeText( str_out,
+                textUTF8,
+                children[pos],
+                WindowHeight );
+  }
+  str_out.writestring(tolayer(layer,zlayer));
+}
+
+static void
+writeText( ByteStream & str_out,
+            const GUTF8String &textUTF8,
+            const DjVuTXT::Zone &zone,
+            const int WindowHeight )
+{
+//  DEBUG_MSG( "--zonetype=" << zone.ztype << "\n" );
+
+  const GUTF8String xindent(indent( 2 * zone.ztype + 2 ));
+  GPosition pos=zone.children;
+  // Build attribute string
+  if( ! pos )
+  {
+    GUTF8String coords;
+    coords.format("coords=\"%d,%d,%d,%d\"",
+      zone.rect.xmin, WindowHeight - 1 - zone.rect.ymin,
+      zone.rect.xmax, WindowHeight - 1 - zone.rect.ymax);
+    const int start=zone.text_start;
+    const int end=textUTF8.firstEndSpace(start,zone.text_length);
+    str_out.writestring(start_tag(zone.ztype,coords));
+    str_out.writestring(textUTF8.substr(start,end-start).toEscaped());
+    str_out.writestring(end_tag(zone.ztype));
+  } else
+  {
+    writeText(str_out,textUTF8,zone.ztype,zone.children,WindowHeight);
+  }
+}
+
+void
+DjVuTXT::writeText(ByteStream &str_out,const int height) const
+{
+  if(has_valid_zones())
+  {
+    ::writeText(str_out,textUTF8,DjVuTXT::PAGE,page_zone.children,height);
+  }else
+  {
+    str_out.writestring(start_tag(DjVuTXT::PAGE));
+    str_out.writestring(end_tag(DjVuTXT::PAGE));
+  }
+}
+
+void
+DjVuText::writeText(ByteStream &str_out,const int height) const
+{
+  if(txt)
+  {
+    txt->writeText(str_out,height);
+  }else
+  {
+    str_out.writestring("<"+GUTF8String(tags[DjVuTXT::PAGE])+"/>\n");
+  }
+   
+}
+GUTF8String
+DjVuTXT::get_xmlText(const int height) const
+{
+  GP<ByteStream> gbs(ByteStream::create());
+  ByteStream &bs=*gbs;
+  writeText(bs,height);
+  bs.seek(0L);
+  return bs.getAsUTF8();
+}
+
+GUTF8String
+DjVuText::get_xmlText(const int height) const
+{
+  GUTF8String retval;
+  if(txt)
+  {
+    retval=txt->get_xmlText(height);
+  }else
+  {
+    retval="<"+GUTF8String(tags[DjVuTXT::PAGE])+"/>\n";
+  }
+  return retval;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/DjVuText.h b/libdjvu/DjVuText.h
new file mode 100644
index 0000000..cf44423
--- /dev/null
+++ b/libdjvu/DjVuText.h
@@ -0,0 +1,279 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVUTEXT_H
+#define _DJVUTEXT_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+
+/** @name DjVuText.h
+
+    Files #"DjVuText.h"# and #"DjVuText.cpp"# implement the mechanism for
+    text in DjVuImages.
+
+    This file implements annotations understood by the DjVu plugins 
+    and encoders.
+
+
+    using: contents of #TXT*# chunks.
+
+    Contents of the #FORM:TEXT# should be passed to \Ref{DjVuText::decode}()
+    for parsing, which initializes \Ref{DjVuText::TXT} 
+    and fills them with decoded data. 
+    @memo Implements support for DjVuImage hidden text.
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+//@{
+
+
+#include "GMapAreas.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+class ByteStream;
+
+// -------- DJVUTXT --------
+
+/** Description of the text contained in a DjVu page.  This class contains the
+    textual data for the page.  It describes the text as a hierarchy of zones
+    corresponding to page, column, region, paragraph, lines, words, etc...
+    The piece of text associated with each zone is represented by an offset
+    and a length describing a segment of a global UTF8 encoded string.  */
+
+class DJVUAPI DjVuTXT : public GPEnabled
+{
+protected:
+  DjVuTXT(void) {}
+public:
+  /// Default creator
+  static GP<DjVuTXT> create(void) {return new DjVuTXT();}
+
+  /** These constants are used to tell what a zone describes.
+      This can be useful for a copy/paste application. 
+      The deeper we go into the hierarchy, the higher the constant. */
+  enum ZoneType { PAGE=1, COLUMN=2, REGION=3, PARAGRAPH=4, 
+                  LINE=5, WORD=6, CHARACTER=7 };
+  /** Data structure representing document textual components.
+      The text structure is represented by a hierarchy of rectangular zones. */
+  class DJVUAPI Zone 
+  {
+  public:
+    Zone();
+    /** Type of the zone. */
+    enum ZoneType ztype;
+    /** Rectangle spanned by the zone */
+    GRect rect;
+    /** Position of the zone text in string #textUTF8#. */
+    int text_start;
+    /** Length of the zone text in string #textUTF8#. */
+    int text_length;
+    /** List of children zone. */
+    GList<Zone> children;
+    /** Appends another subzone inside this zone.  The new zone is initialized
+        with an empty rectangle, empty text, and has the same type as this
+        zone. */
+    Zone *append_child();
+    /** Find the text_start and text_end indicated by the given box. */
+    void get_text_with_rect(const GRect &box, 
+                            int &string_start,int &string_end ) const;
+    /** Find the zones used by the specified string and append them to the list. */
+    void find_zones(GList<Zone *> &list, 
+                    const int string_start, const int string_end) const;
+    /** Finds the smallest rectangles and appends them to the list. */
+    void get_smallest(GList<GRect> &list) const;
+    /** Finds the smallest rectangles and appends them to the list after 
+        padding the smallest unit to fit width or height for the parent rectangle
+        and adding the number of specified pixels. */
+    void get_smallest(GList<GRect> &list,const int padding) const;
+    /// Find out this Zone's parent.
+    const Zone *get_parent(void) const;
+  private:
+    friend class DjVuTXT;
+    const Zone *zone_parent;
+    void cleartext();
+    void normtext(const char *instr, GUTF8String &outstr);
+    unsigned int memuse() const;
+    static const int version;
+    void encode(const GP<ByteStream> &bs, 
+                const Zone * parent=0, const Zone * prev=0) const;
+    void decode(const GP<ByteStream> &bs, int maxtext,
+                const Zone * parent=0, const Zone * prev=0);
+  };
+  /** Textual data for this page.  
+      The content of this string is encoded using the UTF8 code.
+      This code corresponds to ASCII for the first 127 characters.
+      Columns, regions, paragraph and lines are delimited by the following
+      control character:
+      \begin{tabular}{lll}
+        {\bf Name} & {\bf Octal} & {\bf Ascii name} \\\hline\\
+        {\tt DjVuText::end_of_column}    & 013 & VT, Vertical Tab \\
+        {\tt DjVuText::end_of_region}    & 035 & GS, Group Separator \\
+        {\tt DjVuText::end_of_paragraph} & 037 & US, Unit Separator \\
+        {\tt DjVuText::end_of_line}      & 012 & LF: Line Feed
+      \end{tabular} */
+  GUTF8String textUTF8;
+  static const char end_of_column    ;      // VT: Vertical Tab
+  static const char end_of_region    ;      // GS: Group Separator
+  static const char end_of_paragraph ;      // US: Unit Separator
+  static const char end_of_line      ;      // LF: Line Feed
+  /** Main zone in the document.
+      This zone represent the page. */
+  Zone page_zone;
+  /** Tests whether there is a meaningful zone hierarchy. */
+  int has_valid_zones() const;
+  /** Normalize textual data.  Assuming that a zone hierarchy has been built
+      and represents the reading order.  This function reorganizes the string
+      #textUTF8# by gathering the highest level text available in the zone
+      hierarchy.  The text offsets and lengths are recomputed for all the
+      zones in the hierarchy. Separators are inserted where appropriate. */
+  void normalize_text();
+  /** Encode data for a TXT chunk. */
+  void encode(const GP<ByteStream> &bs) const;
+  /** Decode data from a TXT chunk. */
+  void decode(const GP<ByteStream> &bs);
+  /** Returns a copy of this object. */
+  GP<DjVuTXT> copy(void) const;
+  /// Write XML formated text.
+  void writeText(ByteStream &bs,const int height) const;
+  /// Get XML formatted text.
+  GUTF8String get_xmlText(const int height) const;
+  /** Find the text specified by the rectangle. */  
+  GList<Zone*> find_text_in_rect(GRect target_rect, GUTF8String &text) const;
+  /** Find the text specified by the rectangle. */
+  GList<GRect> find_text_with_rect(const GRect &box, GUTF8String &text, const int padding=0) const;
+  /** Get all zones of zone type zone_type under node parent. 
+      zone_list contains the return value. */
+  void get_zones(int zone_type, const Zone *parent, GList<Zone *> & zone_list) const;
+  /** Returns the number of bytes needed by this data structure. It's
+      used by caching routines to estimate the size of a \Ref{DjVuImage}. */
+  unsigned int get_memory_usage() const;
+};
+
+inline const DjVuTXT::Zone *
+DjVuTXT::Zone::get_parent(void) const
+{
+  return zone_parent;
+}
+
+
+class DJVUAPI DjVuText : public GPEnabled
+{
+protected:
+   DjVuText(void) {}
+public:
+   /// Default creator.
+   static GP<DjVuText> create(void) {return new DjVuText();}
+
+      /** Decodes a sequence of annotation chunks and merges contents of every
+	  chunk with previously decoded information. This function
+	  should be called right after applying \Ref{IFFByteStream::get_chunk}()
+	  to data from #FORM:TEXT#. */
+   void decode(const GP<ByteStream> &bs);
+
+      /** Encodes all annotations back into a sequence of chunks to be put
+	  inside a #FORM:TEXT#. */
+   void	encode(const GP<ByteStream> &bs);
+
+      /// Returns a copy of this object
+   GP<DjVuText>	copy(void) const;
+
+      /** Returns the number of bytes needed by this data structure. It's
+	  used by caching routines to estimate the size of a \Ref{DjVuImage}. */
+   inline unsigned int get_memory_usage() const;
+
+   /// Write XML formated text.
+   void writeText(ByteStream &bs,const int height) const;
+
+   /// Get XML formatted text.
+   GUTF8String get_xmlText(const int height) const;
+
+   GP<DjVuTXT>  txt;
+private: // dummy stuff
+   static void decode(ByteStream *);
+   static void	encode(ByteStream *);
+};
+
+//@}
+
+inline unsigned int
+DjVuText::get_memory_usage() const
+{
+  return (txt)?(txt->get_memory_usage()):0;
+}
+
+
+// ----- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
+
diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp
new file mode 100644
index 0000000..f72a4c9
--- /dev/null
+++ b/libdjvu/DjVuToPS.cpp
@@ -0,0 +1,2582 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuToPS.h"
+#include "IFFByteStream.h"
+#include "BSByteStream.h"
+#include "DjVuImage.h"
+#include "DjVuText.h"
+#include "DataPool.h"
+#include "IW44Image.h"
+#include "JB2Image.h"
+#include "GBitmap.h"
+#include "GPixmap.h"
+#include "debug.h"
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <math.h>
+#ifdef UNIX
+#include <pwd.h>
+#include <grp.h>
+#include <unistd.h>
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+static const size_t ps_string_size=15000;
+
+// ***************************************************************************
+// ****************************** Options ************************************
+// ***************************************************************************
+
+DjVuToPS::Options::
+Options(void)
+: format(PS), 
+  level(2), 
+  orientation(AUTO), 
+  mode(COLOR), 
+  zoom(0),
+  color(true), 
+  calibrate(true), 
+  text(false),
+  gamma((double)2.2), 
+  copies(1), 
+  frame(false),
+  cropmarks(false),
+  bookletmode(OFF),
+  bookletmax(0),
+  bookletalign(0),
+  bookletfold(18),
+  bookletxfold(200)
+{}
+
+void
+DjVuToPS::Options::
+set_format(Format xformat)
+{
+  if (xformat != EPS && xformat != PS)
+    G_THROW(ERR_MSG("DjVuToPS.bad_format"));
+  format=xformat;
+}
+
+void
+DjVuToPS::Options::
+set_level(int xlevel)
+{
+  if (xlevel<1 || xlevel>3)
+    G_THROW(ERR_MSG("DjVuToPS.bad_level")
+           + GUTF8String("\t") + GUTF8String(xlevel));
+  level=xlevel;
+}
+
+void
+DjVuToPS::Options::
+set_orientation(Orientation xorientation)
+{
+  if (xorientation!=PORTRAIT && 
+      xorientation!=LANDSCAPE &&
+      xorientation!=AUTO )
+    G_THROW(ERR_MSG("DjVuToPS.bad_orient"));
+  orientation=xorientation;
+}
+
+void
+DjVuToPS::Options::
+set_mode(Mode xmode)
+{
+  if (xmode!=COLOR && xmode!=FORE && xmode!=BACK && xmode!=BW)
+    G_THROW(ERR_MSG("DjVuToPS.bad_mode"));
+  mode=xmode;
+}
+
+void
+DjVuToPS::Options::
+set_zoom(int xzoom)
+{
+  if (xzoom!=0 && !(xzoom>=5 && xzoom<=999))
+    G_THROW(ERR_MSG("DjVuToPS.bad_zoom"));
+  zoom=xzoom;
+}
+
+void
+DjVuToPS::Options::
+set_color(bool xcolor)
+{
+  color=xcolor;
+}
+
+void 
+DjVuToPS::Options::
+set_sRGB(bool xcalibrate)
+{
+  calibrate=xcalibrate;
+}
+
+void
+DjVuToPS::Options::
+set_gamma(double xgamma)
+{
+  if  (xgamma<(double)(0.3-0.0001) || xgamma>(double)(5.0+0.0001))
+    G_THROW(ERR_MSG("DjVuToPS.bad_gamma"));
+  gamma=xgamma;
+}
+
+void
+DjVuToPS::Options::
+set_copies(int xcopies)
+{
+  if (xcopies<=0)
+    G_THROW(ERR_MSG("DjVuToPS.bad_number"));
+  copies=xcopies;
+}
+
+void
+DjVuToPS::Options::
+set_frame(bool xframe)
+{
+  frame=xframe;
+}
+
+void
+DjVuToPS::Options::
+set_cropmarks(bool xmarks)
+{
+  cropmarks=xmarks;
+}
+
+void
+DjVuToPS::Options::
+set_text(bool xtext)
+{
+  text=xtext;
+}
+
+void 
+DjVuToPS::Options::
+set_bookletmode(BookletMode m)
+{
+  bookletmode = m;
+}
+
+void 
+DjVuToPS::Options::
+set_bookletmax(int m)
+{
+  bookletmax = 0;
+  if (m > 0)
+    bookletmax = (m+3)/4;
+  bookletmax *= 4;
+}
+
+void 
+DjVuToPS::Options::
+set_bookletalign(int m)
+{
+  bookletalign = m;
+}
+
+void 
+DjVuToPS::Options::
+set_bookletfold(int fold, int xfold)
+{
+  if (fold >= 0)
+    bookletfold = fold;
+  if (xfold >= 0)
+    bookletxfold = xfold;
+}
+
+
+// ***************************************************************************
+// ******************************* DjVuToPS **********************************
+// ***************************************************************************
+
+static char bin2hex[256][2];
+
+DjVuToPS::DjVuToPS(void)
+{
+  DEBUG_MSG("DjVuToPS::DjVuToPS(): initializing...\n");
+  DEBUG_MAKE_INDENT(3);
+  DEBUG_MSG("Initializing dig2hex[]\n");
+  // Creating tables for bin=>text translation
+  static const char * dig2hex="0123456789ABCDEF";
+  int i;
+  for(i=0;i<256;i++)
+    {
+      bin2hex[i][0]=dig2hex[i/16];
+      bin2hex[i][1]=dig2hex[i%16];
+    }
+  refresh_cb=0;
+  refresh_cl_data=0;
+  prn_progress_cb=0;
+  prn_progress_cl_data=0;
+  dec_progress_cb=0;
+  dec_progress_cl_data=0;
+  info_cb=0;
+  info_cl_data=0;
+}
+
+#ifdef __GNUC__
+static void
+write(ByteStream &str, const char *format, ...)
+__attribute__((format (printf, 2, 3)));
+#endif
+
+static void
+write(ByteStream &str, const char *format, ...)
+{
+  /* Will output the formated string to the specified \Ref{ByteStream}
+     like #fprintf# would do it for a #FILE#. */
+  va_list args;
+  va_start(args, format);
+  GUTF8String tmp;
+  tmp.vformat(format, args);
+  str.writall((const char *) tmp, tmp.length());
+}
+
+// ************************* DOCUMENT LEVEL *********************************
+
+void
+DjVuToPS::
+store_doc_prolog(ByteStream &str, int pages, int dpi, GRect *grect)
+{
+  /* Will store the {\em document prolog}, which is basically a
+     block of document-level comments in PS DSC 3.0 format.
+     @param str Stream where PostScript data should be written
+     @param pages Total number of pages
+     @param dpi (EPS mode only) 
+     @param grect (EPS mode only) */
+  DEBUG_MSG("storing the document prolog\n");
+  DEBUG_MAKE_INDENT(3);
+  if (options.get_format()==Options::EPS)
+    write(str,
+          "%%!PS-Adobe-3.0 EPSF 3.0\n"
+          "%%%%BoundingBox: 0 0 %d %d\n",
+          (grect->width()*100+dpi-1)/dpi, 
+          (grect->height()*100+dpi-1)/dpi );
+  else
+    write(str, "%%!PS-Adobe-3.0\n");
+  write(str,
+        "%%%%Title: DjVu PostScript document\n"
+        "%%%%Copyright: Copyright (c) 1998-1999 AT&T\n"
+        "%%%%Creator: DjVu (code by Andrei Erofeev)\n"
+        "%%%%DocumentData: Clean7Bit\n");
+  // Date
+  time_t tm=time(0);
+  write(str, "%%%%CreationDate: %s", ctime(&tm));
+  // For
+#ifdef UNIX
+  passwd *pswd = getpwuid(getuid());
+  if (pswd)
+    {
+      char *s = strchr(pswd->pw_gecos, ',');
+      if (s) 
+        *s = 0;
+      s = 0;
+      if (pswd->pw_gecos && strlen(pswd->pw_gecos))
+        s = pswd->pw_gecos;
+      else if (pswd->pw_name && strlen(pswd->pw_name))
+        s = pswd->pw_name;
+      if (s)
+        write(str, "%%%%For: %s\n", s);
+    }
+#endif
+  // Language
+  write(str, "%%%%LanguageLevel: %d\n", options.get_level());
+  if (options.get_level()<2 && options.get_color())
+    write(str, "%%%%Extensions: CMYK\n");
+  // Pages
+  write(str, "%%%%Pages: %d\n",pages );
+  write(str, "%%%%PageOrder: Ascend\n");
+  // Orientation
+  if (options.get_orientation() != Options::AUTO)
+    write(str, "%%%%Orientation: %s\n", 
+          options.get_orientation()==Options::PORTRAIT ?
+          "Portrait" : "Landscape" );
+  // Requirements
+  if (options.get_format() == Options::PS)
+    {
+      write(str, "%%%%Requirements:");
+      if (options.get_color())
+        write(str, " color");
+      if (options.get_copies()>1)
+        write(str, " numcopies(%d)", options.get_copies());
+      if (options.get_level()>=2)
+        {
+          if (options.get_copies()>1)
+            write(str, " collate");
+          if (options.get_bookletmode() == Options::RECTOVERSO)
+            write(str, " duplex(tumble)");
+        }
+      write(str, "\n");
+    }
+  // End
+  write(str,
+        "%%%%EndComments\n"
+        "%%%%EndProlog\n"
+        "\n");
+}
+
+void
+DjVuToPS::
+store_doc_setup(ByteStream &str)
+{
+  /* Will store the {\em document setup}, which is a set of
+     PostScript commands and functions used to inspect and prepare
+     the PostScript interpreter environment before displaying images. */
+  write(str, 
+        "%%%%BeginSetup\n"
+        "/doc-origstate save def\n");
+  if (options.get_level()>=2)
+    {
+      if (options.get_format() == Options::PS)
+        {
+          if (options.get_copies()>1)
+            write(str, 
+                  "[{\n"
+                  "%%%%BeginFeature: NumCopies %d\n"
+                  "<< /NumCopies %d >> setpagedevice\n"
+                  "%%%%EndFeature\n"
+                  "} stopped cleartomark\n"
+                  "[{\n"
+                  "%%%%BeginFeature: Collate\n"
+                  "<< /Collate true >> setpagedevice\n"
+                  "%%%%EndFeature\n"
+                  "} stopped cleartomark\n",
+                  options.get_copies(),
+                  options.get_copies() );
+          if (options.get_bookletmode()==Options::RECTOVERSO)
+            write(str, 
+                  "[{\n"
+                  "%%%%BeginFeature: Duplex DuplexTumble\n"
+                  "<< /Duplex true /Tumble true >> setpagedevice\n"
+                  "%%%%EndFeature\n"
+                  "} stopped cleartomark\n");
+        }
+      if (options.get_color())
+        write(str, 
+              "%% -- procs for reading color image\n"
+              "/readR () def\n"
+              "/readG () def\n"
+              "/readB () def\n"
+              "/ReadData {\n"
+              "   currentfile /ASCII85Decode filter dup\n"
+              "   /RunLengthDecode filter\n"
+              "   bufferR readstring pop /readR exch def\n"
+              "   dup status { flushfile } { pop } ifelse\n"
+              "   currentfile /ASCII85Decode filter dup\n"
+              "   /RunLengthDecode filter\n"
+              "   bufferG readstring pop /readG exch def\n"
+              "   dup status { flushfile } { pop } ifelse\n"
+              "   currentfile /ASCII85Decode filter dup\n"
+              "   /RunLengthDecode filter\n"
+              "   bufferB readstring pop /readB exch def\n"
+              "   dup status { flushfile } { pop } ifelse\n"
+              "} bind def\n"
+              "/ReadR {\n"
+              "   readR length 0 eq { ReadData } if\n"
+              "   readR /readR () def\n"
+              "} bind def\n"
+              "/ReadG {\n"
+              "   readG length 0 eq { ReadData } if\n"
+              "   readG /readG () def\n"
+              "} bind def\n"
+              "/ReadB {\n"
+              "   readB length 0 eq { ReadData } if\n"
+              "   readB /readB () def\n"
+              "} bind def\n");
+      write(str,
+            "%% -- procs for foreground layer\n"
+            "/g {gsave 0 0 0 0 5 index 5 index setcachedevice\n"
+            "    true [1 0 0 1 0 0] 5 4 roll imagemask grestore\n"
+            "} bind def\n"
+            "/gn {gsave 0 0 0 0 6 index 6 index setcachedevice\n"
+            "  true [1 0 0 1 0 0] 3 2 roll 5 1 roll \n"
+            "  { 1 sub 0 index 2 add 1 index  1 add roll\n"
+            "  } imagemask grestore pop \n"
+            "} bind def\n"
+            "/c {setcolor rmoveto glyphshow} bind def\n"
+            "/s {rmoveto glyphshow} bind def\n"
+            "/S {rmoveto gsave show grestore} bind def\n" 
+            "/F {(Helvetica) findfont exch scalefont setfont} bind def\n"
+            "%% -- emulations\n"
+            "systemdict /rectstroke known not {\n"
+            "  /rectstroke  %% stack : x y width height \n"
+            "  { newpath 4 2 roll moveto 1 index 0 rlineto\n"
+            "    0 exch rlineto neg 0 rlineto closepath stroke\n"
+            "  } bind def } if\n"
+            "systemdict /rectclip known not {\n"
+            "  /rectclip  %% stack : x y width height \n"
+            "  { newpath 4 2 roll moveto 1 index 0 rlineto\n"
+            "    0 exch rlineto neg 0 rlineto closepath clip\n"
+            "  } bind def } if\n"
+            "%% -- color space\n" );
+      if (options.get_sRGB())
+        write(str,
+              "/DjVuColorSpace [ %s\n"
+              "<< /DecodeLMN [ { dup 0.03928 le {\n"
+              "       12.92321 div\n"
+              "     } {\n"
+              "       0.055 add 1.055 div 2.4 exp\n"
+              "     } ifelse } bind dup dup ]\n"
+              "   /MatrixLMN [\n"
+              "      0.412457 0.212673 0.019334\n"
+              "      0.357576 0.715152 0.119192\n"
+              "      0.180437 0.072175 0.950301 ]\n"
+              "   /WhitePoint [ 0.9505 1 1.0890 ] %% D65 \n"
+              "   /BlackPoint[0 0 0] >> ] def\n",
+              (options.get_color()) ? "/CIEBasedABC" : "/CIEBasedA" );
+      else if (options.get_color())
+        write(str,"/DjVuColorSpace /DeviceRGB def\n");
+      else
+        write(str,"/DjVuColorSpace /DeviceGray def\n");
+    } 
+  else 
+    {
+      // level<2
+      if (options.get_format() == Options::PS)
+        if (options.get_copies() > 1)
+          write(str,"/#copies %d def\n", options.get_copies());
+      if (options.get_color())
+        write(str, 
+              "%% -- buffers for reading image\n"
+              "/buffer8 () def\n"
+              "/buffer24 () def\n"
+              "%% -- colorimage emulation\n"
+              "systemdict /colorimage known {\n"
+              "   /ColorProc {\n"
+              "      currentfile buffer24 readhexstring pop\n"
+              "   } bind def\n"
+              "   /ColorImage {\n"
+              "      colorimage\n"
+              "   } bind def\n"
+              "} {\n"
+              "   /ColorProc {\n"
+              "      currentfile buffer24 readhexstring pop\n"
+              "      /data exch def /datalen data length def\n"
+              "      /cnt 0 def\n"
+              "      0 1 datalen 3 idiv 1 sub {\n"
+              "         buffer8 exch\n"
+              "                data cnt get 20 mul /cnt cnt 1 add def\n"
+              "                data cnt get 32 mul /cnt cnt 1 add def\n"
+              "                data cnt get 12 mul /cnt cnt 1 add def\n"
+              "                add add 64 idiv put\n"
+              "      } for\n"
+              "      buffer8 0 datalen 3 idiv getinterval\n"
+              "   } bind def\n"
+              "   /ColorImage {\n"
+              "      pop pop image\n"
+              "   } bind def\n"
+              "} ifelse\n");
+    } // level<2
+  write(str, "%%%%EndSetup\n\n");
+}
+
+void
+DjVuToPS::
+store_doc_trailer(ByteStream &str)
+{
+  /* Will store the {\em document trailer}, which is a clean-up code
+     used to return the PostScript interpeter back to the state, in which
+     it was before displaying this document. */
+  write(str, 
+        "%%%%Trailer\n"
+        "doc-origstate restore\n"
+        "%%%%EOF\n");
+}
+
+// ***********************************************************************
+// ***************************** PAGE LEVEL ******************************
+// ***********************************************************************
+
+static unsigned char *
+ASCII85_encode(unsigned char * dst, 
+               const unsigned char * src_start,
+               const unsigned char * src_end)
+{
+  /* Will read data between #src_start# and #src_end# pointers (excluding byte
+     pointed by #src_end#), encode it using {\bf ASCII85} algorithm, and
+     output the result into the destination buffer pointed by #dst#.  The
+     function returns pointer to the first unused byte in the destination
+     buffer. */
+  int symbols=0;
+  const unsigned char * ptr;
+  for(ptr=src_start;ptr<src_end;ptr+=4)
+    {
+      unsigned int num=0;
+      if (ptr+3<src_end)
+        {
+          num |= ptr[0] << 24; 
+          num |= ptr[1] << 16; 
+          num |= ptr[2] << 8; 
+          num |= ptr[3];
+        }
+      else
+        {
+          num |= ptr[0] << 24; 
+          if (ptr+1<src_end) 
+            num |= ptr[1] << 16; 
+          if (ptr+2<src_end) 
+            num |= ptr[2] << 8; 
+        }
+      int a1, a2, a3, a4, a5;
+      a5=num % 85; num/=85;
+      a4=num % 85; num/=85;
+      a3=num % 85; num/=85;
+      a2=num % 85;
+      a1=num / 85;
+      *dst++ = a1+33;
+      *dst++ = a2+33;
+      if (ptr+1<src_end)
+        *dst++ = a3+33;
+      if (ptr+2<src_end)
+        *dst++ = a4+33;
+      if (ptr+3<src_end)
+        *dst++ = a5+33;
+      symbols += 5;
+      if (symbols > 70 && ptr+4<src_end)
+        { 
+          *dst++='\n'; 
+          symbols=0; 
+        }
+    }
+  return dst;
+}
+
+static unsigned char *
+RLE_encode(unsigned char * dst,
+           const unsigned char * src_start,
+           const unsigned char * src_end)
+{
+  /* Will read data between #src_start# and #src_end# pointers (excluding byte
+     pointed by #src_end#), RLE encode it, and output the result into the
+     destination buffer pointed by #dst#.  #counter# is used to count the
+     number of output bytes.  The function returns pointer to the first unused
+     byte in the destination buffer. */
+  const unsigned char * ptr;
+  for(ptr=src_start;ptr<src_end;ptr++)
+    {
+      if (ptr==src_end-1)
+        {
+          *dst++=0; *dst++=*ptr;
+        } 
+      else if (ptr[0]!=ptr[1])
+        {
+          // Guess how many non repeating bytes we have
+          const unsigned char * ptr1;
+          for(ptr1=ptr+1;ptr1<src_end-1;ptr1++)
+            if (ptr1[0]==ptr1[1] || ptr1-ptr>=128) break;
+          int pixels=ptr1-ptr;
+          *dst++=pixels-1;
+          for(int cnt=0;cnt<pixels;cnt++)
+            *dst++=*ptr++;
+          ptr--;
+        } 
+      else
+        {
+          // Get the number of repeating bytes
+          const unsigned char * ptr1;
+          for(ptr1=ptr+1;ptr1<src_end-1;ptr1++)
+            if (ptr1[0]!=ptr1[1] || ptr1-ptr+1>=128) break;
+          int pixels=ptr1-ptr+1;
+          *dst++=257-pixels;
+          *dst++=*ptr;
+          ptr=ptr1;
+        }
+    }
+  return dst;
+}
+
+#define GRAY(r,g,b) (((r)*20+(g)*32+(b)*12)/64)
+
+void
+DjVuToPS::
+store_page_setup(ByteStream &str, 
+                 int dpi, 
+                 const GRect &grect, 
+                 int align )
+{
+  /* Will store PostScript code necessary to prepare page for
+     the coming \Ref{DjVuImage}. This is basically a scaling
+     code plus initialization of some buffers. */
+  if (options.get_format() == Options::EPS)
+    write(str, 
+          "/page-origstate save def\n"
+          "%% -- coordinate system\n"
+          "/image-dpi %d def\n"
+          "/image-x 0 def\n"
+          "/image-y 0 def\n"
+          "/image-width  %d def\n"
+          "/image-height %d def\n"
+          "/coeff 100 image-dpi div def\n"
+          "/a11 coeff def\n"
+          "/a12 0 def\n"
+          "/a13 0 def\n"
+          "/a21 0 def\n"
+          "/a22 coeff def\n"
+          "/a23 0 def\n"
+          "[a11 a21 a12 a22 a13 a23] concat\n"
+          "gsave 0 0 image-width image-height rectclip\n"
+          "%% -- begin printing\n",
+          dpi, grect.width(), grect.height() );
+  else
+    {
+      int margin = 0;
+      const char *xauto = "false";
+      const char *xportrait = "false";
+      const char *xfit = "false";
+      if (options.get_orientation()==Options::AUTO)
+        xauto = "true";
+      if (options.get_orientation()==Options::PORTRAIT)
+        xportrait = "true";
+      if (options.get_zoom()<=0)
+        xfit = "true";
+      if (options.get_cropmarks())
+        margin = 36;
+      else if (options.get_frame())
+        margin = 6;
+      write(str, 
+            "/page-origstate save def\n"
+            "%% -- coordinate system\n"
+            "/auto-orient %s def\n"
+            "/portrait %s def\n"
+            "/fit-page %s def\n"
+            "/zoom %d def\n"
+            "/image-dpi %d def\n"
+            "clippath pathbbox newpath\n"
+            "2 index sub exch 3 index sub\n"
+            "/page-width exch def\n"
+            "/page-height exch def\n"
+            "/page-y exch def\n"
+            "/page-x exch def\n"
+            "/image-x 0 def\n"
+            "/image-y 0 def\n"
+            "/image-width  %d def\n"
+            "/image-height %d def\n"
+            "/margin %d def\n"
+            "/halign %d def\n"
+            "/valign 0 def\n",
+            xauto, xportrait, xfit, options.get_zoom(), 
+            dpi, grect.width(), grect.height(),
+            margin, align );
+      write(str, 
+            "%% -- position page\n"
+            "auto-orient {\n"
+            "  image-height image-width sub\n"
+            "  page-height page-width sub\n"
+            "  mul 0 ge /portrait exch def\n" 
+            "} if\n"
+            "fit-page {\n"
+            "  /page-width page-width margin sub\n"
+            "     halign 0 eq { margin sub } if def\n"
+            "  /page-height page-height margin sub\n"
+            "     valign 0 eq { margin sub } if def\n"
+            "  /page-x page-x halign 0 ge { margin add } if def\n"
+            "  /page-y page-y valign 0 ge { margin add } if def\n"
+            "} if\n"
+            "portrait {\n"
+            "  fit-page {\n"
+            "    image-height page-height div\n"
+            "    image-width page-width div\n"
+            "    gt {\n"
+            "      page-height image-height div /coeff exch def\n"
+            "    } {\n"
+            "      page-width image-width div /coeff exch def\n"
+            "    } ifelse\n"
+            "  } {\n"
+            "    /coeff 72 image-dpi div zoom mul 100 div def\n"
+            "  } ifelse\n"
+            "  /start-x page-x page-width image-width\n"
+            "    coeff mul sub 2 div halign 1 add mul add def\n"
+            "  /start-y page-y page-height image-height\n"
+            "    coeff mul sub 2 div valign 1 add mul add def\n"
+            "  /a11 coeff def\n"
+            "  /a12 0 def\n"
+            "  /a13 start-x def\n"
+            "  /a21 0 def\n"
+            "  /a22 coeff def\n"
+            "  /a23 start-y def\n"
+            "} { %% landscape\n"
+            "  fit-page {\n"
+            "    image-height page-width div\n"
+            "    image-width page-height div\n"
+            "    gt {\n"
+            "      page-width image-height div /coeff exch def\n"
+            "    } {\n"
+            "      page-height image-width div /coeff exch def\n"
+            "    } ifelse\n"
+            "  } {\n"
+            "    /coeff 72 image-dpi div zoom mul 100 div def\n"
+            "  } ifelse\n"
+            "  /start-x page-x page-width add page-width image-height\n"
+            "    coeff mul sub 2 div valign 1 add mul sub def\n"
+            "  /start-y page-y page-height image-width\n"
+            "    coeff mul sub 2 div halign 1 add mul add def\n"
+            "  /a11 0 def\n"
+            "  /a12 coeff neg def\n"
+            "  /a13 start-x image-y coeff neg mul sub def\n"
+            "  /a21 coeff def\n"
+            "  /a22 0 def\n"
+            "  /a23 start-y image-x coeff mul add def \n"
+            "} ifelse\n"
+            "[a11 a21 a12 a22 a13 a23] concat\n"
+            "gsave 0 0 image-width image-height rectclip\n"
+            "%% -- begin print\n");
+    }
+}
+
+void
+DjVuToPS::
+store_page_trailer(ByteStream &str)
+{
+  write(str, 
+        "%% -- end print\n" 
+        "grestore\n");
+  if (options.get_frame())
+    write(str, 
+          "%% Drawing frame\n"
+          "gsave 0.7 setgray 0.5 coeff div setlinewidth 0 0\n"
+          "image-width image-height rectstroke\n"
+          "grestore\n");
+  if (options.get_cropmarks() &&
+      options.get_format() != Options::EPS )
+    write(str,
+          "%% Drawing crop marks\n"
+          "/cm { gsave translate rotate 1 coeff div dup scale\n"
+          "      0 setgray 0.5 setlinewidth -36 0 moveto 0 0 lineto\n"
+          "      0 -36 lineto stroke grestore } bind def\n"
+          "0 0 0 cm 180 image-width image-height cm\n"
+          "90 image-width 0 cm 270 0 image-height cm\n");
+  write(str,
+        "page-origstate restore\n");
+}
+
+static int
+compute_red(int w, int h, int rw, int rh)
+{
+  for (int red=1; red<16; red++)
+    if (((w+red-1)/red==rw) && ((h+red-1)/red==rh))
+      return red;
+  return 16;
+}
+
+static int
+get_bg_red(GP<DjVuImage> dimg) 
+{
+  GP<GPixmap> pm = 0;
+  // Access image size
+  int width = dimg->get_width();
+  int height = dimg->get_height();
+  if (width<=0 || height<=0) return 0;
+  // CASE1: Incremental BG IW44Image
+  GP<IW44Image> bg44 = dimg->get_bg44();
+  if (bg44)
+    {
+      int w = bg44->get_width();
+      int h = bg44->get_height();
+      // Avoid silly cases
+      if (w==0 || h==0 || width==0 || height==0)
+        return 0;
+      return compute_red(width,height,w,h);
+    }
+  // CASE 2: Raw background pixmap
+  GP<GPixmap>  bgpm = dimg->get_bgpm();
+  if (bgpm)
+    {
+      int w = bgpm->columns();
+      int h = bgpm->rows();
+      // Avoid silly cases
+      if (w==0 || h==0 || width==0 || height==0)
+        return 0;
+      return compute_red(width,height,w,h);
+    }
+  return 0;
+}
+
+static GP<GPixmap>
+get_bg_pixmap(GP<DjVuImage> dimg, const GRect &rect)
+{
+  GP<GPixmap> pm = 0;
+  // Access image size
+  int width = dimg->get_width();
+  int height = dimg->get_height();
+  GP<DjVuInfo> info = dimg->get_info();
+  if (width<=0 || height<=0 || !info) return 0;
+  // CASE1: Incremental BG IW44Image
+  GP<IW44Image> bg44 = dimg->get_bg44();
+  if (bg44)
+    {
+      int w = bg44->get_width();
+      int h = bg44->get_height();
+      // Avoid silly cases
+      if (w==0 || h==0 || width==0 || height==0)
+        return 0;
+      pm = bg44->get_pixmap(1,rect);
+      return pm;
+    }
+  // CASE 2: Raw background pixmap
+  GP<GPixmap>  bgpm = dimg->get_bgpm();
+  if (bgpm)
+    {
+      int w = bgpm->columns();
+      int h = bgpm->rows();
+      // Avoid silly cases
+      if (w==0 || h==0 || width==0 || height==0)
+        return 0;
+      pm->init(*bgpm, rect);
+      return pm;
+    }
+  // FAILURE
+  return 0;
+}
+
+void 
+DjVuToPS::
+make_gamma_ramp(GP<DjVuImage> dimg)
+{
+  double targetgamma = options.get_gamma();
+  double whitepoint = (options.get_sRGB() ? 255 : 280);
+  for (int i=0; i<256; i++)
+    ramp[i] = i;
+  if (! dimg->get_info()) 
+    return;
+  if (targetgamma < 0.1)
+    return;
+  double filegamma = dimg->get_info()->gamma;
+  double correction = filegamma / targetgamma;
+  if (correction<0.1 || correction>10)
+    return;
+  {
+    for (int i=0; i<256; i++)
+    {
+      double x = (double)(i)/255.0;
+      if (correction != 1.0) 
+        x = pow(x, correction);        
+      int j = (int) floor(whitepoint * x + 0.5);
+      ramp[i] = (j>255) ? 255 : (j<0) ? 0 : j;
+    }
+  }
+}
+
+void
+DjVuToPS::
+print_fg_2layer(ByteStream &str, 
+                GP<DjVuImage> dimg,
+                const GRect &prn_rect, 
+                unsigned char *blit_list)
+{
+  // Pure-jb2 or color-jb2 case.
+  GPixel p;
+  int currentx=0;
+  int currenty=0;
+  GP<DjVuPalette> pal = dimg->get_fgbc();
+  GP<JB2Image> jb2 = dimg->get_fgjb();
+  if (! jb2) return;
+  int num_blits = jb2->get_blit_count();
+  int current_blit;
+  for(current_blit=0; current_blit<num_blits; current_blit++)
+    {
+      if (blit_list[current_blit])
+        {
+          JB2Blit *blit = jb2->get_blit(current_blit);
+          if ((pal) && !(options.get_mode()==Options::BW))
+            {
+              pal->index_to_color(pal->colordata[current_blit], p);
+              if (options.get_color())
+                {
+                  write(str,"/%d %d %d %f %f %f c\n",
+                        blit->shapeno, 
+                        blit->left-currentx, blit->bottom-currenty,
+                        ramp[p.r]/255.0, ramp[p.g]/255.0, ramp[p.b]/255.0);
+                } 
+              else
+                {
+                  write(str,"/%d %d %d %f c\n",
+                        blit->shapeno, 
+                        blit->left-currentx, blit->bottom-currenty,
+                        ramp[GRAY(p.r, p.g, p.b)]/255.0);
+                }
+            }
+          else
+            {
+              write(str,"/%d %d %d s\n", 
+                    blit->shapeno, 
+                    blit->left-currentx, blit->bottom-currenty);
+            }
+          currentx = blit->left;
+          currenty = blit->bottom;
+        }
+    }
+}
+
+void
+DjVuToPS::
+print_fg_3layer(ByteStream &str, 
+                GP<DjVuImage> dimg,
+                const GRect &cprn_rect, 
+                unsigned char *blit_list )
+{
+  GRect prn_rect;
+  GP<GPixmap> brush = dimg->get_fgpm();
+  if (! brush) return;
+  int br = brush->rows();
+  int bc = brush->columns();
+  int red = compute_red(dimg->get_width(),dimg->get_height(),bc,br);
+  prn_rect.ymin = (cprn_rect.ymin)/red;
+  prn_rect.xmin = (cprn_rect.xmin)/red;
+  prn_rect.ymax = (cprn_rect.ymax+red-1)/red;
+  prn_rect.xmax = (cprn_rect.xmax+red-1)/red;
+  int color_nb = ((options.get_color()) ? 3 : 1);
+  GP<JB2Image> jb2 = dimg->get_fgjb();
+  if (! jb2) return;
+  int pw = bc;
+  int ph = 2;
+
+  write(str,
+        "/P {\n" 
+        "  11 dict dup begin 4 1 roll\n"
+        "    /PatternType 1 def\n"
+        "    /PaintType 1 def\n"
+        "    /TilingType 1 def\n"
+        "    /H exch def\n"
+        "    /W exch def\n"
+        "    /Red %d def\n"
+        "    /PatternString exch def\n"
+        "    /XStep W Red mul def\n"
+        "    /YStep H Red mul def\n"
+        "    /BBox [0 0 XStep YStep] def\n"
+        "    /PaintProc { begin\n"
+        "       Red dup scale\n"
+        "       << /ImageType 1 /Width W /Height H\n"
+        "          /BitsPerComponent 8 /Interpolate false\n"
+        "          /Decode [%s] /ImageMatrix [1 0 0 1 0 0]\n"
+        "          /DataSource PatternString >> image\n"
+        "       end } bind def\n"
+        "     0 0 XStep YStep rectclip\n"
+        "     end matrix makepattern\n"
+        "  /Pattern setcolorspace setpattern\n"
+        "  0 0 moveto\n"
+        "} def\n", red, (color_nb == 1) ? "0 1" : "0 1 0 1 0 1" );
+
+  unsigned char *s;
+  GPBuffer<unsigned char> gs(s,pw*ph*color_nb);
+  unsigned char *s_ascii_encoded;
+  GPBuffer<unsigned char> gs_ascii_encoded(s_ascii_encoded,pw*ph*2*color_nb);
+    {
+      for (int y=prn_rect.ymin; y<prn_rect.ymax; y+=ph)
+        for (int x=prn_rect.xmin; x<prn_rect.xmax; x+=pw)
+          {
+            int w = ((x+pw > prn_rect.xmax) ? prn_rect.xmax-x : pw);
+            int h = ((y+ph > prn_rect.ymax) ? prn_rect.ymax-y : ph);
+            int currentx = x * red;
+            int currenty = y * red;
+            // Find first intersecting blit
+            int current_blit;
+            int num_blits = jb2->get_blit_count();
+            GRect rect1(currentx,currenty, w*red, h*red);
+            for(current_blit=0; current_blit<num_blits; current_blit++)
+              if (blit_list[current_blit])
+                {
+                  JB2Blit *blit = jb2->get_blit(current_blit);
+                  GRect rect2(blit->left, blit->bottom,
+                              jb2->get_shape(blit->shapeno).bits->columns(),
+                              jb2->get_shape(blit->shapeno).bits->rows());
+                  if (rect2.intersect(rect1,rect2)) 
+                    break;
+                }
+            if (current_blit >= num_blits)
+              continue;
+            // Setup pattern
+            write(str,"gsave %d %d translate\n", currentx, currenty);
+            write(str,"<~");
+            unsigned char *q = s;
+            for(int current_row = y; current_row<y+h; current_row++)
+              { 
+                GPixel *row_pix = (*brush)[current_row];
+                for(int current_col = x; current_col<x+w; current_col++)
+                  { 
+                    GPixel &p = row_pix[current_col];
+                    if (color_nb>1)
+                      {
+                        *q++ = ramp[p.r];
+                        *q++ = ramp[p.g];
+                        *q++ = ramp[p.b];
+                      }
+                    else
+                      {
+                        *q++ = ramp[GRAY(p.r,p.g,p.b)];
+                      }
+                  }
+              }
+            unsigned char *stop_ascii = 
+              ASCII85_encode(s_ascii_encoded,s,s+w*h*color_nb);
+            *stop_ascii++='\0';
+            write(str,"%s",s_ascii_encoded);
+            write(str,"~> %d %d P\n", w, h);
+            // Keep performing blits
+            for(; current_blit<num_blits; current_blit++)
+              if (blit_list[current_blit])
+                {
+                  JB2Blit *blit = jb2->get_blit(current_blit);
+                  GRect rect2(blit->left, blit->bottom,
+                              jb2->get_shape(blit->shapeno).bits->columns(),
+                              jb2->get_shape(blit->shapeno).bits->rows()); 
+                  if (rect2.intersect(rect1,rect2)) 
+                    {   
+                      write(str,"/%d %d %d s\n",
+                            blit->shapeno, 
+                            blit->left-currentx, blit->bottom-currenty);
+                      currentx = blit->left;
+                      currenty = blit->bottom;
+                    }
+                }
+            write(str,"grestore\n");
+          }
+      // Cleanup
+    }
+}
+
+void
+DjVuToPS::
+print_fg(ByteStream &str, 
+         GP<DjVuImage> dimg,
+         const GRect &prn_rect )
+{
+  GP<JB2Image> jb2=dimg->get_fgjb();
+  if (! jb2) return;
+  int num_blits = jb2->get_blit_count();
+  int num_shapes = jb2->get_shape_count();
+  unsigned char *dict_shapes = 0;
+  unsigned char *blit_list = 0;
+  GPBuffer<unsigned char> gdict_shapes(dict_shapes,num_shapes);
+  GPBuffer<unsigned char> gblit_list(blit_list,num_blits);
+  for(int i=0; i<num_shapes; i++)
+  {
+    dict_shapes[i]=0;
+  }
+  for(int current_blit=0; current_blit<num_blits; current_blit++)
+  {
+    JB2Blit *blit = jb2->get_blit(current_blit);
+    JB2Shape *shape = & jb2->get_shape(blit->shapeno);
+    blit_list[current_blit] = 0;
+    if (! shape->bits) 
+      continue;
+    GRect rect2(blit->left, blit->bottom, 
+      shape->bits->columns(), shape->bits->rows());
+    if (rect2.intersect(rect2, prn_rect))
+    {
+      dict_shapes[blit->shapeno] = 1;
+      blit_list[current_blit] = 1;
+    }
+  }
+  write(str,
+    "%% --- now doing the foreground\n"
+    "gsave DjVuColorSpace setcolorspace\n" );
+      // Define font
+  write(str,
+    "/$DjVuLocalFont 7 dict def\n"
+    "$DjVuLocalFont begin\n"
+    "/FontType 3 def \n"
+    "/FontMatrix [1 0 0 1 0 0] def\n"
+    "/FontBBox [0 0 1 .5] def\n"
+    "/CharStrings %d dict def\n"
+    "/Encoding 2 array def\n"
+    "0 1 1 {Encoding exch /.notdef put} for \n"
+    "CharStrings begin\n"
+    "/.notdef {} def\n",
+    num_shapes+1);
+  for(int current_shape=0; current_shape<num_shapes; current_shape++)
+  {
+    if (dict_shapes[current_shape])
+    {
+      JB2Shape *shape = & jb2->get_shape(current_shape);
+      GP<GBitmap> bitmap = shape->bits;
+      int rows = bitmap->rows();
+      int columns = bitmap->columns();
+      int nbytes = (columns+7)/8*rows+1;
+      int nrows = rows;
+      int nstrings=0;
+      if (nbytes>(int)ps_string_size)   //max string length
+      {
+        nrows=ps_string_size/((columns+7)/8);
+        nbytes=(columns+7)/8*nrows+1;
+      }
+      unsigned char *s_start;
+      GPBuffer<unsigned char> gs_start(s_start,nbytes);
+      unsigned char *s_ascii;
+      GPBuffer<unsigned char> gs_ascii(s_ascii,nbytes*2);
+      write(str,"/%d {",current_shape);
+
+      unsigned char *s = s_start;
+      for(int current_row=0; current_row<rows; current_row++)
+      {  
+        unsigned char * row_bits = (*bitmap)[current_row];
+        unsigned char acc = 0;
+        unsigned char mask = 0;
+        for(int current_col=0; current_col<columns; current_col++)
+        {
+          if (mask == 0)
+            mask = 0x80;
+          if (row_bits[current_col])
+            acc |= mask;
+          mask >>= 1;
+          if (mask == 0)
+          {
+            *s=acc;
+            s++;
+            acc = mask = 0;
+          }
+        }
+        if (mask != 0)
+        {
+          *s=acc;
+          s++;
+        }
+        if (!((current_row+1)%nrows))
+        {
+          unsigned char *stop_ascii = ASCII85_encode(s_ascii,s_start,s); 
+          *stop_ascii++='\0';
+          write(str,"<~%s~> ",s_ascii);
+          s=s_start;
+          nstrings++;
+        }
+      }
+      if (s!=s_start)
+      {
+        unsigned char *stop_ascii = ASCII85_encode(s_ascii,s_start,s);
+        *stop_ascii++='\0';
+        write(str,"<~%s~> ",s_ascii);
+          nstrings++;
+      }
+      if (nstrings==1)
+        write(str," %d %d g} def\n", columns, rows);                  
+      else
+        write(str," %d %d %d gn} def\n", columns, rows,nstrings);
+    }
+  }
+  write(str, 
+    "end\n"
+    "/BuildGlyph {\n"
+    "  exch /CharStrings get exch\n"
+    "  2 copy known not\n"
+    "  {pop /.notdef} if\n"
+    "  get exec \n"
+    "} bind def\n"
+    "end\n"
+    "/LocalDjVuFont $DjVuLocalFont definefont pop\n"
+    "/LocalDjVuFont findfont setfont\n" );
+  write(str,
+    "-%d -%d translate\n"
+    "0 0 moveto\n",
+    prn_rect.xmin, prn_rect.ymin);
+  // Print the foreground layer
+  if (dimg->get_fgpm() && !(options.get_mode()==Options::BW)) 
+    print_fg_3layer(str, dimg, prn_rect, blit_list);
+  else
+    print_fg_2layer(str, dimg, prn_rect, blit_list);        
+  write(str, "/LocalDjVuFont undefinefont grestore\n");
+}
+
+
+void 
+DjVuToPS::
+print_bg(ByteStream &str, 
+         GP<DjVuImage> dimg,
+         const GRect &cprn_rect)
+{
+  GP<GPixmap> pm;
+  GRect prn_rect;
+  double print_done = 0;
+  int red = 0;
+  write(str, "%% --- now doing the background\n");
+  if (! (red = get_bg_red(dimg)))
+    return;
+  write(str, 
+        "gsave -%d -%d translate\n"
+        "/bgred %d def bgred bgred scale\n",
+        cprn_rect.xmin % red, 
+        cprn_rect.ymin % red, 
+        red);
+  prn_rect.ymin = (cprn_rect.ymin)/red;
+  prn_rect.ymax = (cprn_rect.ymax+red-1)/red;
+  prn_rect.xmin = (cprn_rect.xmin)/red;
+  prn_rect.xmax = (cprn_rect.xmax+red-1)/red;
+  // Display image
+  int band_bytes = 125000;
+  int band_height = band_bytes/prn_rect.width();
+  int buffer_size = band_height*prn_rect.width();
+  int ps_chunk_height = 30960/prn_rect.width()+1;
+  buffer_size = buffer_size*23/10;
+  bool do_color = options.get_color();
+  if ((!dimg->is_legal_photo() &&
+       !dimg->is_legal_compound())
+      || options.get_mode()==Options::BW)
+    do_color = false;
+  if (do_color) 
+    buffer_size *= 3;
+  if (do_color)
+    write(str, 
+          "/bufferR %d string def\n"
+          "/bufferG %d string def\n"
+          "/bufferB %d string def\n"
+          "DjVuColorSpace setcolorspace\n"
+          "<< /ImageType 1\n"
+          "   /Width %d\n"
+          "   /Height %d\n"
+          "   /BitsPerComponent 8\n"
+          "   /Decode [0 1 0 1 0 1]\n"
+          "   /ImageMatrix [1 0 0 1 0 0]\n"
+          "   /MultipleDataSources true\n"
+          "   /DataSource [ { ReadR } { ReadG } { ReadB } ]\n"
+          "   /Interpolate false >> image\n",
+          ps_chunk_height*prn_rect.width(),
+          ps_chunk_height*prn_rect.width(),
+          ps_chunk_height*prn_rect.width(),
+          prn_rect.width(), prn_rect.height());
+  else
+    write(str, 
+          "DjVuColorSpace setcolorspace\n"
+          "<< /ImageType 1\n"
+          "   /Width %d\n"
+          "   /Height %d\n"
+          "   /BitsPerComponent 8\n"
+          "   /Decode [0 1]\n"
+          "   /ImageMatrix [1 0 0 1 0 0]\n"
+          "   /DataSource currentfile /ASCII85Decode\n"
+          "      filter /RunLengthDecode filter\n"
+          "   /Interpolate false >> image\n",
+          prn_rect.width(), prn_rect.height());
+  
+  unsigned char *buffer;
+  GPBuffer<unsigned char> gbuffer(buffer,buffer_size);
+  unsigned char *rle_in;
+  GPBuffer<unsigned char> grle_in(rle_in,ps_chunk_height*prn_rect.width());
+  unsigned char *rle_out;
+  GPBuffer<unsigned char> grle_out(rle_out,2*ps_chunk_height*prn_rect.width());
+  {
+    // Start storing image in bands
+    unsigned char * rle_out_end = rle_out;
+    GRect grectBand = prn_rect;
+    grectBand.ymax = grectBand.ymin;
+    while(grectBand.ymax < prn_rect.ymax)
+      {
+        GP<GPixmap> pm = 0;
+        // Compute next band
+        grectBand.ymin=grectBand.ymax;
+        grectBand.ymax=grectBand.ymin+band_bytes/grectBand.width();
+        if (grectBand.ymax>prn_rect.ymax)
+          grectBand.ymax=prn_rect.ymax;
+        pm = get_bg_pixmap(dimg, grectBand);
+        unsigned char *buf_ptr = buffer;
+        if (pm)
+          {
+            if (do_color)
+              {
+                int y=0;
+                while(y<grectBand.height())
+                  {
+                    int row, y1;
+                    unsigned char *ptr, *ptr1;
+                    // Doing R component of current chunk
+                    for (row=0,ptr=rle_in,y1=y; 
+                         row<ps_chunk_height && y1<grectBand.height(); 
+                         row++,y1++)
+                      {
+                        GPixel *pix = (*pm)[y1];
+                        for (int x=grectBand.width(); x>0; x--,pix++)
+                          *ptr++ = ramp[pix->r];
+                      }
+                    ptr1 = RLE_encode(rle_out, rle_in, ptr); 
+                    *ptr1++ = 0x80;
+                    buf_ptr = ASCII85_encode(buf_ptr, rle_out, ptr1);
+                    *buf_ptr++ = '~'; *buf_ptr++ = '>'; *buf_ptr++ = '\n';
+                    // Doing G component of current chunk
+                    for (row=0,ptr=rle_in,y1=y; 
+                         row<ps_chunk_height && y1<grectBand.height(); 
+                         row++,y1++)
+                      {
+                        GPixel *pix = (*pm)[y1];
+                        for (int x=grectBand.width(); x>0; x--,pix++)
+                          *ptr++ = ramp[pix->g];
+                      }
+                    ptr1 = RLE_encode(rle_out, rle_in, ptr); 
+                    *ptr1++ = 0x80;
+                    buf_ptr = ASCII85_encode(buf_ptr, rle_out, ptr1);
+                    *buf_ptr++ = '~'; 
+                    *buf_ptr++ = '>'; 
+                    *buf_ptr++ = '\n';
+                    // Doing B component of current chunk
+                    for (row=0, ptr=rle_in, y1=y;
+                         row<ps_chunk_height && y1<grectBand.height(); 
+                         row++,y1++)
+                      {
+                        GPixel *pix = (*pm)[y1];
+                        for (int x=grectBand.width(); x>0; x--,pix++)
+                          *ptr++ = ramp[pix->b];
+                      }
+                    ptr1 = RLE_encode(rle_out, rle_in, ptr);
+                    *ptr1++ = 0x80;
+                    buf_ptr = ASCII85_encode(buf_ptr, rle_out, ptr1);
+                    *buf_ptr++ = '~'; 
+                    *buf_ptr++ = '>'; 
+                    *buf_ptr++ = '\n';
+                    y=y1;
+                    if (refresh_cb) 
+                      refresh_cb(refresh_cl_data);
+                  } //while (y>=0)
+              } 
+            else
+              {
+                // Don't use color
+                int y=0;
+                while(y<grectBand.height())
+                  {
+                    unsigned char *ptr = rle_in;
+                    for(int row=0; 
+                        row<ps_chunk_height && y<grectBand.height(); 
+                        row++,y++)
+                      {
+                        GPixel *pix = (*pm)[y];
+                        for (int x=grectBand.width(); x>0; x--,pix++)
+                          *ptr++ = ramp[GRAY(pix->r,pix->g,pix->b)];
+                      }
+                    rle_out_end = RLE_encode(rle_out_end, rle_in, ptr);
+                    unsigned char *encode_to 
+                      = rle_out+(rle_out_end-rle_out)/4*4;
+                    int bytes_left = rle_out_end-encode_to;
+                    buf_ptr = ASCII85_encode(buf_ptr, rle_out, encode_to);
+                    *buf_ptr++ = '\n';
+                    memcpy(rle_out, encode_to, bytes_left);
+                    rle_out_end = rle_out+bytes_left;
+                    if (refresh_cb) 
+                      refresh_cb(refresh_cl_data);
+                  }
+              }
+          } // if (pm)
+        str.writall(buffer, buf_ptr-buffer);
+        if (prn_progress_cb)
+          {
+            double done=(double)(grectBand.ymax 
+                                 - prn_rect.ymin)/prn_rect.height();
+            if ((int) (20*print_done)!=(int) (20*done))
+              {
+                print_done=done;
+                prn_progress_cb(done, prn_progress_cl_data);
+              }
+          }
+      } // while(grectBand.yax<grect.ymax)
+    if (! do_color)
+      {
+        unsigned char * buf_ptr = buffer;
+        *rle_out_end++ = 0x80;
+        buf_ptr = ASCII85_encode(buf_ptr, rle_out, rle_out_end);
+        *buf_ptr++='~'; 
+        *buf_ptr++='>'; 
+        *buf_ptr++='\n';
+        str.writall(buffer, buf_ptr-buffer);
+      }
+  } 
+  //restore the scaling
+  write(str, "grestore\n");
+}
+
+void
+DjVuToPS::
+print_image_lev1(ByteStream &str, 
+                 GP<DjVuImage> dimg,
+                 const GRect &prn_rect)
+{         
+  double print_done=0;
+  GRect all(0,0, dimg->get_width(),dimg->get_height());
+  GP<GPixmap> pm;
+  GP<GBitmap> bm;
+  GRect test(0,0,1,1);
+  if (options.get_mode() == Options::FORE)
+    pm = dimg->get_fg_pixmap(test, all);
+  else if (options.get_mode() == Options::BACK)
+    pm = dimg->get_bg_pixmap(test, all);
+  else if (options.get_mode() != Options::BW)
+    pm = dimg->get_pixmap(test, all);
+  if (! pm)
+    bm = dimg->get_bitmap(test,all);
+  if (! pm && ! bm)
+    return;
+  write(str,
+        "%% --- now doing a level 1 image\n"
+        "gsave\n");
+  // Display image
+  int band_bytes=125000;
+  int band_height = band_bytes/prn_rect.width();
+  int buffer_size = band_height*prn_rect.width();
+  buffer_size = buffer_size*21/10;
+  bool do_color = false;
+  bool do_color_or_gray = false;
+  if (pm && (options.get_mode() != Options::BW))
+    do_color_or_gray = true;
+  if (do_color_or_gray && options.get_color())
+    do_color = true;
+  if (do_color) 
+    buffer_size *= 3;
+  if (do_color)
+    write(str, "/buffer24 %d string def\n", 3*prn_rect.width());
+  if (do_color_or_gray)
+    write(str, "/buffer8 %d string def\n", prn_rect.width());
+  else
+    write(str, "/buffer8 %d string def\n", (prn_rect.width()+7)/8);
+  if (do_color)
+    {
+      write(str,
+            "%d %d 8 [ 1 0 0 1 0 0 ]\n"
+            "{ ColorProc } false 3 ColorImage\n",
+            prn_rect.width(), prn_rect.height());
+    } 
+  else if (do_color_or_gray)
+    {
+      write(str,
+            "%d %d 8 [ 1 0 0 1 0 0 ]\n"
+            "{ currentfile buffer8 readhexstring pop } image\n",
+            prn_rect.width(), prn_rect.height());
+    } 
+  else
+    {
+      write(str,
+            "%d %d 1 [ 1 0 0 1 0 0 ]\n"
+            "{ currentfile buffer8 readhexstring pop } image\n",
+            prn_rect.width(), prn_rect.height());
+    }
+  unsigned char * buffer;
+  GPBuffer<unsigned char> gbuffer(buffer,buffer_size);
+    {
+      // Start storing image in bands
+      GRect grectBand = prn_rect;
+      grectBand.ymax = grectBand.ymin;
+      while(grectBand.ymax < prn_rect.ymax)
+        {
+          // Compute next band
+          grectBand.ymin = grectBand.ymax;
+          grectBand.ymax = grectBand.ymin+band_bytes/grectBand.width();
+          if (grectBand.ymax > prn_rect.ymax)
+            grectBand.ymax = prn_rect.ymax;
+          GRect all(0,0, dimg->get_width(),dimg->get_height());
+          pm = 0;
+          bm = 0;
+          if (do_color_or_gray)
+            {
+              if (options.get_mode() == Options::FORE)
+                pm = dimg->get_fg_pixmap(grectBand, all);
+              else if (options.get_mode() == Options::BACK)
+                pm = dimg->get_bg_pixmap(grectBand, all);
+              else
+                pm = dimg->get_pixmap(grectBand, all);
+            }
+          else 
+            {
+              bm = dimg->get_bitmap(grectBand, all);
+            }
+          // Store next band
+          unsigned char *buf_ptr = buffer;
+          int symbols=0;
+          for (int y=0; y<grectBand.height(); y++)
+            {
+              if (pm && do_color_or_gray)
+                {
+                  GPixel *pix = (*pm)[y];
+                  for (int x=grectBand.width(); x>0; x--, pix++)
+                    {
+                      if (do_color)
+                        {
+                          char *data;
+                          data = bin2hex[ramp[pix->r]];
+                          *buf_ptr++ = data[0];
+                          *buf_ptr++ = data[1];
+                          data = bin2hex[ramp[pix->g]];
+                          *buf_ptr++ = data[0];
+                          *buf_ptr++ = data[1];
+                          data = bin2hex[ramp[pix->b]];
+                          *buf_ptr++ = data[0];
+                          *buf_ptr++ = data[1];
+                          symbols += 6;
+                        }
+                      else
+                        {
+                          char *data;
+                          data = bin2hex[ramp[GRAY(pix->r,pix->g,pix->b)]];
+                          *buf_ptr++ = data[0];
+                          *buf_ptr++ = data[1];
+                          symbols += 2;
+                        }
+                      if (symbols>70) 
+                        { 
+                          *buf_ptr++ = '\n'; 
+                          symbols=0; 
+                        }
+                    }
+                }
+              else if (bm)
+                {
+                  unsigned char *pix = (*bm)[y];
+                  unsigned char acc = 0;
+                  unsigned char mask = 0;
+                  char *data;
+                  for (int x=grectBand.width(); x>0; x--, pix++)
+                    {
+                      if (mask == 0)
+                        mask = 0x80;
+                      if (! *pix)
+                        acc |= mask;
+                      mask >>= 1;
+                      if (mask == 0)
+                        {
+                          data = bin2hex[acc];
+                          acc = 0;
+                          *buf_ptr++ = data[0];
+                          *buf_ptr++ = data[1];
+                          symbols += 2;
+                          if (symbols>70) 
+                            { 
+                              *buf_ptr++ = '\n'; 
+                              symbols = 0; 
+                            }
+                        }
+                    }
+                  if (mask != 0) 
+                    {
+                      data = bin2hex[acc];
+                      *buf_ptr++ = data[0];
+                      *buf_ptr++ = data[1];
+                      symbols += 2;
+                    }
+                }
+              if (refresh_cb) 
+                refresh_cb(refresh_cl_data);
+            }
+          str.writall(buffer, buf_ptr-buffer);
+          if (prn_progress_cb)
+            {
+              double done=(double) (grectBand.ymax 
+                                    - prn_rect.ymin)/prn_rect.height();
+              if ((int) (20*print_done)!=(int) (20*done))
+                {
+                  print_done=done;
+                  prn_progress_cb(done, prn_progress_cl_data);
+                }
+            }
+        }
+      write(str, "\n");
+    } 
+  write(str, "grestore\n");
+}
+
+void
+DjVuToPS::
+print_image_lev2(ByteStream &str, 
+                 GP<DjVuImage> dimg,
+                 const GRect &prn_rect)
+{         
+  double print_done=0;
+  GRect all(0,0, dimg->get_width(),dimg->get_height());
+  GP<GPixmap> pm;
+  GRect test(0,0,1,1);
+  if (options.get_mode() == Options::FORE)
+    pm = dimg->get_fg_pixmap(test, all);
+  else if (options.get_mode() == Options::BACK)
+    pm = dimg->get_bg_pixmap(test, all);
+  else if (options.get_mode() != Options::BW)
+    pm = dimg->get_pixmap(test, all);
+  if (! pm)
+    return;
+  write(str,
+        "%% --- now doing a level 2 image\n"
+        "gsave\n");
+  // Display image
+  int band_bytes=125000;
+  int band_height = band_bytes/prn_rect.width();
+  int buffer_size = band_height*prn_rect.width();
+  int ps_chunk_height = 30960/prn_rect.width()+1;
+  buffer_size = buffer_size*21/10 + 32;
+  bool do_color = options.get_color();
+  if (do_color)
+    {
+      buffer_size *= 3;
+      write(str, 
+            "/bufferR %d string def\n"
+            "/bufferG %d string def\n"
+            "/bufferB %d string def\n"
+            "DjVuColorSpace setcolorspace\n"
+            "<< /ImageType 1\n"
+            "   /Width %d\n"
+            "   /Height %d\n"
+            "   /BitsPerComponent 8\n"
+            "   /Decode [0 1 0 1 0 1]\n"
+            "   /ImageMatrix [1 0 0 1 0 0]\n"
+            "   /MultipleDataSources true\n"
+            "   /DataSource [ { ReadR } { ReadG } { ReadB } ]\n"
+            "   /Interpolate false >> image\n",
+            ps_chunk_height*prn_rect.width(),
+            ps_chunk_height*prn_rect.width(),
+            ps_chunk_height*prn_rect.width(),
+            prn_rect.width(), prn_rect.height());
+    } 
+  else
+    {
+      write(str, 
+            "DjVuColorSpace setcolorspace\n"
+            "<< /ImageType 1\n"
+            "   /Width %d\n"
+            "   /Height %d\n"
+            "   /BitsPerComponent 8\n"
+            "   /Decode [0 1]\n"
+            "   /ImageMatrix [1 0 0 1 0 0]\n"
+            "   /DataSource currentfile /ASCII85Decode\n"
+            "       filter /RunLengthDecode filter\n"
+            "   /Interpolate false >> image\n",
+            prn_rect.width(), prn_rect.height());
+    } 
+  unsigned char *buffer;
+  GPBuffer<unsigned char> gbuffer(buffer,buffer_size);
+  unsigned char *rle_in;
+  GPBuffer<unsigned char> grle_in(rle_in,ps_chunk_height*prn_rect.width());
+  unsigned char *rle_out;
+  GPBuffer<unsigned char> grle_out(rle_out,2*ps_chunk_height*prn_rect.width());
+    {
+      // Start storing image in bands
+      unsigned char * rle_out_end = rle_out;
+      GRect grectBand = prn_rect;
+      grectBand.ymax = grectBand.ymin;
+      while(grectBand.ymax < prn_rect.ymax)
+        {
+          // Compute next band
+          grectBand.ymin = grectBand.ymax;
+          grectBand.ymax = grectBand.ymin+band_bytes/grectBand.width();
+          if (grectBand.ymax > prn_rect.ymax)
+            grectBand.ymax = prn_rect.ymax;
+          GRect all(0,0, dimg->get_width(),dimg->get_height());
+          pm = 0;
+          if (options.get_mode() == Options::FORE)
+            pm = dimg->get_fg_pixmap(grectBand, all);
+          else if (options.get_mode() == Options::BACK)
+            pm = dimg->get_bg_pixmap(grectBand, all);
+          else
+            pm = dimg->get_pixmap(grectBand, all);
+          // Store next band
+          unsigned char *buf_ptr = buffer;
+          if (do_color && pm)
+            {
+              int y=0;
+              while(y<grectBand.height())
+                {
+                  int row, y1;
+                  unsigned char *ptr, *ptr1;
+                  // Doing R component of current chunk
+                  for (row=0,ptr=rle_in,y1=y; 
+                       row<ps_chunk_height && y1<grectBand.height(); 
+                       row++,y1++)
+                    {
+                      GPixel *pix = (*pm)[y1];
+                      for (int x=grectBand.width(); x>0; x--,pix++)
+                        *ptr++ = ramp[pix->r];
+                    }
+                  ptr1 = RLE_encode(rle_out, rle_in, ptr); 
+                  *ptr1++ = 0x80;
+                  buf_ptr = ASCII85_encode(buf_ptr, rle_out, ptr1);
+                  *buf_ptr++ = '~'; *buf_ptr++ = '>'; *buf_ptr++ = '\n';
+                  // Doing G component of current chunk
+                  for (row=0,ptr=rle_in,y1=y; 
+                       row<ps_chunk_height && y1<grectBand.height(); 
+                       row++,y1++)
+                    {
+                      GPixel *pix = (*pm)[y1];
+                      for (int x=grectBand.width(); x>0; x--,pix++)
+                        *ptr++ = ramp[pix->g];
+                    }
+                  ptr1 = RLE_encode(rle_out, rle_in, ptr); 
+                  *ptr1++ = 0x80;
+                  buf_ptr = ASCII85_encode(buf_ptr, rle_out, ptr1);
+                  *buf_ptr++ = '~'; 
+                  *buf_ptr++ = '>'; 
+                  *buf_ptr++ = '\n';
+                  // Doing B component of current chunk
+                  for (row=0, ptr=rle_in, y1=y;
+                       row<ps_chunk_height && y1<grectBand.height(); 
+                       row++,y1++)
+                    {
+                      GPixel *pix = (*pm)[y1];
+                      for (int x=grectBand.width(); x>0; x--,pix++)
+                        *ptr++ = ramp[pix->b];
+                    }
+                  ptr1 = RLE_encode(rle_out, rle_in, ptr);
+                  *ptr1++ = 0x80;
+                  buf_ptr = ASCII85_encode(buf_ptr, rle_out, ptr1);
+                  *buf_ptr++ = '~'; 
+                  *buf_ptr++ = '>'; 
+                  *buf_ptr++ = '\n';
+                  y=y1;
+                  if (refresh_cb) 
+                    refresh_cb(refresh_cl_data);
+                } //while (y>=0)
+            } 
+          else if (pm)
+            {
+              // Don't use color
+              int y=0;
+              while(y<grectBand.height())
+                {
+                  unsigned char *ptr = rle_in;
+                  for(int row=0;
+                      row<ps_chunk_height && y<grectBand.height(); 
+                      row++,y++)
+                    {
+                      GPixel *pix = (*pm)[y];
+                      for (int x=grectBand.width(); x>0; x--,pix++)
+                        *ptr++ = ramp[GRAY(pix->r,pix->g,pix->b)];
+                    }
+                  rle_out_end = RLE_encode(rle_out_end, rle_in, ptr);
+                  unsigned char *encode_to = rle_out 
+                    + (rle_out_end-rle_out)/4*4;
+                  int bytes_left = rle_out_end-encode_to;
+                  buf_ptr = ASCII85_encode(buf_ptr, rle_out, encode_to);
+                  *buf_ptr++ = '\n';
+                  memcpy(rle_out, encode_to, bytes_left);
+                  rle_out_end = rle_out+bytes_left;
+                  if (refresh_cb) 
+                    refresh_cb(refresh_cl_data);
+                }
+              if (grectBand.ymax >= prn_rect.ymax)
+                {
+                  *rle_out_end++ = 0x80; // Add EOF marker
+                  buf_ptr = ASCII85_encode(buf_ptr, rle_out, rle_out_end);
+                  *buf_ptr++ = '~'; 
+                  *buf_ptr++ = '>'; 
+                  *buf_ptr++ = '\n';
+                }
+            }
+          str.writall(buffer, buf_ptr-buffer);
+          if (prn_progress_cb)
+            {
+              double done=(double) (grectBand.ymax
+                                    - prn_rect.ymin)/prn_rect.height();
+              if ((int) (20*print_done)!=(int) (20*done))
+                {
+                  print_done=done;
+                  prn_progress_cb(done, prn_progress_cl_data);
+                }
+            }
+        }
+      write(str, "\n");
+    } 
+  write(str, "grestore\n");
+}
+
+static void 
+get_anno_sub(IFFByteStream &iff, IFFByteStream &out)
+{
+  GUTF8String chkid;
+  while (iff.get_chunk(chkid))
+    {
+      if (iff.composite())
+        get_anno_sub(iff, out);
+      else if (chkid == "ANTa" || chkid == "ANTz" ||
+               chkid == "TXTa" || chkid == "TXTz"   )
+        {
+          out.put_chunk(chkid);
+          out.copy(*iff.get_bytestream());
+          out.close_chunk();
+        }
+      iff.close_chunk();
+    }
+}
+
+static GP<ByteStream>
+get_anno(GP<DjVuFile> f)
+{
+  if (! f->anno) 
+    {
+      GP<ByteStream> bs = f->get_init_data_pool()->get_stream();
+      GP<ByteStream> anno = ByteStream::create();
+      GP<IFFByteStream> in = IFFByteStream::create(bs);
+      GP<IFFByteStream> out = IFFByteStream::create(anno);
+      get_anno_sub(*in, *out);
+      f->anno = anno;
+    }
+  f->anno->seek(0);
+  return f->anno;
+}
+
+static GP<DjVuTXT>
+get_text(GP<DjVuFile> file)
+{ 
+  GUTF8String chkid;
+  GP<IFFByteStream> iff = IFFByteStream::create(get_anno(file));
+  while (iff->get_chunk(chkid))
+    {
+      if (chkid == "TXTa") 
+        {
+          GP<DjVuTXT> txt = DjVuTXT::create();
+          txt->decode(iff->get_bytestream());
+          return txt;
+        }
+      else if (chkid == "TXTz") 
+        {
+          GP<DjVuTXT> txt = DjVuTXT::create();
+          GP<ByteStream> bsiff = BSByteStream::create(iff->get_bytestream());
+          txt->decode(bsiff);
+          return txt;
+        }
+      iff->close_chunk();
+    }
+  return 0;
+}
+
+static void
+print_ps_string(const char *data, int length, ByteStream &out)
+{
+  while (*data && length>0) 
+    {
+      int span = 0;
+      while (span<length && data[span]>=0x20 && data[span]<0x7f 
+             && data[span]!='(' && data[span]!=')' && data[span]!='\\' )
+        span++;
+      if (span > 0) 
+        {
+          out.write(data, span);
+          data += span;
+          length -= span;
+        }
+      else
+        {
+          char buffer[5];
+          sprintf(buffer,"\\%03o", *(unsigned char*)data);
+          out.write(buffer,4);
+          data += 1;
+          length -= 1;
+        }
+    }
+}
+
+static void
+print_txt_sub(DjVuTXT &txt, DjVuTXT::Zone &zone, 
+              ByteStream &out,int &lastx,int &lasty)
+{
+  // Get separator
+  char separator = 0;
+  switch(zone.ztype)
+    {
+    case DjVuTXT::COLUMN: 
+      separator = DjVuTXT::end_of_column; break;
+    case DjVuTXT::REGION: 
+      separator = DjVuTXT::end_of_region; break;
+    case DjVuTXT::PARAGRAPH: 
+      separator = DjVuTXT::end_of_paragraph; break;
+    case DjVuTXT::LINE: 
+      separator = DjVuTXT::end_of_line; break;
+    case DjVuTXT::WORD: 
+      separator = ' '; break;
+    default:
+      separator = 0; break;
+    }
+  // Zone children
+  if (zone.children.isempty()) 
+    {
+      const char *data = (const char*)txt.textUTF8 + zone.text_start;
+      int length = zone.text_length;
+      if (data[length-1] == separator)
+        length -= 1;
+      out.write("( ",2);
+      print_ps_string(data,length,out);
+      out.write(")",1);
+      GUTF8String message;
+      int tmpx= zone.rect.xmin-lastx;
+      int tmpy= zone.rect.ymin-lasty;
+      message.format(" %d %d S \n", tmpx, tmpy);
+      lastx=zone.rect.xmin;
+      lasty=zone.rect.ymin;
+      out.write((const char*)message, message.length());
+    }
+  else
+    {
+      if (zone.ztype==DjVuTXT::LINE)
+        {
+          GUTF8String message;
+          message.format("%d F\n",zone.rect.ymax-zone.rect.ymin);
+          out.write((const char*)message,message.length());
+        }
+      for (GPosition pos=zone.children; pos; ++pos)
+        print_txt_sub(txt, zone.children[pos], out,lastx,lasty);
+    }
+}
+
+static void
+print_txt(GP<DjVuTXT> txt, 
+          ByteStream &out )
+{
+  if (txt)
+    {
+      int lastx=0;
+      int lasty=0;
+      GUTF8String message = 
+        "%% -- now doing hidden text\n"
+        "gsave -1 -1 0 0 clip 0 0 moveto\n";
+      out.write((const char*)message,message.length());
+      print_txt_sub(*txt, txt->page_zone, out,lastx,lasty);
+      message = 
+        "grestore \n";
+      out.write((const char*)message,message.length());
+    }
+}
+
+void
+DjVuToPS::
+print_image(ByteStream &str, 
+            GP<DjVuImage> dimg,
+            const GRect &prn_rect, 
+            GP<DjVuTXT> txt)
+{
+  /* Just outputs the specified image. The function assumes, that
+     all add-ons (like {\em document setup}, {\em page setup}) are
+     already there. It will just output the image. Since
+     output of this function will generate PostScript errors when
+     used without output of auxiliary functions, it should be
+     used carefully. */
+  DEBUG_MSG("DjVuToPS::print_image(): Printing DjVuImage to a stream\n");
+  DEBUG_MAKE_INDENT(3);
+  if (!dimg)
+    G_THROW(ERR_MSG("DjVuToPS.empty_image"));
+  if (prn_rect.isempty())
+    G_THROW(ERR_MSG("DjVuToPS.empty_rect"));
+  if (prn_progress_cb)
+    prn_progress_cb(0, prn_progress_cl_data);
+  // Compute information for chosen display mode
+  print_txt(txt, str);
+  make_gamma_ramp(dimg);
+  if (options.get_level() < 2)
+    {
+      print_image_lev1(str, dimg, prn_rect);
+    }
+  else if (options.get_level() < 3 && dimg->get_fgpm())
+    {
+      switch(options.get_mode())
+        {
+        case Options::COLOR:
+        case Options::FORE:
+          print_image_lev2(str, dimg, prn_rect);
+          break;
+        case Options::BW:
+          print_fg(str, dimg, prn_rect);
+          break;
+        case Options::BACK:
+          print_bg(str, dimg, prn_rect);
+          break;
+        }
+    }
+  else 
+    {
+      switch(options.get_mode())
+        {
+        case Options::COLOR:
+          print_bg(str, dimg, prn_rect);
+          print_fg(str, dimg, prn_rect);
+          break;
+        case Options::FORE:
+        case Options::BW:
+          print_fg(str, dimg, prn_rect);
+          break;
+        case Options::BACK:
+          print_bg(str, dimg, prn_rect);
+          break;
+        }
+    }
+  if (prn_progress_cb)
+    prn_progress_cb(1, prn_progress_cl_data);
+}
+
+
+
+
+// ***********************************************************************
+// ******* PUBLIC FUNCTION FOR PRINTING A SINGLE PAGE ********************
+// ***********************************************************************
+
+
+
+
+void
+DjVuToPS::
+print(ByteStream &str, 
+      GP<DjVuImage> dimg,
+      const GRect &prn_rect_in, 
+      const GRect &img_rect,
+      int override_dpi)
+{
+  DEBUG_MSG("DjVuToPS::print(): Printing DjVu page to a stream\n");
+  DEBUG_MAKE_INDENT(3);
+  GRect prn_rect;
+  prn_rect.intersect(prn_rect_in, img_rect);
+  DEBUG_MSG("prn_rect=(" << prn_rect.xmin << ", " << prn_rect.ymin << ", " <<
+            prn_rect.width() << ", " << prn_rect.height() << ")\n");
+  DEBUG_MSG("img_rect=(" << img_rect.xmin << ", " << img_rect.ymin << ", " <<
+            img_rect.width() << ", " << img_rect.height() << ")\n");
+  if (!dimg)
+    G_THROW(ERR_MSG("DjVuToPS.empty_image"));
+  if (prn_rect.isempty())
+    G_THROW(ERR_MSG("DjVuToPS.empty_rect"));
+  if (img_rect.isempty())
+    G_THROW(ERR_MSG("DjVuToPS.bad_scale"));
+  GRectMapper mapper;
+  mapper.set_input(img_rect);
+  GRect full_rect(0, 0, dimg->get_width(), dimg->get_height());
+  mapper.set_output(full_rect);
+  mapper.map(prn_rect);
+  int image_dpi =  dimg->get_dpi();
+  if (override_dpi>0) 
+    image_dpi = override_dpi;
+  if (image_dpi <= 0) 
+    image_dpi = 300;
+  store_doc_prolog(str, 1, (int)(image_dpi), &prn_rect);
+  store_doc_setup(str);
+  write(str,"%%%%Page: 1 1\n");
+  store_page_setup(str, (int)(image_dpi), prn_rect);
+  print_image(str, dimg, prn_rect, 0);
+  store_page_trailer(str);
+  write(str,"showpage\n");
+  store_doc_trailer(str);
+}
+
+
+
+
+// ***********************************************************************
+// *************************** DOCUMENT LEVEL ****************************
+// ***********************************************************************
+
+
+void
+DjVuToPS::
+parse_range(GP<DjVuDocument> doc, 
+             GUTF8String page_range, 
+             GList<int> &pages_todo)
+{
+  int doc_pages = doc->get_pages_num();
+  if (!page_range.length())
+    page_range.format("1-%d", doc_pages);
+  DEBUG_MSG("page_range='" << (const char *)page_range << "'\n");
+  int spec = 0;
+  int both = 1;
+  int start_page = 1;
+  int end_page = doc_pages;
+  const char *q = (const char*)page_range;
+  char *p = (char*)q;
+  while (*p)
+    {
+      while (*p==' ')
+        p += 1;
+      if (! *p)
+        break;
+      if (*p>='0' && *p<='9') 
+        {
+          end_page = strtol(p, &p, 10);
+          spec = 1;
+        } 
+      else if (*p=='$') 
+        {
+          spec = 1;
+          end_page = doc_pages;
+          p += 1;
+        } 
+      else if (both) 
+        {
+          end_page = 1;
+        } 
+      else 
+        {
+          end_page = doc_pages;
+        }
+      while (*p==' ')
+        p += 1;
+      if (both)
+        {
+          start_page = end_page;
+          if (*p == '-') 
+            {
+              p += 1;
+              both = 0;
+              continue;
+            }
+        }
+      both = 1;
+      while (*p==' ')
+        p += 1;
+      if (*p && *p != ',')
+        G_THROW(ERR_MSG("DjVuToPS.bad_range") 
+                + GUTF8String("\t") + GUTF8String(p) );
+      if (*p == ',')
+        p += 1;
+      if (! spec)
+        G_THROW(ERR_MSG("DjVuToPS.bad_range") 
+                + GUTF8String("\t") + page_range );
+      spec = 0;
+      if (end_page < 0)
+        end_page = 0;
+      if (start_page < 0)
+        start_page = 0;
+      if (end_page > doc_pages)
+        end_page = doc_pages;
+      if (start_page > doc_pages)
+        start_page = doc_pages;
+      if (start_page <= end_page)
+        for(int page_num=start_page; page_num<=end_page; page_num++)
+          pages_todo.append(page_num-1);
+      else
+        for(int page_num=start_page; page_num>=end_page; page_num--)
+          pages_todo.append(page_num-1);
+    }
+}
+
+class DjVuToPS::DecodePort : public DjVuPort
+{
+protected:
+  DecodePort(void);
+public:
+  static GP<DecodePort> create(void);
+  GEvent decode_event;
+  bool decode_event_received;
+  double decode_done;
+  GURL decode_page_url;
+  virtual void notify_file_flags_changed(const DjVuFile*,long,long);
+  virtual void notify_decode_progress(const DjVuPort*,float);
+};
+
+DjVuToPS::DecodePort::
+DecodePort(void)
+  : decode_event_received(false),
+    decode_done((double)0) 
+{
+}
+
+GP<DjVuToPS::DecodePort> 
+DjVuToPS::DecodePort::
+create(void)
+{
+  return new DecodePort;
+}
+
+void 
+DjVuToPS::DecodePort::
+notify_file_flags_changed(const DjVuFile *source, 
+                          long set_mask, long clr_mask)
+{
+  // WARNING! This function is called from another thread
+  if (set_mask & (DjVuFile::DECODE_OK | 
+                  DjVuFile::DECODE_FAILED | 
+                  DjVuFile::DECODE_STOPPED ))
+    {
+      if (source->get_url() == decode_page_url)
+        {
+          decode_event_received=true;
+          decode_event.set();
+        }
+    }
+}
+
+void 
+DjVuToPS::DecodePort::
+notify_decode_progress(const DjVuPort *source, float done)
+{
+  // WARNING! This function is called from another thread
+  if (source->inherits("DjVuFile"))
+    {
+      DjVuFile * file=(DjVuFile *) source;
+      if (file->get_url()==decode_page_url)
+        if ((int) (decode_done*20)!=(int) (done*20))
+          {
+            decode_done=done;
+            decode_event_received=true;
+            decode_event.set();
+          }
+    }
+}
+
+void 
+DjVuToPS::
+set_refresh_cb(void (*_refresh_cb)(void*), void *_refresh_cl_data)
+{
+  refresh_cb = _refresh_cb;
+  refresh_cl_data = _refresh_cl_data;
+}
+
+void 
+DjVuToPS::
+set_prn_progress_cb(void (*_prn_progress_cb)(double, void *),
+                    void *_prn_progress_cl_data)
+{
+  prn_progress_cb=_prn_progress_cb;
+  prn_progress_cl_data=_prn_progress_cl_data;
+}
+
+void 
+DjVuToPS::
+set_dec_progress_cb(void (*_dec_progress_cb)(double, void *),
+                    void *_dec_progress_cl_data)
+{
+  dec_progress_cb=_dec_progress_cb;
+  dec_progress_cl_data=_dec_progress_cl_data;
+}
+
+void 
+DjVuToPS::
+set_info_cb(void (*_info_cb)(int, int, int, Stage, void*),
+            void *_info_cl_data)
+{
+  info_cb=_info_cb;
+  info_cl_data=_info_cl_data;
+}
+
+GP<DjVuImage>
+DjVuToPS::
+decode_page(GP<DjVuDocument> doc, 
+            int page_num, int cnt, int todo)
+{
+  DEBUG_MSG("processing page #" << page_num << "\n");
+  if (! port)
+    {
+      port = DecodePort::create();
+      DjVuPort::get_portcaster()->add_route((DjVuDocument*)doc, port);
+    }
+  port->decode_event_received = false;
+  port->decode_done = 0;
+  GP<DjVuFile> djvu_file;
+  GP<DjVuImage> dimg;
+  if (page_num >= 0 && page_num < doc->get_pages_num())
+    djvu_file = doc->get_djvu_file(page_num);
+  if (! djvu_file )
+    return 0;
+  if (djvu_file->is_decode_ok())
+    return doc->get_page(page_num, false);
+  // This is the best place to call info_cb(). Note, that
+  // get_page() will start decoding if necessary, and will not
+  // return until the decoding is over in a single threaded
+  // environment. That's why we call get_djvu_file() first.
+  if (info_cb)
+    info_cb(page_num, cnt, todo, DECODING, info_cl_data);
+  // Do NOT decode the page synchronously here!!!
+  // The plugin will deadlock otherwise.
+  dimg = doc->get_page(page_num, false);
+  djvu_file = dimg->get_djvu_file();
+  port->decode_page_url = djvu_file->get_url();
+  if (djvu_file->is_decode_ok())
+    return dimg;
+  DEBUG_MSG("decoding\n");
+  if (dec_progress_cb)
+    dec_progress_cb(0, dec_progress_cl_data);
+  while(! djvu_file->is_decode_ok())
+    {
+      while(!port->decode_event_received && 
+            !djvu_file->is_decode_ok())
+        {
+          port->decode_event.wait(250);
+          if (refresh_cb) 
+            refresh_cb(refresh_cl_data);
+        }
+      port->decode_event_received = false;
+      if (djvu_file->is_decode_failed() || 
+          djvu_file->is_decode_stopped())
+        G_THROW(ERR_MSG("DjVuToPS.no_image") 
+                + GUTF8String("\t") 
+                + GUTF8String(page_num));
+      if (dec_progress_cb)
+        dec_progress_cb(port->decode_done, dec_progress_cl_data);
+    }
+  if (dec_progress_cb)
+    dec_progress_cb(1, dec_progress_cl_data);
+  return dimg;
+}
+
+void
+DjVuToPS::
+process_single_page(ByteStream &str, 
+                    GP<DjVuDocument> doc,
+                    int page_num, int cnt, int todo,
+                    int magic)
+{
+  GP<DjVuTXT> txt;
+  GP<DjVuImage> dimg;
+  dimg = decode_page(doc, page_num, cnt, todo);
+  if (options.get_text())
+    txt = get_text(dimg->get_djvu_file());
+  if (info_cb)
+    info_cb(page_num, cnt, todo, PRINTING, info_cl_data);
+  if (!magic)
+    write(str, "%%%%Page: %d %d\n", page_num+1, cnt+1);
+  if (dimg)
+    {
+      int dpi = dimg->get_dpi();
+      dpi = ((dpi <= 0) ? 300 : dpi);
+      GRect img_rect(0, 0, dimg->get_width(), dimg->get_height());
+      store_page_setup(str, dpi, img_rect, magic);
+      print_image(str, dimg, img_rect,txt);
+      store_page_trailer(str);
+    }
+  if (!magic)
+    write(str,"showpage\n");
+}
+
+
+struct pdata {
+  int page1, page2;
+  int smax, spos;
+  int offset;
+};
+
+void 
+DjVuToPS::
+process_double_page(ByteStream &str, 
+                    GP<DjVuDocument> doc,
+                    void *v, int cnt, int todo)
+{
+  const pdata *inf = (const pdata*)v;
+  int off = abs(inf->offset);
+  write(str,
+        "%%%%Page: (%d,%d) %d\n"
+        "gsave\n"
+        "/fold-dict 8 dict dup 3 1 roll def begin\n"
+        " clippath pathbbox newpath pop pop translate\n"
+        " clippath pathbbox newpath 4 2 roll pop pop\n"
+        " /ph exch def\n"
+        " /pw exch def\n"
+        " /w ph %d sub 2 div def\n"
+        " /m1 %d def\n"
+        " /m2 %d def\n"
+        "end\n",
+        inf->page1 + 1, inf->page2 + 1, cnt,
+        2 * (off + options.get_bookletfold(inf->smax-1)),
+        inf->offset + options.get_bookletfold(inf->spos),
+        inf->offset - options.get_bookletfold(inf->spos));
+  if (options.get_cropmarks())
+    write(str,
+          "%% -- folding marks\n"
+          "fold-dict begin\n"
+          " 0 setgray 0.5 setlinewidth\n"
+          " ph m1 m2 add add 2 div dup\n"
+          " 0 exch moveto 36 0 rlineto stroke\n"
+          " pw exch moveto -36 0 rlineto stroke\n"
+          "end\n");
+  write(str,
+        "%% -- first page\n"
+        "gsave fold-dict begin\n"
+        " 0 ph 2 div w add m1 add translate 270 rotate\n"
+        " 0 0 w pw rectclip end\n");
+  if (inf->page1 >= 0)
+    process_single_page(str, doc, inf->page1, cnt*2, todo*2, +1);
+  write(str,
+        "grestore\n"
+        "%% -- second page\n"
+        "gsave fold-dict begin\n"
+        " 0 ph 2 div m2 add translate 270 rotate\n"
+        " 0 0 w pw rectclip end\n");
+  if (inf->page2 >= 0)
+    process_single_page(str, doc, inf->page2, cnt*2+1, todo*2, -1);
+  write(str,
+        "grestore\n"
+        "grestore\n"
+        "showpage\n");
+}
+
+static void
+booklet_order(GList<int>& pages, int smax)
+{
+  // -- make a multiple of four
+  while (pages.size() & 0x3)
+    pages.append(-1);
+  // -- copy to array
+  int i = 0;
+  int n = pages.size();
+  GTArray<int> p(0,n-1);
+  for (GPosition pos=pages; pos; ++pos)
+    p[i++] = pages[pos];
+  // -- rebuild
+  pages.empty();
+  for (i=0; i<n; i+=smax)
+    {
+      int lo = i;
+      int hi = i+smax-1;
+      if (hi >= n)
+        hi = n-1;
+      while (lo < hi)
+        {
+          pages.append(p[hi--]);
+          pages.append(p[lo++]);
+          pages.append(p[lo++]);
+          pages.append(p[hi--]);
+        }
+    }
+}
+
+
+// ***********************************************************************
+// ******* PUBLIC FUNCTIONS FOR PRINTING MULTIPLE PAGES ******************
+// ***********************************************************************
+
+
+
+void
+DjVuToPS::
+print(ByteStream &str, 
+      GP<DjVuDocument> doc, 
+      GUTF8String page_range)
+{
+  DEBUG_MSG("DjVuToPS::print(): Printing DjVu document\n");
+  DEBUG_MAKE_INDENT(3);
+  // Get page range
+  GList<int> pages_todo;
+  parse_range(doc, page_range, pages_todo);
+  int todo = pages_todo.size();
+  if (options.get_format()==Options::EPS)
+    {
+      /* Encapsulated Postscript mode */
+      if (todo != 1)
+        G_THROW(ERR_MSG("DjVuToPS.only_one_page"));
+      GPosition pos = pages_todo;
+      int page_num = pages_todo[pos];
+      GP<DjVuImage> dimg = decode_page(doc,page_num,0,todo);
+      if (! dimg)
+        G_THROW(ERR_MSG("DjVuToPS.no_image") + GUTF8String("\t1"));
+      GRect bbox(0, 0, dimg->get_width(), dimg->get_height());
+      store_doc_prolog(str, 1, dimg->get_dpi(), &bbox);
+      store_doc_setup(str);
+      process_single_page(str, doc, page_num, 0, todo, 0);
+    }
+  else if (options.get_bookletmode()==Options::OFF)
+    {
+      /* Normal mode */
+      int cnt = 0;
+      store_doc_prolog(str, todo, 0, 0);
+      store_doc_setup(str);
+      for(GPosition pos = pages_todo; pos; ++pos)
+        process_single_page(str,doc,pages_todo[pos],cnt++,todo,0);
+      store_doc_trailer(str);
+    }
+  else
+    {
+      /* Booklet mode */
+      int sheets_left = (todo+3)/4;
+      int sides_todo = sheets_left;
+      if (options.get_bookletmode() == Options::RECTOVERSO)
+        sides_todo *= 2;
+      int sheets_max = (options.get_bookletmax()+3)/4;
+      if (! sheets_max)
+        sheets_max = sheets_left;
+      // -- reorder pages
+      booklet_order(pages_todo, sheets_max*4);
+      // -- print
+      int sides = 0;
+      int sheetpos = sheets_max;
+      store_doc_prolog(str, sides_todo, 0, 0);
+      store_doc_setup(str);
+      for (GPosition p=pages_todo; p; ++p)
+        {
+          struct pdata inf;
+          inf.page1 = pages_todo[p]; 
+          inf.page2 = pages_todo[++p]; 
+          inf.smax = sheets_max;
+          inf.spos = --sheetpos;
+          inf.offset = options.get_bookletalign();
+          if (options.get_bookletmode() != Options::VERSO)
+            process_double_page(str,doc,(void*)&inf,sides++,sides_todo);
+          inf.page1 = pages_todo[++p]; 
+          inf.page2 = pages_todo[++p]; 
+          inf.offset = -inf.offset;
+          if (options.get_bookletmode() != Options::RECTO)
+            process_double_page(str,doc,(void*)&inf,sides++,sides_todo);
+          sheets_left -= 1;
+          if (sheetpos <= 0)
+            sheetpos = ((sheets_max<sheets_left) ? sheets_max : sheets_left);
+        }
+      store_doc_trailer(str);
+    }
+}
+
+
+void
+DjVuToPS::
+print(ByteStream &str, GP<DjVuDocument> doc)
+{
+  GUTF8String dummy;
+  print(str,doc,dummy);
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/DjVuToPS.h b/libdjvu/DjVuToPS.h
new file mode 100644
index 0000000..96bd218
--- /dev/null
+++ b/libdjvu/DjVuToPS.h
@@ -0,0 +1,422 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DJVU_TO_PS_H_
+#define _DJVU_TO_PS_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name DjVuToPS.h
+    Files #"DjVuToPS.h"# and #"DjVuToPS.cpp"# implement code that can be
+    used to convert a \Ref{DjVuImage} or \Ref{DjVuDocument} to PostScript
+    format. The conversion is carried out by the \Ref{DjVuToPS} class.
+    
+    @memo PostScript file generator
+    @author Andrei Erofeev <eaf@geocities.com> \\
+            Florin Nicsa <Florin.Nicsa@insa-lyon.fr>
+*/
+//@{
+
+#include "DjVuGlobal.h"
+#include "GRect.h"
+#include "DjVuDocument.h"
+#include "DjVuText.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+/** DjVuImage to PostScript converter.
+    Use this class to print \Ref{DjVuImage}s and \Ref{DjVuDocument}s.
+    The behavior is customizable. See \Ref{DjVuToPS::Options} for the
+    description of available options.*/
+class DjVuToPS
+{
+public:
+  class DecodePort;
+
+  /** DjVuToPS options. Use this class to customize the way
+      in which DjVu to PS conversion will be done. You can adjust
+      the following things:
+          \begin{description}
+             \item[Format] ({\em EPS} or {\em PS}). Use the {\em EPS}
+                format if you plan to embed the output image into another
+                document. Print {\em PS} otherwise.
+             \item[Language level] ({\em 1} or {\em 2}). Any PostScript
+                printer or interpreter should understand PostScript Level 1
+                files. Unfortunately we cannot efficiently compress and encode
+                data when generating Level 1 files. PostScript Level 2 allows
+                to employ an RLE compression and ASCII85 encoding scheme,
+                which makes output files significantly smaller. Most of
+                the printers and word processors nowadays support PostScript
+                Level 2.
+             \item[Orientation] ({\em PORTRAIT} or {\em LANDSCAPE})
+             \item[Zoom factor] ({\em FIT_PAGE} or {\em ONE_TO_ONE}).
+                {\em ONE_TO_ONE} mode is useful, if you want the output to
+                be of the same size as the original image (before compression).
+                This requires that the #dpi# setting inside the \Ref{DjVuImage}
+                is correct. In most of the cases the {\em FIT_PAGE} zoom is
+                would be your best choice.
+             \item[Mode] ({\em COLOR}, {\em FORE}, {\em BACK}, or {\em BW})
+                Specifies how the \Ref{DjVuImage}s will be rendered (all layers,
+                foreground layer, background layer, and the mask respectively)
+             \item[Color] ({\em TRUE} or {\em FALSE}). Choosing {\em FALSE}
+                converts color images to gray scale.
+             \item[Gamma] Printer color correction. 
+                This parameter ranges from #0.3# to #5.0#. 
+             \item[sRGB] ({\em TRUE} or {\em FALSE}).  Choosing {\em TRUE}
+                enables accurate sRGB color calibration.  This option
+                only works with language level 2.  When this is set,
+                gamma correction is clamped to #2.2#.
+             \item[Number of copies] Specifies how many copies should be
+                printed. This does {\bf not} affect the size of the output file.
+          \end{description}
+  */
+  class Options
+  {
+  public:
+    /** Specifies the rendering mode */
+    enum Mode { COLOR, FORE, BACK, BW };
+    /** Selects the output format */
+    enum Format { PS, EPS };
+    /** Specifies the orientation of the output image */
+    enum Orientation { PORTRAIT, LANDSCAPE, AUTO };
+    /** Specifies the booklet mode */
+    enum BookletMode { OFF, RECTO, VERSO, RECTOVERSO };
+  private:
+    Format format;
+    int level;
+    Orientation orientation;
+    Mode mode;
+    int zoom;
+    bool color;
+    bool calibrate;
+    bool text;
+    double gamma;
+    int copies;
+    bool frame;
+    bool cropmarks;
+    BookletMode bookletmode;
+    int bookletmax;
+    int bookletalign;
+    int bookletfold;
+    int bookletxfold;
+  public:
+    /** Sets output image format to #PS# or #EPS# */
+    void set_format(Format format);
+    /** Sets PostScript level (#1#, #2#, or #3#) */
+    void set_level(int level);
+    /** Sets orientation (#LANDSCAPE# or #PORTRAIT#) */
+    void set_orientation(Orientation orientation);
+    /** Sets \Ref{DjVuImage} rendering mode (#COLOR#, #BW#, #FORE#, #BACK#) */
+    void set_mode(Mode mode);
+    /** Sets zoom factor. Zoom 0 means fit page. */
+    void set_zoom(int zoom);
+    /** Affects automatic conversion to GreyScale mode. */
+    void set_color(bool color);
+    /** Sets gamma correction factor. Ranges from #0.3# to #5.0#. */    
+    void set_gamma(double gamma);
+    /** Sets sRGB color calibration flag. */
+    void set_sRGB(bool calibrate);
+    /** Specifies the number of copies to be printed. */
+    void set_copies(int copies);
+    /** Specifies if a gray frame around the image should be printed. */
+    void set_frame(bool on);
+    /** Specifies if crop marks should be printed. */
+    void set_cropmarks(bool on);
+    /** Specifies if a shadow text should be printed. */
+    void set_text(bool on);
+    /** Specifies the bookletmode */
+    void set_bookletmode(BookletMode m);
+    /** Specifies the maximal number of pages in a booklet */
+    void set_bookletmax(int m);
+    /** Specifies an offset (points) between 
+        booklet recto(s) and verso(s). */
+    void set_bookletalign(int m);
+    /** Specifies the margin (points) required to fold 
+        the booklet (#fold# in points) and the margin 
+        increase required for each sheet (#xfold# in millipoints). */
+    void set_bookletfold(int fold, int xfold=0);
+
+    /** Returns output image format (#PS# or #EPS#) */
+    Format get_format(void) const {
+      return format; }
+    /** Returns PostScript level (#1# or #2#) */
+    int get_level(void) const {
+      return level; }
+    /** Returns output image orientation (#PORTRAIT# or #LANDSCAPE#) */
+    Orientation get_orientation(void) const {
+      return orientation; }
+    /** Returns \Ref{DjVuImage} rendering mode 
+        (#COLOR#, #FORE#, #BACK#, #BW#) */
+    Mode get_mode(void) const {
+      return mode; }
+    /** Returns output zoom factor (#FIT_PAGE# or #ONE_TO_ONE#) */
+    int get_zoom(void) const {
+      return zoom; }
+    /** Returns color printing flag. */
+    bool get_color(void) const {
+      return color; }
+    /** Returns sRGB color calibration flag. */
+    bool get_sRGB(void) const {
+      return calibrate; }
+    /** Returns printer gamma correction factor */
+    double get_gamma(void) const {
+      return ((calibrate) ? ((double)2.2) : gamma); }
+    /** Returns the number of copies, which will be printed by printer
+        This parameter does {\bf not} affect the size of output file */
+    int get_copies(void) const {
+      return copies; }
+    /** Returns #TRUE# if there will be a gray frame */
+    bool get_frame(void) const {
+      return frame; }
+    /** Returns #TRUE# if there will be a gray frame */
+    bool get_cropmarks(void) const {
+      return cropmarks; }
+    /** Returns #TRUE# if there will be a shadow text printed */
+    bool get_text(void) const {
+      return text; }
+    /** Returns the booklet mode */
+    BookletMode get_bookletmode(void) const {
+      return bookletmode; }
+    /** Returns the booklet max size */
+    int get_bookletmax(void) {
+      return bookletmax; }
+    /** Returns the booklet recto/verso offset */
+    int get_bookletalign(void) {
+      return bookletalign; }
+    /** Returns the folding margin for sheet number #n#. */
+    int get_bookletfold(int n=0) {
+      return bookletfold + (n*bookletxfold+500)/1000; }
+    /* Constructor */
+    Options(void);
+  };
+  
+  /** Describes current page processing stage. This is passed to
+      the #info_cb()# callback. See \Ref{set_info_cb}() for details. */
+  enum Stage { DECODING, PRINTING };
+  
+private:
+  void (*refresh_cb)(void*);
+  void  *refresh_cl_data;
+  void (*prn_progress_cb)(double, void*);
+  void  *prn_progress_cl_data;
+  void (*dec_progress_cb)(double, void*);
+  void  *dec_progress_cl_data;
+  void (*info_cb)(int,int,int,Stage,void*);
+  void  *info_cl_data;
+  unsigned char ramp[256];
+  GP<DecodePort> port;
+protected:
+  void store_doc_prolog(ByteStream&,int,int,GRect*);
+  void store_doc_setup(ByteStream&);
+  void store_doc_trailer(ByteStream&);
+  void store_page_setup(ByteStream&,int,const GRect&,int align=0);
+  void store_page_trailer(ByteStream&);
+  void make_gamma_ramp(GP<DjVuImage>);
+  void print_image_lev1(ByteStream&,GP<DjVuImage>,const GRect&);
+  void print_image_lev2(ByteStream&,GP<DjVuImage>,const GRect&);
+  void print_bg(ByteStream&,GP<DjVuImage>,const GRect&);
+  void print_fg_3layer(ByteStream&,GP<DjVuImage>,const GRect&,unsigned char*);
+  void print_fg_2layer(ByteStream&,GP<DjVuImage>,const GRect&,unsigned char*);
+  void print_fg(ByteStream&,GP<DjVuImage>,const GRect&);
+  void print_image(ByteStream&,GP<DjVuImage>,const GRect&,GP<DjVuTXT>);
+  void parse_range(GP<DjVuDocument>,GUTF8String,GList<int>&);
+  GP<DjVuImage> decode_page(GP<DjVuDocument>,int,int,int);
+  void process_single_page(ByteStream&,GP<DjVuDocument>,int,int,int,int);
+  void process_double_page(ByteStream&,GP<DjVuDocument>,void*,int,int);
+  
+public:
+  /** Options affecting the print result. Please refer to
+      \Ref{DjVuToPS::Options} for details. */
+  Options options;
+  
+  /** @name Callbacks */
+  //@{
+  /** Refresh callback is a function, which will be called fairly
+      often while the image (document) is being printed. It can
+      be used to refresh a GUI, if necessary.
+      
+      @param refresh_cb Callback function to be called periodically
+      @param refresh_cl_data Pointer passed to #refresh_cb()# */
+   void set_refresh_cb(void (*refresh_cb)(void*), void *refresh_cl_data);
+  /** Callback used to report the progress of printing.  The progress is a
+      double number from 0 to 1.  If an existing \Ref{DjVuImage} is printed,
+      this callback will be called at least twice: in the beginning and at the
+      end of printing.  If a \Ref{DjVuDocument} is being printed, this
+      callback will be used to report printing progress of every page. To
+      learn the number of the page being printed you can use
+      \Ref{set_info_cb}() function.  See \Ref{set_dec_progress_cb}() to find
+      out how to learn the decoding progress.
+      
+      @param cb Callback function to be called
+      @param data Pointer passed to #cb()#. */
+  void set_prn_progress_cb(void (*cb)(double, void*), void *data);
+  /** Callback used to report the progress of decoding.  The progress is a
+      double number from 0 to 1.  This callback is only used when printing a
+      \Ref{DjVuDocument} in a multithreaded environment. In all other cases it
+      will not be called.  Whenever you \Ref{print}() a page range from a
+      \Ref{DjVuDocument}, the #DjVuToPS# has to decode the mentioned pages
+      before writing them to the output \Ref{ByteStream}. This callback can be
+      helpful to find out the status of the decoding.  See
+      \Ref{set_prn_progress_cb}() to find out how to learn the printing
+      progress.  See \Ref{set_info_cb}() to learn how to find out the number
+      of the page being processed, the total number of pages and the number of
+      processed pages.
+          
+      @param cb Callback function to be called
+      @param data Pointer passed to #cb()#. */
+  void set_dec_progress_cb(void (*cb)(double, void*), void *data);
+  /** Callback used to report the current printing stage of a
+      \Ref{DjVuDocument}.  When printing a \Ref{DjVuDocument} ({\bf not} a
+      \Ref{DjVuImage}), the #DjVuToPS# class will decode and output every page
+      mentioned in the {\em page range}. Before decoding and outputing, it
+      will call this #info_cb()# callback in order to let you know about what
+      is going on. This can be quite useful in a GUI program to keep the user
+      informed.  This function is not called when you print a \Ref{DjVuImage}.
+
+      Description of the arguments passed to #info_cb#:
+      \begin{description}
+      \item[page_num] The number of the page being processed
+      \item[page_cnt] Counts how many pages have already been processed.
+      \item[tot_pages] Counts how many pages will be output enventually.
+      \item[stage] Describes the current processing stage 
+                   (#DECODING# or #PRINTING#).
+      \end{description}
+      @param cb Callback function to be called
+      @param data Pointer, which will be passed to #cb()#. */
+  void set_info_cb(void (*cb)(int,int,int,Stage,void*), void *data);
+  //@}
+  
+  /** Prints the specified \Ref{DjVuImage} #dimg# into the
+      \Ref{ByteStream} #str#. The function will first scale
+      the image to fit the #img_rect#, then extract #prn_rect#
+      from the obtained bitmap and will output it in the
+      PostScript format. The function generates a legal PostScript
+      (or Encapsulated PostScript) file taking care of all comments
+      conforming to Document Structure Conventions v. 3.0.
+      
+      {\bf Warning:} The zoom factor specified in \Ref{Options} does
+      not affect the amount of data stored into the PostScript file.
+      It will be used by the PostScript code to additionally scale
+      the image. We cannot pre-scale it here, because we do not know
+      the future resolution of the printer. The #img_rect# and
+      #prn_rect# alone define how much data will be sent to printer.
+      
+      Using #img_rect# one can upsample or downsample the image prior
+      to sending it to the printer.
+      
+      @param str \Ref{ByteStream} where PostScript output will be sent
+      @param dimg \Ref{DjVuImage} to print
+      @param img_rect Rectangle to which the \Ref{DjVuImage} will be scaled.
+             Note that this parameters defines the amount of data
+             that will actually be sent to the printer. The PostScript
+             code can futher resize the image according to the
+             #zoom# parameter from the \Ref{Options} structure.
+      @param prn_rect Part of img_rect to send to printer.
+      @param override_dpi Optional parameter allowing you to override
+             dpi setting that would otherwise be extracted from #dimg# */
+   void print(ByteStream&, GP<DjVuImage> dimg,
+              const GRect &prn_rect, const GRect &img_rect,
+              int override_dpi=-1 );
+  
+  /** Outputs the specifies pages from the \Ref{DjVuDocument} into the
+      \Ref{ByteStream} in PostScript format.  The function will generate a
+      multipage PostScript document conforming to PS DSC 3.0 by storing into
+      it every page mentioned in the #page_range#.
+
+      If #page_range# is empty, all pages from the \Ref{DjVuDocument} #doc#
+      will be printed.  The #page_range# is a set of ranges separated by
+      commas. Every range has this form: {\em start_page}[-{\em
+      end_page}]. {\em end_page} is optional and can be less than the {\em
+      start_page}, in which case the pages will be printed in the reverse
+      order.
+
+      Examples:
+      \begin{itemize}
+      \item {\bf 1-10} - Will print pages 1 to 10.
+      \item {\bf 10-1} - Will print pages 1 to 10 in reverse order.
+      \item {\bf 1-10,12-20} - Will print pages 1 to 20 with page 11 skipped.
+      \end{itemize} */
+  void print(ByteStream&, GP<DjVuDocument> doc, GUTF8String page_range);
+  void print(ByteStream&, GP<DjVuDocument> doc);
+ 
+  
+  /** Default constructor. Initializes the class. */
+  DjVuToPS(void);
+};
+
+
+//****************************************************************************
+//******************************** DjVuToPS **********************************
+//****************************************************************************
+
+//@}
+// ------------
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
new file mode 100644
index 0000000..80e4b94
--- /dev/null
+++ b/libdjvu/GBitmap.cpp
@@ -0,0 +1,1686 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GBitmap.h"
+#include "ByteStream.h"
+#include "GRect.h"
+#include "GString.h"
+#include "GThreads.h"
+#include "GException.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+// - Author: Leon Bottou, 05/1997
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+// ----- constructor and destructor
+
+GBitmap::~GBitmap()
+{
+}
+
+void
+GBitmap::destroy(void)
+{
+  gbytes_data.resize(0);
+  bytes = 0;
+  grle.resize(0);
+  grlerows.resize(0);
+  rlelength = 0;
+}
+
+GBitmap::GBitmap()
+  : nrows(0), ncolumns(0), border(0), 
+    bytes_per_row(0), grays(0), bytes(0), gbytes_data(bytes_data), 
+    grle(rle), grlerows(rlerows), rlelength(0),
+    monitorptr(0)
+{
+}
+
+GBitmap::GBitmap(int nrows, int ncolumns, int border)
+  : nrows(0), ncolumns(0), border(0), 
+    bytes_per_row(0), grays(0), bytes(0), gbytes_data(bytes_data), 
+    grle(rle), grlerows(rlerows), rlelength(0),
+    monitorptr(0)
+{
+  G_TRY
+  { 
+    init(nrows, ncolumns, border);
+  }
+  G_CATCH_ALL
+  {
+    destroy();
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GBitmap::GBitmap(ByteStream &ref, int border)
+  : nrows(0), ncolumns(0), border(0), 
+    bytes_per_row(0), grays(0), bytes(0), gbytes_data(bytes_data),
+    grle(rle), grlerows(rlerows), rlelength(0),
+    monitorptr(0)
+{
+  G_TRY
+  { 
+    init(ref, border);
+  }
+  G_CATCH_ALL
+  {
+    destroy();
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GBitmap::GBitmap(const GBitmap &ref)
+  : nrows(0), ncolumns(0), border(0), 
+    bytes_per_row(0), grays(0), bytes(0), gbytes_data(bytes_data), 
+    grle(rle), grlerows(rlerows), rlelength(0),
+    monitorptr(0)
+{
+  G_TRY
+  { 
+    init(ref, ref.border);
+  }
+  G_CATCH_ALL
+  {
+    destroy();
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GBitmap::GBitmap(const GBitmap &ref, int border)
+  : nrows(0), ncolumns(0), border(0), 
+    bytes_per_row(0), grays(0), bytes(0), gbytes_data(bytes_data),
+    grle(rle), grlerows(rlerows), rlelength(0),
+    monitorptr(0)
+{
+  G_TRY
+  { 
+    init(ref, border);
+  }
+  G_CATCH_ALL
+  {
+    destroy();
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+
+GBitmap::GBitmap(const GBitmap &ref, const GRect &rect, int border)
+  : nrows(0), ncolumns(0), border(0), 
+    bytes_per_row(0), grays(0), bytes(0), gbytes_data(bytes_data),
+    grle(rle), grlerows(rlerows), rlelength(0),
+    monitorptr(0)
+{
+  G_TRY
+  { 
+    init(ref, rect, border);
+  }
+  G_CATCH_ALL
+  {
+    destroy();
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+
+
+
+
+
+// ----- initialization
+
+void 
+GBitmap::init(int arows, int acolumns, int aborder)
+{
+  if (arows != (unsigned short) arows ||
+      acolumns != (unsigned short) acolumns ||
+      acolumns + aborder != (unsigned short)(acolumns + aborder))
+    G_THROW("Illegal arguments");
+  GMonitorLock lock(monitor());
+  destroy();
+  grays = 2;
+  nrows = arows;
+  ncolumns = acolumns;
+  border = aborder;
+  bytes_per_row = ncolumns + border;
+  int npixels = nrows * bytes_per_row + border;
+  gzerobuffer=zeroes(bytes_per_row + border);
+  if (npixels > 0) 
+    {
+      gbytes_data.resize(npixels);
+      gbytes_data.clear();
+      bytes = bytes_data;
+    }
+}
+
+
+void 
+GBitmap::init(const GBitmap &ref, int aborder)
+{
+  GMonitorLock lock(monitor());
+  if (this != &ref) 
+    {
+      GMonitorLock lock(ref.monitor());
+      init(ref.nrows, ref.ncolumns, aborder);
+      grays = ref.grays;
+      unsigned char *row = bytes_data+border;
+      for (int n=0; n<nrows; n++, row+=bytes_per_row)
+      memcpy( (void*)row, (void*)ref[n],  ncolumns );
+    }
+  else if (aborder > border)
+    {
+      minborder(aborder);
+    }
+}
+
+
+void 
+GBitmap::init(const GBitmap &ref, const GRect &rect, int border)
+{
+  GMonitorLock lock(monitor());
+  // test bitmap physical equality
+  if (this == &ref)
+    {
+      GBitmap tmp;
+      tmp.grays = grays;
+      tmp.border = border;
+      tmp.bytes_per_row = bytes_per_row;
+      tmp.ncolumns = ncolumns;
+      tmp.nrows = nrows;
+      tmp.bytes = bytes;
+      tmp.gbytes_data.swap(gbytes_data);
+      tmp.grle.swap(grle);
+      bytes = 0 ;
+      init(tmp, rect, border);
+    }
+  else
+    {
+      GMonitorLock lock(ref.monitor());
+      // create empty bitmap
+      init(rect.height(), rect.width(), border);
+      grays = ref.grays;
+      // compute destination rectangle
+      GRect rect2(0, 0, ref.columns(), ref.rows() );
+      rect2.intersect(rect2, rect);
+      rect2.translate(-rect.xmin, -rect.ymin);
+      // copy bits
+      if (! rect2.isempty())
+        {
+          for (int y=rect2.ymin; y<rect2.ymax; y++)
+            {
+              unsigned char *dst = (*this)[y];
+              const unsigned char *src = ref[y+rect.ymin] + rect.xmin;
+              for (int x=rect2.xmin; x<rect2.xmax; x++)
+                dst[x] = src[x];
+            }
+        }
+    }
+}
+
+
+void 
+GBitmap::init(ByteStream &ref, int aborder)
+{
+  GMonitorLock lock(monitor());
+  // Get magic number
+  char magic[2];
+  magic[0] = magic[1] = 0;
+  ref.readall((void*)magic, sizeof(magic));
+  char lookahead = '\n';
+  int acolumns = read_integer(lookahead, ref);
+  int arows = read_integer(lookahead, ref);
+  int maxval = 1;
+  init(arows, acolumns, aborder);
+  // go reading file
+  if (magic[0]=='P')
+    {
+      switch(magic[1])
+        {
+        case '1':
+          grays = 2;
+          read_pbm_text(ref); 
+          return;
+        case '2':
+          maxval = read_integer(lookahead, ref);
+          if (maxval > 65535)
+            G_THROW("Cannot read PGM with depth greater than 16 bits.");
+          grays = (maxval>255 ? 256 : maxval+1);
+          read_pgm_text(ref, maxval); 
+          return;
+        case '4':
+          grays = 2;
+          read_pbm_raw(ref); 
+          return;
+        case '5':
+          maxval = read_integer(lookahead, ref);
+          if (maxval > 65535)
+            G_THROW("Cannot read PGM with depth greater than 16 bits.");
+          grays = (maxval>255 ? 256 : maxval+1);
+          read_pgm_raw(ref, maxval); 
+          return;
+        }
+    }
+  else if (magic[0]=='R')
+    {
+      switch(magic[1])
+        {
+        case '4':
+          grays = 2;
+          read_rle_raw(ref); 
+          return;
+        }
+    }
+  G_THROW( ERR_MSG("GBitmap.bad_format") );
+}
+
+void
+GBitmap::donate_data(unsigned char *data, int w, int h)
+{
+  destroy();
+  grays = 2;
+  nrows = h;
+  ncolumns = w;
+  border = 0;
+  bytes_per_row = w;
+  gbytes_data.replace(data,w*h);
+  bytes = bytes_data;
+  rlelength = 0;
+}
+
+void
+GBitmap::donate_rle(unsigned char *rledata, unsigned int rledatalen, int w, int h)
+{
+  destroy();
+  grays = 2;
+  nrows = h;
+  ncolumns = w;
+  border = 0;
+  bytes_per_row = w;
+//  rle = rledata;
+  grle.replace(rledata,rledatalen);
+  rlelength = rledatalen;
+}
+
+
+unsigned char *
+GBitmap::take_data(size_t &offset)
+{
+  GMonitorLock lock(monitor());
+  unsigned char *ret = bytes_data;
+  if (ret) offset = (size_t)border;
+  bytes_data=0;
+  return ret;
+}
+
+const unsigned char *
+GBitmap::get_rle(unsigned int &rle_length)
+{
+  if(!rle)
+    compress();
+  rle_length=rlelength;
+  return rle; 
+}
+
+// ----- compression
+
+
+void 
+GBitmap::compress()
+{
+  if (grays > 2)
+    G_THROW( ERR_MSG("GBitmap.cant_compress") );
+  GMonitorLock lock(monitor());
+  if (bytes)
+    {
+      grle.resize(0);
+      grlerows.resize(0);
+      rlelength = encode(rle,grle);
+      if (rlelength)
+        {
+          gbytes_data.resize(0);
+          bytes = 0;
+        }
+    }
+}
+
+void
+GBitmap::uncompress()
+{
+  GMonitorLock lock(monitor());
+  if (!bytes && rle)
+    decode(rle);
+}
+
+
+
+unsigned int 
+GBitmap::get_memory_usage() const
+{
+  unsigned long usage = sizeof(GBitmap);
+  if (bytes)
+    usage += nrows * bytes_per_row + border;
+  if (rle)
+    usage += rlelength;
+  return usage;
+}
+
+
+void 
+GBitmap::minborder(int minimum)
+{
+  if (border < minimum)
+    {
+      GMonitorLock lock(monitor());
+      if (border < minimum)
+        {
+          if (bytes)
+            {
+              GBitmap tmp(*this, minimum);
+              bytes_per_row = tmp.bytes_per_row;
+              tmp.gbytes_data.swap(gbytes_data);
+              bytes = bytes_data;
+              tmp.bytes = 0;
+            }
+          border = minimum;
+          gzerobuffer=zeroes(border + ncolumns + border);
+        }
+    }
+}
+
+
+#define NMONITORS 8
+static GMonitor monitors[NMONITORS];
+
+void
+GBitmap::share()
+{
+  if (!monitorptr)
+    {
+      size_t x = (size_t)this;
+      monitorptr = &monitors[(x^(x>>5)) % NMONITORS];
+    }
+}
+
+
+// ----- gray levels
+
+void
+GBitmap::set_grays(int ngrays)
+{
+  if (ngrays<2 || ngrays>256)
+    G_THROW( ERR_MSG("GBitmap.bad_levels") );
+  // set gray levels
+  GMonitorLock lock(monitor());
+  grays = ngrays;
+  if (ngrays>2 && !bytes)
+    uncompress();
+}
+
+void 
+GBitmap::change_grays(int ngrays)
+{
+  GMonitorLock lock(monitor());
+  // set number of grays
+  int ng = ngrays - 1;
+  int og = grays - 1;
+  set_grays(ngrays);
+  // setup conversion table
+  unsigned char conv[256];
+  for (int i=0; i<256; i++)
+    {
+      if (i > og)
+        conv[i] = ng;
+      else
+        conv[i] = (i*ng+og/2)/og;
+    }
+  // perform conversion
+  for (int row=0; row<nrows; row++)
+    {
+      unsigned char *p = (*this)[row];
+      for (int n=0; n<ncolumns; n++)
+        p[n] = conv[ p[n] ];
+    }
+}
+
+void 
+GBitmap::binarize_grays(int threshold)
+{
+  GMonitorLock lock(monitor());
+  if (bytes)
+    for (int row=0; row<nrows; row++)
+      {
+        unsigned char *p = (*this)[row];
+        for(unsigned char const * const pend=p+ncolumns;p<pend;++p)
+        {
+          *p = (*p>threshold) ? 1 : 0;
+        }
+      }
+  grays = 2;
+}
+
+
+// ----- additive blitting
+
+#undef min
+#undef max
+
+static inline int
+min(int x, int y) 
+{ 
+  return (x < y ? x : y);
+}
+
+static inline int
+max(int x, int y) 
+{ 
+  return (x > y ? x : y);
+}
+
+void 
+GBitmap::blit(const GBitmap *bm, int x, int y)
+{
+  // Check boundaries
+  if ((x >= ncolumns)              || 
+      (y >= nrows)                 ||
+      (x + (int)bm->columns() < 0) || 
+      (y + (int)bm->rows() < 0)     )
+    return;
+
+  // Perform blit
+  GMonitorLock lock1(monitor());
+  GMonitorLock lock2(bm->monitor());
+  if (bm->bytes)
+    {
+      if (!bytes_data)
+        uncompress();
+      // Blit from bitmap
+      const unsigned char *srow = bm->bytes + bm->border;
+      unsigned char *drow = bytes_data + border + y*bytes_per_row + x;
+      for (int sr = 0; sr < bm->nrows; sr++)
+        {
+          if (sr+y>=0 && sr+y<nrows) 
+            {
+              int sc = max(0, -x);
+              int sc1 = min(bm->ncolumns, ncolumns-x);
+              while (sc < sc1)
+                {
+                  drow[sc] += srow[sc];
+                  sc += 1;
+                }
+            }
+          srow += bm->bytes_per_row;
+          drow += bytes_per_row;
+        }
+    }
+  else if (bm->rle)
+    {
+      if (!bytes_data)
+        uncompress();
+      // Blit from rle
+      const unsigned char *runs = bm->rle;
+      unsigned char *drow = bytes_data + border + y*bytes_per_row + x;
+      int sr = bm->nrows - 1;
+      drow += sr * bytes_per_row;
+      int sc = 0;
+      char p = 0;
+      while (sr >= 0)
+        {
+          const int z = read_run(runs);
+          if (sc+z > bm->ncolumns)
+            G_THROW( ERR_MSG("GBitmap.lost_sync") );
+          int nc = sc + z;
+          if (p && sr+y>=0 && sr+y<nrows) 
+            {
+              if (sc + x < 0) 
+                sc = min(-x, nc); 
+              while (sc < nc && sc + x<ncolumns)
+                drow[sc++] += 1;
+            }
+          sc = nc;
+          p = 1 - p;
+          if (sc >= bm->ncolumns) 
+            {
+              p = 0;
+              sc = 0;
+              drow -= bytes_per_row;
+              sr -= 1; 
+            }
+        }
+    }
+}
+
+
+
+void 
+GBitmap::blit(const GBitmap *bm, int xh, int yh, int subsample)
+{
+  // Use code when no subsampling is necessary
+  if (subsample == 1)
+    {
+      blit(bm, xh, yh);
+      return;
+    }
+
+  // Check boundaries
+  if ((xh >= ncolumns * subsample) || 
+      (yh >= nrows * subsample)    ||
+      (xh + (int)bm->columns() < 0)   || 
+      (yh + (int)bm->rows() < 0)     )
+    return;
+
+  // Perform subsampling blit
+  GMonitorLock lock1(monitor());
+  GMonitorLock lock2(bm->monitor());
+  if (bm->bytes)
+    {
+      if (!bytes_data)
+        uncompress();
+      // Blit from bitmap
+      int dr, dr1, zdc, zdc1;
+      euclidian_ratio(yh, subsample, dr, dr1);
+      euclidian_ratio(xh, subsample, zdc, zdc1);
+      const unsigned char *srow = bm->bytes + bm->border;
+      unsigned char *drow = bytes_data + border + dr*bytes_per_row;
+      for (int sr = 0; sr < bm->nrows; sr++)
+        {
+          if (dr>=0 && dr<nrows) 
+            {
+              int dc = zdc;
+              int dc1 = zdc1;
+              for (int sc=0; sc < bm->ncolumns; sc++) 
+                {
+                  if (dc>=0 && dc<ncolumns)
+                    drow[dc] += srow[sc];
+                  if (++dc1 >= subsample) 
+                    {
+                      dc1 = 0;
+                      dc += 1;
+                    }
+                }
+            }
+          // next line in source
+          srow += bm->bytes_per_row;
+          // next line fraction in destination
+          if (++dr1 >= subsample)
+            {
+              dr1 = 0;
+              dr += 1;
+              drow += bytes_per_row;
+            }
+        }
+    }
+  else if (bm->rle)
+    {
+      if (!bytes_data)
+        uncompress();
+      // Blit from rle
+      int dr, dr1, zdc, zdc1;
+      euclidian_ratio(yh+bm->nrows-1, subsample, dr, dr1);
+      euclidian_ratio(xh, subsample, zdc, zdc1);
+      const unsigned char *runs = bm->rle;
+      unsigned char *drow = bytes_data + border + dr*bytes_per_row;
+      int sr = bm->nrows -1;
+      int sc = 0;
+      char p = 0;
+      int dc = zdc;
+      int dc1 = zdc1;
+      while (sr >= 0)
+        {
+          int z = read_run(runs);
+          if (sc+z > bm->ncolumns)
+            G_THROW( ERR_MSG("GBitmap.lost_sync") );
+          int nc = sc + z;
+
+          if (dr>=0 && dr<nrows)
+            while (z>0 && dc<ncolumns)
+              {
+                int zd = subsample - dc1;
+                if (zd > z) 
+                  zd = z;
+                if (p && dc>=0) 
+                  drow[dc] += zd;
+                z -= zd;
+                dc1 += zd;
+                if (dc1 >= subsample)
+                  {
+                    dc1 = 0;
+                    dc += 1;
+                  }
+              }
+          // next fractional row
+          sc = nc;
+          p = 1 - p;
+          if (sc >= bm->ncolumns) 
+            {
+              sc = 0;
+              dc = zdc;
+              dc1 = zdc1;
+              p = 0;
+              sr -= 1; 
+              if (--dr1 < 0)
+                {
+                  dr1 = subsample - 1;
+                  dr -= 1;
+                  drow -= bytes_per_row;
+                }
+            }
+        }
+    }
+}
+
+
+
+// ------ load bitmaps
+
+
+unsigned int 
+GBitmap::read_integer(char &c, ByteStream &bs)
+{
+  unsigned int x = 0;
+  // eat blank before integer
+  while (c==' ' || c=='\t' || c=='\r' || c=='\n' || c=='#') 
+    {
+      if (c=='#') 
+        do { } while (bs.read(&c,1) && c!='\n' && c!='\r');
+      c = 0; 
+      bs.read(&c, 1);
+    }
+  // check integer
+  if (c<'0' || c>'9')
+    G_THROW( ERR_MSG("GBitmap.not_int") );
+  // eat integer
+  while (c>='0' && c<='9') 
+    {
+      x = x*10 + c - '0';
+      c = 0;
+      bs.read(&c, 1);
+    }
+  return x;
+}
+
+
+void 
+GBitmap::read_pbm_text(ByteStream &bs)
+{
+  unsigned char *row = bytes_data + border;
+  row += (nrows-1) * bytes_per_row;
+  for (int n = nrows-1; n>=0; n--) 
+    {
+      for (int c = 0; c<ncolumns; c++) 
+        {
+          char bit = 0;
+          bs.read(&bit,1);
+          while (bit==' ' || bit=='\t' || bit=='\r' || bit=='\n')
+            { 
+              bit=0; 
+              bs.read(&bit,1); 
+            }
+          if (bit=='1')
+            row[c] = 1;
+          else if (bit=='0')
+            row[c] = 0;
+          else
+            G_THROW( ERR_MSG("GBitmap.bad_PBM") );
+        }
+      row -= bytes_per_row;
+    }
+}
+
+void 
+GBitmap::read_pgm_text(ByteStream &bs, int maxval)
+{
+  unsigned char *row = bytes_data + border;
+  row += (nrows-1) * bytes_per_row;
+  char lookahead = '\n';
+  GTArray<unsigned char> ramp(0, maxval);
+  for (int i=0; i<=maxval; i++)
+    ramp[i] = (i<maxval ? ((grays-1)*(maxval-i) + maxval/2) / maxval : 0);
+  for (int n = nrows-1; n>=0; n--) 
+    {
+      for (int c = 0; c<ncolumns; c++)
+        row[c] = ramp[(int)read_integer(lookahead, bs)];
+      row -= bytes_per_row;
+    }
+}
+
+void 
+GBitmap::read_pbm_raw(ByteStream &bs)
+{
+  unsigned char *row = bytes_data + border;
+  row += (nrows-1) * bytes_per_row;
+  for (int n = nrows-1; n>=0; n--) 
+    {
+      unsigned char acc = 0;
+      unsigned char mask = 0;
+      for (int c = 0; c<ncolumns; c++)
+        {
+          if (!mask) 
+            {
+              bs.read(&acc, 1);
+              mask = (unsigned char)0x80;
+            }
+          if (acc & mask)
+            row[c] = 1;
+          else
+            row[c] = 0;
+          mask >>= 1;
+        }
+      row -= bytes_per_row;
+    }
+}
+
+void 
+GBitmap::read_pgm_raw(ByteStream &bs, int maxval)
+{
+  int maxbin = (maxval>255) ? 65536 : 256;
+  GTArray<unsigned char> ramp(0, maxbin-1);
+  for (int i=0; i<maxbin; i++)
+    ramp[i] = (i<maxval ? ((grays-1)*(maxval-i) + maxval/2) / maxval : 0);
+  unsigned char *bramp = ramp;
+  unsigned char *row = bytes_data + border;
+  row += (nrows-1) * bytes_per_row;
+  for (int n = nrows-1; n>=0; n--) 
+    {
+      if (maxbin > 256)
+        {
+          for (int c = 0; c<ncolumns; c++)
+            {
+              unsigned char x[2];
+              bs.read((void*)&x, 2);
+              row[c] = bramp[x[0]*256+x[1]];
+            }
+        }
+      else
+        {
+          for (int c = 0; c<ncolumns; c++)
+            {
+              unsigned char x;
+              bs.read((void*)&x, 1);
+              row[c] = bramp[x];
+            }
+        }
+      row -= bytes_per_row;
+    }
+}
+
+void 
+GBitmap::read_rle_raw(ByteStream &bs)
+{
+  // interpret runs data
+  unsigned char h;
+  unsigned char p = 0;
+  unsigned char *row = bytes_data + border;
+  int n = nrows - 1;
+  row += n * bytes_per_row;
+  int c = 0;
+  while (n >= 0)
+    {
+      bs.read(&h, 1);
+      int x = h;
+      if (x >= (int)RUNOVERFLOWVALUE)
+        {
+          bs.read(&h, 1);
+          x = h + ((x - (int)RUNOVERFLOWVALUE) << 8);
+        }
+      if (c+x > ncolumns)
+        G_THROW( ERR_MSG("GBitmap.lost_sync") );
+      while (x-- > 0)
+        row[c++] = p;
+      p = 1 - p;
+      if (c >= ncolumns) 
+        {
+          c = 0;
+          p = 0;
+          row -= bytes_per_row;
+          n -= 1; 
+        }
+    }
+}
+
+
+// ------ save bitmaps
+
+void 
+GBitmap::save_pbm(ByteStream &bs, int raw)
+{
+  // check arguments
+  if (grays > 2)
+    G_THROW( ERR_MSG("GBitmap.cant_make_PBM") );
+  GMonitorLock lock(monitor());
+  // header
+  {
+    GUTF8String head;
+    head.format("P%c\n%d %d\n", (raw ? '4' : '1'), ncolumns, nrows);
+    bs.writall((void*)(const char *)head, head.length());
+  }
+  // body
+  if(raw)
+  {
+    if(!rle)
+      compress();
+    const unsigned char *runs=rle;
+    const unsigned char * const runs_end=rle+rlelength;
+    const int count=(ncolumns+7)>>3;
+    unsigned char *buf;
+    GPBuffer<unsigned char> gbuf(buf,count);
+    while(runs<runs_end)
+    {
+      rle_get_bitmap(ncolumns,runs,buf,false);
+      bs.writall(buf,count);
+    }
+  }else
+  {
+    if (!bytes)
+      uncompress();
+    const unsigned char *row = bytes + border;
+    int n = nrows - 1;
+    row += n * bytes_per_row;
+    while (n >= 0)
+    {
+      unsigned char eol='\n';
+      for (int c=0; c<ncolumns;)
+      {
+        unsigned char bit= (row[c] ? '1' : '0');
+        bs.write((void*)&bit, 1);
+        c += 1;
+        if (c==ncolumns || (c&(int)RUNMSBMASK)==0) 
+          bs.write((void*)&eol, 1);          
+       }
+      // next row
+      row -= bytes_per_row;
+      n -= 1;
+    }
+  }
+}
+
+void 
+GBitmap::save_pgm(ByteStream &bs, int raw)
+{
+  // checks
+  GMonitorLock lock(monitor());
+  if (!bytes)
+    uncompress();
+  // header
+  GUTF8String head;
+  head.format("P%c\n%d %d\n%d\n", (raw ? '5' : '2'), ncolumns, nrows, grays-1);
+  bs.writall((void*)(const char *)head, head.length());
+  // body
+  const unsigned char *row = bytes + border;
+  int n = nrows - 1;
+  row += n * bytes_per_row;
+  while (n >= 0)
+    {
+      if (raw)
+        {
+          for (int c=0; c<ncolumns; c++)
+            {
+              char x = grays - 1 - row[c];
+              bs.write((void*)&x, 1);
+            }
+        }
+      else 
+        {
+          unsigned char eol='\n';
+          for (int c=0; c<ncolumns; )
+            {
+              head.format("%d ", grays - 1 - row[c]);
+              bs.writall((void*)(const char *)head, head.length());
+              c += 1;
+              if (c==ncolumns || (c&0x1f)==0) 
+                bs.write((void*)&eol, 1);          
+            }
+        }
+      row -= bytes_per_row;
+      n -= 1;
+    }
+}
+
+void 
+GBitmap::save_rle(ByteStream &bs)
+{
+  // checks
+  if (ncolumns==0 || nrows==0)
+    G_THROW( ERR_MSG("GBitmap.not_init") );
+  GMonitorLock lock(monitor());
+  if (grays > 2)
+    G_THROW( ERR_MSG("GBitmap.cant_make_PBM") );
+  // header
+  GUTF8String head;
+  head.format("R4\n%d %d\n", ncolumns, nrows);
+  bs.writall((void*)(const char *)head, head.length());
+  // body
+  if (rle)
+    {
+      bs.writall((void*)rle, rlelength);
+    }
+  else
+    {
+      unsigned char *runs = 0;
+      GPBuffer<unsigned char> gruns(runs);
+      int size = encode(runs,gruns);
+      bs.writall((void*)runs, size);
+    }
+}
+
+
+// ------ runs
+
+
+void
+GBitmap::makerows(
+  int nrows, const int ncolumns, unsigned char *runs, unsigned char *rlerows[])
+{
+  while (nrows-- > 0)
+  {
+    rlerows[nrows] = runs;
+    int c;
+    for(c=0;c<ncolumns;c+=GBitmap::read_run(runs))
+      EMPTY_LOOP;
+    if (c > ncolumns)
+      G_THROW( ERR_MSG("GBitmap.lost_sync2") );
+  }
+}
+
+
+void
+GBitmap::rle_get_bitmap (
+  const int ncolumns,
+  const unsigned char *&runs,
+  unsigned char *bitmap,
+  const bool invert )
+{
+  const int obyte_def=invert?0xff:0;
+  const int obyte_ndef=invert?0:0xff;
+  int mask=0x80,obyte=0;
+  for(int c=ncolumns;c > 0 ;)
+  {
+    int x=read_run(runs);
+    c-=x;
+    while((x--)>0)
+    {
+      if(!(mask>>=1))
+      {
+        *(bitmap++) = obyte^obyte_def;
+        obyte=0;
+        mask=0x80;
+        for(;x>=8;x-=8)
+        {
+          *(bitmap++)=obyte_def;
+        }
+      }
+    }
+    if(c>0)
+    {
+      int x=read_run(runs);
+      c-=x;
+      while((x--)>0)
+      {
+        obyte|=mask;
+        if(!(mask>>=1))
+        {
+          *(bitmap++)=obyte^obyte_def;
+          obyte=0;
+          mask=0x80;
+          for(;(x>8);x-=8)
+            *(bitmap++)=obyte_ndef;
+        }
+      }
+    }
+  }
+  if(mask != 0x80)
+  {
+    *(bitmap++)=obyte^obyte_def;
+  }
+}
+
+int 
+GBitmap::rle_get_bits(int rowno, unsigned char *bits) const
+{
+  GMonitorLock lock(monitor());
+  if (!rle)
+    return 0;
+  if (rowno<0 || rowno>=nrows)
+    return 0;
+  if (!rlerows)
+  {
+    const_cast<GPBuffer<unsigned char *> &>(grlerows).resize(nrows);
+    makerows(nrows,ncolumns,rle,const_cast<unsigned char **>(rlerows));
+  }
+  int n = 0;
+  int p = 0;
+  int c = 0;
+  unsigned char *runs = rlerows[rowno];
+  while (c < ncolumns)
+    {
+      const int x=read_run(runs);
+      if ((c+=x)>ncolumns)
+        c = ncolumns;
+      while (n<c)
+        bits[n++] = p;
+      p = 1-p;
+    }
+  return n;
+}
+
+
+int 
+GBitmap::rle_get_runs(int rowno, int *rlens) const
+{
+  GMonitorLock lock(monitor());
+  if (!rle)
+    return 0;
+  if (rowno<0 || rowno>=nrows)
+    return 0;
+  if (!rlerows)
+  {
+    const_cast<GPBuffer<unsigned char *> &>(grlerows).resize(nrows);
+    makerows(nrows,ncolumns,rle,const_cast<unsigned char **>(rlerows));
+  }
+  int n = 0;
+  int d = 0;
+  int c = 0;
+  unsigned char *runs = rlerows[rowno];
+  while (c < ncolumns)
+    {
+      const int x=read_run(runs);
+      if (n>0 && !x)
+        {
+          n--;
+          d = d-rlens[n];
+        }
+      else 
+        {
+          rlens[n++] = (c+=x)-d;
+          d = c;
+        }
+    }
+  return n;
+}
+
+
+int 
+GBitmap::rle_get_rect(GRect &rect) const
+{
+  GMonitorLock lock(monitor());
+  if (!rle) 
+    return 0;
+  int area = 0;
+  unsigned char *runs = rle;
+  rect.xmin = ncolumns;
+  rect.ymin = nrows;
+  rect.xmax = 0;
+  rect.ymax = 0;
+  int r = nrows;
+  while (--r >= 0)
+    {
+      int p = 0;
+      int c = 0;
+      int n = 0;
+      while (c < ncolumns)
+        {
+          const int x=read_run(runs);
+          if(x)
+            {
+              if (p)
+                {
+                  if (c < rect.xmin) 
+                    rect.xmin = c;
+                  if ((c += x) > rect.xmax) 
+                    rect.xmax = c-1;
+                  n += x;
+                }
+              else
+                {
+                  c += x;
+                }
+            }
+          p = 1-p;
+        }
+      area += n;
+      if (n)
+        {
+          rect.ymin = r;
+          if (r > rect.ymax) 
+            rect.ymax = r;
+        }
+    }
+  if (area==0)
+    rect.clear();
+  return area;
+}
+
+
+
+// ------ helpers
+
+int
+GBitmap::encode(unsigned char *&pruns,GPBuffer<unsigned char> &gpruns) const
+{
+  // uncompress rle information
+  if (nrows==0 || ncolumns==0)
+  {
+    gpruns.resize(0);
+    return 0;
+  }
+  if (!bytes)
+    {
+      unsigned char *runs;
+      GPBuffer<unsigned char> gruns(runs,rlelength);
+      memcpy((void*)runs, rle, rlelength);
+      gruns.swap(gpruns);
+      return rlelength;
+    }
+  gpruns.resize(0);
+  // create run array
+  int pos = 0;
+  int maxpos = 1024 + ncolumns + ncolumns;
+  unsigned char *runs;
+  GPBuffer<unsigned char> gruns(runs,maxpos);
+  // encode bitmap as rle
+  const unsigned char *row = bytes + border;
+  int n = nrows - 1;
+  row += n * bytes_per_row;
+  while (n >= 0)
+    {
+      if (maxpos < pos+ncolumns+ncolumns+2)
+        {
+          maxpos += 1024 + ncolumns + ncolumns;
+          gruns.resize(maxpos);
+        }
+
+      unsigned char *runs_pos=runs+pos;
+      const unsigned char * const runs_pos_start=runs_pos;
+      append_line(runs_pos,row,ncolumns);
+      pos+=(size_t)runs_pos-(size_t)runs_pos_start;
+      row -= bytes_per_row;
+      n -= 1;
+    }
+  // return result
+  gruns.resize(pos);
+  gpruns.swap(gruns);
+  return pos;
+}
+
+void 
+GBitmap::decode(unsigned char *runs)
+{
+  // initialize pixel array
+  if (nrows==0 || ncolumns==0)
+    G_THROW( ERR_MSG("GBitmap.not_init") );
+  bytes_per_row = ncolumns + border;
+  if (runs==0)
+    G_THROW( ERR_MSG("GBitmap.null_arg") );
+  int npixels = nrows * bytes_per_row + border;
+  if (!bytes_data)
+  {
+    gbytes_data.resize(npixels);
+    bytes = bytes_data;
+  }
+  gbytes_data.clear();
+  gzerobuffer=zeroes(bytes_per_row + border);
+  // interpret runs data
+  int c, n;
+  unsigned char p = 0;
+  unsigned char *row = bytes_data + border;
+  n = nrows - 1;
+  row += n * bytes_per_row;
+  c = 0;
+  while (n >= 0)
+    {
+      int x = read_run(runs);
+      if (c+x > ncolumns)
+        G_THROW( ERR_MSG("GBitmap.lost_sync2") );
+      while (x-- > 0)
+        row[c++] = p;
+      p = 1 - p;
+      if (c >= ncolumns) 
+        {
+          c = 0;
+          p = 0;
+          row -= bytes_per_row;
+          n -= 1; 
+        }
+    }
+  // Free rle data possibly attached to this bitmap
+  grle.resize(0);
+  grlerows.resize(0);
+  rlelength = 0;
+#ifndef NDEBUG
+  check_border();
+#endif
+}
+
+class GBitmap::ZeroBuffer : public GPEnabled
+{
+public:
+  ZeroBuffer(const unsigned int zerosize);
+  unsigned char *zerobuffer;
+  GPBuffer<unsigned char> gzerobuffer;
+};
+
+GBitmap::ZeroBuffer::ZeroBuffer(const unsigned int zerosize)
+: gzerobuffer(zerobuffer,zerosize)
+{
+  gzerobuffer.clear();
+  GBitmap::zerobuffer=zerobuffer;
+  GBitmap::zerosize=zerosize;
+}
+
+static const unsigned char static_zerobuffer[]=
+{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 32
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 64
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 96 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 128 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 160
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 192
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 234
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 256
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 288
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 320
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 352 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 384 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 416
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 448
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 480
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 512
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 544
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 576
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 608 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 640 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 672
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 704
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 736
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 768
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 800
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 832
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 864 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 896 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 928
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 960
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 992
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+32
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+64
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+96 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+128 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+160
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+192
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+234
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+256
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+288
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+320
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+352 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+384 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+416
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+448
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+480
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+512
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+544
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+576
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+608 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+640 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+672
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+704
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+736
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+768
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+800
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+832
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+864 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+896 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+928
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+960
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 1024+992
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+32
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+64
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+96 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+128 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+160
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+192
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+234
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+256
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+288
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+320
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+352 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+384 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+416
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+448
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+480
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+512
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+544
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+576
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+608 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+640 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+672
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+704
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+736
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+768
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+800
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+832
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+864 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+896 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+928
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+960
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 2048+992
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+32
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+64
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+96 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+128 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+160
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+192
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+234
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+256
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+288
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+320
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+352 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+384 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+416
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+448
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+480
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+512
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+544
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+576
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+608 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+640 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+672
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+704
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+736
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+768
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+800
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+832
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+864 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+896 
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+928
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+960
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 3072+992
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; // 4096
+
+int GBitmap::zerosize = sizeof(static_zerobuffer);
+unsigned char *GBitmap::zerobuffer=const_cast<unsigned char *>(static_zerobuffer);
+
+GP<GBitmap::ZeroBuffer>
+GBitmap::zeroes(int required)
+{
+  GMonitorLock lock(&monitors[0]); // any monitor would do
+  static GP<GBitmap::ZeroBuffer> gzerobuffer;
+  if (zerosize < required)
+  {
+    int z;
+    for(z=zerosize;z<required;z <<= 1)
+      EMPTY_LOOP;
+    z=(z+0xfff)&(~0xfff);
+    gzerobuffer=new GBitmap::ZeroBuffer((unsigned int)z);
+  }
+  return gzerobuffer;
+}
+
+
+// Fills a bitmap with the given value
+void 
+GBitmap::fill(unsigned char value)
+{
+  GMonitorLock lock(monitor());
+  for(unsigned int y=0; y<rows(); y++)
+    {
+      unsigned char* bm_y = (*this)[y];
+      for(unsigned int x=0; x<columns(); x++)
+        bm_y[x] = value;
+    }
+}
+
+
+void 
+GBitmap::append_long_run(unsigned char *&data, int count)
+{
+  while (count > MAXRUNSIZE)
+    {
+      data[0] = data[1] = 0xff;
+      data[2] = 0;
+      data += 3;
+      count -= MAXRUNSIZE;
+    }
+  if (count < RUNOVERFLOWVALUE)
+    {
+      data[0] = count;
+      data += 1;
+    }
+  else
+    {
+      data[0] = (count>>8) + GBitmap::RUNOVERFLOWVALUE;
+      data[1] = (count & 0xff);
+      data += 2;
+    }
+}
+
+
+void
+GBitmap::append_line(unsigned char *&data,const unsigned char *row,
+                     const int rowlen,bool invert)
+{
+  const unsigned char *rowend=row+rowlen;
+  bool p=!invert;
+  while(row<rowend)
+    {
+      int count=0;
+      if ((p=!p)) 
+        {
+          if(*row)
+            for(++count,++row;(row<rowend)&&*row;++count,++row)
+            	EMPTY_LOOP;
+        } 
+      else if(!*row)
+        {
+          for(++count,++row;(row<rowend)&&!*row;++count,++row)
+          	EMPTY_LOOP;
+        }
+      append_run(data,count);
+    }
+}
+
+#if 0
+static inline int
+GetRowTDLRNR(
+  GBitmap &bit,const int row, const unsigned char *&startptr,
+  const unsigned char *&stopptr)
+{
+  stopptr=(startptr=bit[row])+bit.columns();
+  return 1;
+}
+
+static inline int
+GetRowTDLRNR(
+  GBitmap &bit,const int row, const unsigned char *&startptr,
+  const unsigned char *&stopptr)
+{
+  stopptr=(startptr=bit[row])+bit.columns();
+  return 1;
+}
+
+static inline int
+GetRowTDRLNR(
+  GBitmap &bit,const int row, const unsigned char *&startptr,
+  const unsigned char *&stopptr)
+{
+  startptr=(stopptr=bit[row]-1)+bit.columns();
+  return -1;
+}
+#endif // 0
+
+GP<GBitmap> 
+GBitmap::rotate(int count)
+{
+  GP<GBitmap> newbitmap=this;
+  count = count & 3;
+  if(count)
+  {
+    if( count & 0x01 )
+    {
+      newbitmap = new GBitmap(ncolumns, nrows);
+    }else
+    {
+      newbitmap = new GBitmap(nrows, ncolumns);
+    }
+    GMonitorLock lock(monitor());
+    if (!bytes_data)
+      uncompress();
+    GBitmap &dbitmap = *newbitmap;
+    dbitmap.set_grays(grays);
+    switch(count)
+    {
+    case 3: // rotate 90 counter clockwise
+      {
+        const int lastrow = dbitmap.rows()-1;
+        for(int y=0; y<nrows; y++)
+        {
+          const unsigned char *r=operator[] (y);
+          for(int x=0,xnew=lastrow;xnew>=0; x++,xnew--)
+          {
+            dbitmap[xnew][y] = r[x];
+          }
+        }
+      }
+      break;
+    case 2: // rotate 180 counter clockwise
+      {
+        const int lastrow = dbitmap.rows()-1;
+        const int lastcolumn = dbitmap.columns()-1;
+        for(int y=0,ynew=lastrow;ynew>=0; y++,ynew--)
+        {
+          const unsigned char *r=operator[] (y);
+          unsigned char *d=dbitmap[ynew];
+          for(int xnew=lastcolumn;xnew>=0; r++,--xnew)
+          {
+            d[xnew] = *r;
+          }
+        }
+      }
+      break;
+    case 1: // rotate 270 counter clockwise
+      {
+        const int lastcolumn = dbitmap.columns()-1;
+        for(int y=0,ynew=lastcolumn;ynew>=0;y++,ynew--)
+        {
+          const unsigned char *r=operator[] (y);
+          for(int x=0; x<ncolumns; x++)
+          {
+            dbitmap[x][ynew] = r[x];
+          }
+        }
+      }
+      break;
+    }
+    if(grays == 2)
+    {
+      compress();
+      dbitmap.compress();
+    }
+  }
+  return newbitmap;
+}
+
+#ifndef NDEBUG
+void 
+GBitmap::check_border() const
+{int col ;
+  if (bytes)
+    {
+      const unsigned char *p = (*this)[-1];
+      for (col=-border; col<ncolumns+border; col++)
+        if (p[col])
+          G_THROW( ERR_MSG("GBitmap.zero_damaged") );
+      for (int row=0; row<nrows; row++)
+        {
+          p = (*this)[row];
+          for (col=-border; col<0; col++)
+            if (p[col])
+              G_THROW( ERR_MSG("GBitmap.left_damaged") );
+          for (col=ncolumns; col<ncolumns+border; col++)
+            if (p[col])
+              G_THROW( ERR_MSG("GBitmap.right_damaged") );
+        }
+    }
+}
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h
new file mode 100644
index 0000000..e8e0c9b
--- /dev/null
+++ b/libdjvu/GBitmap.h
@@ -0,0 +1,672 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GBITMAP_H_
+#define _GBITMAP_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GSmartPointer.h"
+#ifndef NDEBUG
+#include "GException.h"
+#endif
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+class GRect;
+class GMonitor;
+class ByteStream;
+
+/** @name GBitmap.h
+
+    Files #"GBitmap.h"# and #"GBitmap.cpp"# implement class \Ref{GBitmap}.
+    Instances of this class represent bilevel or gray-level images. The
+    ``bottom left'' coordinate system is used consistently in the DjVu library.
+    Line zero of a bitmap is the bottom line in the bitmap.  Pixels are
+    organized from left to right within each line.  As suggested by its name,
+    class #GBitmap# was initially a class for bilevel images only.  It was
+    extended to handle gray-level images when arose the need to render
+    anti-aliased images.  This class has been a misnomer since then.
+
+    {\bf ToDo} --- Class #GBitmap# can internally represent bilevel images
+    using a run-length encoded representation.  Some algorithms may benefit
+    from a direct access to this run information.
+
+    @memo
+    Generic support for bilevel and gray-level images.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+
+ */
+//@{
+
+
+/** Bilevel and gray-level images.  Instances of class #GBitmap# represent
+    bilevel or gray-level images.  Images are usually represented using one
+    byte per pixel.  Value zero represents a white pixel.  A value equal to
+    the number of gray levels minus one represents a black pixel.  The number
+    of gray levels is returned by the function \Ref{get_grays} and can be
+    manipulated by the functions \Ref{set_grays} and \Ref{change_grays}.
+
+    The bracket operator returns a pointer to the bytes composing one line of
+    the image.  This pointer can be used to read or write the image pixels.
+    Line zero represents the bottom line of the image.
+
+    The memory organization is setup in such a way that you can safely read a
+    few pixels located in a small border surrounding all four sides of the
+    image.  The width of this border can be modified using the function
+    \Ref{minborder}.  The border pixels are initialized to zero and therefore
+    represent white pixels.  You should never write anything into border
+    pixels because they are shared between images and between lines.  */
+
+class DJVUAPI GBitmap : public GPEnabled
+{
+protected:
+  GBitmap(void);
+  GBitmap(int nrows, int ncolumns, int border=0);
+  GBitmap(const GBitmap &ref);
+  GBitmap(const GBitmap &ref, int border);
+  GBitmap(const GBitmap &ref, const GRect &rect, int border=0);
+  GBitmap(ByteStream &ref, int border=0);
+public:
+  virtual ~GBitmap();
+  void destroy(void);
+  /** @name Construction. */
+  //@{
+  /** Constructs an empty GBitmap object.  The returned GBitmap has zero rows
+      and zero columns.  Use function \Ref{init} to change the size of the
+      image. */
+  static GP<GBitmap> create(void) {return new GBitmap;}
+
+  /** Constructs a GBitmap with #nrows# rows and #ncolumns# columns.  All
+      pixels are initialized to white. The optional argument #border#
+      specifies the size of the optional border of white pixels surrounding
+      the image.  The number of gray levels is initially set to #2#.  */
+  static GP<GBitmap> create(const int nrows, const int ncolumns, const int border=0)
+  {return new GBitmap(nrows,ncolumns, border); }
+
+  /** Copy constructor. Constructs a GBitmap by replicating the size, the
+      border and the contents of GBitmap #ref#. */
+  static GP<GBitmap> create(const GBitmap &ref)
+  {return new GBitmap(ref);}
+
+  /** Constructs a GBitmap by copying the contents of GBitmap #ref#.  
+      Argument #border# specifies the width of the optional border. */
+  static GP<GBitmap> create(const GBitmap &ref, const int border)
+  { return new GBitmap(ref,border); }
+
+  /** Constructs a GBitmap by copying a rectangular segment #rect# of GBitmap
+      #ref#.  The optional argument #border# specifies the size of the
+      optional border of white pixels surrounding the image. */
+  static GP<GBitmap> create(const GBitmap &ref, const GRect &rect, const int border=0)
+  { return new GBitmap(ref,rect,border); }
+
+  /** Constructs a GBitmap by reading PBM, PGM or RLE data from ByteStream
+      #ref# into this GBitmap. The optional argument #border# specifies the
+      size of the optional border of white pixels surrounding the image.  See
+      \Ref{PNM and RLE file formats} for more information.  */
+  static GP<GBitmap> create(ByteStream &ref, const int border=0)
+  { return new GBitmap(ref,border); }
+
+  //@}
+
+  /** @name Initialization. */
+  //@{
+  /** Resets this GBitmap size to #nrows# rows and #ncolumns# columns and sets
+      all pixels to white.  The optional argument #border# specifies the size
+      of the optional border of white pixels surrounding the image.  The
+      number of gray levels is initialized to #2#. */
+  void init(int nrows, int ncolumns, int border=0);
+  /** Initializes this GBitmap with the contents of the GBitmap #ref#.  The
+      optional argument #border# specifies the size of the optional border of
+      white pixels surrounding the image. */
+  void init(const GBitmap &ref, int border=0);
+  /** Initializes this GBitmap with a rectangular segment #rect# of GBitmap
+      #ref#.  The optional argument #border# specifies the size of the
+      optional border of white pixels surrounding the image. */
+  void init(const GBitmap &ref, const GRect &rect, int border=0);
+  /** Reads PBM, PGM or RLE data from ByteStream #ref# into this GBitmap.  The
+      previous content of the GBitmap object is lost. The optional argument
+      #border# specifies the size of the optional border of white pixels
+      surrounding the image. See \Ref{PNM and RLE file formats} for more
+      information. */
+  void init(ByteStream &ref, int border=0);
+  /** Assignment operator. Initializes this GBitmap by copying the size, the
+      border and the contents of GBitmap #ref#. */
+  GBitmap& operator=(const GBitmap &ref);
+  /** Initializes all the GBitmap pixels to value #value#. */
+  void fill(unsigned char value);
+  //@}
+
+  /** @name Accessing the pixels. */
+  //@{
+  /** Returns the number of rows (the image height). */
+  unsigned int rows() const;
+  /** Returns the number of columns (the image width). */
+  unsigned int columns() const;
+  /** Returns a constant pointer to the first byte of row #row#.
+      This pointer can be used as an array to read the row elements. */
+  const unsigned char *operator[] (int row) const;
+  /** Returns a pointer to the first byte of row #row#.
+      This pointer can be used as an array to read or write the row elements. */
+  unsigned char *operator[] (int row);
+  /** Returns the size of a row in memory (in pixels).  This number is equal
+      to the difference between pointers to pixels located in the same column
+      in consecutive rows.  This difference can be larger than the number of
+      columns in the image. */
+  unsigned int rowsize() const;
+  /** Makes sure that the border is at least #minimum# pixels large.  This
+      function does nothing it the border width is already larger than
+      #minimum#.  Otherwise it reorganizes the data in order to provide a
+      border of #minimum# pixels. */
+  void minborder(int minimum);
+  //@}
+
+  /** @name Managing gray levels. */
+  //@{
+  /** Returns the number of gray levels. 
+      Value #2# denotes a bilevel image. */
+  int  get_grays() const;
+  /** Sets the number of gray levels without changing the pixels.
+      Argument #grays# must be in range #2# to #256#. */
+  void set_grays(int grays);
+  /** Changes the number of gray levels.  The argument #grays# must be in the
+      range #2# to #256#.  All the pixel values are then rescaled and clipped
+      in range #0# to #grays-1#. */
+  void change_grays(int grays);
+  /** Binarizes a gray level image using a threshold.  The number of gray
+      levels is reduced to #2# as in a bilevel image.  All pixels whose value
+      was strictly greater than #threshold# are set to black. All other pixels
+      are set to white. */
+  void binarize_grays(int threshold=0);
+  //@}
+
+  /** @name Optimizing the memory usage.  
+      The amount of memory used by bilevel images can be reduced using
+      function \Ref{compress}, which encodes the image using a run-length
+      encoding scheme.  The bracket operator decompresses the image on demand.
+      A few highly optimized functions (e.g. \Ref{blit}) can use a run-length
+      encoded bitmap without decompressing it.  There are unfortunate locking
+      issues associated with this capability (c.f. \Ref{share} and
+      \Ref{monitor}). */
+  //@{
+  /** Reduces the memory required for a bilevel image by using a run-length
+      encoded representation.  Functions that need to access the pixel array
+      will decompress the image on demand. */
+  void compress();
+  /** Decodes run-length encoded bitmaps and recreate the pixel array.
+      This function is usually called by #operator[]# when needed. */
+  void uncompress();
+  /** Returns the number of bytes allocated for this image. */
+  unsigned int get_memory_usage() const;
+  /** Returns a possibly null pointer to a \Ref{GMonitor} for this bitmap.
+      You should use this monitor to ensure that the data representation of the 
+      bitmap will not change while you are using it.  We suggest using
+      class \Ref{GMonitorLock} which properly handles null monitor pointers. */
+  GMonitor *monitor() const;
+  /** Associates a \Ref{GMonitor} with this bitmap. This function should be
+      called on all bitmaps susceptible of being simultaneously used by
+      several threads.  It will make sure that function \Ref{monitor} returns
+      a pointer to a suitable monitor for this bitmap. */
+  void share();
+  //@}
+
+  /** @name Accessing RLE data.
+      The next functions are useful for processing bilevel images
+      encoded using the run length encoding scheme.  These functions always return
+      zero if the bitmap is not RLE encoded.  Function \Ref{compress} must
+      be used to ensure that the bitmap is RLE encoded.  */
+  //@{
+  /** Gets the pixels for line #rowno#.  One line of pixel is stored as
+      #unsigned char# values into array #bits#.  Each pixel is either 1 or 0.
+      The array must be large enough to hold the whole line.  The number of
+      pixels is returned. */
+
+  int rle_get_bits(int rowno, unsigned char *bits) const;
+
+  /** Gets the bitmap line rle data passed.  One line of pixel is stored one
+      with 8 bits per #unsigned char# in an array.  The array must be large
+      enough to hold the whole line.  */
+
+  static void rle_get_bitmap(const int ncolumns,const unsigned char *&runs,
+    unsigned char *bitmap, const bool invert );
+
+  /** Gets the lengths of all runs in line #rowno#.  The array #rlens# must be
+      large enough to accomodate #w+2# integers where #w# is the number of
+      columns in the image.  These integers represent the lengths of
+      consecutive runs of alternatively white or black pixels.  Lengths can be
+      zero in order to allow for lines starting with black pixels.  This
+      function returns the total number of runs in the line. */
+  int rle_get_runs(int rowno, int *rlens) const;
+  /** Gets the smallest rectangle enclosing black pixels.
+      Rectangle rect gives the coordinates of the smallest rectangle
+      containing all black pixels. Returns the number of black pixels. */
+  int rle_get_rect(GRect &rect) const;
+  //@}
+
+  /** @name Additive Blit.  
+      The blit functions are designed to efficiently construct an anti-aliased
+      image by copying smaller images at predefined locations.  The image of a
+      page, for instance, is composed by copying the images of characters at
+      predefined locations.  These functions are fairly optimized.  They can
+      directly use compressed GBitmaps (see \Ref{compress}).  We consider in
+      this section that each GBitmap comes with a coordinate system defined as
+      follows.  Position (#0#,#0#) corresponds to the bottom left corner of
+      the bottom left pixel.  Position (#1#,#1#) corresponds to the top right
+      corner of the bottom left pixel, which is also the bottom left corner of
+      the second pixel of the second row.  Position (#w#,#h#), where #w# and
+      #h# denote the size of the GBitmap, corresponds to the top right corner
+      of the top right pixel. */
+
+  //@{
+  /** Performs an additive blit of the GBitmap #bm#.  The GBitmap #bm# is
+      first positioned above the current GBitmap in such a way that position
+      (#u#,#v#) in GBitmap #bm# corresponds to position (#u#+#x#,#v#+#y#) in
+      the current GBitmap.  The value of each pixel in GBitmap #bm# is then
+      added to the value of the corresponding pixel in the current GBitmap.
+      
+      {\bf Example}: Assume for instance that the current GBitmap is initially
+      white (all pixels have value zero).  This operation copies the pixel
+      values of GBitmap #bm# at position (#x#,#y#) into the current GBitmap.
+      Note that function #blit# does not change the number of gray levels in
+      the current GBitmap.  You may have to call \Ref{set_grays} to specify
+      how the pixel values should be interpreted. */
+  void blit(const GBitmap *bm, int x, int y);
+  /** Performs an additive blit of the GBitmap #bm# with anti-aliasing.  The
+      GBitmap #bm# is first positioned above the current GBitmap in such a
+      way that position (#u#,#v#) in GBitmap #bm# corresponds to position
+      (#u#+#x#/#subsample#,#v#+#y#/#subsample#) in the current GBitmap.  This
+      mapping results in a contraction of GBitmap #bm# by a factor
+      #subsample#.  Each pixel of the current GBitmap can be covered by a
+      maximum of #subsample^2# pixels of GBitmap #bm#.  The value of
+      each pixel in GBitmap #bm# is then added to the value of the
+      corresponding pixel in the current GBitmap.
+
+      {\bf Example}: Assume for instance that the current GBitmap is initially
+      white (all pixels have value zero).  Each pixel of the current GBitmap
+      then contains the sum of the gray levels of the corresponding pixels in
+      GBitmap #bm#.  There are up to #subsample*subsample# such pixels.  If
+      for instance GBitmap #bm# is a bilevel image (pixels can be #0# or #1#),
+      the pixels of the current GBitmap can take values in range #0# to
+      #subsample*subsample#.  Note that function #blit# does not change the
+      number of gray levels in the current GBitmap.  You must call
+      \Ref{set_grays} to indicate that there are #subsample^2+1# gray
+      levels.  Since there is at most 256 gray levels, this also means that
+      #subsample# should never be greater than #15#.
+
+      {\bf Remark}: Arguments #x# and #y# do not represent a position in the
+      coordinate system of the current GBitmap.  According to the above
+      discussion, the position is (#x/subsample#,#y/subsample#).  In other
+      words, you can position the blit with a sub-pixel resolution.  The
+      resulting anti-aliasing changes are paramount to the image quality. */
+  void blit(const GBitmap *shape, int x, int y, int subsample);
+  //@}
+  
+  /** @name Saving images.  
+      The following functions write PBM, PGM and RLE files.  PBM and PGM are
+      well known formats for bilevel and gray-level images.  The RLE is a
+      simple run-length encoding scheme for bilevel images. These files can be
+      read using the ByteStream based constructor or initialization function.
+      See \Ref{PNM and RLE file formats} for more information. */
+  //@{
+  /** Saves the image into ByteStream #bs# using the PBM format.  Argument
+      #raw# selects the ``Raw PBM'' (1) or the ``Ascii PBM'' (0) format.  The
+      image is saved as a bilevel image.  All non zero pixels are considered
+      black pixels. See section \Ref{PNM and RLE file formats}. */
+  void save_pbm(ByteStream &bs, int raw=1);
+  /** Saves the image into ByteStream #bs# using the PGM format.  Argument
+      #raw# selects the ``Raw PGM'' (1) or the ``Ascii PGM'' (0) format.  The
+      image is saved as a gray level image.  See section
+      \Ref{PNM and RLE file formats}. */
+  void save_pgm(ByteStream &bs, int raw=1);
+  /** Saves the image into ByteStream #bs# using the RLE file format.
+      The image is saved as a bilevel image. All non zero pixels are
+      considered black pixels. See section \Ref{PNM and RLE file formats}. */
+  void save_rle(ByteStream &bs);
+  //@}
+
+  /** @name Stealing or borrowing the memory buffer (advanced). */
+  //@{
+  /** Steals the memory buffer of a GBitmap.  This function returns the
+      address of the memory buffer allocated by this GBitmap object.  The
+      offset of the first pixel in the bottom line is written into variable
+      #offset#.  Other lines can be accessed using pointer arithmetic (see
+      \Ref{rowsize}).  The GBitmap object no longer ``owns'' the buffer: you
+      must explicitly de-allocate the buffer using #operator delete []#.  This
+      de-allocation should take place after the destruction or the
+      re-initialization of the GBitmap object.  This function will return a
+      null pointer if the GBitmap object does not ``own'' the buffer in the
+      first place.  */
+  unsigned char *take_data(size_t &offset);
+  /** Initializes this GBitmap by borrowing a memory segment.  The GBitmap
+      then directly addresses the memory buffer #data# provided by the user.
+      This buffer must be large enough to hold #w*h# bytes representing each
+      one pixel.  The GBitmap object does not ``own'' the buffer: you must
+      explicitly de-allocate the buffer using #operator delete []#.  This
+      de-allocation should take place after the destruction or the
+      re-initialization of the GBitmap object.  */
+  inline void borrow_data(unsigned char &data, int w, int h);
+  /** Same as borrow_data, except GBitmap will call #delete[]#. */
+  void donate_data(unsigned char *data, int w, int h);
+  /** Return a pointer to the rle data. */
+  const unsigned char *get_rle(unsigned int &rle_length);
+  /** Initializes this GBitmap by setting the size to #h# rows and #w#
+      columns, and directly addressing the memory buffer #rledata# provided by
+      the user.  This buffer contains #rledatalen# bytes representing the
+      bitmap in run length encoded form.  The GBitmap object then ``owns'' the
+      buffer (unlike #borrow_data#, but like #donate_data#) and will
+      deallocate this buffer when appropriate: you should not deallocate this
+      buffer yourself.  The encoding of buffer #rledata# is similar to the
+      data segment of the RLE file format (without the header) documented in
+      \Ref{PNM and RLE file formats}.  */
+  void donate_rle(unsigned char *rledata, unsigned int rledatalen, int w, int h);
+  /** Static function for parsing run data.
+      This function returns one run length encoded at position #data# 
+      and increments the pointer #data# accordingly. */
+  static inline int read_run(const unsigned char *&data);
+  static inline int read_run(unsigned char *&data);
+  /** Static function for generating run data.
+      This function encoded run length #count# at position #data#
+      and increments the pointer accordingly.  The pointer must
+      initially point to a large enough data buffer. */
+  static inline void append_run(unsigned char *&data, int count);
+  /** Rotates bitmap by 90, 180 or 270 degrees anticlockwise
+      and returns a new pixmap, input bitmap is not changed. 
+      count can be 1, 2, or 3 for 90, 180, 270 degree rotation.
+      It returns the same bitmap if not rotated. 
+      The input bitmap will be uncompressed for rotation*/
+  GP<GBitmap> rotate(int count=0);
+  //@}
+
+// These are constants, but we use enum because that works on older compilers.
+  enum {MAXRUNSIZE=0x3fff};
+  enum {RUNOVERFLOWVALUE=0xc0};
+  enum {RUNMSBMASK=0x3f};
+  enum {RUNLSBMASK=0xff};
+
+
+protected:
+  // bitmap components
+  unsigned short nrows;
+  unsigned short ncolumns;
+  unsigned short border;
+  unsigned short bytes_per_row;
+  unsigned short grays;
+  unsigned char  *bytes;
+  unsigned char  *bytes_data;
+  GPBuffer<unsigned char> gbytes_data;
+  unsigned char  *rle;
+  GPBuffer<unsigned char> grle;
+  unsigned char  **rlerows;
+  GPBuffer<unsigned char *> grlerows;
+  unsigned int   rlelength;
+private:
+  GMonitor       *monitorptr;
+public:
+  class ZeroBuffer;
+  friend class ZeroBuffer;
+  GP<ZeroBuffer> gzerobuffer; 
+private:
+  static int zerosize;
+  static unsigned char *zerobuffer;
+  static GP<ZeroBuffer> zeroes(int ncolumns);
+  static unsigned int read_integer(char &lookahead, ByteStream &ref);
+  static void euclidian_ratio(int a, int b, int &q, int &r);
+  int encode(unsigned char *&pruns,GPBuffer<unsigned char> &gpruns) const;
+  void decode(unsigned char *runs);
+  void read_pbm_text(ByteStream &ref); 
+  void read_pgm_text(ByteStream &ref, int maxval); 
+  void read_pbm_raw(ByteStream &ref); 
+  void read_pgm_raw(ByteStream &ref, int maxval); 
+  void read_rle_raw(ByteStream &ref); 
+  static void append_long_run(unsigned char *&data, int count);
+  static void append_line(unsigned char *&data,const unsigned char *row,
+                          const int rowlen,bool invert=false);
+  static void makerows(int,const int, unsigned char *, unsigned char *[]);
+  friend class DjVu_Stream;
+  friend class DjVu_PixImage;
+public:
+#ifndef NDEBUG
+  void check_border() const;
+#endif
+};
+
+
+/** @name PNM and RLE file formats
+
+    {\bf PNM} --- There are actually three PNM file formats: PBM for bilevel
+    images, PGM for gray level images, and PPM for color images.  These
+    formats are widely used by popular image manipulation packages such as
+    NetPBM \URL{http://www.arc.umn.edu/GVL/Software/netpbm.html} or
+    ImageMagick \URL{http://www.wizards.dupont.com/cristy/}.
+    
+    {\bf RLE} --- The binary RLE file format is a simple run-length encoding
+    scheme for storing bilevel images.  Encoding or decoding a RLE encoded
+    file is extremely simple. Yet RLE encoded files are usually much smaller
+    than the corresponding PBM encoded files.  RLE files always begin with a
+    header line composed of:\\
+    - the two characters #"R4"#,\\
+    - one or more blank characters,\\
+    - the number of columns, encoded using characters #"0"# to #"9"#,\\
+    - one or more blank characters,\\
+    - the number of lines, encoded using characters #"0"# to #"9"#,\\
+    - exactly one blank character (usually a line-feed character).
+
+    The rest of the file encodes a sequence of numbers representing the
+    lengths of alternating runs of white and black pixels.  Lines are encoded
+    starting with the top line and progressing towards the bottom line.  Each
+    line starts with a white run. The decoder knows that a line is finished
+    when the sum of the run lengths for that line is equal to the number of
+    columns in the image.  Numbers in range #0# to #191# are represented by a
+    single byte in range #0x00# to #0xbf#.  Numbers in range #192# to #16383#
+    are represented by a two byte sequence: the first byte, in range #0xc0# to
+    #0xff#, encodes the six most significant bits of the number, the second
+    byte encodes the remaining eight bits of the number. This scheme allows
+    for runs of length zero, which are useful when a line starts with a black
+    pixel, and when a very long run (whose length exceeds #16383#) must be
+    split into smaller runs.
+
+    @memo
+    Simple image file formats.  */
+
+//@}
+
+
+// ---------------- IMPLEMENTATION
+
+inline unsigned int
+GBitmap::rows() const
+{
+  return nrows;
+}
+
+inline unsigned int
+GBitmap::columns() const
+{
+  return ncolumns;
+}
+
+inline unsigned int 
+GBitmap::rowsize() const
+{
+  return bytes_per_row;
+}
+
+inline int
+GBitmap::get_grays() const
+{
+  return grays;
+}
+
+inline unsigned char *
+GBitmap::operator[](int row) 
+{
+  if (!bytes) 
+    uncompress();
+  if (row<0 || row>=nrows) {
+#ifndef NDEBUG
+    if (zerosize < bytes_per_row + border)
+      G_THROW( ERR_MSG("GBitmap.zero_small") );
+#endif
+    return zerobuffer + border;
+  }
+  return &bytes[row * bytes_per_row + border];
+}
+
+inline const unsigned char *
+GBitmap::operator[](int row) const
+{
+  if (!bytes) 
+    ((GBitmap*)this)->uncompress();
+  if (row<0 || row>=nrows) {
+#ifndef NDEBUG
+    if (zerosize < bytes_per_row + border)
+      G_THROW( ERR_MSG("GBitmap.zero_small") );
+#endif
+    return zerobuffer + border;
+  }
+  return &bytes[row * bytes_per_row + border];
+}
+
+inline GBitmap& 
+GBitmap::operator=(const GBitmap &ref)
+{
+  init(ref, ref.border);
+  return *this;
+}
+
+inline GMonitor *
+GBitmap::monitor() const
+{
+  return monitorptr;
+}
+
+inline void 
+GBitmap::euclidian_ratio(int a, int b, int &q, int &r)
+{
+  q = a / b;
+  r = a - b*q;
+  if (r < 0)
+  {
+    q -= 1;
+    r += b;
+  }
+}
+
+
+inline int
+GBitmap::read_run(unsigned char *&data)
+{
+  register int z=*data++;
+  return (z>=RUNOVERFLOWVALUE)?
+    ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
+}
+
+inline int
+GBitmap::read_run(const unsigned char *&data)
+{
+  register int z=*data++;
+  return (z>=RUNOVERFLOWVALUE)?
+    ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
+}
+
+inline void
+GBitmap::append_run(unsigned char *&data, int count)
+{
+  if (count < RUNOVERFLOWVALUE)
+    {
+      data[0] = count;
+      data += 1;
+    }
+  else if (count <= MAXRUNSIZE)
+    {
+      data[0] = (count>>8) + GBitmap::RUNOVERFLOWVALUE;
+      data[1] = (count & 0xff);
+      data += 2;
+    }
+  else
+    {
+      append_long_run(data, count);
+    }
+}
+
+
+inline void
+GBitmap::borrow_data(unsigned char &data,int w,int h)
+{
+  donate_data(&data,w,h);
+  bytes_data=0;
+}
+
+// ---------------- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GContainer.cpp b/libdjvu/GContainer.cpp
new file mode 100644
index 0000000..9611bff
--- /dev/null
+++ b/libdjvu/GContainer.cpp
@@ -0,0 +1,813 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GContainer.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// ------------------------------------------------------------
+// DYNAMIC ARRAYS
+// ------------------------------------------------------------
+
+
+GArrayBase::GArrayBase(const GArrayBase &ref)
+  : traits(ref.traits), data(0),
+    minlo(ref.minlo), maxhi(ref.maxhi),
+    lobound(ref.lobound), hibound(ref.hibound)
+{
+  if (maxhi >= minlo)
+    data = ::operator new(traits.size * (maxhi - minlo + 1));
+  if (hibound >= lobound)
+    traits.copy(traits.lea(data, lobound-minlo), 
+                traits.lea(ref.data, lobound-minlo),
+                hibound - lobound + 1, 0);
+}
+
+
+GArrayBase::GArrayBase(const GCONT Traits &traits)
+  : traits(traits), data(0),
+    minlo(0), maxhi(-1),
+    lobound(0), hibound(-1)
+{
+}
+
+
+GArrayBase::GArrayBase(const GCONT Traits &traits, int lobound, int hibound)
+  : traits(traits), data(0),
+    minlo(0), maxhi(-1),
+    lobound(0), hibound(-1)
+{
+  resize(lobound, hibound);
+}
+
+
+GArrayBase::~GArrayBase()
+{
+  G_TRY { empty(); } G_CATCH_ALL { } G_ENDCATCH;
+}
+
+
+GArrayBase &
+GArrayBase::operator= (const GArrayBase &ga)
+{
+  if (this == &ga)
+    return *this;
+  empty();
+  if (ga.hibound >= ga.lobound)
+    {
+      resize(ga.lobound, ga.hibound);
+      traits.copy( traits.lea(data, lobound-minlo),
+                   traits.lea(ga.data, ga.lobound-ga.minlo),
+                   hibound - lobound + 1, 0 );
+    }
+  return *this;
+}
+
+
+void
+GArrayBase::steal(GArrayBase &ga)
+{
+  if (this != &ga)
+    {
+      empty();
+      lobound = ga.lobound;
+      hibound = ga.hibound;
+      minlo = ga.minlo;
+      maxhi = ga.maxhi;
+      data = ga.data;
+      ga.data = 0;
+      ga.lobound = ga.minlo = 0;
+      ga.hibound = ga.maxhi = -1;
+    }
+}
+
+
+void 
+GArrayBase::empty()
+{
+  resize(0, -1);
+}
+
+
+void 
+GArrayBase::touch(int n)
+{
+  int nlo = (n<lobound ? n : lobound);
+  int nhi = (n>hibound ? n : hibound);
+  if (hibound < lobound)
+    nlo = nhi = n;
+  resize(nlo, nhi);
+}
+
+
+void 
+GArrayBase::resize(int lo, int hi)
+{
+  // Validation
+  int nsize = hi - lo + 1;
+  if (nsize < 0)
+    G_THROW( ERR_MSG("GContainer.bad_args") );
+  // Destruction
+  if (nsize == 0)
+    {
+      if (hibound >= lobound)
+        traits.fini( traits.lea(data, lobound-minlo), hibound-lobound+1 );
+      if (data)
+        ::operator delete (data);
+      data = 0;
+      lobound = minlo = 0;
+      hibound = maxhi = -1;
+      return;
+    }
+  // Simple extension
+  if (lo >= minlo && hi <= maxhi)
+    {
+      if (lobound > lo)
+        traits.init( traits.lea(data,lo-minlo), lobound-lo );
+      else if (lo > lobound)
+        traits.fini( traits.lea(data,lobound-minlo), lo-lobound );
+      if (hi > hibound)
+        traits.init( traits.lea(data,hibound-minlo+1), hi-hibound );
+      else if (hibound > hi)
+        traits.fini( traits.lea(data,hi-minlo+1), hibound-hi );        
+      lobound = lo;
+      hibound = hi;
+      return;
+    }
+  // General case
+  int nminlo = minlo;
+  int nmaxhi = maxhi;
+  if (nminlo > nmaxhi)
+    nminlo = nmaxhi = lo;
+  while (nminlo > lo) {
+    int incr = nmaxhi - nminlo;
+    nminlo -= (incr < 8 ? 8 : (incr > 32768 ? 32768 : incr));
+  }
+  while (nmaxhi < hi) {
+    int incr = nmaxhi - nminlo;
+    nmaxhi += (incr < 8 ? 8 : (incr > 32768 ? 32768 : incr));
+  }
+  // allocate and move
+  int beg = lo;
+  int end = hi;
+  int bytesize = traits.size * (nmaxhi-nminlo+1);
+  void *ndata = ::operator new(bytesize);
+#if GCONTAINER_ZERO_FILL
+  memset(ndata, 0, bytesize);  // slower but cleaner
+#endif
+  G_TRY
+    {
+      if (lo < lobound)
+        { traits.init( traits.lea(ndata,lo-nminlo), lobound-lo ); beg=lobound; }
+      else if (lobound < lo)
+        { traits.fini( traits.lea(data,lobound-minlo), lo-lobound); }
+      if (hibound < hi)
+        { traits.init( traits.lea(ndata,hibound-nminlo+1), hi-hibound ); end=hibound; }
+      else if (hi < hibound)
+        { traits.fini( traits.lea(data, hi-minlo+1), hibound-hi ); }
+      if (end >= beg)
+        { traits.copy( traits.lea(ndata, beg-nminlo), 
+                       traits.lea(data, beg-minlo),
+                       end-beg+1, 1 ); }
+    }
+  G_CATCH_ALL
+    {
+      if (ndata)
+        ::operator delete(ndata);
+      G_RETHROW;
+    }
+  G_ENDCATCH;
+  // free and replace
+  if (data) 
+    ::operator delete(data);
+  data = ndata;
+  minlo = nminlo;
+  maxhi = nmaxhi;
+  lobound = lo;
+  hibound = hi;
+}
+
+
+void 
+GArrayBase::shift(int disp)
+{
+  lobound += disp;
+  hibound += disp;
+  minlo += disp;
+  maxhi += disp;
+}
+
+
+void 
+GArrayBase::del(int n, int howmany)
+{
+  if (howmany < 0)
+    G_THROW( ERR_MSG("GContainer.bad_howmany") );
+  if (howmany == 0)
+    return;
+  if ( n < lobound || n+(int)howmany-1 > hibound)
+    G_THROW( ERR_MSG("GContainer.bad_sub2") );
+  traits.fini( traits.lea(data, n-minlo), howmany );
+  if ( n+howmany-1 < hibound)
+    traits.copy( traits.lea(data, n-minlo),
+                 traits.lea(data, n-minlo+howmany),
+                 hibound - (n+howmany-1), 1 );
+  hibound = hibound - howmany;
+}
+
+
+static inline void *
+nextptr(void *p, int elsize)
+{
+  return (void*)(((char*)p) + elsize);
+}
+
+
+static inline void *
+prevptr(void *p, int elsize)
+{
+  return (void*)(((char*)p) - elsize);  
+}
+
+
+void 
+GArrayBase::ins(int n, const void *src, int howmany)
+{
+  if (howmany < 0)
+    G_THROW( ERR_MSG("GContainer.bad_howmany") );
+  if (howmany == 0)
+    return;
+  // Make enough room
+  if (hibound+howmany > maxhi)
+    {
+      int nmaxhi = maxhi;
+      while (nmaxhi < hibound+howmany)
+        nmaxhi += (nmaxhi < 8 ? 8 : (nmaxhi > 32768 ? 32768 : nmaxhi));
+      int bytesize = traits.size * (nmaxhi-minlo+1);
+      void *ndata = ::operator new (bytesize);
+#if GCONTAINER_ZERO_FILL
+      memset(ndata, 0, bytesize);
+#endif
+      G_TRY
+        {
+          if (hibound >= lobound)
+            traits.copy( traits.lea(ndata, lobound-minlo),
+                         traits.lea(data, lobound-minlo),
+                         hibound-lobound+1, 1 );
+        }
+      G_CATCH_ALL
+        {
+          if (ndata)
+            ::operator delete (ndata);
+          G_RETHROW;
+        }
+      G_ENDCATCH;
+      if (data)
+        ::operator delete(data);
+      data = ndata;
+      maxhi = nmaxhi;
+    }
+  // Shift data
+  int elsize = traits.size;
+  void *pdst = traits.lea(data, hibound+howmany-minlo);
+  void *psrc = traits.lea(data, hibound-minlo);
+  void *pend = traits.lea(data, n-minlo);
+  while ((char*)psrc >= (char*)pend)
+    {
+      traits.copy( pdst, psrc, 1, 1 );
+      pdst = prevptr(pdst, elsize);
+      psrc = prevptr(psrc, elsize);
+    }
+  hibound += howmany;
+  // Initialize new data
+  if (! src)
+    {
+      traits.init( traits.lea(data, n-minlo), howmany );
+      hibound += howmany;
+      return;
+    }
+  // Initialize new data with copy constructor
+  pdst = traits.lea(data, n-minlo);
+  pend = traits.lea(data, n+howmany-minlo);
+  while ((char*)pdst < (char*)pend)
+    {
+      traits.copy( pdst, src, 1, 0);
+      pdst = nextptr(pdst, elsize);
+    }
+}
+
+
+
+// ------------------------------------------------------------
+// GPOSITION
+// ------------------------------------------------------------
+
+
+
+void 
+GPosition::throw_invalid(void *c) const
+{
+  if (c != cont)
+    G_THROW( ERR_MSG("GContainer.bad_pos_cont") );
+  else if (! ptr)
+    G_THROW( ERR_MSG("GContainer.bad_pos_null") );
+  else 
+    G_THROW( ERR_MSG("GContainer.bad_pos") );
+}
+
+
+
+// ------------------------------------------------------------
+// DOUBLY LINKED LISTS
+// ------------------------------------------------------------
+
+
+GListBase::GListBase(const Traits& traits)
+  : traits(traits)
+{
+  nelem = 0;
+  head.next = head.prev = 0;
+}
+
+
+GListBase::GListBase(const GListBase &ref)
+  : traits(ref.traits)
+{
+  nelem = 0;
+  head.next = head.prev = 0;
+  GListBase::operator= (ref);
+}
+
+GListBase::~GListBase()
+{
+  G_TRY
+  {
+    empty();
+  }
+  G_CATCH_ALL
+  {
+  }
+  G_ENDCATCH;
+}
+
+
+void 
+GListBase::append(Node *n)
+{
+  // Link
+  n->next = 0;
+  n->prev = head.prev;
+  head.prev = n;
+  if (n->prev)
+    n->prev->next = n;
+  else
+    head.next = n;
+  // Finish
+  nelem += 1;
+}
+
+
+void 
+GListBase::prepend(Node *n)
+{
+  // Link
+  n->next = head.next;
+  n->prev = 0;
+  head.next = n;
+  if (n->next)
+    n->next->prev = n;
+  else
+    head.prev = n;
+  // Finish
+  nelem += 1;
+}
+
+
+void 
+GListBase::insert_after(GPosition pos, Node *n)
+{
+  // Prepare
+  if (pos.ptr)
+    {
+      if (pos.cont != (void*)this)
+        pos.throw_invalid((void*)this);
+      Node *p = pos.ptr;
+      n->prev = p;
+      n->next = p->next;
+    }
+  else
+    {
+      n->prev = 0;
+      n->next = head.next;
+    }
+  // Link
+  if (n->prev)
+    n->prev->next = n;
+  else
+    head.next = n;
+  if (n->next)
+    n->next->prev = n;
+  else
+    head.prev = n;
+  // Finish
+  nelem += 1;
+}
+
+
+void 
+GListBase::insert_before(GPosition pos, Node *n)
+{
+  // Prepare
+  if (pos.ptr)
+    {
+      if (pos.cont != (void*)this)
+        pos.throw_invalid((void*)this);
+      Node *p = pos.ptr;
+      n->prev = p->prev;
+      n->next = p;
+    }
+  else
+    {
+      n->prev = head.prev;
+      n->next = 0;
+    }
+  // Link
+  if (n->prev)
+    n->prev->next = n;
+  else
+    head.next = n;
+  if (n->next)
+    n->next->prev = n;
+  else
+    head.prev = n;
+  // Finish
+  nelem += 1;
+}
+
+
+void
+GListBase::insert_before(GPosition pos, GListBase &fromlist, GPosition &frompos)
+{
+  // Check
+  if (!frompos.ptr || frompos.cont != (void*)&fromlist)
+    frompos.throw_invalid((void*)&fromlist);
+  if (pos.ptr && pos.cont != (void*)this)
+    pos.throw_invalid((void*)this);
+  // Update frompos
+  Node *n = frompos.ptr;
+  frompos.ptr = n->next;
+  if (pos.ptr == n) return;
+  // Unlink
+  if (n->next)
+    n->next->prev = n->prev;
+  else
+    fromlist.head.prev = n->prev;
+  if (n->prev)
+    n->prev->next = n->next;
+  else
+    fromlist.head.next = n->next;
+  fromlist.nelem -= 1;
+  // Prepare insertion
+  if (pos.ptr)
+    {
+      Node *p = pos.ptr;
+      n->prev = p->prev;
+      n->next = p;
+    }
+  else
+    {
+      n->prev = head.prev;
+      n->next = 0;
+    }
+  // Link
+  if (n->prev)
+    n->prev->next = n;
+  else
+    head.next = n;
+  if (n->next)
+    n->next->prev = n;
+  else
+    head.prev = n;
+  nelem += 1;
+}
+
+
+void 
+GListBase::del(GPosition &pos)
+{
+  // Check
+  if (!pos.ptr || pos.cont != (void*)this) return;
+  // Unlink
+  Node *n = pos.ptr;
+  if (n->next)
+    n->next->prev = n->prev;
+  else
+    head.prev = n->prev;
+  if (n->prev)
+    n->prev->next = n->next;
+  else
+    head.next = n->next;
+  // Finish
+  nelem -= 1;
+  traits.fini( (void*)n, 1);
+  operator delete ( (void*)n );
+  pos.ptr = 0;
+}
+
+
+GPosition 
+GListBase::nth(unsigned int n) const
+{
+  Node *p = 0;
+  if ((int)n < nelem)
+    for (p=head.next; p; p=p->next)
+      if ( n-- == 0)
+        break;
+  return GPosition(p, (void*)this);
+}
+
+
+void 
+GListBase::empty()
+{
+  Node *n=head.next;
+  while (n)
+    {
+      Node *p = n->next;
+      traits.fini( (void*)n, 1 );
+      operator delete ( (void*)n );
+      n = p;
+    }
+  head.next = head.prev = 0;
+  nelem = 0;
+}
+
+
+GListBase & 
+GListBase::operator= (const GListBase & ref)
+{
+  if (this == &ref)
+    return *this;
+  empty();
+  for(Node *n = ref.head.next; n; n=n->next)
+    {
+      Node *m = (Node*) operator new (traits.size);
+      traits.copy( (void*)m, (void*)n, 1, 0);
+      append(m);
+    }
+  return *this;
+}
+
+
+
+
+
+// ------------------------------------------------------------
+// ASSOCIATIVE MAPS
+// ------------------------------------------------------------
+
+
+
+
+GSetBase::GSetBase(const Traits &traits)
+  : traits(traits), nelems(0), nbuckets(0), 
+    gtable(table), first(0)
+{
+  rehash(17);
+}
+
+
+GSetBase::GSetBase(const GSetBase &ref)
+  : traits(ref.traits), 
+    nelems(0), nbuckets(0), gtable(table), first(0)
+{
+  GSetBase::operator= (ref);
+}
+
+
+GSetBase::~GSetBase()
+{
+  G_TRY { empty(); } G_CATCH_ALL { } G_ENDCATCH;
+//  delete [] table;
+}
+
+
+GCONT HNode *
+GSetBase::hashnode(unsigned int hashcode) const
+{
+  int bucket = hashcode % nbuckets;
+  return table[bucket];
+}
+
+GCONT HNode *
+GSetBase::installnode(HNode *n)
+{
+  // Rehash if table is more than 60% full
+  if (nelems*3 > nbuckets*2)
+    rehash( 2*nbuckets - 1 );
+  // Create and insert
+  insertnode(n);
+  return n;
+}
+
+void 
+GSetBase::insertnode(HNode *n)
+{
+  int bucket = n->hashcode % nbuckets;
+  n->prev = n->hprev = table[bucket];
+  if (n->prev) 
+    {
+      // bucket was not empty
+      n->next = n->prev->next;
+      n->prev->next = n;
+      if (n->next)
+        n->next->prev = n;
+    }
+  else
+    {
+      // bucket was empty.
+      n->next = first;
+      first = n;
+      if (n->next)
+        n->next->prev = n;
+    }
+  // finish
+  table[bucket] = n;
+  nelems += 1;
+}
+
+
+void   
+GSetBase::deletenode(GCONT HNode *n)
+{
+  if (n == 0) 
+    return;
+  int bucket = n->hashcode % nbuckets;
+  // Regular links
+  if (n->next)
+    n->next->prev = n->prev;
+  if (n->prev)
+    n->prev->next = n->next;
+  else
+    first = (HNode*)(n->next);
+  // HPrev links
+  if (table[bucket] == n)
+    table[bucket] = n->hprev;
+  else
+    ((HNode*)(n->next))->hprev = n->hprev;
+  // Delete entry
+  traits.fini( (void*)n, 1 );
+  operator delete ( (void*)n );
+  nelems -= 1;
+}
+
+
+void   
+GSetBase::rehash(int newbuckets)
+{
+  // Save chain of nodes
+  Node *n = first;
+  // Simulate an empty map
+  nelems = 0;
+  first = 0;
+  // Allocate a new empty bucket table
+  gtable.resize(0);
+  nbuckets = newbuckets;
+  gtable.resize(nbuckets);
+  gtable.clear();
+  // Insert saved nodes
+  while (n)
+    {
+      Node *p = n->next;
+      insertnode((HNode*)n);
+      n = p;
+    }
+}
+
+
+GSetBase& 
+GSetBase::operator=(const GSetBase &ref)
+{
+  if (this == &ref) 
+    return *this;
+  empty();
+  rehash(ref.nbuckets);
+  for (Node *n = ref.first; n; n=n->next)
+    {
+      HNode *m = (HNode*) operator new (traits.size);
+      traits.copy( (void*)m, (void*)n, 1, 0);
+      insertnode(m);
+    }
+  return *this;
+}
+
+
+GPosition 
+GSetBase::firstpos() const
+{
+  return GPosition(first, (void*)this);
+}
+
+
+void 
+GSetBase::del(GPosition &pos)
+{
+  if (pos.ptr && pos.cont==(void*)this)
+    {
+      deletenode((HNode*)pos.ptr);
+      pos.ptr = 0;
+    }
+}
+
+void 
+GSetBase::empty()
+{
+  HNode *n = first;
+  while (n)
+    {
+      HNode *p = (HNode*)(n->next);
+      traits.fini( (void*)n, 1 );
+      operator delete ( (void*)n );
+      n = p;
+    }
+  first = 0;
+  nelems = 0;
+  gtable.clear();
+//  for (int i=0; i<nbuckets; i++)
+//    table[i] = 0;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h
new file mode 100644
index 0000000..b5e9da4
--- /dev/null
+++ b/libdjvu/GContainer.h
@@ -0,0 +1,1358 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GCONTAINER_H_
+#define _GCONTAINER_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GException.h"
+#include "GSmartPointer.h"
+#include <string.h>
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// Supports old iterators (first/last/next/prev) on lists and maps?
+#ifndef GCONTAINER_OLD_ITERATORS
+#define GCONTAINER_OLD_ITERATORS 1
+#endif
+
+// Check array bounds at runtime ?
+#ifndef GCONTAINER_BOUNDS_CHECK
+#define GCONTAINER_BOUNDS_CHECK 1
+#endif
+
+// Clears allocated memory prior to running constructors ?
+#ifndef GCONTAINER_ZERO_FILL
+#define GCONTAINER_ZERO_FILL 1
+#endif
+
+// Avoid member templates (needed by old compilers)
+#ifndef GCONTAINER_NO_MEMBER_TEMPLATES
+#if defined(__GNUC__) && (__GNUC__==2) && (__GNUC_MINOR__<91)
+#define GCONTAINER_NO_MEMBER_TEMPLATES 1
+#elif defined(_MSC_VER) && !defined(__ICL)
+#define GCONTAINER_NO_MEMBER_TEMPLATES 1
+#elif defined(__MWERKS__)
+#define GCONTAINER_NO_MEMBER_TEMPLATES 1
+#else
+#define GCONTAINER_NO_MEMBER_TEMPLATES 0
+#endif
+#endif
+
+// Define typename when needed
+#ifndef GCONTAINER_NO_TYPENAME
+#define GCONTAINER_NO_TYPENAME 0
+#endif
+#if GCONTAINER_NO_TYPENAME
+#define typename /**/
+#endif
+
+
+/** @name GContainer.h
+
+    Files #"GContainer.h"# and #"GContainer.cpp"# implement three main
+    template class for generic containers.  
+    Class #GArray# (see \Ref{Dynamic Arrays}) implements an array of objects
+    with variable bounds. Class #GList# (see \Ref{Doubly Linked Lists})
+    implements a doubly linked list of objects.  Class #GMap# (see
+    \Ref{Associative Maps}) implements a hashed associative map.  The
+    container templates are not thread-safe. Thread safety can be implemented
+    using the facilities provided in \Ref{GThreads.h}.
+    
+    @memo 
+    Template class for generic containers.
+    @author 
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation.\\
+    Andrei Erofeev <eaf@geocities.com> -- bug fixes.
+*/
+//@{
+
+
+
+// ------------------------------------------------------------
+// HASH FUNCTIONS
+// ------------------------------------------------------------
+
+
+/** @name Hash functions
+    These functions let you use template class \Ref{GMap} with the
+    corresponding elementary types. The returned hash code may be reduced to
+    an arbitrary range by computing its remainder modulo the upper bound of
+    the range.
+    @memo Hash functions for elementary types. */
+//@{
+
+/** Hashing function (unsigned int). */
+static inline unsigned int 
+hash(const unsigned int & x) 
+{ 
+  return x; 
+}
+
+/** Hashing function (int). */
+static inline unsigned int 
+hash(const int & x) 
+{ 
+  return (unsigned int)x;
+}
+
+/** Hashing function (long). */
+static inline unsigned int
+hash(const long & x) 
+{ 
+  return (unsigned int)x;
+}
+
+/** Hashing function (unsigned long). */
+static inline unsigned int
+hash(const unsigned long & x) 
+{ 
+  return (unsigned int)x;
+}
+
+/** Hashing function (const void *). */
+static inline unsigned int 
+hash(const void * const & x) 
+{ 
+  return (unsigned int)(size_t) x; 
+}
+
+/** Hashing function (float). */
+static inline unsigned int
+hash(const float & x) 
+{ 
+  // optimizer will get rid of unnecessary code  
+  unsigned int *addr = (unsigned int*)&x;
+  if (sizeof(float)<2*sizeof(unsigned int))
+    return addr[0];
+  else
+    return addr[0]^addr[1];
+}
+
+/** Hashing function (double). */
+static inline unsigned int
+hash(const double & x) 
+{ 
+  // optimizer will get rid of unnecessary code
+  unsigned int *addr = (unsigned int*)&x;
+  if (sizeof(double)<2*sizeof(unsigned int))
+    return addr[0];
+  else if (sizeof(double)<4*sizeof(unsigned int))
+    return addr[0]^addr[1];
+  else
+    return addr[0]^addr[1]^addr[2]^addr[3];    
+}
+
+
+
+// ------------------------------------------------------------
+// HELPER CLASSES
+// ------------------------------------------------------------
+
+
+
+/* Namespace for containers support classes.  This class is used as a
+   namespace for global identifiers related to the implementation of
+   containers.  It is inherited by all container objects.  This is disabled by
+   defining compilation symbol #GCONTAINER_NO_MEMBER_TEMPATES# to 1. */
+
+
+#ifdef _MSC_VER
+// Language lawyer say MS is wrong on that one. 
+// Cf section 5.4.7 in november 1997 draft.
+#pragma warning( disable : 4243 )
+#endif
+
+
+// GPEnabled inhertenced removed again so the code works on more machines.
+class GCont
+#if GCONTAINER_NO_MEMBER_TEMPLATES
+{
+};
+#else
+{
+public:
+#endif
+  // --- Pointers to type management functions
+  struct Traits
+  {
+    int       size;
+    void     *(*lea)     (void *base, int n);
+    void      (*init)    (void *dst, int n); 
+    void      (*copy)    (void *dst, const void* src, int n, int zap);
+    void      (*fini)    (void *dst, int n);
+  };
+#if !GCONTAINER_NO_MEMBER_TEMPLATES
+protected:
+#endif
+  // --- Management of simple types
+  template <int SZ> class TrivTraits
+  {
+  public:
+    // The unique object
+    static const Traits & traits();
+    // Offset in an array of T
+    static void * lea(void* base, int n)
+      { return (void*)( ((char*)base) + SZ*n ); }
+    // Trivial default constructor
+    static void   init(void* dst, int n) {}
+    // Trivial copy constructor
+    static void   copy(void* dst, const void* src, int n, int ) 
+      { ::memcpy(dst, src, SZ*n); }
+    // Trivial destructor
+    static void   fini(void* dst, int n) {}
+  };
+  // --- Management of regular types
+  template <class T> class NormTraits
+  {
+  public:
+    // The unique object
+    static const Traits & traits();
+    // Offset in an array of T
+    static void * lea(void* base, int n)
+      { return (void*)( ((T*)base) + n ); }
+    // Template based default constructor
+    static void init(void* dst, int n) 
+      { T* d = (T*)dst; while (--n>=0) { new ((void*)d) T; d++; } }
+    // Template based copy constructor
+    static void copy(void* dst, const void* src, int n, int zap)
+      { T* d = (T*)dst; T* s = (T*)src; while (--n>=0) { 
+          new ((void*)d) T(*s); if (zap) { s->~T(); }; d++; s++; } }
+    // Template based destructor
+    static void fini(void* dst, int n) 
+      { T* d = (T*)dst; while (--n>=0) { d->~T(); d++; } }
+  };
+  // --- Base class for list nodes
+  struct Node
+  {
+    Node *next;
+    Node *prev;
+  };
+  // -- Class for list nodes
+  template <class T> struct ListNode : public Node
+  { 
+    T val;
+  };
+  // -- Class for map nodes showing the hash
+  struct HNode : public Node
+  {
+    HNode *hprev;
+    unsigned int hashcode;
+  };
+  // -- Class for map nodes showing the hash and the key
+  template <class K> struct SetNode : public HNode
+  { 
+    K key;
+  };
+  // -- Class for map nodes with everything
+  template <class K, class T> struct MapNode : public SetNode<K>
+  {
+    T val;
+  };
+#if !GCONTAINER_NO_MEMBER_TEMPLATES
+};
+#endif
+
+
+#if !GCONTAINER_NO_MEMBER_TEMPLATES
+#define GCONT GCont::
+#else
+#define GCONT
+#endif
+
+template <int SZ> const GCONT Traits & 
+GCONT TrivTraits<SZ>::traits()
+{
+  static const Traits theTraits = {
+    SZ,
+    TrivTraits<SZ>::lea,
+    TrivTraits<SZ>::init,
+    TrivTraits<SZ>::copy,
+    TrivTraits<SZ>::fini
+  };
+  return theTraits;
+}
+
+template <class T> const GCONT Traits & 
+GCONT NormTraits<T>::traits()
+{
+  static const Traits theTraits = {
+    sizeof(T),
+    NormTraits<T>::lea,
+    NormTraits<T>::init,
+    NormTraits<T>::copy,
+    NormTraits<T>::fini
+  };
+  return theTraits;
+}
+
+
+// ------------------------------------------------------------
+// DYNAMIC ARRAYS
+// ------------------------------------------------------------
+
+
+/** @name Dynamic Arrays
+
+    These class implement arrays of objects of any type.  Each element is
+    identified by an integer subscript.  The valid subscripts range is defined
+    by dynamically adjustable lower- and upper-bounds.  Besides accessing and
+    setting elements, member functions are provided to insert or delete
+    elements at specified positions.
+
+    Class \Ref{GArrayTemplate} implements all methods for manipulating arrays
+    of type #TYPE#.  You should not however create instances of this class.
+    You should instead use one of the following classes:
+    \begin{itemize}
+    \item Class \Ref{GArray<TYPE>} is the most general class,
+    \item Class \Ref{GTArray<TYPE>} is more efficient, but only works for
+          types that do not require sophisticated constructors or destructors,
+          such as the plain old C types (e.g. #int# or #char# ...).
+    \item Class \Ref{GPArray<TYPE>} implements an array of smart-pointers
+          \Ref{GP<TYPE>} to objects of type #TYPE#.  Using this class 
+          reduces the size of the code generated by the template instanciation.
+    \end{itemize}
+
+    Another variant of dynamic arrays is implemented in file \Ref{Arrays.h}.
+    The main difference is that class \Ref{TArray}, \Ref{DArray} and
+    \Ref{DPArray} implement a copy-on-demand scheme.
+
+    @memo Dynamic arrays.  */
+//@{
+
+class DJVUAPI GArrayBase : public GCont
+{
+public:
+  // -- CONSTRUCTORS
+  GArrayBase(const GArrayBase &ref);
+  GArrayBase(const Traits &traits);
+  GArrayBase(const Traits &traits, int lobound, int hibound);
+  // -- DESTRUCTOR
+  ~GArrayBase();
+  // -- ASSIGNMENT
+  GArrayBase& operator= (const GArrayBase &ga);
+  // -- ALTERATION
+  void empty();
+  void touch(int n);
+  void resize(int lobound, int hibound);
+  void shift(int disp);
+  void del(int n, int howmany=1);
+  void ins(int n, const void *src, int howmany=1);
+  void steal(GArrayBase &ga);
+protected:
+  const Traits &traits;
+  void  *data;
+  int   minlo;
+  int   maxhi;
+  int   lobound;
+  int   hibound;
+};
+
+
+/** Common base class for all dynamic arrays.  
+    Class \Ref{GArrayTemplate} implements all methods for manipulating arrays
+    of type #TYPE#.  You should not however create instances of this class.
+    You should instead use class \Ref{GArray}, \Ref{GTArray} or
+    \Ref{GPArray}. */
+
+template<class TYPE>
+class GArrayTemplate : protected GArrayBase
+{
+public:
+  // -- CONSTRUCTORS
+  GArrayTemplate(const Traits &traits) : GArrayBase(traits) {}
+  GArrayTemplate(const Traits &traits, int lobound, int hibound)
+    : GArrayBase(traits, lobound, hibound) {}
+  // -- ACCESS
+  /** Returns the number of elements in the array. */
+  int size() const
+    { return hibound-lobound+1; }
+  /** Returns the lower bound of the valid subscript range. */
+  int lbound() const
+    { return lobound; }
+  /** Returns the upper bound of the valid subscript range. */
+  int hbound() const
+    { return hibound; }
+  /** Returns a reference to the array element for subscript #n#.  This
+      reference can be used for both reading (as "#a[n]#") and writing (as
+      "#a[n]=v#") an array element.  This operation will not extend the valid
+      subscript range: an exception \Ref{GException} is thrown if argument #n#
+      is not in the valid subscript range. */
+  inline TYPE& operator[](int const n);
+  /** Returns a constant reference to the array element for subscript #n#.
+      This reference can only be used for reading (as "#a[n]#") an array
+      element.  This operation will not extend the valid subscript range: an
+      exception \Ref{GException} is thrown if argument #n# is not in the valid
+      subscript range.  This variant of #operator[]# is necessary when dealing
+      with a #const GArray<TYPE>#. */
+  inline const TYPE& operator[](int n) const;
+  // -- CONVERSION
+  /** Returns a pointer for reading or writing the array elements.  This
+      pointer can be used to access the array elements with the same
+      subscripts and the usual bracket syntax.  This pointer remains valid as
+      long as the valid subscript range is unchanged. If you change the
+      subscript range, you must stop using the pointers returned by prior
+      invocation of this conversion operator. */
+  operator TYPE* ()
+    { return ((TYPE*)data)-minlo; }
+  /** Returns a pointer for reading (but not modifying) the array elements.
+      This pointer can be used to access the array elements with the same
+      subscripts and the usual bracket syntax.  This pointer remains valid as
+      long as the valid subscript range is unchanged. If you change the
+      subscript range, you must stop using the pointers returned by prior
+      invocation of this conversion operator. */
+  operator const TYPE* () const
+    { return ((const TYPE*)data)-minlo; }
+  // -- ALTERATION
+  /** Erases the array contents. All elements in the array are destroyed.  
+      The valid subscript range is set to the empty range. */
+  void empty()
+    { GArrayBase::empty(); }
+  /** Extends the subscript range so that it contains #n#.
+      This function does nothing if #n# is already int the valid subscript range.
+      If the valid range was empty, both the lower bound and the upper bound
+      are set to #n#.  Otherwise the valid subscript range is extended
+      to encompass #n#. This function is very handy when called before setting
+      an array element:
+      \begin{verbatim}
+       int lineno=1;
+       GArray<GString> a;
+       while (! end_of_file()) { 
+         a.touch(lineno); 
+         a[lineno++] = read_a_line(); 
+       }
+      \end{verbatim} */
+  void touch(int n)
+    { if (n<lobound || n>hibound) GArrayBase::touch(n); }
+  /** Resets the valid subscript range to #0#---#hibound#.
+      This function may destroy some array elements and may construct
+      new array elements with the null constructor. Setting #hibound# to
+      #-1# resets the valid subscript range to the empty range. */
+  void resize(int hibound)
+    { GArrayBase::resize(0, hibound); }
+  /** Resets the valid subscript range to #lobound#---#hibound#. 
+      This function may destroy some array elements and may construct
+      new array elements with the null constructor. Setting #lobound# to #0# and
+      #hibound# to #-1# resets the valid subscript range to the empty range. */
+  void resize(int lobound, int hibound)
+    { GArrayBase::resize(lobound, hibound); }
+  /** Shifts the valid subscript range. Argument #disp# is added to both 
+      bounds of the valid subscript range. Array elements previously
+      located at subscript #x# will now be located at subscript #x+disp#. */
+  void shift(int disp)
+    { GArrayBase::shift(disp); }
+  /** Deletes array elements. The array elements corresponding to
+      subscripts #n#...#n+howmany-1# are destroyed. All array elements
+      previously located at subscripts greater or equal to #n+howmany#
+      are moved to subscripts starting with #n#. The new subscript upper
+      bound is reduced in order to account for this shift. */
+  void del(int n, int howmany=1)
+    { GArrayBase::del(n, howmany); }
+  /** Insert new elements into an array. This function inserts
+      #howmany# elements at position #n# into the array. These
+      elements are constructed using the default constructor for type
+      #TYPE#.  All array elements previously located at subscripts #n#
+      and higher are moved to subscripts #n+howmany# and higher. The
+      upper bound of the valid subscript range is increased in order
+      to account for this shift. */
+  void ins(int n, int howmany=1)
+    { GArrayBase::ins(n, 0, howmany); }
+  /** Insert new elements into an array. The new elements are
+      constructed by copying element #val# using the copy constructor
+      for type #TYPE#. See \Ref{ins(int n, unsigned int howmany=1)}. */
+  void ins(int n, const TYPE &val, int howmany=1)
+    { GArrayBase::ins(n, (const void*)&val, howmany); }
+  /** Steals contents from array #ga#.  After this call, array #ga# is empty,
+      and this array contains everything previously contained in #ga#. */
+  void steal(GArrayTemplate &ga)
+    { GArrayBase::steal(ga); }
+  // -- SORTING
+  /** Sort array elements.  Sort all array elements in ascending
+      order according to the less-or-equal comparison
+      operator for type #TYPE#. */
+  void sort()
+    { sort(lbound(), hbound()); }
+  /** Sort array elements in subscript range #lo# to #hi#.  Sort all array
+      elements whose subscripts are in range #lo# to #hi# in ascending order
+      according to the less-or-equal comparison operator for type #TYPE#.  The
+      other elements of the array are left untouched.  An exception is thrown
+      if arguments #lo# and #hi# are not in the valid subscript range.  */
+  void sort(int lo, int hi);
+};
+
+
+
+/* That one must be implemented as a regular template function. */
+template <class TYPE> void
+GArrayTemplate<TYPE>::sort(int lo, int hi)
+{
+  if (hi <= lo)
+    return;
+  if (hi > hibound || lo<lobound)
+    G_THROW( ERR_MSG("GContainer.illegal_subscript") );
+  TYPE *data = (TYPE*)(*this);
+  // Test for insertion sort
+  if (hi <= lo + 50)
+    {
+      for (int i=lo+1; i<=hi; i++)
+        {
+          int j = i;
+          TYPE tmp = data[i];
+          while ((--j>=lo) && !(data[j]<=tmp))
+            data[j+1] = data[j];
+          data[j+1] = tmp;
+        }
+      return;
+    }
+  // -- determine suitable quick-sort pivot
+  TYPE tmp = data[lo];
+  TYPE pivot = data[(lo+hi)/2];
+  if (pivot <= tmp)
+    { tmp = pivot; pivot=data[lo]; }
+  if (data[hi] <= tmp)
+    { pivot = tmp; }
+  else if (data[hi] <= pivot)
+    { pivot = data[hi]; }
+  // -- partition set
+  int h = hi;
+  int l = lo;
+  while (l < h)
+    {
+      while (! (pivot <= data[l])) l++;
+      while (! (data[h] <= pivot)) h--;
+      if (l < h)
+        {
+          tmp = data[l];
+          data[l] = data[h];
+          data[h] = tmp;
+          l = l+1;
+          h = h-1;
+      }
+    }
+  // -- recursively restart
+  sort(lo, h);
+  sort(l, hi);
+}
+
+template<class TYPE> inline TYPE&
+GArrayTemplate<TYPE>::operator[](int const n)
+{
+#if GCONTAINER_BOUNDS_CHECK
+  if (n<lobound || n>hibound)
+  {
+    G_THROW( ERR_MSG("GContainer.illegal_subscript") ); 
+  }
+#endif
+  return ((TYPE*)data)[n-minlo];
+}
+
+
+template<class TYPE> inline const TYPE &
+GArrayTemplate<TYPE>::operator[](int const n) const
+{
+#if GCONTAINER_BOUNDS_CHECK
+  if (n<lobound || n>hibound)
+  {
+    G_THROW( ERR_MSG("GContainer.illegal_subscript") ); 
+  }
+#endif
+  return ((const TYPE*)data)[n-minlo];
+}
+
+
+
+/** Dynamic array for general types.  
+    Template class #GArray<TYPE># implements an array of elements of type
+    #TYPE#. This template class must be able to access the following
+    functions.
+    \begin{itemize}
+    \item a default constructor #TYPE::TYPE()#, 
+    \item a copy constructor #TYPE::TYPE(const TYPE &)#,
+    \item and optionally a destructor #TYPE::~TYPE()#.
+    \end{itemize}
+    This class only implement constructors.  See class \Ref{GArrayTemplate}
+    for a description of all access methods. */
+
+template<class TYPE>
+class GArray : public GArrayTemplate<TYPE>
+{
+public:
+  /** Constructs an empty array. The valid subscript range is initially
+      empty. Member function #touch# and #resize# provide convenient ways
+      to enlarge the subscript range. */
+  GArray() 
+    : GArrayTemplate<TYPE>(GCONT NormTraits<TYPE>::traits() ) {}
+  /** Constructs an array with subscripts in range 0 to #hibound#. 
+      The subscript range can be subsequently modified with member functions
+      #touch# and #resize#. */
+  GArray(int hi) 
+    : GArrayTemplate<TYPE>(GCONT NormTraits<TYPE>::traits(), 0, hi ) {}
+  /** Constructs an array with subscripts in range #lobound# to #hibound#.  
+      The subscript range can be subsequently modified with member functions
+      #touch# and #resize#. */
+  GArray(int lo, int hi) 
+    : GArrayTemplate<TYPE>(GCONT NormTraits<TYPE>::traits(), lo, hi ) {}
+  // Copy operator
+  GArray& operator=(const GArray &r)
+    { GArrayBase::operator=(r); return *this; }
+};
+
+
+/** Dynamic array for smart pointers.  
+    Template class #GPArray<TYPE># implements an array of elements of type
+    #GP<TYPE># (see \Ref{GSmartPointer.h}).  Significantly smaller code sizes
+    can be achieved by using this class instead of the more general
+    #GArray<GP<TYPE>>#.  
+    This class only implement constructors.  See class \Ref{GArrayTemplate}
+    for a description of all access methods.  */
+
+template<class TYPE>
+class GPArray : public GArrayTemplate<GP<TYPE> >
+{
+public:
+  GPArray() 
+    : GArrayTemplate<GP<TYPE> >(GCONT NormTraits<GPBase>::traits() ) {}
+  GPArray(int hi) 
+    : GArrayTemplate<GP<TYPE> >(GCONT NormTraits<GPBase>::traits(), 0, hi ) {}
+  GPArray(int lo, int hi) 
+    : GArrayTemplate<GP<TYPE> >(GCONT NormTraits<GPBase>::traits(), lo, hi ) {}
+  // Copy operator
+  GPArray& operator=(const GPArray &r)
+    { GArrayBase::operator=(r); return *this; }
+};
+
+/** Dynamic array for simple types.  
+    Template class #GTArray<TYPE># implements an array of elements of {\em
+    simple} type #TYPE#.  {\em Simple} means that objects of type #TYPE# can
+    be created, copied, moved or destroyed without using specific constructors
+    or destructor functions.  Class #GTArray<TYPE># will move or copy objects
+    using simple bitwise copies.  Otherwise you must use class #GArray<TYPE>#. 
+    This class only implement constructors.  See class \Ref{GArrayTemplate}
+    for a description of all access methods.  */
+template<class TYPE>
+class GTArray : public GArrayTemplate<TYPE>
+{
+public:
+  GTArray() 
+    : GArrayTemplate<TYPE>(GCONT TrivTraits<sizeof(TYPE)>::traits() ) {}
+  GTArray(int hi) 
+    : GArrayTemplate<TYPE>(GCONT TrivTraits<sizeof(TYPE)>::traits(), 0, hi ) {}
+  GTArray(int lo, int hi) 
+    : GArrayTemplate<TYPE>(GCONT TrivTraits<sizeof(TYPE)>::traits(), lo, hi ) {}
+  // Copy operator
+  GTArray& operator=(const GTArray &r)
+    { GArrayBase::operator=(r); return *this; }
+};
+
+
+//@}
+
+
+
+// ------------------------------------------------------------
+// DOUBLY LINKED LISTS
+// ------------------------------------------------------------
+
+
+/** @name Doubly Linked Lists
+
+    The template classes \Ref{GList} and \Ref{GPList} implement a doubly
+    linked list of objects of arbitrary types. Member functions are provided
+    to search the list for an element, to insert or delete elements at
+    specified positions.  Theses template class must be able to access
+    \begin{itemize}
+    \item a default constructor #TYPE::TYPE()#,
+    \item a copy constructor #TYPE::TYPE(const TYPE &)#,
+    \item optionally a destructor #TYPE::~TYPE()#,
+    \item and optionally a comparison operator #TYPE::operator==(const TYPE &)#.
+    \end{itemize} 
+    @memo Doubly linked lists.  
+*/
+//@{
+
+/** Generic iterator class.
+    This class represents a position in a list (see \Ref{GList}) or a map
+    (see \Ref{GMap}).   As demonstrated by the following examples,
+    this class should be used to iterate over the objects contained
+    in a list or a map:
+    \begin{verbatim}
+    void print_list(GList<GString> a)
+    {
+      for (GPosition i = a ; i; ++i) 
+        DjVuPrintMessage("%s\n", (const char*) a[i] );
+    }
+
+    void print_list_backwards(GList<GString> a)
+    {
+      for (GPosition i = a.lastpos() ; i; --i) 
+        DjVuPrintMessage("%s\n", (const char*) a[i] );
+    }
+    \end{verbatim}
+    GPosition objects should only be used with the list or map for which they
+    have been created (using the member functions #firstpos# or #lastpos# of
+    the container).  Furthermore, you should never use a GPosition object
+    which designates a list element which has been removed from the list
+    (using member function #del# or by other means.)
+*/
+
+class DJVUAPI GPosition : protected GCont
+{
+public:
+  /** Creates a null GPosition object. */
+  GPosition() : ptr(0), cont(0) {}
+  /** Creates a copy of a GPosition object. */
+  GPosition(const GPosition &ref) : ptr(ref.ptr), cont(ref.cont) {}
+  /** Tests whether this GPosition object is non null. */
+  operator int() const 
+    { return !!ptr; }
+  /** Tests whether this GPosition object is null. */
+  int operator !() const 
+    { return !ptr; }
+  /** Moves this GPosition object to the next object in the container. */
+  GPosition& operator ++() 
+    { if (ptr) ptr = ptr->next; return *this; }
+  /** Moves this GPosition object to the previous object in the container. */
+  GPosition& operator --() 
+    { if (ptr) ptr = ptr->prev; return *this; }
+  // Internal. Do not use.
+  GPosition(Node *p, void *c) : ptr(p), cont(c) {}
+#if GCONTAINER_BOUNDS_CHECK
+  Node *check(void *c) 
+    { if (!ptr || c!=cont) throw_invalid(c); return ptr; }
+  const Node *check(void *c) const
+    { if (!ptr || c!=cont) throw_invalid(c); return ptr; }
+#else
+  Node *check(void *c) 
+    { return ptr; }
+  const Node *check(void *c) const
+    { return ptr; }
+#endif
+protected:
+  Node *ptr;
+  void *cont;
+  friend class GListBase;
+  friend class GSetBase;
+  void throw_invalid(void *c) const no_return;
+};
+
+
+class DJVUAPI GListBase : public GCont
+{
+protected:
+  GListBase(const Traits& traits);
+  GListBase(const GListBase &ref);
+  void append(Node *n);
+  void prepend(Node *n);
+  void insert_after(GPosition pos, Node *n);
+  void insert_before(GPosition pos, Node *n);
+  void insert_before(GPosition pos, GListBase &fromlist, GPosition &frompos);
+  void del(GPosition &pos);
+protected:
+  const Traits &traits;
+  int nelem;
+  Node head;
+public:
+  ~GListBase();
+  GListBase & operator= (const GListBase & gl);
+  GPosition firstpos() const { return GPosition(head.next, (void*)this); }
+  GPosition lastpos() const { return GPosition(head.prev, (void*)this); }
+  bool isempty() const { return nelem==0; };
+  GPosition nth(unsigned int n) const;
+  void empty();
+};
+
+
+template<class TI>
+class GListImpl : public GListBase
+{
+  typedef GCONT ListNode<TI> LNode;
+protected:
+  GListImpl();
+  static Node * newnode(const TI &elt);
+  int operator==(const GListImpl<TI> &l2) const;
+  int search(const TI &elt, GPosition &pos) const;
+};
+
+template<class TI> 
+GListImpl<TI>::GListImpl() 
+  : GListBase( GCONT NormTraits<LNode>::traits() ) 
+{ 
+}
+
+template<class TI> GCONT Node *
+GListImpl<TI>::newnode(const TI &elt)
+{
+  LNode  *n = (LNode *) operator new (sizeof(LNode ));
+#if GCONTAINER_ZERO_FILL
+  memset(n, 0, sizeof(LNode ));
+#endif
+  new ((void*)&(n->val)) TI(elt);
+  return (Node*) n;
+}
+
+template<class TI> int
+GListImpl<TI>::operator==(const GListImpl<TI> &l2) const
+{
+  Node *p, *q;
+  for (p=head.next, q=l2.head.next; p && q; p=p->next, q=q->next )
+    if (((LNode*)p)->val != ((LNode*)q)->val)
+      return 0;
+  return p==0 && q==0;
+}
+
+template<class TI> int
+GListImpl<TI>::search(const TI &elt, GPosition &pos) const
+{
+  Node *n = (pos ? pos.check((void*)this) : head.next);
+  for (; n; n=n->next) 
+    if ( ((LNode *)n)->val == elt ) 
+      break;
+  if (n) pos = GPosition(n, (void*)this);
+  return (n != 0);
+}
+
+
+/** Common base class for all doubly linked lists.  
+    Class \Ref{GListTemplate} implements all methods for manipulating lists 
+    of of objects of type #TYPE#.  You should not however create instances of 
+    this class. You should instead use class \Ref{GList} or \Ref{GPList}. */
+
+template <class TYPE, class TI>
+class GListTemplate : protected GListImpl<TI>
+{
+  typedef GCONT ListNode<TI> LNode;
+public:
+  // -- ACCESS
+  /** Returns the number of elements in the list. */
+  int size() const
+    { return this->nelem; }
+  /** Returns the first position in the list. See \Ref{GPosition}. */
+  GPosition firstpos() const
+    { return GListImpl<TI>::firstpos(); }
+  /** Returns the last position in the list. See \Ref{GPosition}. */
+  GPosition lastpos() const
+    { return GListImpl<TI>::lastpos(); }
+  /** Implicit notation for GList::firstpos(). */
+  operator GPosition() const
+    { return firstpos(); }    
+  /** Returns a reference to the list element at position #pos#.  This
+      reference can be used for both reading (as "#a[n]#") and modifying (as
+      "#a[n]=v#") a list element.  Using an invalid position will cause a
+      segmentation violation. See \Ref{GPosition} for efficient operations on
+      positions. */
+  TYPE& operator[](GPosition pos)
+    { return (TYPE&) (((LNode *)pos.check((void*)this))->val); }
+  /** Returns a constant reference to the list element at position #pos#.
+      This reference only be used for reading a list element.  An exception
+      \Ref{GException} is thrown if #pos# is not a valid position. This
+      variant of #operator[]# is necessary when dealing with a #const
+      GList<TYPE>#.  See \Ref{GPosition} for efficient operations on
+      positions. */
+  const TYPE& operator[](GPosition pos) const
+    { return (const TYPE&) (((const LNode *)pos.check((void*)this))->val); }
+  // -- TEST
+  /** Tests whether a list is empty.  
+      Returns a non zero value if the list contains no elements. */
+  bool isempty() const 
+    { return this->nelem==0; }
+  /** Compares two lists. Returns a non zero value if and only if both lists
+      contain the same elements (as tested by #TYPE::operator==(const TYPE&)#
+      in the same order. */
+  int operator==(const GListTemplate<TYPE,TI> &l2) const
+    { return GListImpl<TI>::operator==(l2); }
+  // -- SEARCHING
+  /** Returns the position #pos# of the #n#-th list element.  An invalid
+      position is returned if the list contains less than #n# elements. The
+      operation works by sequentially scanning the list until reaching the
+      #n#-th element. */
+  GPosition nth(unsigned int n) const
+    { return GListImpl<TI>::nth(n); }
+  /*  Compatibility */
+  int nth(unsigned int n, GPosition &pos) const
+    { GPosition npos=nth(n); if (npos) pos=npos; return !!pos; }
+  /** Tests whether the list contains a given element.  If the list contains
+      #elt#, the position of the the first list element equal to #elt# as
+      checked by #TYPE::operator==(const TYPE&)# is returned.  Otherwise an
+      invalid position is returned. */
+  GPosition contains(const TYPE &elt) const
+    { GPosition pos; GListImpl<TI>::search((const TI&)elt, pos); return pos; }
+  /** Searches the list for a given element. If position #pos# is a valid
+      position for this list, the search starts at the specified position. If
+      position #pos# is not a valid position, the search starts at the
+      beginning of the list.  The list elements are sequentially compared with
+      #elt# using #TYPE::operator==(const TYPE&)#.  As soon as a list element
+      is equal to #elt#, function #search# sets argument #pos# with the
+      position of this list element and returns 1.  If however the search
+      reaches the end of the list, function #search# returns 0 and leaves
+      #pos# unchanged. */
+  int search(const TYPE &elt, GPosition &pos) const
+    { return GListImpl<TI>::search((const TI&)elt, pos); }
+  // -- ALTERATION
+  /** Erases the list contents.  All list elements are destroyed and
+      unlinked. The list is left with zero elements. */
+  void empty()
+    { GListImpl<TI>::empty(); }
+  /** Inserts an element after the last element of the list. 
+      The new element is initialized with a copy of argument #elt#. */
+  void append(const TYPE &elt)
+    { GListImpl<TI>::append(this->newnode((const TI&)elt)); }
+  /** Inserts an element before the first element of the list. 
+      The new element is initialized with a copy of argument #elt#. */
+  void prepend(const TYPE &elt)
+    { GListImpl<TI>::prepend(this->newnode((const TI&)elt)); }
+  /** Inserts a new element after the list element at position #pos#.  When
+      position #pos# is null the element is inserted at the beginning of the
+      list.  The new element is initialized with a copy of #elt#. */
+  void insert_after(GPosition pos, const TYPE &elt)
+    { GListImpl<TI>::insert_after(pos, this->newnode((const TI&)elt)); }
+  /** Inserts a new element before the list element at position #pos#. When
+      position #pos# is null the element is inserted at the end of the
+      list. The new element is initialized with a copy of #elt#. */
+  void insert_before(GPosition pos, const TYPE &elt)
+    { GListImpl<TI>::insert_before(pos, this->newnode((const TI&)elt)); }
+  /** Inserts an element of another list into this list.  This function
+      removes the element at position #frompos# in list #frompos#, inserts it
+      in the current list before the element at position #pos#, and advances
+      #frompos# to the next element in list #fromlist#. When position #pos# is
+      null the element is inserted at the end of the list. */
+  void insert_before(GPosition pos, GListTemplate<TYPE,TI> &fromlist, GPosition &frompos)
+    { GListImpl<TI>::insert_before(pos, fromlist, frompos); }
+  /** Destroys the list element at position #pos#.  This function does 
+      nothing unless position #pos# is a valid position. */
+  void del(GPosition &pos)
+    { GListImpl<TI>::del(pos); }
+  /* Old iterators. Do not use. */
+#if GCONTAINER_OLD_ITERATORS
+  void first(GPosition &pos) const { pos = firstpos(); }
+  void last(GPosition &pos) const { pos = lastpos(); }
+  const TYPE *next(GPosition &pos) const 
+    { if (!pos) return 0; const TYPE *x=&((*this)[pos]); ++pos; return x; }
+  const TYPE *prev(GPosition &pos) const 
+    { if (!pos) return 0; const TYPE *x=&((*this)[pos]); --pos; return x; }
+  TYPE *next(GPosition &pos)
+    { if (!pos) return 0; TYPE *x=&((*this)[pos]); ++pos; return x; }
+  TYPE *prev(GPosition &pos)
+    { if (!pos) return 0; TYPE *x=&((*this)[pos]); --pos; return x; }
+#endif
+};
+
+
+/** Doubly linked lists.  Template class #GList<TYPE># implements a doubly
+    linked list of elements of type #TYPE#.  This class only implement
+    constructors.  See class \Ref{GListTemplate} and \Ref{GPosition} for a
+    description of all access methods. */
+
+template <class TYPE>
+class GList : public GListTemplate<TYPE,TYPE>
+{
+public:
+  /** Null Constructor. Constructs a list with zero elements. */
+  GList() : GListTemplate<TYPE,TYPE>() {}
+  GList& operator=(const GList &r) 
+    { GListBase::operator=(r); return *this; }
+};
+
+
+/** Doubly linked lists for smart pointers. 
+    Template class #GList<TYPE># implements a doubly linked list of elements
+    of type #GP<TYPE># (see \Ref{GSmartPointer.h}).  Significantly smaller
+    code sizes can be achieved by using this class instead of the more general
+    #GArray<GP<TYPE>>#.  
+    This class only implement constructors.  See class \Ref{GListTemplate} and
+    \Ref{GPosition} for a description of all access methods. */
+
+template <class TYPE>
+class GPList : public GListTemplate<GP<TYPE>,GPBase>
+{
+public:
+  /** Null Constructor. Constructs a list with zero elements. */
+  GPList() : GListTemplate<GP<TYPE>,GPBase>() {}
+  GPList& operator=(const GPList &r) 
+    { GListBase::operator=(r); return *this; }
+};
+
+
+//@}
+
+
+
+// ------------------------------------------------------------
+// ASSOCIATIVE MAPS
+// ------------------------------------------------------------
+
+/** @name Associative Maps
+
+    These template classes implements a associative maps.  The associative map
+    contains an arbitrary number of entries. Each entry is a pair containing
+    one element of type #KTYPE# (named the "key") and one element of type
+    #VTYPE# (named the "value").  All entries have distinct keys. 
+    These template class must be able to access the following functions:
+    \begin{itemize}
+    \item a #VTYPE# default constructor #VTYPE::VTYPE()#, 
+    \item a #VTYPE# copy constructor #VTYPE::VTYPE(const VTYPE &)#, 
+    \item optionally a #VTYPE# destructor #VTYPE::~VTYPE()#,
+    \item a #KTYPE# default constructor #KTYPE::KTYPE()#, 
+    \item a #KTYPE# copy constructor #KTYPE::KTYPE(const KTYPE &)#, 
+    \item optionally a #KTYPE# destructor #KTYPE::~KTYPE()#,
+    \item a #KTYPE# comparison operator #KTYPE::operator==(const KTYPE &)#,
+    \item and a #KTYPE# hashing function #hash(const KTYPE&)#.
+    \end{itemize} 
+    The hashing function must return an #unsigned int# number. Multiple
+    invocations of the hashing function with equal arguments (in the sense of
+    #KTYPE::operator==#) must always return the same number.  
+    Position objects (see \Ref{GPosition}) may be used to iterate over the
+    entries contained by an associative map. 
+    @memo Associative maps.
+*/
+//@{
+
+class DJVUAPI GSetBase : public GCont
+{
+protected:
+  GSetBase(const Traits &traits);
+  GSetBase(const GSetBase &ref);
+  static GCONT HNode *newnode(const void *key);
+  HNode *hashnode(unsigned int hashcode) const;
+  HNode *installnode(HNode *n);
+  void   deletenode(HNode *n);
+protected:
+  const Traits &traits;
+  int nelems;
+  int nbuckets;
+  HNode **table;
+  GPBuffer<HNode *> gtable;
+  HNode *first;
+private:
+  void insertnode(HNode *n);
+  void rehash(int newbuckets);
+public:
+  ~GSetBase();
+  GSetBase& operator=(const GSetBase &ref);
+  GPosition firstpos() const;
+  void del(GPosition &pos); 
+  void empty();
+};
+
+template <class K>
+class GSetImpl : public GSetBase
+{
+  typedef GCONT SetNode<K> SNode;
+protected:
+  GSetImpl();
+  GSetImpl(const Traits &traits);
+  HNode *get(const K &key) const;
+  HNode *get_or_throw(const K &key) const;
+  HNode *get_or_create(const K &key);
+public:
+  GPosition contains(const K &key) const 
+    { return GPosition( get(key), (void*)this); }
+  void del(const K &key) 
+    { deletenode(get(key)); }
+};
+
+template<class K>
+GSetImpl<K>::GSetImpl()
+  : GSetBase( GCONT NormTraits<GCONT SetNode<K> >::traits() )
+{ 
+}
+
+template<class K>
+GSetImpl<K>::GSetImpl(const Traits &traits)
+  : GSetBase(traits) 
+{ 
+}
+
+template<class K> GCONT HNode *
+GSetImpl<K>::get(const K &key) const
+{ 
+  unsigned int hashcode = hash(key);
+  for (SNode *s=(SNode*)hashnode(hashcode); s; s=(SNode*)(s->hprev))
+    if (s->hashcode == hashcode && s->key == key) return s;
+  return 0;
+}
+
+#if GCONTAINER_BOUNDS_CHECK
+template<class K> GCONT HNode *
+GSetImpl<K>::get_or_throw(const K &key) const
+{ 
+  HNode *m = get(key);
+  if (!m)
+  {
+    G_THROW( ERR_MSG("GContainer.cannot_add") );
+  }
+  return m;
+}
+#else
+template<class K> inline GCONT HNode *
+GSetImpl<K>::get_or_throw(const K &key) const
+{ 
+  return get(key);
+}
+#endif
+
+template<class K> GCONT HNode *
+GSetImpl<K>::get_or_create(const K &key)
+{
+  HNode *m = get(key);
+  if (m) return m;
+  SNode *n = (SNode*) operator new (sizeof(SNode));
+#if GCONTAINER_ZERO_FILL
+  memset(n, 0, sizeof(SNode));
+#endif
+  new ((void*)&(n->key)) K ( key );
+  n->hashcode = hash((const K&)(n->key));
+  installnode(n);
+  return n;
+}
+
+template <class K, class TI>
+class GMapImpl : public GSetImpl<K>
+{
+  typedef GCONT MapNode<K,TI> MNode;
+protected:
+  GMapImpl();
+  GMapImpl(const GCONT Traits &traits);
+  GCONT HNode* get_or_create(const K &key);
+};
+
+template<class K, class TI>
+GMapImpl<K,TI>::GMapImpl()
+  : GSetImpl<K> ( GCONT NormTraits<GCONT MapNode<K,TI> >::traits() ) 
+{ 
+}
+
+template<class K, class TI>
+GMapImpl<K,TI>::GMapImpl(const GCONT Traits &traits)
+  : GSetImpl<K>(traits) 
+{ 
+}
+
+template<class K, class TI> GCONT HNode *
+GMapImpl<K,TI>::get_or_create(const K &key)
+{
+  GCONT HNode *m = this->get(key);
+  if (m) return m;
+  MNode *n = (MNode*) operator new (sizeof(MNode));
+#if GCONTAINER_ZERO_FILL
+  memset(n, 0, sizeof(MNode));
+#endif
+  new ((void*)&(n->key)) K  (key);
+  new ((void*)&(n->val)) TI ();
+  n->hashcode = hash((const K&)(n->key));
+  this->installnode(n);
+  return n;
+}
+
+
+
+/** Common base class for all associative maps.
+    Class \Ref{GArrayTemplate} implements all methods for manipulating 
+    associative maps with key type #KTYPE# and value type #VTYPE#. 
+    You should not however create instances of this class.
+    You should instead use class \Ref{GMap} or \Ref{GPMap}. */
+
+template <class KTYPE, class VTYPE, class TI>
+class GMapTemplate : protected GMapImpl<KTYPE,TI>
+{
+  typedef GCONT MapNode<KTYPE,TI> MNode;
+public:
+  /** Returns the number of elements in the map. */
+  int size() const
+    { return this->nelems; }
+  /** Returns the first position in the map. */
+  GPosition firstpos() const
+    { return GMapImpl<KTYPE,TI>::firstpos(); }
+  /** Implicit notation for GMap::firstpos(). */
+  operator GPosition() const
+    { return firstpos(); }    
+  /** Tests whether the associative map is empty.  
+      Returns a non zero value if and only if the map contains zero entries. */
+  bool isempty() const
+    { return this->nelems==0; }
+  /** Searches an entry for key #key#.  If the map contains an entry whose key
+      is equal to #key# according to #KTYPE::operator==(const KTYPE&)#, this
+      function returns its position.  Otherwise it returns an invalid
+      position. */
+  GPosition contains(const KTYPE &key) const
+    { return GMapImpl<KTYPE,TI>::contains(key); }
+  /*  Compatibility */
+  GPosition contains(const KTYPE &key, GPosition &pos) const
+    { return pos = GMapImpl<KTYPE,TI>::contains(key); }
+  // -- ALTERATION
+  /** Erases the associative map contents.  All entries are destroyed and
+      removed. The map is left with zero entries. */
+  void empty()
+    { GMapImpl<KTYPE,TI>::empty(); }
+  /** Returns a constant reference to the key of the map entry at position
+      #pos#.  An exception \Ref{GException} is thrown if position #pos# is not
+      valid.  There is no direct way to change the key of a map entry. */
+  const KTYPE &key(const GPosition &pos) const
+    { return (const KTYPE&)(((MNode*)(pos.check((void*)this)))->key); }
+  /** Returns a reference to the value of the map entry at position #pos#.
+      This reference can be used for both reading (as "#a[n]#") and modifying
+      (as "#a[n]=v#").  An exception \Ref{GException} is thrown if position
+      #pos# is not valid. */
+  VTYPE& operator[](const GPosition &pos)
+    { return (VTYPE&)(((MNode*)(pos.check((void*)this)))->val); }
+  /** Returns a constant reference to the value of the map entry at position
+      #pos#.  This reference can only be used for reading (as "#a[n]#") the
+      entry value.  An exception \Ref{GException} is thrown if position #pos#
+      is not valid. */
+  const VTYPE& operator[](const GPosition &pos) const
+    { return (const VTYPE&)(((MNode*)(pos.check((void*)this)))->val); }
+  /** Returns a constant reference to the value of the map entry for key
+      #key#.  This reference can only be used for reading (as "#a[n]#") the
+      entry value.  An exception \Ref{GException} is thrown if no entry
+      contains key #key#. This variant of #operator[]# is necessary when
+      dealing with a #const GMAP<KTYPE,VTYPE>#. */
+  const VTYPE& operator[](const KTYPE &key) const
+    { return (const VTYPE&)(((const MNode*)(this->get_or_throw(key)))->val); }
+  /** Returns a reference to the value of the map entry for key #key#.  This
+      reference can be used for both reading (as "#a[n]#") and modifying (as
+      "#a[n]=v#"). If there is no entry for key #key#, a new entry is created
+      for that key with the null constructor #VTYPE::VTYPE()#. */
+  VTYPE& operator[](const KTYPE &key)
+    { return (VTYPE&)(((MNode*)(this->get_or_create(key)))->val); }
+  /** Destroys the map entry for position #pos#.  
+      Nothing is done if position #pos# is not a valid position. */
+  void del(GPosition &pos)
+    { GSetBase::del(pos); }
+  /** Destroys the map entry for key #key#.  
+      Nothing is done if there is no entry for key #key#. */
+  void del(const KTYPE &key)
+    { GMapImpl<KTYPE,TI>::del(key); }
+  /* Old iterators. Do not use. */
+#if GCONTAINER_OLD_ITERATORS
+  void first(GPosition &pos) const { pos = firstpos(); }
+  const VTYPE *next(GPosition &pos) const 
+    { if (!pos) return 0; const VTYPE *x=&((*this)[pos]); ++pos; return x; }
+  VTYPE *next(GPosition &pos)
+    { if (!pos) return 0; VTYPE *x=&((*this)[pos]); ++pos; return x; }
+#endif
+};
+
+
+
+/** Associative maps.  
+    Template class #GMap<KTYPE,VTYPE># implements an associative map.
+    The map contains an arbitrary number of entries. Each entry is a
+    pair containing one element of type #KTYPE# (named the "key") and one
+    element of type #VTYPE# (named the "value").  
+    The entry associated to a particular value of the key can retrieved
+    very efficiently.
+    This class only implement constructors.  See class \Ref{GMapTemplate} and
+    \Ref{GPosition} for a description of all access methods.*/
+
+template <class KTYPE, class VTYPE>
+class GMap : public GMapTemplate<KTYPE,VTYPE,VTYPE>
+{
+public:
+  // -- ACCESS
+  GMap() : GMapTemplate<KTYPE,VTYPE,VTYPE>() {}
+  GMap& operator=(const GMap &r) 
+    { GSetBase::operator=(r); return *this; }
+};
+
+/** Associative maps for smart-pointers.  
+    Template class #GMap<KTYPE,VTYPE># implements an associative map for key
+    type #KTYPE# and value type #GP<VTYPE># (see \Ref{GSmartPointer.h}).  The
+    map contains an arbitrary number of entries. Each entry is a pair
+    containing one element of type #KTYPE# (named the "key") and one aelement
+    of type #VTYPE# (named the "value").  The entry associated to a particular
+    value of the key can retrieved very efficiently.
+    Significantly smaller code sizes can be achieved by using this class
+    instead of the more general #GMap<KTYPE,GP<VTYPE>># (see \Ref{GMap}).
+    This class only implement constructors.  See class \Ref{GMapTemplate} and
+    \Ref{GPosition} for a description of all access methods.*/
+
+template <class KTYPE, class VTYPE>
+class GPMap : public GMapTemplate<KTYPE,GP<VTYPE>,GPBase>
+{
+public:
+  GPMap() : GMapTemplate<KTYPE,GP<VTYPE>,GPBase>() {}
+  GPMap& operator=(const GPMap &r) 
+    { GSetBase::operator=(r); return *this; }
+};
+
+
+
+//@}
+//@}
+//@}
+
+// ------------ THE END
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
+
diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp
new file mode 100644
index 0000000..4585ebe
--- /dev/null
+++ b/libdjvu/GException.cpp
@@ -0,0 +1,232 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "GException.h"
+#include "DjVuMessageLite.h"
+#include "debug.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// - Author: Leon Bottou, 05/1997
+
+GException::GException() 
+  : cause(0), file(0), func(0), line(0), source(GException::GINTERNAL)
+{
+}
+
+const char * const
+GException::outofmemory = ERR_MSG("GException.outofmemory");
+
+GException::GException(const GException & exc) 
+  : file(exc.file), func(exc.func), line(exc.line), source(exc.source)
+{
+  if (exc.cause && exc.cause!=outofmemory) 
+    {
+      char *s = new char[strlen(exc.cause)+1];
+      strcpy(s, exc.cause);
+      cause = s;
+    }
+  else
+    {
+      cause = exc.cause;
+    }
+}
+
+GException::GException (const char *xcause, const char *file, int line,
+   const char *func, const source_type xsource)
+  : file(file), func(func), line(line), source(xsource)
+{
+  // good place to set a breakpoint and DEBUG message too. 
+  // It'd hard to track exceptions which seem to go from nowhere
+#ifdef DEBUG_MSG
+  DEBUG_MSG("GException::GException(): cause=" << (xcause ? xcause : "unknown") << "\n");
+#endif
+  if (xcause && xcause!=outofmemory) 
+    {
+      char *s = new char[strlen(xcause)+1];
+      strcpy(s, xcause);
+      cause = s;
+    }
+  else
+    {
+      cause = xcause;
+    }
+}
+
+GException::~GException(void)
+{
+  if (cause && cause!=outofmemory ) 
+    delete [] const_cast<char*>(cause); 
+  cause=file=func=0;
+}
+
+GException & 
+GException::operator=(const GException & exc)
+{
+  if (cause && cause!=outofmemory) 
+    delete [] const_cast<char*>(cause);
+  cause = 0;
+  file = exc.file;
+  func = exc.func;
+  line = exc.line;
+  source=exc.source;
+  if (exc.cause && exc.cause!=outofmemory) 
+    {
+      char *s = new char[strlen(exc.cause)+1];
+      strcpy(s, exc.cause);
+      cause = s;
+    }
+  else
+    {
+      cause = exc.cause;
+    }
+  return *this;
+}
+
+void
+GException::perror(void) const
+{
+  fflush(0);
+  DjVuPrintErrorUTF8("*** ");
+  DjVuMessageLite::perror(get_cause());
+  if (file && line>0)
+    DjVuPrintErrorUTF8("*** (%s:%d)\n", file, line);    
+  else if (file)
+    DjVuPrintErrorUTF8("*** (%s)\n", file);
+  if (func)
+    DjVuPrintErrorUTF8("*** '%s'\n", func);    
+  DjVuPrintErrorUTF8("\n");
+}
+
+const char* 
+GException::get_cause(void) const
+{
+  if (! cause)
+    return "Invalid exception";
+  return cause;
+}
+
+int
+GException::cmp_cause(const char s1[] , const char s2[])
+{
+  int retval;
+  if(! s2 || !s2[0])
+  {
+    retval=(s1&&s1[0])?1:(-1);
+  }else if(! s1 || !s1[0])
+  {
+    retval=(-1);
+  }else
+  {
+    const char *end_s1=strpbrk(s1,"\t\n");
+    const int n1=end_s1?(int)((size_t)end_s1-(size_t)s1):strlen(s1);
+    const char *end_s2=strpbrk(s1,"\t\n");
+    const int n2=end_s2?(int)((size_t)end_s2-(size_t)s2):strlen(s2);
+    retval=(n1==n2)?strncmp(s1,s2,n1):strcmp(s1,s2);
+  }
+  return retval;
+}
+
+int
+GException::cmp_cause(const char s2[]) const
+{
+  return cmp_cause(cause,s2);
+}
+
+
+// ------ MEMORY MANAGEMENT HANDLER
+
+#ifndef NEED_DJVU_MEMORY
+// This is not activated when C++ memory management
+// is overidden.  The overriding functions handle
+// memory exceptions by themselves.
+static void throw_memory_error() { G_THROW(GException::outofmemory); }
+# if defined(_WIN32) || defined(__CYGWIN32__) || defined(OS2)
+static void (*old_handler)() = std::set_new_handler(throw_memory_error);
+# else 
+#   ifdef HAVE_STDINCLUDES
+static void (*old_handler)() = std::set_new_handler(throw_memory_error);
+#   else
+static void (*old_handler)() = set_new_handler(throw_memory_error);
+#  endif // HAVE_STDINCLUDES
+# endif // ! WIN32
+#endif // !NEED_DJVU_MEMORY
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GException.h b/libdjvu/GException.h
new file mode 100644
index 0000000..ada8c8b
--- /dev/null
+++ b/libdjvu/GException.h
@@ -0,0 +1,248 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GEXCEPTION_H_
+#define _GEXCEPTION_H_
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#ifndef no_return
+#ifdef __GNUC__
+#define no_return __attribute__ ((noreturn))
+#else
+#define no_return
+#endif
+#endif
+
+/** @name GException.h
+
+    Files #"GException.h"# and #"GException.cpp"# are left over from a
+    portable exception scheme used through the DjVu Reference Library.  The
+    setjmp/longjmp exception emulation code was motivated because many
+    compilers did not properly support exceptions as mandated by the C++
+    standard documents. This emulation is now considered obsolete. All
+    exception are now based on C++ exception.
+    
+    There are four macros for handling exceptions.  Macros #G_TRY#, #G_CATCH# and
+    #G_ENDCATCH# are used to define an exception catching block.  Exceptions can
+    be thrown at all times using macro #G_THROW(cause)#. An exception can be
+    re-thrown from a catch block using macro #G_RETHROW#.
+    
+    Example:
+    \begin{verbatim}
+    G_TRY
+      {
+        // program lines which may result in a call to THROW()
+        G_THROW("message");
+      }
+    G_CATCH(ex) 
+      {
+        // Variable ex refers to a GException object.
+        ex.perror();  
+        // You can rethrow the exception to an outer exception handler.
+        G_RETHROW;
+      }
+    G_ENDCATCH;
+    \end{verbatim} 
+
+    @memo 
+    Portable exceptions.
+    @author 
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation.\\
+    Andrei Erofeev <eaf@geocities.com> -- fixed message memory allocation.
+*/
+//@{
+
+#include "DjVuGlobal.h"
+
+// Check if compiler supports native exceptions
+#ifdef HAVE_CONFIG_H
+# ifndef HAVE_EXCEPTIONS
+#  define USE_EXCEPTION_EMULATION 1
+# endif
+#endif
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+# endif
+#endif
+
+/** Exception class.  
+    The library always uses macros #G_TRY#, #G_THROW#, #G_CATCH# and #G_ENDCATCH# for
+    throwing and catching exceptions (see \Ref{GException.h}). These macros
+    only deal with exceptions of type #GException#. */
+
+class DJVUAPI GException {
+public:
+  enum source_type { GINTERNAL=0, GEXTERNAL, GAPPLICATION, GOTHER };
+  /** Constructs a GException.  This constructor is usually called by macro
+      #G_THROW#.  Argument #cause# is a plain text error message. As a
+      convention, string #ByteStream::EndOfFile# is used when reaching an unexpected
+      end-of-file condition and string #DataPool::Stop# is used when the user
+      interrupts the execution. The remaining arguments are usually provided
+      by the predefined macros #__FILE__#, #__LINE__#, and (G++ and EGCS only)
+      #__PRETTY_FUNCTION__#.  */
+  GException (const char *cause, const char *file=0, int line=0, 
+              const char *func=0, const source_type source=GINTERNAL);
+
+  /** Copy Constructor. */
+  GException (const GException & exc);
+  
+  /** Null Constructor. */
+  GException ();
+  
+  /** Destructor. */
+  virtual ~GException(void);
+  
+  /** Copy Operator. */
+  GException & operator=(const GException & exc);
+  
+  /** Prints an error message on stderr.
+      This function no longer takes a message parameter because 
+      some instances used a i18n message id and other instances
+      used a literal string. */
+  void perror(void) const;
+  
+  /** Returns the string describing the cause of the exception.  The returned
+      pointer is never null.  Exception handlers should not rely on the value
+      of the string #cause#.  As a convention however, string
+      #ByteStream::EndOfFile# is used
+      when reaching an unexpected end-of-file condition and string
+      #DataPool::Stop# is used when the user interrupts the execution. These
+      strings can be tested by the exception handlers, with
+      #cmp_cause#. Similar conventional strings may be defined
+      in the future. They all will be small strings with only uppercase
+      characters. */
+  const char* get_cause(void) const;
+
+  /** Compares the cause with the specified string, ignoring anything after
+      the first tab. */
+  int cmp_cause(const char s2[]) const;
+
+  /** Compares the cause with the specified string, ignoring anything after
+      the first tab. */
+  static int cmp_cause(const char s1[],const char s2[]);
+
+  /** Returns the function name from which the exception was thrown.
+      A null pointer is returned if no function name is available. */
+  const char* get_function(void) const { return func; }
+  
+  /** Returns the file name from which the exception was thrown.
+      A null pointer is returned if no file name is available. */
+  const char* get_file(void) const { return file; }
+ 
+  /** Returns the exception source */
+  source_type get_source(void) const { return source; }
+ 
+  /** Returns the line number from which the exception was thrown.
+      A zero is returned if no line number is available. */
+  int get_line(void) const { return line; };
+  
+  //  Magic cause string
+  static const char * const outofmemory;
+
+private:
+  const char *cause;
+  const char *file;
+  const char *func;
+  int line;
+  source_type source;
+};
+
+//@}
+
+#undef G_TRY
+#undef G_CATCH
+#undef G_CATCH_ALL
+#undef G_ENDCATCH
+#undef G_RETHROW
+#undef G_THROW
+
+#ifdef USE_EXCEPTION_EMULATION
+# error "Libdjvulibre requires c++ exceptions"
+#else
+
+// Compiler supports ANSI C++ exceptions.
+// Defined exception macros accordingly.
+
+# define G_TRY         try
+# define G_CATCH(n)    catch(const GException &n) { 
+# define G_CATCH_ALL   catch(...) { 
+# define G_ENDCATCH    } 
+# define G_RETHROW     throw
+# ifdef __GNUG__
+#  define G_THROW(msg) throw GException(msg,__FILE__,__LINE__,__PRETTY_FUNCTION__)
+# else
+#  define G_THROW(msg) throw GException(msg,__FILE__,__LINE__)
+# endif
+
+#endif
+
+
+// -------------- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GIFFManager.cpp b/libdjvu/GIFFManager.cpp
new file mode 100644
index 0000000..fed232d
--- /dev/null
+++ b/libdjvu/GIFFManager.cpp
@@ -0,0 +1,662 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GIFFManager.h"
+#include "GException.h"
+#include "debug.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+GIFFChunk::~GIFFChunk(void) {}
+
+GIFFManager::~GIFFManager(void) {}
+
+GP<GIFFManager> 
+GIFFManager::create(void)
+{
+  GIFFManager *iff=new GIFFManager();
+  GP<GIFFManager> retval=iff;
+  iff->init();
+  return retval;
+}
+
+GP<GIFFManager> 
+GIFFManager::create(const GUTF8String &name)
+{
+  GIFFManager *iff=new GIFFManager();
+  GP<GIFFManager> retval=iff;
+  iff->init(name);
+  return retval;
+}
+
+void
+GIFFChunk::set_name(GUTF8String name)
+{
+  DEBUG_MSG("GIFFChunk::set_name(): name='" << name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+
+  const int colon=name.search(':');
+  if(colon>=0)
+  {
+    type=name.substr(0,colon);
+    name=name.substr(colon+1,(unsigned int)-1);
+    if(name.search(':')>=0)
+      G_THROW( ERR_MSG("GIFFManager.one_colon") );
+  }
+
+  DEBUG_MSG("auto-setting type to '" << type << "'\n");
+
+  if (name.contains(".[]")>=0)
+    G_THROW( ERR_MSG("GIFFManager.bad_char") );
+
+  strncpy(GIFFChunk::name, (const char *)name, 4);
+  GIFFChunk::name[4]=0;
+  for(int i=strlen(GIFFChunk::name);i<4;i++)
+    GIFFChunk::name[i]=' ';
+}
+
+bool
+GIFFChunk::check_name(GUTF8String name)
+{
+  GUTF8String type;
+  const int colon=name.search(':');
+  if(colon>=0)
+    {
+      type=name.substr(0,colon);
+      name=name.substr(colon+1,(unsigned int)-1);
+    }
+
+  const GUTF8String sname=(name.substr(0,4)+"    ").substr(0,4);
+
+  DEBUG_MSG("GIFFChunk::check_name(): type='" << type << "' name='" << sname << "'\n");
+  return (type==GIFFChunk::type || (!type.length() && GIFFChunk::type=="FORM"))
+    && sname==GIFFChunk::name;
+}
+
+void
+GIFFChunk::save(IFFByteStream & istr, bool use_trick)
+{
+  DEBUG_MSG("GIFFChunk::save(): saving chunk '" << get_full_name() << "'\n");
+  DEBUG_MAKE_INDENT(3);
+
+  if (is_container())
+  {
+    istr.put_chunk(get_full_name(), use_trick);
+    if (chunks.size())
+    {
+      GPosition pos;
+      for(pos=chunks;pos;++pos)
+        if (chunks[pos]->get_type()=="PROP")
+          chunks[pos]->save(istr);
+      for(pos=chunks;pos;++pos)
+        if (chunks[pos]->get_type()!="PROP")
+          chunks[pos]->save(istr);
+    } else
+    {
+      DEBUG_MSG("but it's empty => saving empty container.\n");
+    }
+    istr.close_chunk();
+  } else
+  {
+    istr.put_chunk(get_name(), use_trick);
+    istr.get_bytestream()->writall((const char *) data, data.size());
+    istr.close_chunk();
+  }
+}
+
+void
+GIFFChunk::add_chunk(const GP<GIFFChunk> & chunk, int position)
+{
+  DEBUG_MSG("GIFFChunk::add_chunk(): Adding chunk to '" << get_name() <<
+     "' @ position=" << position << "\n");
+  DEBUG_MAKE_INDENT(3);
+
+  if (!type.length())
+  {
+    DEBUG_MSG("Converting the parent to FORM\n");
+    type="FORM";
+  }
+
+  if (chunk->get_type()=="PROP")
+  {
+    DEBUG_MSG("Converting the parent to LIST\n");
+    type="LIST";
+  }
+
+  GPosition pos;
+  if (position>=0 && chunks.nth(position, pos))
+  {
+    chunks.insert_before(pos, chunk);
+  }else
+  {
+    chunks.append(chunk);
+  }
+}
+
+GUTF8String 
+GIFFChunk::decode_name(const GUTF8String &name, int &number)
+{
+  DEBUG_MSG("GIFFChunk::decode_name(): Checking brackets in name '" << name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  if (name.search('.')>=0)
+    G_THROW( ERR_MSG("GIFFManager.no_dots") );
+
+  number=0;
+  const int obracket=name.search('[');
+  GUTF8String short_name;
+  if (obracket >= 0)
+  {
+    const int cbracket=name.search(']',obracket+1);
+    if (cbracket < 0)
+      G_THROW( ERR_MSG("GIFFManager.unmatched") );
+    if (name.length() > (unsigned int)(cbracket+1))
+      G_THROW( ERR_MSG("GIFFManager.garbage") );
+//    number =atoi((const char *)name.substr(obracket+1,cbracket-obracket-1));
+    number= name.substr(obracket+1,cbracket-obracket-1).toInt(); 
+    short_name=name.substr(0,obracket);
+  }else
+  {
+    short_name=name;
+  }
+
+  const int colon=short_name.search(':');
+  if (colon>=0)
+    short_name=short_name.substr(colon+1,(unsigned int)-1);
+
+  for(int i=short_name.length();i<4;i++)
+    short_name.setat(i, ' ');
+   
+  DEBUG_MSG("short_name='" << short_name << "'\n");
+  DEBUG_MSG("number=" << number << "\n");
+   
+  return short_name;
+}
+
+void
+GIFFChunk::del_chunk(const GUTF8String &name)
+   // The name may contain brackets to specify the chunk number
+{
+  DEBUG_MSG("GIFFChunk::del_chunk(): Deleting chunk '" << name <<
+     "' from '" << get_name() << "'\n");
+  DEBUG_MAKE_INDENT(3);
+
+  int number;
+  const GUTF8String short_name=decode_name(name,number);
+
+  GPosition pos=chunks;
+  for(int num=0;pos;++pos)
+  {
+    if ((chunks[pos]->get_name()==short_name)&&(num++ == number))
+    {
+      chunks.del(pos);
+      break;
+    }
+  }
+  if(! pos)
+  {
+    G_THROW( ERR_MSG("GIFFManager.no_chunk") "\t"+short_name+"\t"+GUTF8String(number)+"\t"+get_name());
+  }
+}
+
+GP<GIFFChunk>
+GIFFChunk::get_chunk(const GUTF8String &name, int * pos_ptr)
+   // The name may contain brackets to specify the chunk number
+{
+  DEBUG_MSG("GIFFChunk::get_chunk(): Returning chunk '" << name <<
+     "' from '" << get_name() << "'\n");
+  DEBUG_MAKE_INDENT(3);
+
+  int number;
+  const GUTF8String short_name=decode_name(name,number);
+
+  int num=0;
+  int pos_num;
+  GP<GIFFChunk> retval;
+  GPosition pos;
+  for(pos=chunks, pos_num=0;pos;++pos, pos_num++)
+  {
+    if (chunks[pos]->get_name()==short_name && num++==number)
+    {
+      if (pos_ptr)
+        *pos_ptr=pos_num;
+      retval=chunks[pos];
+      break;
+    }
+  }
+  return retval;
+}
+
+int
+GIFFChunk::get_chunks_number(void)
+{
+  DEBUG_MSG("GIFFChunk::get_chunks_number(): Returning number of chunks '" << name <<
+     "' in '" << get_name() << "'\n");
+  DEBUG_MAKE_INDENT(3);
+  return chunks.size();
+}
+
+int
+GIFFChunk::get_chunks_number(const GUTF8String &name)
+{
+  DEBUG_MSG("GIFFChunk::get_chunks_number(): Returning number of chunks '" << name <<
+     "' in '" << get_name() << "'\n");
+  DEBUG_MAKE_INDENT(3);
+
+  if (name.contains("[]")>=0)
+    G_THROW( ERR_MSG("GIFFManager.no_brackets") );
+  
+  int number; 
+  GUTF8String short_name=decode_name(name,number);
+   
+  int num=0;
+  for(GPosition pos=chunks;pos;++pos)
+     num+=(chunks[pos]->get_name()==short_name);
+  return num;
+}
+
+//************************************************************************
+
+void
+GIFFManager::add_chunk(GUTF8String parent_name, const GP<GIFFChunk> & chunk,
+		       int pos)
+      // parent_name is the fully qualified name of the PARENT
+      //             IT MAY BE EMPTY
+      // All the required chunks will be created
+      // pos=-1 means to append the chunk
+{
+  DEBUG_MSG("GIFFManager::add_chunk(): Adding chunk to name='" << parent_name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  if (!top_level->get_name().length())
+  {
+    if ((!parent_name.length())||(parent_name[0]!='.'))
+      G_THROW( ERR_MSG("GIFFManager.no_top_name") );
+    if (parent_name.length() < 2)
+    {
+      // 'chunk' is actually the new top-level chunk
+      DEBUG_MSG("since parent_name=='.', making the chunk top-level\n");
+      if (!chunk->is_container())
+        G_THROW( ERR_MSG("GIFFManager.no_top_cont") );
+      top_level=chunk;
+      return;
+    }
+
+    DEBUG_MSG("Setting the name of the top-level chunk\n");
+    const int next_dot=parent_name.search('.',1);
+    if(next_dot>=0)
+    {
+      top_level->set_name(parent_name.substr(1,next_dot-1));
+    }else
+    {
+      top_level->set_name(parent_name.substr(1,(unsigned int)-1));
+    }
+  }
+
+  DEBUG_MSG("top level chunk name='" << top_level->get_name() << "'\n");
+   
+  if (parent_name.length() && parent_name[0] == '.')
+  {
+    int next_dot=parent_name.search('.',1);
+    if(next_dot<0)
+    {
+      next_dot=parent_name.length();
+    }
+    GUTF8String top_name=parent_name.substr(1,next_dot-1);
+    if (!top_level->check_name(top_name))
+      G_THROW( ERR_MSG("GIFFManager.wrong_name") "\t"+top_name);
+    parent_name=parent_name.substr(next_dot,(unsigned int)-1);
+  }
+
+  GP<GIFFChunk> cur_sec=top_level;
+  const char * start, * end=(const char *)parent_name-1;
+  do
+  {
+    for(start=++end;*end&&(*end!='.');end++)
+      EMPTY_LOOP;
+    if (end>start)
+    {
+      GUTF8String name(start,end-start);
+      GUTF8String short_name;
+      int number=0;
+      const int obracket=name.search('[');
+      if (obracket >= 0)
+      {
+        const int cbracket=name.search(']',obracket+1);
+        if (cbracket < 0)
+          G_THROW( ERR_MSG("GIFFManager.unmatched") );
+//        number=atoi((const char *)name.substr(obracket+1,cbracket-obracket-1));
+        number = name.substr(obracket+1,cbracket-obracket-1).toInt();
+        short_name=name.substr(0,obracket);
+      }else
+      {
+        short_name=name;
+      }
+
+      for(int i=cur_sec->get_chunks_number(short_name);i<number+1;i++)
+        cur_sec->add_chunk(GIFFChunk::create(short_name));
+      cur_sec=cur_sec->get_chunk(name);
+      if (!cur_sec)
+        G_THROW( ERR_MSG("GIFFManager.unknown") "\t"+name);
+    }
+  } while(*end);
+  cur_sec->add_chunk(chunk, pos);
+}
+
+void
+GIFFManager::add_chunk(GUTF8String name, const TArray<char> & data)
+      // name is fully qualified name of the chunk TO BE INSERTED.
+      //      it may contain brackets at the end to set the position
+      // All the required chunks will be created
+{
+  DEBUG_MSG("GIFFManager::add_chunk(): adding plain chunk with name='" << name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+
+  GUTF8String chunk_name;
+  const int lastdot=name.rsearch('.');
+  if(lastdot < 0)
+  {
+    chunk_name=name;
+    name=name.substr(0,lastdot);
+  }else
+  {
+    chunk_name=name.substr(lastdot+1,(unsigned int)-1);
+  }
+
+  int pos=-1;
+  const int obracket=chunk_name.search('[');
+  if (obracket >= 0)
+  {
+    const int cbracket=chunk_name.search(']',obracket+1);
+    if (cbracket < 0)
+      G_THROW( ERR_MSG("GIFFManager.unmatched") );
+    if (name.length() > (unsigned int)(cbracket+1))
+      G_THROW( ERR_MSG("GIFFManager.garbage") );
+//    pos=atoi((const char *)chunk_name.substr(obracket+1,cbracket-obracket-1));
+    pos = chunk_name.substr(obracket+1,cbracket-obracket-1).toInt();
+    chunk_name=chunk_name.substr(0,obracket);
+  }
+  DEBUG_MSG("Creating new chunk with name " << chunk_name << "\n");
+  GP<GIFFChunk> chunk;
+  chunk=GIFFChunk::create(chunk_name, data);
+  add_chunk(name, chunk, pos);
+}
+
+void
+GIFFManager::del_chunk(void)
+{
+  DEBUG_MSG("GIFFManager::del_chunk(): Deleting chunk\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  G_THROW( ERR_MSG("GIFFManager.del_empty") );
+}
+
+void
+GIFFManager::del_chunk(GUTF8String name)
+      // "name" should be fully qualified, that is contain dots.
+      // It may also end with [] to set the chunk order number
+{
+  DEBUG_MSG("GIFFManager::del_chunk(): Deleting chunk '" << name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  if (!name.length())
+    G_THROW( ERR_MSG("GIFFManager.del_empty") );
+
+  if (name[0]=='.')
+  {
+    const int next_dot=name.search('.',1);
+    if (next_dot < 0)
+    {
+      if (top_level->check_name(name.substr(1,(unsigned int)-1)))
+      {
+        DEBUG_MSG("Removing top level chunk..\n");
+        top_level=GIFFChunk::create();
+        return;
+      }
+      G_THROW( ERR_MSG("GIFFManager.wrong_name2") "\t"+name.substr(1,(unsigned int)-1));
+    }
+    const GUTF8String top_name=name.substr(1,next_dot-1);
+    if (!top_level->check_name(top_name))
+      G_THROW( ERR_MSG("GIFFManager.wrong_name2") "\t"+top_name);
+    name=name.substr(next_dot+1,(unsigned int)-1);
+  }
+   
+  GP<GIFFChunk> cur_sec=top_level;
+  const char * start, * end=(const char *)name-1;
+  do
+  {
+    for(start=++end;*end&&(*end!='.');end++)
+      EMPTY_LOOP;
+    if (end>start && *end=='.')
+      cur_sec=cur_sec->get_chunk(GUTF8String(start, end-start));
+    if (!cur_sec)
+      G_THROW( ERR_MSG("GIFFManager.cant_find") "\t"+GUTF8String(name));
+  } while(*end);
+   
+  if (!start[0])
+  {
+    G_THROW(GUTF8String( ERR_MSG("GIFFManager.malformed") "\t")+name);
+  }
+   
+  cur_sec->del_chunk(start);
+}
+
+GP<GIFFChunk>
+GIFFManager::get_chunk(GUTF8String name, int * pos_num)
+      // "name" should be fully qualified, that is contain dots.
+      // It may also end with [] to set the chunk order number
+{
+  DEBUG_MSG("GIFFManager::get_chunk(): Returning chunk '" << name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  if (!name.length())
+    G_THROW( ERR_MSG("GIFFManager.get_empty") );
+
+  if (name[0]=='.')
+  {
+    const int next_dot=name.search('.',1);
+    if (next_dot < 0)
+    {
+      if (top_level->check_name(name.substr(1,(unsigned int)-1)))
+      {
+        DEBUG_MSG("Removing top level chunk..\n");
+        return top_level;
+      }
+      G_THROW( ERR_MSG("GIFFManager.wrong_name2") "\t"+name.substr(1,(unsigned int)-1));
+    }
+    const GUTF8String top_name=name.substr(1,next_dot-1);
+    if (!top_level->check_name(top_name))
+      G_THROW( ERR_MSG("GIFFManager.wrong_name2") "\t"+top_name);
+    name=name.substr(next_dot+1,(unsigned int)-1);
+  }
+   
+  GP<GIFFChunk> cur_sec=top_level;
+  const char * start, * end=(const char *) name-1;
+  do
+  {
+    for(start=++end;*end&&(*end!='.');end++)
+      EMPTY_LOOP;
+    if (end>start)
+      cur_sec=cur_sec->get_chunk(GUTF8String(start, end-start), pos_num);
+    if (!cur_sec)
+      break;
+  } while(*end);
+   
+  return cur_sec;
+}
+
+int
+GIFFManager::get_chunks_number(void)
+{
+  DEBUG_MSG("GIFFManager::get_chunks_number()\n");
+  DEBUG_MAKE_INDENT(3);
+  return top_level->get_chunks_number();
+}
+
+int
+GIFFManager::get_chunks_number(const GUTF8String &name)
+   // Returns the number of chunks with given fully qualified name
+{
+  DEBUG_MSG("GIFFManager::get_chunks_number(): name='" << name << "'\n");
+  DEBUG_MAKE_INDENT(3);
+
+  int retval;
+  const int last_dot=name.rsearch('.');
+  if (last_dot<0)
+  {
+    retval=top_level->get_chunks_number(name);
+  }else if(!last_dot)
+  {
+    retval=(top_level->get_name()==name.substr(1,(unsigned int)-1))?1:0;
+  }else
+  {
+    GP<GIFFChunk> chunk=get_chunk(name.substr(0,last_dot));
+    retval=( chunk
+      ?(chunk->get_chunks_number(name.substr(last_dot+1,(unsigned int)-1)))
+      :0 );
+  }
+  return retval;
+}
+
+void
+GIFFManager::load_chunk(IFFByteStream & istr, GP<GIFFChunk> chunk)
+{
+  DEBUG_MSG("GIFFManager::load_chunk(): loading contents of chunk '" <<
+    chunk->get_name() << "'\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  int chunk_size;
+  GUTF8String chunk_id;
+  while ((chunk_size=istr.get_chunk(chunk_id)))
+  {
+    if (istr.check_id(chunk_id))
+    {
+      GP<GIFFChunk> ch=GIFFChunk::create(chunk_id);
+      load_chunk(istr, ch);
+      chunk->add_chunk(ch);
+    } else
+    {
+      TArray<char> data(chunk_size-1);
+      istr.get_bytestream()->readall( (char*)data, data.size());
+      GP<GIFFChunk> ch=GIFFChunk::create(chunk_id, data);
+      chunk->add_chunk(ch);
+    }
+    istr.close_chunk();
+  }
+}
+
+void
+GIFFManager::load_file(const TArray<char> & data)
+{
+  GP<ByteStream> str=ByteStream::create((const char *)data, data.size());
+  load_file(str);
+}
+
+void
+GIFFManager::load_file(GP<ByteStream> str)
+{
+  DEBUG_MSG("GIFFManager::load_file(): Loading IFF file.\n");
+  DEBUG_MAKE_INDENT(3);
+   
+  GP<IFFByteStream> gistr=IFFByteStream::create(str);
+  IFFByteStream &istr=*gistr;
+  GUTF8String chunk_id;
+  if (istr.get_chunk(chunk_id))
+  {
+    if (chunk_id.substr(0,5) != "FORM:")
+      G_THROW( ERR_MSG("GIFFManager.cant_find2") );
+    set_name(chunk_id);
+    load_chunk(istr, top_level);
+    istr.close_chunk();
+  }
+}
+
+void
+GIFFManager::save_file(TArray<char> & data)
+{
+  GP<ByteStream> gstr=ByteStream::create();
+  save_file(gstr);
+  data=gstr->get_data();
+}
+
+void
+GIFFManager::save_file(GP<ByteStream> str)
+{
+  GP<IFFByteStream> istr=IFFByteStream::create(str);
+  top_level->save(*istr, 1);
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GIFFManager.h b/libdjvu/GIFFManager.h
new file mode 100644
index 0000000..c23add0
--- /dev/null
+++ b/libdjvu/GIFFManager.h
@@ -0,0 +1,392 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GIFFMANAGER_H
+#define _GIFFMANAGER_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "IFFByteStream.h"
+#include "GContainer.h"
+#include "Arrays.h"
+#include "GSmartPointer.h"
+#include "GString.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/** @name GIFFManager.h
+
+    Files #"GIFFManager.h"# and #"GIFFManager.cpp"# define more convenient
+    interface to IFF files. You may want to use the {\Ref GIFFManager} class
+    instead of coping with {\Ref IFFByteStream} especially when you have to
+    insert or move chunks, which is a kind of tricky with sequential access
+    provided by {\Ref IFFByteStream}.
+
+    You will mostly deal with {\Ref GIFFManager} class, but sometimes you may
+    want to use {\Ref GIFFChunk}s as well thus bypassing {\Ref GIFFManager}'s
+    interface and working with the chunks hierarchy yourself.
+    
+    Interface to IFF files.
+    @author 
+    Andrei Erofeev <eaf@geocities.com> -- Initial implementation.
+*/
+
+/** #GIFFChunk# is the base class for other IFF chunks understood by
+    {\Ref GIFFManager}. It provides some basic interface, and is not supposed
+    to be used on its own. */
+
+class GIFFChunk : public GPEnabled
+{
+protected:
+   GIFFChunk(void);
+   GIFFChunk(const GUTF8String &name);
+   GIFFChunk(const GUTF8String &name, const TArray<char> & data);
+public:
+      /// Default creator.
+   static GP<GIFFChunk> create(void) {return new GIFFChunk();}
+
+      /** Creates the chunk with the given name. The {\em name} may not
+	  contain dots colons or brackets */
+   static GP<GIFFChunk> create(const GUTF8String &name)
+   {return new GIFFChunk(name);}
+
+      /** Creates the {\em plain chunk} containing raw data */
+   static GP<GIFFChunk> create(const GUTF8String &name, const TArray<char> & data)
+   { return new GIFFChunk(name,data); }
+
+      /// Destructor
+   virtual ~GIFFChunk(void);
+
+      /// Returns the name of the chunk (without possible #FORM:# or similar prefixes)
+   GUTF8String	get_name(void) const;
+      /// Returns full chunk name, with possible container specification
+   GUTF8String	get_full_name(void) const;
+      /// Returns the chunk type, like #CAT# for chunk #CAT:DJVU#
+   GUTF8String	get_type(void) const;
+      /// Returns TRUE if the chunk may contain other chunks or FALSE otherwise
+   bool		is_container(void) const;
+      /** Sets the chunk name. The {\em name} may not contain dots or brackets,
+	  but {\bf may} contain colons. */
+   void		set_name(GUTF8String name);
+      /** Parses the {\em name} probably containing colon and compares it
+	  with its own name returning TRUE if they are the same */
+   bool		check_name(GUTF8String name);
+
+      /** Adds the {\em chunk} to the chunks list at position {\em order}.
+	  Set {\em order} to #-1# to append the chunk to the list.
+          {\bf Note!} By adding chunk #PROP# you will convert this chunk
+          to type #LIST# {\em automatically}. */
+   void		add_chunk(const GP<GIFFChunk> & chunk, int order=-1);
+      /** Removes the chunk with given {\em name}. The {\em name} may not
+	  contain dots, but MAY contain colons and brackets (the latter -
+	  for specifying the chunk number) */
+   void		del_chunk(const GUTF8String &name);
+      /** Returns the chunk with given {\em name}. The {\em name} may not
+	  contain dots, but MAY contain colons and brackets (the latter -
+	  for specifying the chunk number). If {\em position} is not zero
+	  then the chunk position in its parent will be put into #*position# */
+   GP<GIFFChunk>get_chunk(const GUTF8String &name, int * position=0);
+      /** Returns the number of chunks with given {\em name}. The {\em name}
+	  may not contain dots and brackets. If {\em name} is ZERO, the
+	  total number of chunks will be returned. */
+   int		get_chunks_number(const GUTF8String &name);
+   int		get_chunks_number(void);
+      /** Returns the data array for plain chunks */
+   TArray<char>	get_data(void) const;
+   
+      /** Saves the chunk into the {\Ref IFFByteStream}.
+	  Set {\em use_trick} to #1# if this is a top-level chunk */
+   void		save(IFFByteStream & istr, bool use_trick=0);
+private:
+   char			name[5];
+   GUTF8String		type;
+   GPList<GIFFChunk>	chunks;
+   TArray<char>		data;
+   static GUTF8String decode_name(const GUTF8String &name, int &number);
+};
+
+inline GUTF8String
+GIFFChunk::get_name(void) const { return GUTF8String(name, 4); }
+
+inline GUTF8String
+GIFFChunk::get_type(void) const { return type; };
+
+inline GUTF8String
+GIFFChunk::get_full_name(void) const { return get_type()+":"+get_name(); };
+
+inline bool
+GIFFChunk::is_container(void) const { return type.length()!=0; };
+
+inline TArray<char>
+GIFFChunk::get_data(void) const { return data; };
+
+inline
+GIFFChunk::GIFFChunk(void) { name[0]=0; }
+
+inline
+GIFFChunk::GIFFChunk(const GUTF8String &name) { set_name(name); }
+
+inline
+GIFFChunk::GIFFChunk(const GUTF8String &name, const TArray<char> & data_in) :
+      data(data_in)
+{
+   set_name(name);
+}
+
+//************************************************************************
+
+/** Intuitive interface to IFF files.
+
+    It's too terrible to keep reading/writing IFF files chunk after chunk
+    using {\Ref IFFByteStream}s. This class allows you to operate with chunks
+    as with structures or arrays without even caring about the byte streams.
+
+    Some of the examples are below:
+    \begin{verbatim}
+       GP<GIFFChunk> chunk;
+       chunk=manager1.get_chunk("BG44[2]");
+       manager2.add_chunk(".FORM:DJVU.BG44[-1]", chunk);
+    \end{verbatim}
+
+    {\bf Chunk name}
+    \begin{itemize}
+       \item Every chunk name may contain optional prefix #FORM:#, #LIST:#,
+             #PROP:# or #CAT:#. If the prefix is omitted and the chunk happens
+	     to contain other chunks, #FORM:# will be assumed.
+       \item Every chunk name may be {\em short} or {\em complete}.
+             {\em short} chunk names may not contain dots as they're a
+	     subchunks names with respect to a given chunk.
+	     {\em complete} chunk names may contain dots. But there may be
+	     or may not be the {\em leading dot} in the name. If the
+	     {\em leading dot} is present, then the name is assumed to contain
+	     the name of the top-level chunk as well. Otherwise it's treated
+	     {\em with respect} to the top-level chunk. You may want to use
+	     the leading dot only when you add a chunk to an empty document,
+	     since a command like #manager.addChunk(".FORM:DJVU.BG44", chunk)#
+	     will create the top level chunk of the requested type (#FORM:DJVU#)
+	     and will add chunk #BG44# to it {\em automatically}.
+       \item You may use {\em brackets} in the name to specify the chunk's
+             position. The meaning of the number inside the brackets depends
+	     on the function you call. In most of the cases this is the number
+	     of the chunk with the given name in the parent chunk. But sometimes
+	     (as in #addChunk(name, buffer, length)#) the brackets at the
+	     end of the #name# actually specify the {\em position} of the
+	     chunk in the parent. For example, to insert #INCL# chunk into
+	     #DJVU# form at position #1# (make it the second) you may want to
+	     use #manager.addChunk(".DJVU.INCL[1]", data, size)#. At the same
+	     time, to get 2-nd chunk with name #BG44# from form #DJVU# you
+	     should do smth like #chunk=manager.getChunk("BG44[1]")#. Note, that
+	     here the manager will search for chunk #BG44# in form #DJVU# and
+	     will take the second {\em found} one.
+    \end{itemize} */
+
+class GIFFManager : public GPEnabled
+{
+protected:
+   GIFFManager(void);
+   void init(void);
+   void init(const GUTF8String &name);
+public:
+      /// Default creator.
+   static GP<GIFFManager> create(void);
+
+      /** Creates the {\Ref GIFFManager} and assigns name {\em name} to
+	  the top-level chunk. you may use chunk type names (before colon)
+	  to set the top-level chunk type, or omit it to work with #FORM# */
+   static GP<GIFFManager> create(const GUTF8String &name);
+
+      /// Virtual destructor.
+   virtual ~GIFFManager(void);
+
+      /// Sets the name of the top level chunk to {\em name}
+   void		set_name(const GUTF8String &name);
+      /** Adds the chunk {\em chunk} to chunk with name {\em parent_name} at
+	  position {\em pos}. {\em parent_name} may contain dots, brackets
+	  and colons. All missing chunks in the chain will be created.
+
+	  {\bf Examples:}
+	  \begin{verbatim}
+	     ;; To set the top-level chunk to 'ch'
+	     m.addChunk(".", ch);
+	     ;; To add 'ch' to the top-level chunk "DJVU" creating it if necessary
+	     m.addChunk(".DJVU", ch);
+	     ;; Same as above regardless of top-level chunk name
+	     m.addChunk("", ch);
+	     ;; To add 'ch' to 2nd FORM DJVU in top-level form DJVM
+	     m.addChunk(".FORM:DJVM.FORM:DJVU[1]", ch);
+	     ;; Same thing regardless of the top-level chunk name
+	     m.addChunk("FORM:DJVU[1]", ch);
+	  \end{verbatim} */
+   void		add_chunk(GUTF8String parent_name, const GP<GIFFChunk> & chunk, int pos=-1);
+      /** If {\em name}={\em name1}.{\em name2} where {\em name2} doesn't
+	  contain dots, then #addChunk()# will create plain chunk with
+	  name {\em name2} with data {\em buffer} of size {\em length} and
+	  will add it to chunk {\em name1} in the same way as
+	  #addChunk(name, chunk, pos)# function would do it. The #pos# in
+	  this case is either #-1# (append) or is extracted from between
+          brackets if the {\em name} ends with them.
+	  
+          {\bf Examples:}
+          \begin{verbatim}
+             ;; To insert INCL chunk at position 2 (make it 3rd)
+             m.addChunk("INCL[2]", data, length);
+             ;; To append chunk BG44 to 2nd DjVu file inside DjVm archive:
+             m.addChunk(".DJVM.DJVU[1].BG44", data, length);
+          \end{verbatim} */
+   void		add_chunk(GUTF8String name, const TArray<char> & data);
+      /** Will remove chunk with name {\em name}. You may use dots, colons
+	  and brackets to specify the chunk uniquely.
+
+	  {\bf Examples:}
+	  \begin{verbatim}
+	     ;; To remove 2nd DjVu document from DjVm archive use
+	     m.delChunk(".DJVM.DJVU[1]");
+	     ;; Same thing without top-level chunk name specification
+	     m.delChunk("DJVU[1]");
+	     ;; Same thing for the first DJVU chunk
+	     m.delChunk("DJVU");
+	  \end{verbatim}
+      */
+   void		del_chunk(GUTF8String name);
+   void		del_chunk(void);
+      /** Will return the number of chunks with given name. The {\em name} may
+	  not end with brackets, but may contain them inside. It may also
+	  contain dots and colons. If {\em name} is ZERO, the total number
+	  of chunks will be returned.
+
+	  {\bf Examples:}
+	  \begin{verbatim}
+	     ;; To get the number of DJVU forms inside DjVm document
+	     m.getChunksNumber(".DJVM.DJVU");
+	     ;; Same thing without top-level chunk name specification
+	     m.getChunksNumber("DJVU");
+	  \end{verbatim}
+      */
+   int		get_chunks_number(const GUTF8String &name);
+   int		get_chunks_number(void);
+
+      /** Returns the chunk with name {\em name}. The {\em name} may contain dots
+	  colons and slashes. If {\em position} is not zero, #*position# will
+	  be assigned the position of the found chunk in the parent chunk.
+
+	  {\bf Examples:}
+	  \begin{verbatim}
+	     ;; To get the directory chunk of DjVm document
+	     m.getChunk(".DJVM.DIR0");
+	     ;; To get chunk corresponding to 2nd DJVU form
+	     m.getChunk(".DJVU[1]");
+	  \end{verbatim} */
+   GP<GIFFChunk>get_chunk(GUTF8String name, int * position=0);
+
+      /** Loads the composite {\em chunk}'s contents from stream {\em istr}. */
+   void		load_chunk(IFFByteStream & istr, GP<GIFFChunk> chunk);
+      /** Loads the file contents from stream {\em str} */
+   void		load_file(GP<ByteStream> str);
+      /** Loads the file contents from the data array {\em data} */
+   void		load_file(const TArray<char> & data);
+      /** Saves all the chunks into stream {\em str} */
+   void		save_file(GP<ByteStream> str);
+      /** Saves all the chunks into the data array {\em data} */
+   void		save_file(TArray<char> & data);
+
+private:
+   GP<GIFFChunk>	top_level;
+
+   static const char *	check_leading_dot(const GUTF8String &name);
+private: //dummy methods
+   static void save_file(ByteStream *);
+   static void load_file(ByteStream *);
+};
+
+inline void
+GIFFManager::set_name(const GUTF8String &name)
+{
+   top_level->set_name(name);
+}
+
+inline
+GIFFManager::GIFFManager(void) {}
+
+inline  void
+GIFFManager::init(void)
+{
+  top_level=GIFFChunk::create();
+}
+
+inline  void
+GIFFManager::init(const GUTF8String &name)
+{
+  top_level=GIFFChunk::create(name);
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GMapAreas.cpp b/libdjvu/GMapAreas.cpp
new file mode 100644
index 0000000..2200ef7
--- /dev/null
+++ b/libdjvu/GMapAreas.cpp
@@ -0,0 +1,1077 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GMapAreas.h"
+#include "GException.h"
+#include "debug.h"
+
+#include <math.h>
+#include <stdio.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/****************************************************************************
+***************************** GMapArea definition ***************************
+****************************************************************************/
+
+const char GMapArea::MAPAREA_TAG[] = 		"maparea";
+const char GMapArea::RECT_TAG[] = 		"rect";
+const char GMapArea::POLY_TAG[] = 		"poly";
+const char GMapArea::OVAL_TAG[] = 		"oval";
+const char GMapArea::NO_BORDER_TAG[] = 		"none";
+const char GMapArea::XOR_BORDER_TAG[] = 	"xor";
+const char GMapArea::SOLID_BORDER_TAG[] = 	"border";
+const char GMapArea::SHADOW_IN_BORDER_TAG[] = 	"shadow_in";
+const char GMapArea::SHADOW_OUT_BORDER_TAG[] = 	"shadow_out";
+const char GMapArea::SHADOW_EIN_BORDER_TAG[] = 	"shadow_ein";
+const char GMapArea::SHADOW_EOUT_BORDER_TAG[] = "shadow_eout";
+const char GMapArea::BORDER_AVIS_TAG[] = 	"border_avis";
+const char GMapArea::HILITE_TAG[] = 		"hilite";
+const char GMapArea::URL_TAG[] = 		"url";
+const char GMapArea::TARGET_SELF[] = 		"_self";
+static const char zero_width[] = ERR_MSG("GMapAreas.zero_width");
+static const char zero_height[] = ERR_MSG("GMapAreas.zero_height");
+static const char width_1[] = ERR_MSG("GMapAreas.width_1");
+static const char width_3_32 [] = ERR_MSG("GMapAreas.width_3-32");
+static const char error_poly_border [] = ERR_MSG("GMapAreas.poly_border");
+static const char error_poly_hilite [] = ERR_MSG("GMapAreas.poly_hilite");
+static const char error_oval_border [] = ERR_MSG("GMapAreas.oval_border");
+static const char error_oval_hilite [] = ERR_MSG("GMapAreas.oval_hilite");
+static const char error_too_few_points [] = ERR_MSG("GMapAreas.too_few_points");
+static const char error_intersect [] = ERR_MSG("GMapAreas.intersect");
+
+GMapArea::~GMapArea() {}
+
+GMapRect::~GMapRect() {}
+
+GMapPoly::~GMapPoly() {}
+
+GMapOval::~GMapOval() {}
+
+void
+GMapArea::initialize_bounds(void)
+{
+   xmin=gma_get_xmin();
+   xmax=gma_get_xmax();
+   ymin=gma_get_ymin();
+   ymax=gma_get_ymax();
+   bounds_initialized=true;
+}
+
+int
+GMapArea::get_xmin(void) const
+{
+   if (!bounds_initialized)
+     const_cast<GMapArea *>(this)->initialize_bounds();
+   return xmin;
+}
+
+int
+GMapArea::get_ymin(void) const
+{
+   if (!bounds_initialized)
+     const_cast<GMapArea *>(this)->initialize_bounds();
+   return ymin;
+}
+
+int
+GMapArea::get_xmax(void) const
+{
+   if (!bounds_initialized)
+     const_cast<GMapArea *>(this)->initialize_bounds();
+   return xmax;
+}
+
+int
+GMapArea::get_ymax(void) const
+{
+   if (!bounds_initialized)
+     const_cast<GMapArea *>(this)->initialize_bounds();
+   return ymax;
+}
+
+GRect
+GMapArea::get_bound_rect(void) const
+{
+   return GRect(get_xmin(), get_ymin(), get_xmax()-get_xmin(),
+		get_ymax()-get_ymin());
+}
+
+void
+GMapArea::move(int dx, int dy)
+{
+   if (dx || dy)
+   {
+     if (bounds_initialized)
+     {
+        xmin+=dx;
+        ymin+=dy;
+        xmax+=dx;
+        ymax+=dy;
+     }
+     gma_move(dx, dy);
+   }
+}
+
+void
+GMapArea::resize(int new_width, int new_height)
+{
+   if (get_xmax()-get_xmin()!=new_width ||
+       get_ymax()-get_ymin()!=new_height)
+   {
+     gma_resize(new_width, new_height);
+     bounds_initialized=false;
+   }
+}
+
+void
+GMapArea::transform(const GRect & grect)
+{
+   if (grect.xmin!=get_xmin() || grect.ymin!=get_ymin() ||
+       grect.xmax!=get_xmax() || grect.ymax!=get_ymax())
+   {
+     gma_transform(grect);
+     bounds_initialized=false;
+   }
+}
+
+char const * const
+GMapArea::check_object(void)
+{
+   char const *retval;
+   if (get_xmax()==get_xmin())
+   {
+     retval=zero_width;
+   }
+   else if (get_ymax()==get_ymin())
+   {
+     retval=zero_height;
+   }
+   else if ((border_type==XOR_BORDER ||
+       border_type==SOLID_BORDER) && border_width!=1)
+   {
+     retval=width_1;
+   }
+   else if ((border_type==SHADOW_IN_BORDER ||
+       border_type==SHADOW_OUT_BORDER ||
+       border_type==SHADOW_EIN_BORDER ||
+       border_type==SHADOW_EOUT_BORDER)&&
+       (border_width<3 || border_width>32))
+   {
+     retval=width_3_32;
+   }else
+   {
+     retval=gma_check_object();
+   }
+   return retval;
+}
+
+bool
+GMapArea::is_point_inside(int x, int y) const
+{
+   if (!bounds_initialized)
+     const_cast<GMapArea *>(this)->initialize_bounds();
+   return (x>=xmin && x<xmax && y>=ymin && y<ymax) ?
+	      gma_is_point_inside(x, y) : false;
+}
+
+static GUTF8String make_c_string(GUTF8String string)
+{
+  GUTF8String buffer;
+  const char *data = (const char*)string;
+  int length = string.length();
+  buffer = GUTF8String("\"");
+  while (*data && length>0) 
+    {
+      int span = 0;
+      while (span<length && (unsigned char)(data[span])>=0x20 && 
+             data[span]!=0x7f && data[span]!='"' && data[span]!='\\' )
+        span++;
+      if (span > 0) 
+        {  
+          buffer = buffer + GUTF8String(data, span);
+          data += span;
+          length -= span;
+        }  
+      else 
+        {
+          char buf[8];
+          static const char *tr1 = "\"\\tnrbf";
+          static const char *tr2 = "\"\\\t\n\r\b\f";
+          sprintf(buf,"\\%03o", (int)(((unsigned char*)data)[span]));
+          for (int i=0; tr2[i]; i++)
+            if (data[span] == tr2[i])
+              buf[1] = tr1[i];
+          if (buf[1]<'0' || buf[1]>'3')
+            buf[2] = 0;
+          buffer = buffer + GUTF8String(buf);
+          data += 1;
+          length -= 1;
+        }
+    }
+  buffer = buffer + GUTF8String("\"");
+  return buffer;
+}
+
+GUTF8String
+GMapArea::print(void)
+{
+      // Make this hard check to make sure, that *no* illegal GMapArea
+      // can be stored into a file.
+   const char * const errors=check_object();
+   if (errors[0])
+   {
+     G_THROW(errors);
+   }
+   
+   GUTF8String url1 = make_c_string((GUTF8String)url);
+   GUTF8String target1 = make_c_string(target);
+   GUTF8String comment1 = make_c_string(comment);
+   
+   GUTF8String border_color_str;
+   border_color_str.format("#%02X%02X%02X",
+	   (border_color & 0xff0000) >> 16,
+	   (border_color & 0xff00) >> 8,
+	   (border_color & 0xff));
+
+   static const GUTF8String left('(');
+   static const GUTF8String right(')');
+   static const GUTF8String space(' ');
+   GUTF8String border_type_str;
+   switch(border_type)
+   {
+      case NO_BORDER:
+        border_type_str=left+NO_BORDER_TAG+right;
+        break;
+      case XOR_BORDER:
+        border_type_str=left+XOR_BORDER_TAG+right;
+        break;
+      case SOLID_BORDER:
+        border_type_str=left+SOLID_BORDER_TAG+space+border_color_str+right;
+        break;
+      case SHADOW_IN_BORDER:
+        border_type_str=left+SHADOW_IN_BORDER_TAG+space+GUTF8String(border_width)+right;
+        break;
+      case SHADOW_OUT_BORDER:
+        border_type_str=left+SHADOW_OUT_BORDER_TAG+space+GUTF8String(border_width)+right;
+        break;
+      case SHADOW_EIN_BORDER:
+        border_type_str=left+SHADOW_EIN_BORDER_TAG+space+GUTF8String(border_width)+right;
+        break;
+      case SHADOW_EOUT_BORDER:
+        border_type_str=left+SHADOW_EOUT_BORDER_TAG+space+GUTF8String(border_width)+right;
+        break;
+      default:
+        border_type_str=left+XOR_BORDER_TAG+right;
+        break;
+   }
+
+   GUTF8String hilite_str;
+   if (hilite_color!=0xffffffff)
+   {
+      hilite_str.format("(%s #%02X%02X%02X)",
+	      HILITE_TAG, (hilite_color & 0xff0000) >> 16,
+	      (hilite_color & 0xff00) >> 8,
+	      (hilite_color & 0xff));
+   }
+   
+   GUTF8String URL;
+   if (target1==TARGET_SELF)
+   {
+      URL=url1;
+   }else
+   {
+      URL=left+URL_TAG+space+url1+space+target1+right;
+   }
+
+   GUTF8String total=left+MAPAREA_TAG+space+URL+space+comment1+space+gma_print()+border_type_str;
+   if (border_always_visible)
+     total+=space+left+BORDER_AVIS_TAG+right;
+   if ( hilite_str.length() > 0 )
+     total+=space+hilite_str;
+   total+=right;
+   return total;
+}
+
+/*
+void 
+GMapArea::map(GRectMapper &mapper)
+{
+    get_bound_rect();
+    GRect rect = GRect(xmin, ymin, xmax, ymax);
+    mapper.map(rect);
+    xmin = rect.xmin;
+    ymin = rect.ymin;
+    xmax = rect.xmax;
+    ymax = rect.ymax;
+    clear_bounds();
+}
+void 
+GMapArea::unmap(GRectMapper &mapper)
+{
+    get_bound_rect();
+    GRect rect = GRect(xmin, ymin, xmax, ymax);
+    mapper.unmap(rect);
+    xmin = rect.xmin;
+    ymin = rect.ymin;
+    xmax = rect.xmax;
+    ymax = rect.ymax;
+    clear_bounds();
+}
+*/
+
+
+/// Virtual function generating a list of defining coordinates
+/// (default are the opposite corners of the enclosing rectangle)
+void GMapArea::get_coords( GList<int> & CoordList ) const
+{
+  CoordList.append( get_xmin() );
+  CoordList.append( get_ymin() );
+  CoordList.append( get_xmax() );
+  CoordList.append( get_ymax() );
+}
+
+
+/****************************************************************************
+**************************** GMapRect definition ****************************
+****************************************************************************/
+
+void
+GMapRect::gma_resize(int new_width, int new_height)
+{
+   xmax=xmin+new_width;
+   ymax=ymin+new_height;
+}
+
+void
+GMapRect::gma_transform(const GRect & grect)
+{
+   xmin=grect.xmin; ymin=grect.ymin;
+   xmax=grect.xmax; ymax=grect.ymax;
+}
+
+GUTF8String
+GMapRect::gma_print(void)
+{
+   GUTF8String buffer;
+   return buffer.format("(%s %d %d %d %d) ",
+	   RECT_TAG, xmin, ymin, xmax-xmin, ymax-ymin);
+}
+
+void 
+GMapRect::map(GRectMapper &mapper)
+{
+    get_bound_rect();
+    GRect rect;
+    rect.xmin = xmin;
+    rect.xmax = xmax;
+    rect.ymin = ymin;
+    rect.ymax = ymax;
+    mapper.map(rect);
+    xmin = rect.xmin;
+    ymin = rect.ymin;
+    xmax = rect.xmax;
+    ymax = rect.ymax;
+    clear_bounds();
+}
+void 
+GMapRect::unmap(GRectMapper &mapper)
+{
+    get_bound_rect();
+    GRect rect;
+    rect.xmin = xmin;
+    rect.xmax = xmax;
+    rect.ymin = ymin;
+    rect.ymax = ymax;
+    mapper.unmap(rect);
+    xmin = rect.xmin;
+    ymin = rect.ymin;
+    xmax = rect.xmax;
+    ymax = rect.ymax;
+    clear_bounds();
+}
+
+/****************************************************************************
+**************************** GMapPoly definition ****************************
+****************************************************************************/
+
+inline int
+GMapPoly::sign(int x) { return x<0 ? -1 : x>0 ? 1 : 0; }
+
+bool
+GMapPoly::does_side_cross_rect(const GRect & grect, int side)
+{
+   int x1=xx[side], x2=xx[(side+1)%points];
+   int y1=yy[side], y2=yy[(side+1)%points];
+   int xmin=x1<x2 ? x1 : x2;
+   int ymin=y1<y2 ? y1 : y2;
+   int xmax=x1+x2-xmin;
+   int ymax=y1+y2-ymin;
+
+   if (xmax<grect.xmin || xmin>grect.xmax ||
+       ymax<grect.ymin || ymin>grect.ymax)
+     return false;
+
+   return
+     (x1>=grect.xmin && x1<=grect.xmax && y1>=grect.ymin && y1<=grect.ymax) ||
+     (x2>=grect.xmin && x2<=grect.xmax && y2>=grect.ymin && y2<=grect.ymax) ||
+     do_segments_intersect(grect.xmin, grect.ymin, grect.xmax, grect.ymax,
+			   x1, y1, x2, y2) ||
+     do_segments_intersect(grect.xmax, grect.ymin, grect.xmin, grect.ymax,
+			   x1, y1, x2, y2);
+}
+
+bool
+GMapPoly::is_projection_on_segment(int x, int y, int x1, int y1, int x2, int y2)
+{
+   int res1=(x-x1)*(x2-x1)+(y-y1)*(y2-y1);
+   int res2=(x-x2)*(x2-x1)+(y-y2)*(y2-y1);
+   return sign(res1)*sign(res2)<=0;
+}
+
+bool
+GMapPoly::do_segments_intersect(int x11, int y11, int x12, int y12,
+				int x21, int y21, int x22, int y22)
+{
+   int res11=(x11-x21)*(y22-y21)-(y11-y21)*(x22-x21);
+   int res12=(x12-x21)*(y22-y21)-(y12-y21)*(x22-x21);
+   int res21=(x21-x11)*(y12-y11)-(y21-y11)*(x12-x11);
+   int res22=(x22-x11)*(y12-y11)-(y22-y11)*(x12-x11);
+   if (!res11 && !res12)
+   {
+      // Segments are on the same line
+      return
+	 is_projection_on_segment(x11, y11, x21, y21, x22, y22) ||
+	 is_projection_on_segment(x12, y12, x21, y21, x22, y22) ||
+	 is_projection_on_segment(x21, y21, x11, y11, x12, y12) ||
+	 is_projection_on_segment(x22, y22, x11, y11, x12, y12);
+   }
+   int sign1=sign(res11)*sign(res12);
+   int sign2=sign(res21)*sign(res22);
+   return sign1<=0 && sign2<=0;
+}
+
+bool
+GMapPoly::are_segments_parallel(int x11, int y11, int x12, int y12,
+				int x21, int y21, int x22, int y22)
+{
+   return (x12-x11)*(y22-y21)-(y12-y11)*(x22-x21)==0;
+}
+
+char const * const
+GMapPoly::check_data(void)
+{
+  if ((open && points<2) || (!open && points<3))
+    return error_too_few_points;
+  for(int i=0;i<sides;i++)
+    {
+      for(int j=i+2;j<sides;j++)
+	{
+	  if (i != (j+1)%points )
+	    if (do_segments_intersect(xx[i], yy[i], xx[i+1], yy[i+1],
+				      xx[j], yy[j], xx[(j+1)%points], yy[(j+1)%points]))
+	      return error_intersect;
+	}
+    }
+  return "";
+}
+
+void
+GMapPoly::optimize_data(void)
+{
+  // Removing segments of length zero
+  int i;
+  for(i=0;i<sides;i++)
+    {
+      while(xx[i]==xx[(i+1)%points] && yy[i]==yy[(i+1)%points])
+	{
+	  for(int k=(i+1)%points;k<points-1;k++)
+	    {
+	      xx[k]=xx[k+1]; yy[k]=yy[k+1];
+	    }
+	  points--; sides--;
+	  if (!points) return;
+	}
+    }
+  // Concatenating consequitive parallel segments
+  for(i=0;i<sides;i++)
+    {
+      while(((open && i+1<sides) || !open) &&
+	    are_segments_parallel(xx[i], yy[i],
+				  xx[(i+1)%points], yy[(i+1)%points],
+				  xx[(i+1)%points], yy[(i+1)%points],
+				  xx[(i+2)%points], yy[(i+2)%points]))
+	{
+	  for(int k=(i+1)%points;k<points-1;k++)
+	    {
+	      xx[k]=xx[k+1]; yy[k]=yy[k+1];
+	    }
+	  points--; sides--;
+	  if (!points) return;
+	}
+    }
+}
+
+bool
+GMapPoly::gma_is_point_inside(const int xin, const int yin) const
+{
+   if (open)
+     return false;
+
+   int xfar=get_xmax()+(get_xmax()-get_xmin());
+
+   int intersections=0;
+   for(int i=0;i<points;i++)
+   {
+      int res1=yy[i]-yin;
+      if (!res1) continue;
+      int res2, isaved=i;
+      while(!(res2=yy[(i+1)%points]-yin)) i++;
+      if (isaved!=i)
+      {
+	 // Some points fell exactly on the line
+	 if ((xx[(isaved+1)%points]-xin)*
+	     (xx[i%points]-xin)<=0)
+	 {
+	    // Test point is exactly on the boundary
+	    return true;
+	 }
+      }
+      if ((res1<0 && res2>0) || (res1>0 && res2<0))
+      {
+	 int x1=xx[i%points], y1=yy[i%points];
+	 int x2=xx[(i+1)%points], y2=yy[(i+1)%points];
+	 int _res1=(xin-x1)*(y2-y1)-(yin-y1)*(x2-x1);
+	 int _res2=(xfar-x1)*(y2-y1)-(yin-y1)*(x2-x1);
+	 if (!_res1 || !_res2)
+	 {
+	    // The point is on this boundary
+	    return true;
+	 }
+	 if (sign(_res1)*sign(_res2)<0) intersections++;
+      }
+   }
+   return (intersections % 2)!=0;
+}
+
+int
+GMapPoly::gma_get_xmin(void) const
+{
+   int x=xx[0];
+   for(int i=1;i<points;i++)
+      if (x>xx[i]) x=xx[i];
+   return x;
+}
+
+int
+GMapPoly::gma_get_xmax(void) const
+{
+   int x=xx[0];
+   for(int i=1;i<points;i++)
+      if (x<xx[i]) x=xx[i];
+   return x+1;
+}
+
+int
+GMapPoly::gma_get_ymin(void) const
+{
+   int y=yy[0];
+   for(int i=1;i<points;i++)
+      if (y>yy[i]) y=yy[i];
+   return y;
+}
+
+int
+GMapPoly::gma_get_ymax(void) const
+{
+   int y=yy[0];
+   for(int i=1;i<points;i++)
+      if (y<yy[i]) y=yy[i];
+   return y+1;
+}
+
+void
+GMapPoly::gma_move(int dx, int dy)
+{
+   for(int i=0;i<points;i++)
+   {
+      xx[i]+=dx; yy[i]+=dy;
+   }
+}
+
+void
+GMapPoly::gma_resize(int new_width, int new_height)
+{
+   int width=get_xmax()-get_xmin();
+   int height=get_ymax()-get_ymin();
+   int xmin=get_xmin(), ymin=get_ymin();
+   for(int i=0;i<points;i++)
+   {
+      xx[i]=xmin+(xx[i]-xmin)*new_width/width;
+      yy[i]=ymin+(yy[i]-ymin)*new_height/height;
+   }
+}
+
+void
+GMapPoly::gma_transform(const GRect & grect)
+{
+   int width=get_xmax()-get_xmin();
+   int height=get_ymax()-get_ymin();
+   int xmin=get_xmin(), ymin=get_ymin();
+   for(int i=0;i<points;i++)
+   {
+      xx[i]=grect.xmin+(xx[i]-xmin)*grect.width()/width;
+      yy[i]=grect.ymin+(yy[i]-ymin)*grect.height()/height;
+   }
+}
+
+char const * const
+GMapPoly::gma_check_object(void) const
+{
+   const char * str;
+   str=(border_type!=NO_BORDER &&
+        border_type!=SOLID_BORDER &&
+        border_type!=XOR_BORDER) ? error_poly_border:
+       ((hilite_color!=0xffffffff) ? error_poly_hilite:"");
+   return str;
+}
+
+GMapPoly::GMapPoly(const int * _xx, const int * _yy, int _points, bool _open) :
+   open(_open), points(_points)
+{
+   sides=points-(open!=0);
+   
+   xx.resize(points-1); yy.resize(points-1);
+   for(int i=0;i<points;i++)
+   {
+      xx[i]=_xx[i]; yy[i]=_yy[i];
+   }
+   optimize_data();
+   char const * const res=check_data();
+   if (res[0])
+     G_THROW(res);
+}
+
+int      
+GMapPoly::add_vertex(int x, int y)
+{
+    points++;
+    sides=points-(open!=0);
+
+    xx.resize(points-1); yy.resize(points-1);
+    xx[points-1] = x;
+    yy[points-1] = y;
+
+    return points;
+}
+
+void
+GMapPoly::close_poly()
+{
+    open = false;
+    sides=points;
+}
+
+GUTF8String
+GMapPoly::gma_print(void)
+{
+   static const GUTF8String space(' ');
+   GUTF8String res=GUTF8String('(')+POLY_TAG+space;
+   for(int i=0;i<points;i++)
+   {
+      GUTF8String buffer;
+      res+=buffer.format("%d %d ", xx[i], yy[i]);
+   }
+   res.setat(res.length()-1, ')');
+   res+=space;
+   return res;
+}
+
+/// Virtual function generating a list of defining coordinates
+void GMapPoly::get_coords( GList<int> & CoordList ) const
+{
+  for(int i = 0 ; i < points ; i++)
+  {
+    CoordList.append( xx[i] );
+    CoordList.append( yy[i] );
+  }
+}
+
+void 
+GMapPoly::map(GRectMapper &mapper)
+{
+    get_bound_rect();
+    for(int i=0; i<points; i++)
+    {
+        mapper.map(xx[i], yy[i]);
+    }
+    clear_bounds();
+}
+
+void 
+GMapPoly::unmap(GRectMapper &mapper)
+{
+    get_bound_rect();
+    for(int i=0; i<points; i++)
+    {
+        mapper.unmap(xx[i], yy[i]);
+    }
+    clear_bounds();
+}
+
+
+
+/****************************************************************************
+**************************** GMapOval definition ****************************
+****************************************************************************/
+
+void
+GMapOval::gma_resize(int new_width, int new_height)
+{
+   xmax=xmin+new_width;
+   ymax=ymin+new_height;
+   initialize();
+}
+
+void
+GMapOval::gma_transform(const GRect & grect)
+{
+   xmin=grect.xmin; ymin=grect.ymin;
+   xmax=grect.xmax; ymax=grect.ymax;
+   initialize();
+}
+
+bool
+GMapOval::gma_is_point_inside(const int x, const int y) const
+{
+   return
+      sqrt((double)((x-xf1)*(x-xf1)+(y-yf1)*(y-yf1))) +
+      sqrt((double)((x-xf2)*(x-xf2)+(y-yf2)*(y-yf2))) <= 2*rmax;
+}
+
+char const * const
+GMapOval::gma_check_object(void) const
+{
+   return (border_type!=NO_BORDER &&
+       border_type!=SOLID_BORDER &&
+       border_type!=XOR_BORDER)?error_oval_border:
+      ((hilite_color!=0xffffffff) ? error_oval_hilite:"");
+}
+
+void
+GMapOval::initialize(void)
+{
+   int xc=(xmax+xmin)/2;
+   int yc=(ymax+ymin)/2;
+   int f;
+   
+   a=(xmax-xmin)/2;
+   b=(ymax-ymin)/2;
+   if (a>b)
+   {
+      rmin=b; rmax=a;
+      f=(int) sqrt((double)(rmax*rmax-rmin*rmin));
+      xf1=xc+f; xf2=xc-f; yf1=yf2=yc;
+   } else
+   {
+      rmin=a; rmax=b;
+      f=(int) sqrt((double)(rmax*rmax-rmin*rmin));
+      yf1=yc+f; yf2=yc-f; xf1=xf2=xc;
+   }
+}
+
+GMapOval::GMapOval(const GRect & rect) : xmin(rect.xmin), ymin(rect.ymin),
+   xmax(rect.xmax), ymax(rect.ymax)
+{
+   initialize();
+}
+
+GUTF8String
+GMapOval::gma_print(void)
+{
+   GUTF8String buffer;
+   return buffer.format("(%s %d %d %d %d) ",
+	   OVAL_TAG, xmin, ymin, xmax-xmin, ymax-ymin);
+}
+
+void 
+GMapOval::map(GRectMapper &mapper)
+{
+    get_bound_rect();
+    GRect rect;
+    rect.xmin = xmin;
+    rect.xmax = xmax;
+    rect.ymin = ymin;
+    rect.ymax = ymax;
+    mapper.map(rect);
+    xmin = rect.xmin;
+    ymin = rect.ymin;
+    xmax = rect.xmax;
+    ymax = rect.ymax;
+    clear_bounds();
+    initialize();
+}
+
+void 
+GMapOval::unmap(GRectMapper &mapper)
+{
+    get_bound_rect();
+    GRect rect;
+    rect.xmin = xmin;
+    rect.xmax = xmax;
+    rect.ymin = ymin;
+    rect.ymax = ymax;
+    mapper.unmap(rect);
+    xmin = rect.xmin;
+    ymin = rect.ymin;
+    xmax = rect.xmax;
+    ymax = rect.ymax;
+    clear_bounds();
+    initialize();
+}
+
+GMapArea::GMapArea(void) : target("_self"), border_type(NO_BORDER),
+   border_always_visible(false), border_color(0xff), border_width(1),
+   hilite_color(0xffffffff), bounds_initialized(0) {}
+
+GMapRect::GMapRect(void) : xmin(0), ymin(0), xmax(0), ymax(0) {}
+
+GMapRect::GMapRect(const GRect & rect) : xmin(rect.xmin), ymin(rect.ymin),
+   xmax(rect.xmax), ymax(rect.ymax) {}
+
+GMapRect &
+GMapRect::operator=(const GRect & rect)
+{
+   xmin=rect.xmin;
+   xmax=rect.xmax;
+   ymin=rect.ymin;
+   ymax=rect.ymax;
+   return *this;
+}
+
+void
+GMapRect::gma_move(int dx, int dy)
+{
+   xmin+=dx;
+   xmax+=dx;
+   ymin+=dy;
+   ymax+=dy;
+}
+
+bool
+GMapRect::gma_is_point_inside(const int x, const int y) const
+{
+   return (x>=xmin)&&(x<xmax)&&(y>=ymin)&&(y<ymax);
+}
+
+GP<GMapArea>
+GMapRect::get_copy(void) const { return new GMapRect(*this); }
+
+GMapPoly::GMapPoly(void) : points(0), sides(0) {}
+
+void
+GMapPoly::move_vertex(int i, int x, int y)
+{
+   xx[i]=x; yy[i]=y;
+   clear_bounds();
+}
+
+GP<GMapArea>
+GMapPoly::get_copy(void) const { return new GMapPoly(*this); }
+
+GMapOval::GMapOval(void) : xmin(0), ymin(0), xmax(0), ymax(0) {}
+
+void
+GMapOval::gma_move(int dx, int dy)
+{
+   xmin+=dx; xmax+=dx; ymin+=dy; ymax+=dy;
+   xf1+=dx; yf1+=dy; xf2+=dx; yf2+=dy;
+}
+
+GP<GMapArea>
+GMapOval::get_copy(void) const
+{
+  return new GMapOval(*this);
+}
+
+static GUTF8String
+GMapArea2xmltag(const GMapArea &area,const GUTF8String &coords)
+{
+  GUTF8String retval("<AREA coords=\""
+    +coords+"\" shape=\""+area.get_shape_name()+"\" "
+    +"alt=\""+area.comment.toEscaped()+"\" ");
+  if(area.url.length())
+  {
+    retval+="href=\""+area.url+"\" ";
+  }else
+  {
+    retval+="nohref=\"nohref\" ";
+  }
+  if(area.target.length())
+  {
+    retval+="target=\""+area.target.toEscaped()+"\" ";
+  }
+  //  highlight
+  if( area.hilite_color != GMapArea::NO_HILITE &&
+      area.hilite_color != GMapArea::XOR_HILITE )
+  {
+    retval+=GUTF8String().format( "highlight=\"#%06X\" ", area.hilite_color );
+  }
+  const char *b_type="none";
+  switch( area.border_type )
+  {
+  case GMapArea::NO_BORDER:
+    b_type = "none";
+    break;
+  case GMapArea::XOR_BORDER:
+    b_type = "xor";
+    break;
+  case GMapArea::SOLID_BORDER:
+    b_type = "solid";
+    break;
+  case GMapArea::SHADOW_IN_BORDER:
+    b_type = "shadowin";
+    break;
+  case GMapArea::SHADOW_OUT_BORDER:
+    b_type = "shadowout";
+    break;
+  case GMapArea::SHADOW_EIN_BORDER:
+    b_type = "etchedin";
+    break;
+  case GMapArea::SHADOW_EOUT_BORDER:
+    b_type = "etchedout";
+    break;
+  }
+  retval=retval+"bordertype=\""+b_type+"\" ";
+  if( area.border_type != GMapArea::NO_BORDER)
+  {
+    retval+="bordercolor=\""+GUTF8String().format("#%06X",area.border_color)
+      +"\" border=\""+GUTF8String(area.border_width)+"\" ";
+  }
+  if(area.border_always_visible )
+    retval=retval+"visible=\"visible\" ";
+  return retval+"/>\n";
+}
+
+GUTF8String
+GMapRect::get_xmltag(const int height) const
+{
+  return GMapArea2xmltag( *this, GUTF8String(get_xmin())
+    +","+GUTF8String(height-1-get_ymax())
+    +","+GUTF8String(get_xmax())
+    +","+GUTF8String(height-1-get_ymin()));
+#if 0
+  GUTF8String retval;
+  return retval;
+#endif
+}
+
+GUTF8String
+GMapOval::get_xmltag(const int height) const
+{ 
+  return GMapArea2xmltag( *this, GUTF8String(get_xmin())
+    +","+GUTF8String(height-1-get_ymax())
+    +","+GUTF8String(get_xmax())
+    +","+GUTF8String(height-1-get_ymin()));
+#if 0
+  GUTF8String retval;
+  return retval;
+#endif
+}
+
+GUTF8String
+GMapPoly::get_xmltag(const int height) const
+{
+  GList<int> CoordList;
+  get_coords(CoordList);
+  GPosition pos=CoordList;
+  GUTF8String retval;
+  if(pos)
+  {
+    GUTF8String coords(CoordList[pos]);
+    while(++pos)
+    {
+      coords+=","+GUTF8String(height-1-CoordList[pos]);
+      if(! ++pos)
+        break;
+      coords+=","+GUTF8String(CoordList[pos]);
+    }
+    retval=GMapArea2xmltag( *this, coords);
+  }
+  return retval;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GMapAreas.h b/libdjvu/GMapAreas.h
new file mode 100644
index 0000000..eed2c23
--- /dev/null
+++ b/libdjvu/GMapAreas.h
@@ -0,0 +1,563 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GMAPAREAS_H
+#define _GMAPAREAS_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GSmartPointer.h"
+#include "GContainer.h"
+#include "GString.h"
+#include "GRect.h"
+#include "GURL.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/** @name GMapAreas.h
+
+    Files #"GMapAreas.h"# and #"GMapAreas.cpp"# implement base objects
+    used by the plugin to display and manage hyperlinks and highlighted
+    areas inside a \Ref{DjVuImage} page.
+
+    The currently supported areas can be rectangular (\Ref{GMapRect}),
+    elliptical (\Ref{GMapOval}) and polygonal (\Ref{GMapPoly}). Every
+    map area besides the definition of its shape contains information
+    about display style and optional {\bf URL}, which it may refer to.
+    If this {\bf URL} is not empty then the map area will work like a
+    hyperlink.
+
+    The classes also implement some useful functions to ease geometry
+    manipulations
+
+    @memo Definition of base map area classes
+    @author Andrei Erofeev <eaf@geocities.com>
+*/
+//@{
+
+
+// ---------- GMAPAREA ---------
+
+/** This is the base object for all map areas. It defines some standard
+    interface to access the geometrical properties of the areas and
+    describes the area itsef:
+    \begin{itemize}
+       \item #url# If the optional #URL# is specified, the map area will
+             also work as a hyperlink meaning that if you click it with
+	     your mouse pointer, the browser will be advised to load
+	     the page referenced by the #URL#.
+       \item #target# Defines where the specified #URL# should be loaded
+       \item #comment# This is a string displayed in a status line or in
+             a popup window when the mouse pointer moves over the hyperlink
+	     area
+       \item #border_type#, #border_color# and #border_width# describes
+             how the area border should be drawn
+       \item #area_color# describes how the area should be highlighted.
+    \end{itemize}
+
+    The map areas can be displayed using two different techniques, which
+    can be combined together:
+    \begin{itemize}
+       \item Visible border. The border of a map area can be drawn in several
+             different ways (like #XOR_BORDER# or #SHADOW_IN_BORDER#).
+	     It can be made always visible, or appearing only when the
+	     mouse pointer moves over the map area.
+       \item Highlighted contents. Contents of rectangular map areas can
+             also be highlighted with some given color.
+    \end{itemize}
+*/
+
+class GMapArea : public GPEnabled
+{
+protected:
+   GMapArea(void);
+public:
+//      // Default creator.
+//   static GP<GMapArea> create(void) {return new GMapArea();}
+
+      /// Virtual destructor.
+   virtual ~GMapArea();
+
+   static const char MAPAREA_TAG [];
+   static const char RECT_TAG [];
+   static const char POLY_TAG [];
+   static const char OVAL_TAG [];
+   static const char NO_BORDER_TAG [];
+   static const char XOR_BORDER_TAG [];
+   static const char SOLID_BORDER_TAG [];
+   static const char SHADOW_IN_BORDER_TAG [];
+   static const char SHADOW_OUT_BORDER_TAG [];
+   static const char SHADOW_EIN_BORDER_TAG [];
+   static const char SHADOW_EOUT_BORDER_TAG [];
+   static const char BORDER_AVIS_TAG [];
+   static const char HILITE_TAG [];
+   static const char URL_TAG [];
+   static const char TARGET_SELF [];
+
+   enum BorderType { NO_BORDER=0, XOR_BORDER=1, SOLID_BORDER=2,
+		     SHADOW_IN_BORDER=3, SHADOW_OUT_BORDER=4,
+		     SHADOW_EIN_BORDER=5, SHADOW_EOUT_BORDER=6 };
+
+   enum Special_Hilite_Color{ NO_HILITE=0xFFFFFFFF, XOR_HILITE=0xFF000000};
+
+   // Enumeration for reporting the type of map area. "MapUnknown" is reported
+   // for objects of type GMapArea (there shouldn't be any).
+   enum MapAreaType { UNKNOWN, RECT, OVAL, POLY };
+
+      /** Optional URL which this map area can be associated with.
+	  If it's not empty then clicking this map area with the mouse
+	  will make the browser load the HTML page referenced by
+	  this #url#.  Note: This may also be a relative URL, so the
+          GURL class is not used. */
+   GUTF8String	url;
+      /** The target for the #URL#. Standard targets are:
+	  \begin{itemize}
+	     \item #_blank# - Load the link in a new blank window
+	     \item #_self# - Load the link into the plugin window
+	     \item #_top# - Load the link into the top-level frame
+	  \end{itemize} */
+   GUTF8String	target;
+      /** Comment (displayed in a status line or as a popup hint when
+	  the mouse pointer moves over the map area */
+   GUTF8String	comment;
+      /** Border type. Defines how the map area border should be drawn
+	  \begin{itemize}
+	     \item #NO_BORDER# - No border drawn
+	     \item #XOR_BORDER# - The border is drawn using XOR method.
+	     \item #SOLID_BORDER# - The border is drawn as a solid line
+	           of a given color.
+	     \item #SHADOW_IN_BORDER# - Supported for \Ref{GMapRect} only.
+	     	   The map area area looks as if it was "pushed-in".
+	     \item #SHADOW_OUT_BORDER# - The opposite of #SHADOW_OUT_BORDER#
+	     \item #SHADOW_EIN_BORDER# - Also for \Ref{GMapRect} only.
+	     	   Is translated as "shadow etched in"
+	     \item #SHADOW_EOUT_BORDER# - The opposite of #SHADOW_EIN_BORDER#.
+	  \end{itemize} */
+   BorderType	border_type;
+      /** If #TRUE#, the border will be made always visible. Otherwise
+	  it will be drawn when the mouse moves over the map area. */
+   bool		border_always_visible;
+      /// Border color (when relevant) in #0x00RRGGBB# format
+   unsigned long int	border_color;
+      /// Border width in pixels
+   int		border_width;
+      /** Specified a color for highlighting the internal area of the map
+	  area. Will work with rectangular map areas only. The color is
+	  specified in \#00RRGGBB format. A special value of \#FFFFFFFF disables
+          highlighting and \#FF000000 is for XOR highlighting. */
+   unsigned long int	hilite_color;
+
+      /// Returns 1 if the given point is inside the hyperlink area
+   bool		is_point_inside(int x, int y) const;
+
+      /// Returns xmin of the bounding rectangle
+   int		get_xmin(void) const;
+      /// Returns ymin of the bounding rectangle
+   int		get_ymin(void) const;
+      /** Returns xmax of the bounding rectangle. In other words, if #X# is
+	  a coordinate of the last point in the right direction, the
+	  function will return #X+1# */
+   int		get_xmax(void) const;
+      /** Returns xmax of the bounding rectangle. In other words, if #Y# is
+	  a coordinate of the last point in the top direction, the
+	  function will return #Y+1# */
+   int		get_ymax(void) const;
+      /// Returns the hyperlink bounding rectangle
+   GRect	get_bound_rect(void) const;
+      /** Moves the hyperlink along the given vector. Is used by the
+	  hyperlinks editor. */
+   void		move(int dx, int dy);
+      /** Resizes the hyperlink to fit new bounding rectangle while
+	  keeping the (xmin, ymin) points at rest. */
+   void		resize(int new_width, int new_height);
+      /** Transforms the hyperlink to be within the specified rectangle */
+   void		transform(const GRect & grect);
+      /** Checks if the object is OK. Especially useful with \Ref{GMapPoly}
+	  where edges may intersect. If there is a problem it returns a
+	  string describing it. */
+   char const *	const check_object(void);
+      /** Stores the contents of the hyperlink object in a lisp-like format
+	  for saving into #ANTa# chunk (see \Ref{DjVuAnno}) */
+   GUTF8String	print(void);
+
+   virtual GUTF8String get_xmltag(const int height) const=0;
+
+      /// Virtual function returning the shape type.
+   virtual MapAreaType const get_shape_type( void ) const { return UNKNOWN; };
+      /// Virtual function returning the shape name.
+   virtual char const * const	get_shape_name(void) const=0;
+      /// Virtual function generating a copy of this object
+   virtual GP<GMapArea>	get_copy(void) const=0;
+      /// Virtual function generating a list of defining coordinates
+      /// (default are the opposite corners of the enclosing rectangle)
+   virtual void get_coords( GList<int> & CoordList ) const;
+   /// Virtual function maps maparea from one area to another using mapper
+   virtual void map(GRectMapper &mapper)=0;
+   /// Virtual function unmaps maparea from one area to another using mapper
+   virtual void unmap(GRectMapper &mapper)=0;
+
+protected:
+   virtual int		gma_get_xmin(void) const=0;
+   virtual int		gma_get_ymin(void) const=0;
+   virtual int		gma_get_xmax(void) const=0;
+   virtual int		gma_get_ymax(void) const=0;
+   virtual void		gma_move(int dx, int dy)=0;
+   virtual void		gma_resize(int new_width, int new_height)=0;
+   virtual void		gma_transform(const GRect & grect)=0;
+   virtual bool		gma_is_point_inside(const int x, const int y) const=0;
+   virtual char const * const	gma_check_object(void) const=0;
+   virtual GUTF8String	gma_print(void)=0;
+   
+   void		clear_bounds(void) { bounds_initialized=0; }
+private:
+   int		xmin, xmax, ymin, ymax;
+   bool		bounds_initialized;
+
+   void		initialize_bounds(void);
+};
+
+// ---------- GMAPRECT ---------
+
+/** Implements rectangular map areas. This is the only kind of map areas
+    supporting #SHADOW_IN_BORDER#, #SHADOW_OUT_BORDER#, #SHADOW_EIN_BORDER#
+    and #SHADOW_EOUT_BORDER# types of border and area highlighting. */
+
+class GMapRect: public GMapArea
+{
+protected:
+   GMapRect(void);
+   GMapRect(const GRect & rect);
+public:
+   /// Default creator.
+   static GP<GMapRect> create(void) {return new GMapRect();}
+   /// Create with the specified GRect.
+   static GP<GMapRect> create(const GRect &rect) {return new GMapRect(rect);}
+
+   virtual ~GMapRect();
+
+      /// Returns the width of the rectangle
+   int		get_width(void) const { return xmax-xmin; }
+      /// Returns the height of the rectangle
+   int		get_height(void) const { return ymax-ymin; }
+
+      /// Changes the #GMapRect#'s geometry
+   GMapRect & operator=(const GRect & rect);
+
+      /// Returns \Ref{GRect} describing the map area's rectangle
+   operator GRect(void);
+   
+   virtual GUTF8String get_xmltag(const int height) const;
+      /// Returns MapRect
+   virtual MapAreaType const get_shape_type( void ) const { return RECT; };
+      /// Returns #"rect"#
+   virtual char const * const	get_shape_name(void) const;
+      /// Returns a copy of the rectangle
+   virtual GP<GMapArea>	get_copy(void) const;
+      /// Virtual function maps rectangle from one area to another using mapper
+   virtual void map(GRectMapper &mapper);
+      /// Virtual function unmaps rectangle from one area to another using mapper
+   virtual void unmap(GRectMapper &mapper);
+protected:
+   int			xmin, ymin, xmax, ymax;
+   virtual int		gma_get_xmin(void) const;
+   virtual int		gma_get_ymin(void) const;
+   virtual int		gma_get_xmax(void) const;
+   virtual int		gma_get_ymax(void) const;
+   virtual void		gma_move(int dx, int dy);
+   virtual void		gma_resize(int new_width, int new_height);
+   virtual void		gma_transform(const GRect & grect);
+   virtual bool		gma_is_point_inside(const int x, const int y) const;
+   virtual char const * const gma_check_object(void) const;
+   virtual GUTF8String	gma_print(void);
+};
+
+// ---------- GMAPPOLY ---------
+
+/** Implements polygonal map areas. The only supported types of border
+    are #NO_BORDER#, #XOR_BORDER# and #SOLID_BORDER#. Its contents can not
+    be highlighted either. It's worth mentioning here that despite its
+    name the polygon may be open, which basically makes it a broken line.
+    This very specific mode is used by the hyperlink editor when creating
+    the polygonal hyperlink. */
+
+class GMapPoly : public GMapArea
+{
+protected:
+   GMapPoly(void);
+   GMapPoly(const int * xx, const int * yy, int points, bool open=false);
+public:
+   /// Default creator
+   static GP<GMapPoly> create(void) {return new GMapPoly();}
+
+   /// Create from specified coordinates.
+   static GP<GMapPoly> create(
+     const int xx[], const int yy[], const int points, const bool open=false)
+   {return new GMapPoly(xx,yy,points,open);}
+
+   /// Virtual destructor.
+   virtual ~GMapPoly();
+
+      /// Returns 1 if side #side# crosses the specified rectangle #rect#.
+   bool		does_side_cross_rect(const GRect & grect, int side);
+
+      /// Returns the number of vertices in the polygon
+   int		get_points_num(void) const;
+
+      /// Returns the number sides in the polygon
+   int		get_sides_num(void) const;
+
+      /// Returns x coordinate of vertex number #i#
+   int		get_x(int i) const;
+   
+      /// Returns y coordinate of vertex number #i#
+   int		get_y(int i) const;
+
+      /// Moves vertex #i# to position (#x#, #y#)
+   void		move_vertex(int i, int x, int y);
+
+      /// Adds a new vertex and returns number of vertices in the polygon
+   int      add_vertex(int x, int y);
+
+      /// Closes the polygon if it is not closed
+   void     close_poly();
+      /// Optimizes the polygon 
+   void		optimize_data(void);
+      /// Checks validity of the polygon 
+   char const * const	check_data(void);
+
+   virtual GUTF8String get_xmltag(const int height) const;
+      /// Returns MapPoly
+   virtual MapAreaType const get_shape_type( void ) const { return POLY; };
+      /// Returns #"poly"# all the time
+   virtual char const * const 	get_shape_name(void) const;
+      /// Returns a copy of the polygon
+   virtual GP<GMapArea>	get_copy(void) const;
+      /// Virtual function generating a list of defining coordinates
+   void get_coords( GList<int> & CoordList ) const;
+      /// Virtual function maps polygon from one area to another using mapper
+   virtual void map(GRectMapper &mapper);
+   /// Virtual function unmaps polygon from one area to another using mapper
+   virtual void unmap(GRectMapper &mapper);
+protected:
+   virtual int		gma_get_xmin(void) const;
+   virtual int		gma_get_ymin(void) const;
+   virtual int		gma_get_xmax(void) const;
+   virtual int		gma_get_ymax(void) const;
+   virtual void		gma_move(int dx, int dy);
+   virtual void		gma_resize(int new_width, int new_height);
+   virtual void		gma_transform(const GRect & grect);
+   virtual bool		gma_is_point_inside(const int x, const int y) const;
+   virtual char const * const gma_check_object(void) const;
+   virtual GUTF8String	gma_print(void);
+private:
+   bool		open;
+   int		points, sides;
+   GTArray<int>	xx, yy;
+   static int	sign(int x);
+   static bool	is_projection_on_segment(int x, int y, int x1, int y1, int x2, int y2);
+   static bool	do_segments_intersect(int x11, int y11, int x12, int y12,
+				      int x21, int y21, int x22, int y22);
+   static bool	are_segments_parallel(int x11, int y11, int x12, int y12,
+				      int x21, int y21, int x22, int y22);
+};
+
+// ---------- GMAPOVAL ---------
+
+/** Implements elliptical map areas. The only supported types of border
+    are #NO_BORDER#, #XOR_BORDER# and #SOLID_BORDER#. Its contents can not
+    be highlighted either. */
+
+class GMapOval: public GMapArea
+{
+protected:
+   GMapOval(void);
+   GMapOval(const GRect & rect);
+public:
+   /// Default creator.
+   static GP<GMapOval> create(void) {return new GMapOval();}
+
+   /// Create from the specified GRect.
+   static GP<GMapOval> create(const GRect &rect) {return new GMapOval(rect);}
+
+   /// Virtual destructor. 
+   virtual ~GMapOval();
+
+      /// Returns (xmax-xmin)/2
+   int		get_a(void) const;
+      /// Returns (ymax-ymin)/2
+   int		get_b(void) const;
+      /// Returns the lesser of \Ref{get_a}() and \Ref{get_b}()
+   int		get_rmin(void) const;
+      /// Returns the greater of \Ref{get_a}() and \Ref{get_b}()
+   int		get_rmax(void) const;
+
+   virtual GUTF8String get_xmltag(const int height) const;
+      /// Returns MapOval
+   virtual MapAreaType const get_shape_type( void ) const { return OVAL; };
+      /// Returns #"oval"#
+   virtual char const * const get_shape_name(void) const;
+      /// Returns a copy of the oval
+   virtual GP<GMapArea>	get_copy(void) const;
+      /// Virtual function maps oval from one area to another using mapper
+   virtual void map(GRectMapper &mapper);
+      /// Virtual function unmaps oval from one area to another using mapper
+   virtual void unmap(GRectMapper &mapper);
+protected:
+   virtual int		gma_get_xmin(void) const;
+   virtual int		gma_get_ymin(void) const;
+   virtual int		gma_get_xmax(void) const;
+   virtual int		gma_get_ymax(void) const;
+   virtual void		gma_move(int dx, int dy);
+   virtual void		gma_resize(int new_width, int new_height);
+   virtual void		gma_transform(const GRect & grect);
+   virtual bool		gma_is_point_inside(const int x, const int y) const;
+   virtual char const * const	gma_check_object(void) const;
+   virtual GUTF8String	gma_print(void);
+private:
+   int		rmax, rmin;
+   int		a, b;
+   int		xf1, yf1, xf2, yf2;
+   int		xmin, ymin, xmax, ymax;
+   
+   void		initialize(void);
+};
+
+inline
+GMapRect::operator GRect(void)
+{
+  return GRect(xmin, ymin, xmax-xmin, ymax-ymin);
+}
+
+inline int
+GMapRect::gma_get_xmin(void) const { return xmin; }
+
+inline int
+GMapRect::gma_get_ymin(void) const { return ymin; }
+
+inline int
+GMapRect::gma_get_xmax(void) const { return xmax; }
+
+inline int
+GMapRect::gma_get_ymax(void) const { return ymax; }
+
+inline char const * const
+GMapRect::gma_check_object(void)  const{ return ""; }
+
+inline char const * const 
+GMapRect::get_shape_name(void) const { return RECT_TAG; }
+
+inline int
+GMapPoly::get_points_num(void) const { return points; }
+
+inline int
+GMapPoly::get_sides_num(void) const { return sides; }
+
+inline int
+GMapPoly::get_x(int i) const { return xx[i]; }
+
+inline int
+GMapPoly::get_y(int i) const { return yy[i]; }
+
+inline char const * const
+GMapPoly::get_shape_name(void) const { return POLY_TAG; }
+
+inline int
+GMapOval::get_a(void) const { return a; }
+
+inline int
+GMapOval::get_b(void) const { return b; }
+
+inline int
+GMapOval::get_rmin(void) const { return rmin; }
+
+inline int
+GMapOval::get_rmax(void) const { return rmax; }
+
+inline int
+GMapOval::gma_get_xmin(void) const { return xmin; }
+
+inline int
+GMapOval::gma_get_ymin(void) const { return ymin; }
+
+inline int
+GMapOval::gma_get_xmax(void) const { return xmax; }
+
+inline int
+GMapOval::gma_get_ymax(void) const { return ymax; }
+
+inline char const * const
+GMapOval::get_shape_name(void) const { return OVAL_TAG; }
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp
new file mode 100644
index 0000000..3d2e89f
--- /dev/null
+++ b/libdjvu/GOS.cpp
@@ -0,0 +1,372 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GException.h"
+#include "GThreads.h"
+#include "GOS.h"
+#include "GURL.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+#include <string.h>
+
+#if defined(__CYGWIN32__)
+# define UNIX 1
+#endif
+
+#if defined(_WIN32) && !defined(UNIX)
+# include <windows.h>
+# include <string.h>
+# include <direct.h>
+# define getcwd _getcwd
+#endif
+
+#if defined(OS2)
+# define INCL_DOS
+# include <os2.h>
+#endif
+
+#if defined(macintosh) && !defined(UNIX)
+# include <unix.h>
+# include <errno.h>
+# include <unistd.h>
+#endif
+
+#if defined(UNIX) || defined(OS2)
+# include <errno.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/time.h>
+# include <fcntl.h>
+# include <pwd.h>
+# include <stdio.h>
+# include <unistd.h>
+#endif
+
+
+// -- TRUE FALSE
+#undef TRUE
+#undef FALSE
+#define TRUE 1
+#define FALSE 0
+
+// -- MAXPATHLEN
+#ifndef MAXPATHLEN
+# ifdef _MAX_PATH
+#  define MAXPATHLEN _MAX_PATH
+# else
+#  define MAXPATHLEN 1024
+# endif
+#else
+# if ( MAXPATHLEN < 1024 )
+#  undef MAXPATHLEN
+#  define MAXPATHLEN 1024
+# endif
+#endif
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+#if defined(AUTOCONF) && !defined(HAVE_STRERROR)
+# define NEED_STRERROR
+#elif defined(sun) && !defined(__svr4__) && !defined(__SVR4)
+# define NEED_STRERROR
+#elif defined(REIMPLEMENT_STRERROR)
+# define NEED_STRERROR
+#endif
+#ifdef NEED_STRERROR
+char *
+strerror(int errno)
+{
+  extern int sys_nerr;
+  extern char *sys_errlist[];
+  if (errno>0 && errno<sys_nerr) 
+    return sys_errlist[errno];
+  return (char*) "unknown stdio error";
+}
+#endif
+
+
+static const char slash='/';
+static const char percent='%';
+static const char backslash='\\';
+static const char colon=':';
+static const char dot='.';
+static const char nillchar=0;
+
+
+// -----------------------------------------
+// Functions for dealing with filenames
+// -----------------------------------------
+
+static inline int
+finddirsep(const GUTF8String &fname)
+{
+#if defined(_WIN32)
+  return fname.rcontains("\\/",0);
+#elif defined(UNIX)
+  return fname.rsearch('/',0);
+#elif defined(macintosh)
+  return fname.rcontains(":/",0);
+#else
+# error "Define something here for your operating system"
+#endif  
+}
+
+
+// basename(filename[, suffix])
+// -- returns the last component of filename and removes suffix
+//    when present. works like /bin/basename.
+GUTF8String 
+GOS::basename(const GUTF8String &gfname, const char *suffix)
+{
+  if(!gfname.length())
+    return gfname;
+
+  const char *fname=gfname;
+#if defined(_WIN32) || defined(OS2)
+  // Special cases
+  if (fname[1] == colon)
+  {
+    if(!fname[2])
+    {
+      return gfname;
+    }
+    if (!fname[3] && (fname[2]== slash || fname[2]== backslash))
+    {
+      char string_buffer[4];
+      string_buffer[0] = fname[0];
+      string_buffer[1] = colon;
+      string_buffer[2] = backslash; 
+      string_buffer[3] = 0; 
+      return string_buffer;
+    }
+  }
+#endif
+
+
+  // Allocate buffer
+  GUTF8String retval(gfname,finddirsep(gfname)+1,(unsigned int)(-1));
+  fname=retval;
+
+  // Process suffix
+  if (suffix)
+  {
+    if (suffix[0]== dot )
+      suffix ++;
+    if (suffix[0])
+    {
+      const GUTF8String gsuffix(suffix);
+      const int sl = gsuffix.length();
+      const char *s = fname + strlen(fname);
+      if (s > fname + sl)
+      {
+        s = s - (sl + 1);
+        if(*s == dot && (GUTF8String(s+1).downcase() == gsuffix.downcase()))
+        {
+          retval.setat((int)((size_t)s-(size_t)fname),0);
+        }
+      }
+    }
+  }
+  return retval;
+}
+
+
+
+// errmsg --
+// -- A small helper function returning a 
+//    stdio error message in a static buffer.
+
+static GNativeString 
+errmsg()
+{
+  GNativeString buffer;
+  const char *errname = strerror(errno);
+  buffer.format("%s (errno = %d)", errname, errno);
+  return buffer;
+}
+
+
+
+// -----------------------------------------
+// Functions for measuring time
+// -----------------------------------------
+
+// ticks() --
+// -- returns the number of milliseconds elapsed since 
+//    a system dependent date.
+unsigned long 
+GOS::ticks()
+{
+#if defined(UNIX)
+  struct timeval tv;
+  if (gettimeofday(&tv, NULL) < 0)
+    G_THROW(errmsg());
+  return (unsigned long)( ((tv.tv_sec & 0xfffff)*1000) 
+                          + (tv.tv_usec/1000) );
+#elif defined(_WIN32)
+  DWORD clk = GetTickCount();
+  return (unsigned long)clk;
+#elif defined(OS2)
+  ULONG clk = 0;
+  DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, (PVOID)&clk, sizeof(ULONG));
+  return clk;
+#elif defined(macintosh)
+  return (unsigned long)((double)TickCount()*16.66);
+#else
+# error "Define something here for your operating system"
+#endif
+}
+
+// sleep(int milliseconds) --
+// -- sleeps during the specified time (in milliseconds)
+void 
+GOS::sleep(int milliseconds)
+{
+#if defined(UNIX)
+  struct timeval tv;
+  tv.tv_sec = milliseconds / 1000;
+  tv.tv_usec = (milliseconds - (tv.tv_sec * 1000)) * 1000;
+  ::select(0, NULL, NULL, NULL, &tv);
+#elif defined(_WIN32)
+  Sleep(milliseconds);
+#elif defined(OS2)
+  DosSleep(milliseconds);
+#elif defined(macintosh)
+  unsigned long tick = ticks(), now;
+  while (1) {
+    now = ticks();
+    if ((tick+milliseconds) < now)
+      break;
+    GThread::yield();
+  }
+#endif
+}
+
+
+// -----------------------------------------
+// Testing
+// -----------------------------------------
+
+// cwd([dirname])
+// -- changes directory to dirname (when specified).
+//    returns the full path name of the current directory. 
+GUTF8String 
+GOS::cwd(const GUTF8String &dirname)
+{
+#if defined(UNIX) || defined(macintosh) || defined(OS2)
+  if (dirname.length() && chdir(dirname.getUTF82Native())==-1)//MBCS cvt
+    G_THROW(errmsg());
+  char *string_buffer;
+  GPBuffer<char> gstring_buffer(string_buffer,MAXPATHLEN+1);
+  char *result = getcwd(string_buffer,MAXPATHLEN);
+  if (!result)
+    G_THROW(errmsg());
+  return GNativeString(result).getNative2UTF8();//MBCS cvt
+#elif defined(_WIN32)
+  char drv[2];
+  if (dirname.length() && _chdir(dirname.getUTF82Native())==-1)//MBCS cvt
+    G_THROW(errmsg());
+  drv[0]= dot ; drv[1]=0;
+  char *string_buffer;
+  GPBuffer<char> gstring_buffer(string_buffer,MAXPATHLEN+1);
+  char *result = getcwd(string_buffer,MAXPATHLEN);
+  GetFullPathName(drv, MAXPATHLEN, string_buffer, &result);
+  return GNativeString(string_buffer).getNative2UTF8();//MBCS cvt
+#else
+# error "Define something here for your operating system"
+#endif 
+}
+
+GUTF8String
+GOS::getenv(const GUTF8String &name)
+{
+  GUTF8String retval;
+  if(name.length())
+  {
+    const char *env=::getenv(name.getUTF82Native());
+    if(env)
+    {
+      retval=GNativeString(env);
+    }
+  }
+  return retval;
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GOS.h b/libdjvu/GOS.h
new file mode 100644
index 0000000..8bef54f
--- /dev/null
+++ b/libdjvu/GOS.h
@@ -0,0 +1,158 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GOS_H_
+#define _GOS_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name GOS.h
+    Files #"GOS.h"# and #"GOS.cpp"# implement operating system 
+    dependent functions with a unified interface.  All these functions
+    are implemented as static member of class \Ref{GOS}. 
+    Functions are provided for testing the presence of a file or a directory
+    (\Ref{GOS::is_file}, \Ref{GOS::is_dir}), for manipulating file and directory names
+    (\Ref{GOS::dirname}, \Ref{GOS::basename}, \Ref{GOS::expand_name},
+    for obtaining and changing the current directory (\Ref{GOS::cwd}),
+    for converting between file names and urls (\Ref{GOS::filename_to_url},
+    \Ref{GOS::url_to_filename}), and for counting time (\Ref{GOS::ticks},
+    \Ref{GOS::sleep}).
+    
+    @memo
+    Operating System dependent functions.
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- Initial implementation
+*/
+//@{
+
+#include "DjVuGlobal.h"
+#include "GString.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+class GURL;
+
+/** Operating System dependent functions. */
+class DJVUAPI GOS 
+{
+ public:
+  // -----------------------------------------
+  // Functions for dealing with filenames
+  // -----------------------------------------
+
+  /** Returns the last component of file name #filename#.  If the filename
+      suffix matches argument #suffix#, the filename suffix is removed.  This
+      function works like the unix command #/bin/basename#, but also supports
+      the naming conventions of other operating systems. */
+  static GUTF8String basename(const GUTF8String &filename, const char *suffix=0);
+
+  /** Sets and returns the current working directory.
+      When argument #dirname# is specified, the current directory is changed
+      to #dirname#. This function always returns the fully qualified name
+      of the current directory. */
+  static GUTF8String cwd(const GUTF8String &dirname=GUTF8String());
+
+  // -----------------------------------------
+  // Functions for measuring time
+  // -----------------------------------------
+  
+  /** Returns a number of elapsed milliseconds.  This number counts elapsed
+      milliseconds since a operating system dependent date. This function is
+      useful for timing code. */
+  static unsigned long ticks();
+
+  /** Sleeps during the specified time expressed in milliseconds.
+      Other threads can run while the calling thread sleeps. */
+  static void sleep(int milliseconds);
+
+  /// Read the named variable from the environment, and converts it to UTF8.
+  static GUTF8String getenv(const GUTF8String &name);
+
+#if 0
+  // -------------------------------------------
+  // Functions for converting filenames and urls
+  // -------------------------------------------
+  /** Encodes all reserved characters, so that the #filename# can be
+      used inside a URL. Every reserved character is encoded using escape
+      sequence in the form of #%XX#. The legal characters are alphanumeric and
+      #$-_.+!*'(),:#.
+      Use \Ref{decode_reserved}() to convert the URL back to the filename. */
+//  static GString encode_reserved(const char * filename);
+  static GString encode_mbcs_reserved(const char * filename);/*MBCS*/
+#endif
+
+};
+
+
+//@}
+// ------------
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp
new file mode 100644
index 0000000..9237889
--- /dev/null
+++ b/libdjvu/GPixmap.cpp
@@ -0,0 +1,1760 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// -- Implements class PIXMAP
+// Author: Leon Bottou 07/1997
+
+
+
+#include "GPixmap.h"
+
+#include "GString.h"
+#include "GException.h"
+#include "ByteStream.h"
+#include "GRect.h"
+#include "GBitmap.h"
+#include "GThreads.h"
+#include "Arrays.h"
+#include "JPEGDecoder.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <math.h>
+#include <assert.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+//////////////////////////////////////////////////
+// ------- predefined colors
+//////////////////////////////////////////////////
+
+
+const GPixel GPixel::WHITE = { 255, 255, 255 };
+const GPixel GPixel::BLACK = {   0,   0,   0 };
+const GPixel GPixel::BLUE  = { 255,   0,   0 };
+const GPixel GPixel::GREEN = {   0, 255,   0 };
+const GPixel GPixel::RED   = {   0,   0, 255 };
+
+
+//////////////////////////////////////////////////
+// ----- utilities
+//////////////////////////////////////////////////
+
+
+static const GPixel *
+new_gray_ramp(int grays,GPixel *ramp)
+{
+  int color = 0xff0000;
+  int decrement = color / (grays-1);
+  for (int i=0; i<grays; i++)
+    {
+      int level = color >> 16;
+      ramp[i].b = level;
+      ramp[i].g = level;
+      ramp[i].r = level;
+      color -= decrement;
+    }
+  return ramp;
+}
+
+
+static inline int
+mini(int x, int y) 
+{ 
+  return (x < y ? x : y);
+}
+
+
+static inline int
+maxi(int x, int y) 
+{ 
+  return (x > y ? x : y);
+}
+
+
+static inline void 
+euclidian_ratio(int a, int b, int &q, int &r)
+{
+  q = a / b;
+  r = a - b*q;
+  if (r < 0)
+  {
+    q -= 1;
+    r += b;
+  }
+}
+
+
+//////////////////////////////////////////////////
+// global lock used by some rare operations
+//////////////////////////////////////////////////
+
+static GMonitor &pixmap_monitor() {
+  static GMonitor xpixmap_monitor;
+  return xpixmap_monitor;
+}
+
+
+//////////////////////////////////////////////////
+// constructors and destructors
+//////////////////////////////////////////////////
+
+
+GPixmap::~GPixmap()
+{
+  delete [] pixels_data;
+}
+
+void
+GPixmap::destroy(void)
+{
+  delete [] pixels_data;
+  pixels = pixels_data = 0;
+}
+
+GPixmap::GPixmap()
+: nrows(0), ncolumns(0), pixels(0), pixels_data(0)
+{
+}
+
+GPixmap::GPixmap(int nrows, int ncolumns, const GPixel *filler)
+: nrows(0), ncolumns(0), pixels(0), pixels_data(0)
+{
+  G_TRY
+  {
+    init(nrows, ncolumns, filler);
+  }
+  G_CATCH_ALL
+  {
+	destroy();
+	G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GPixmap::GPixmap(ByteStream &bs)
+: nrows(0), ncolumns(0), pixels(0), pixels_data(0)
+{
+  G_TRY
+  {
+	init(bs);
+  }
+  G_CATCH_ALL
+  {
+	destroy();
+	G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GPixmap::GPixmap(const GBitmap &ref)
+: nrows(0), ncolumns(0), pixels(0), pixels_data(0)
+{
+  G_TRY
+  {
+	init(ref, 0);
+  }
+  G_CATCH_ALL
+  {
+	destroy();
+	G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GPixmap::GPixmap(const GBitmap &ref, const GRect &rect)
+: nrows(0), ncolumns(0), pixels(0), pixels_data(0)
+{
+  G_TRY
+  {
+    init(ref, rect, 0);
+  }
+  G_CATCH_ALL
+  {
+	destroy();
+	G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GPixmap::GPixmap(const GPixmap &ref)
+: nrows(0), ncolumns(0), pixels(0), pixels_data(0)
+{
+  G_TRY
+  {
+    init(ref);
+  }
+  G_CATCH_ALL
+  {
+	destroy();
+	G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+GPixmap::GPixmap(const GPixmap &ref, const GRect &rect)
+: nrows(0), ncolumns(0), pixels(0), pixels_data(0)
+{
+  G_TRY
+  {
+	init(ref, rect);
+  }
+  G_CATCH_ALL
+  {
+	destroy();
+	G_RETHROW;
+  }
+  G_ENDCATCH;
+}
+
+
+
+//////////////////////////////////////////////////
+// Initialization
+//////////////////////////////////////////////////
+
+
+void 
+GPixmap::init(int arows, int acolumns, const GPixel *filler)
+{
+  if (arows != (unsigned short) arows ||
+      acolumns != (unsigned short) acolumns )
+    G_THROW("Illegal arguments");
+  destroy();
+  nrows = arows;
+  ncolumns = acolumns;
+  nrowsize = acolumns;
+  int npix = nrows * nrowsize;
+  if (npix > 0)
+  {
+    pixels = pixels_data = new GPixel[npix];
+    if (filler)
+    { 
+      while (--npix>=0) 
+        pixels_data[npix] = *filler;
+    }
+  }
+}
+
+
+void 
+GPixmap::init(const GBitmap &ref, const GPixel *userramp)
+{
+  init(ref.rows(), ref.columns(), 0);
+  GPixel *xramp;
+  GPBuffer<GPixel> gxramp(xramp);
+  if (nrows>0 && ncolumns>0)
+  {
+    // Create pixel ramp
+    const GPixel *ramp = userramp;
+    if (!userramp)
+	{
+          gxramp.resize(256);
+          gxramp.clear();
+	  ramp = new_gray_ramp(ref.get_grays(),xramp);
+	}
+    // Copy pixels
+    for (int y=0; y<nrows; y++)
+    {
+      GPixel *dst = (*this)[y];
+      const unsigned char *src = ref[y];
+      for (int x=0; x<ncolumns; x++)
+        dst[x] = ramp[ src[x] ];
+    }
+    // Free ramp
+//    if (!userramp)
+//      delete [] (GPixel*)ramp;
+  }
+}
+
+
+void 
+GPixmap::init(const GBitmap &ref, const GRect &rect, const GPixel *userramp)
+{
+  init(rect.height(), rect.width(), 0);
+  // compute destination rectangle
+  GRect rect2(0, 0, ref.columns(), ref.rows() );
+  rect2.intersect(rect2, rect);
+  rect2.translate(-rect.xmin, -rect.ymin);
+  // copy bits
+  if (! rect2.isempty())
+  {
+    GPixel *xramp;
+    GPBuffer<GPixel> gxramp(xramp);
+    // allocate ramp
+    const GPixel *ramp = userramp;
+    if (!userramp)
+	{
+	  gxramp.resize(256);
+          gxramp.clear();
+          ramp = new_gray_ramp(ref.get_grays(),xramp);
+	}
+    // copy pixels
+    for (int y=rect2.ymin; y<rect2.ymax; y++)
+    {
+      GPixel *dst = (*this)[y];
+      const unsigned char *src = ref[y+rect.ymin] + rect.xmin;
+      for (int x=rect2.xmin; x<rect2.xmax; x++)
+        dst[x] = ramp[ src[x] ];
+    }
+    // free ramp
+//    if (!userramp)
+//      delete [] (GPixel*) ramp;
+  }
+}
+
+
+void 
+GPixmap::init(const GPixmap &ref)
+{
+  init(ref.rows(), ref.columns(), 0);
+  if (nrows>0 && ncolumns>0)
+  {
+    for (int y=0; y<nrows; y++)
+    {
+      GPixel *dst = (*this)[y];
+      const GPixel *src = ref[y];
+      for (int x=0; x<ncolumns; x++)
+        dst[x] = src[x];
+    }
+  }
+}
+
+
+void 
+GPixmap::init(const GPixmap &ref, const GRect &rect)
+{
+  init(rect.height(), rect.width(), 0);
+  // compute destination rectangle
+  GRect rect2(0, 0, ref.columns(), ref.rows() );
+  rect2.intersect(rect2, rect);
+  rect2.translate(-rect.xmin, -rect.ymin);
+  // copy bits
+  if (! rect2.isempty())
+  {
+    for (int y=rect2.ymin; y<rect2.ymax; y++)
+    {
+      GPixel *dst = (*this)[y];
+      const GPixel *src = ref[y+rect.ymin] + rect.xmin;
+      for (int x=rect2.xmin; x<rect2.xmax; x++)
+        dst[x] = src[x];
+    }
+  }
+}
+
+
+void 
+GPixmap::donate_data(GPixel *data, int w, int h)
+{
+  destroy();
+  nrows = h;
+  ncolumns = w;
+  nrowsize = w;
+  pixels_data=pixels=data;
+}
+
+
+GPixel *
+GPixmap::take_data(size_t &offset)
+{
+  GPixel *ret = pixels_data;
+  pixels_data = 0;
+  offset = 0;
+  return ret;
+}
+
+
+
+//////////////////////////////////////////////////
+// Save and load ppm files
+//////////////////////////////////////////////////
+
+
+static unsigned int 
+read_integer(char &c, ByteStream &bs)
+{
+  unsigned int x = 0;
+  // eat blank before integer
+  while (c==' ' || c=='\t' || c=='\r' || c=='\n' || c=='#') 
+    {
+      if (c=='#') 
+        do { } while (bs.read(&c,1) && c!='\n' && c!='\r');
+      c = 0; 
+      bs.read(&c, 1);
+    }
+  // check integer
+  if (c<'0' || c>'9')
+    G_THROW( ERR_MSG("GPixmap.no_int") );
+  // eat integer
+  while (c>='0' && c<='9') 
+    {
+      x = x*10 + c - '0';
+      c = 0;
+      bs.read(&c, 1);
+    }
+  return x;
+}
+
+
+void 
+GPixmap::init(ByteStream &bs)
+{
+  // Read header
+  bool raw = false;
+  bool grey = false;
+  int magic = bs.read16();
+  GP<GBitmap> bm;
+  switch (magic)
+    {
+    case ('P'<<8)+'2':
+      grey = true;
+      break;
+    case ('P'<<8)+'3':
+      break;
+    case ('P'<<8)+'5':
+      raw = grey = true;
+    case ('P'<<8)+'6':
+      raw = true;
+      break;
+    case ('P'<<8)+'1':
+    case ('P'<<8)+'4': 
+      bs.seek(0L);
+      bm = GBitmap::create(bs); 
+      init(*bm);
+      return;
+    default:
+#ifdef NEED_JPEG_DECODER
+      bs.seek(0L);
+      JPEGDecoder::decode(bs,*this);
+      return;
+#else
+      
+      G_THROW( ERR_MSG("GPixmap.unk_PPM") );
+#endif
+    }
+  // Read image size
+  char lookahead = '\n';
+  int bytesperrow = 0;
+  int bytespercomp = 1;
+  int acolumns = read_integer(lookahead, bs);
+  int arows = read_integer(lookahead, bs);
+  int maxval = read_integer(lookahead, bs);
+  if (maxval > 65535)
+    G_THROW("Cannot read PPM with depth greater than 48 bits.");
+  if (maxval > 255)
+    bytespercomp = 2;
+  init(arows, acolumns, 0);
+  // Prepare ramp
+  GTArray<unsigned char> ramp;
+  int maxbin = 1 << (8 * bytespercomp);
+  ramp.resize(0, maxbin-1);
+  for (int i=0; i<maxbin; i++)
+    ramp[i] = (i<maxval ? (255*i + maxval/2) / maxval : 255);
+  unsigned char *bramp = ramp;
+  // Read image data
+  if (raw && grey)
+    {
+      bytesperrow = ncolumns * bytespercomp;
+      GTArray<unsigned char> line(bytesperrow);
+      for (int y=nrows-1; y>=0; y--) 
+        {
+          GPixel *p = (*this)[y];
+          unsigned char *g = &line[0];
+          if ( bs.readall((void*)g, bytesperrow) < (size_t)bytesperrow)
+            G_THROW( ByteStream::EndOfFile );
+          if (bytespercomp <= 1)
+            {
+              for (int x=0; x<ncolumns; x+=1, g+=1)
+                p[x].r = p[x].g = p[x].b = bramp[g[0]];
+            }
+          else
+            {
+              for (int x=0; x<ncolumns; x+=1, g+=2)
+                p[x].r = p[x].g = p[x].b = bramp[g[0]*256+g[1]];
+            }
+        }
+    }
+  else if (raw)
+    {
+      bytesperrow = ncolumns * bytespercomp * 3;
+      GTArray<unsigned char> line(bytesperrow);
+      for (int y=nrows-1; y>=0; y--) 
+        {
+          GPixel *p = (*this)[y];
+          unsigned char *rgb = &line[0];
+          if ( bs.readall((void*)rgb, bytesperrow) < (size_t)bytesperrow)
+            G_THROW( ByteStream::EndOfFile );
+          if (bytespercomp <= 1)
+            {
+              for (int x=0; x<ncolumns; x+=1, rgb+=3)
+                {
+                  p[x].r = bramp[rgb[0]];
+                  p[x].g = bramp[rgb[1]];
+                  p[x].b = bramp[rgb[2]];
+                }
+            }
+          else
+            for (int x=0; x<ncolumns; x+=1, rgb+=6)
+              {
+                p[x].r = bramp[rgb[0]*256+rgb[1]];
+                p[x].g = bramp[rgb[2]*256+rgb[3]];
+                p[x].b = bramp[rgb[4]*256+rgb[5]];
+              }
+        }
+    }
+  else
+    {
+      for (int y=nrows-1; y>=0; y--) 
+        {
+          GPixel *p = (*this)[y];
+          for (int x=0; x<ncolumns; x++)
+            if (grey)
+              {
+                p[x].g = p[x].b = p[x].r = ramp[(int)read_integer(lookahead, bs)];
+              }
+            else
+              {
+                p[x].r = ramp[(int)read_integer(lookahead, bs)];
+                p[x].g = ramp[(int)read_integer(lookahead, bs)];
+                p[x].b = ramp[(int)read_integer(lookahead, bs)];
+              }
+        }
+    }
+}
+
+
+void 
+GPixmap::save_ppm(ByteStream &bs, int raw) const
+{
+  GUTF8String head;
+  head.format("P%c\n%d %d\n255\n", (raw ? '6' : '3'), ncolumns, nrows);
+  bs.writall((void*)(const char *)head, head.length());
+  if (raw)
+    {
+      int rowsize = ncolumns+ncolumns+ncolumns;
+      GTArray<unsigned char> xrgb(rowsize);
+      for (int y=nrows-1; y>=0; y--) 
+        {
+          const GPixel *p = (*this)[y];
+          unsigned char *d = xrgb;
+          for (int x=0; x<ncolumns; x++) 
+            {
+              *d++ = p[x].r;
+              *d++ = p[x].g;
+              *d++ = p[x].b;
+            }
+          bs.writall((void*)(unsigned char*)xrgb, ncolumns * 3);
+        }
+    }
+  else
+    {
+      for (int y=nrows-1; y>=0; y--) 
+        {
+          const GPixel *p = (*this)[y];
+          unsigned char eol='\n';
+          for (int x=0; x<ncolumns; )
+            {
+              head.format("%d %d %d  ", p[x].r, p[x].g, p[x].b);
+              bs.writall((void*)(const char *)head, head.length());
+              x += 1;
+              if (x==ncolumns || (x&0x7)==0) 
+                bs.write((void*)&eol, 1);          
+            }
+        }
+    }
+}
+
+
+
+
+//////////////////////////////////////////////////
+// Color correction
+//////////////////////////////////////////////////
+
+
+static void
+color_correction_table(double gamma, GPixel white,
+                       unsigned char gtable[256][3] )
+{
+  // Check argument
+  if (gamma<0.1 || gamma>10.0)
+    G_THROW( ERR_MSG("GPixmap.bad_param") );
+  if (gamma<1.001 && gamma>0.999 && white==GPixel::WHITE)
+    {
+      // Trivial correction
+      for (int i=0; i<256; i++)
+        gtable[i][0] = gtable[i][1] = gtable[i][2] = i;
+    }
+  else
+    {
+      // Must compute the correction
+      for (int i=0; i<256; i++)
+        {
+          double x = (double)(i)/255.0;
+#ifdef BEZIERGAMMA
+          double t = ( sqrt(1.0+(gamma*gamma-1.0)*x) - 1.0 ) / (gamma - 1.0);
+          x = ( (1.0 - gamma)*t + 2.0 * gamma ) * t / (gamma + 1.0);
+#else
+          x = pow(x, 1.0/gamma);        
+#endif
+          gtable[i][0] = (int) floor(white.b * x + 0.5);
+          gtable[i][1] = (int) floor(white.g * x + 0.5);
+          gtable[i][2] = (int) floor(white.r * x + 0.5);
+        }
+      // Make sure that min and max values are exactly black or white
+      gtable[0][0] = 0;
+      gtable[0][1] = 0;
+      gtable[0][2] = 0;
+      gtable[255][0] = white.b;
+      gtable[255][1] = white.g;
+      gtable[255][2] = white.r;
+    }
+}
+
+static void
+color_correction_table_cache(double gamma, GPixel white,
+                             unsigned char gtable[256][3] )
+{
+  // Compute color correction table
+  if (gamma<1.001 && gamma>0.999 && white==GPixel::WHITE)
+    {
+      color_correction_table(gamma, white, gtable);
+    }
+  else
+    {
+      static double lgamma = -1.0;
+      static GPixel lwhite = GPixel::BLACK;
+      static unsigned char ctable[256][3];
+      GMonitorLock lock(&pixmap_monitor());
+      if (gamma != lgamma || white != lwhite)
+        {
+          color_correction_table(gamma, white, ctable);
+          lgamma = gamma;
+          lwhite = white;
+        }
+      memcpy(gtable, ctable, 256*3*sizeof(unsigned char));
+    }
+}
+
+void 
+GPixmap::color_correct(double gamma_correction, GPixel white)
+{
+  // Trivial corrections
+  if (gamma_correction>0.999 && gamma_correction<1.001 && white==GPixel::WHITE)
+    return;
+  // Compute correction table
+  unsigned char gtable[256][3];
+  color_correction_table_cache(gamma_correction, white, gtable);
+  // Perform correction
+  for (int y=0; y<nrows; y++)
+  {
+    GPixel *pix = (*this)[y];
+    for (int x=0; x<ncolumns; x++, pix++)
+    {
+      pix->b = gtable[ pix->b ][0];
+      pix->g = gtable[ pix->g ][1];
+      pix->r = gtable[ pix->r ][2];
+    }
+  }
+}
+
+void 
+GPixmap::color_correct(double gamma_correction)
+{
+  // Trivial corrections
+  if (gamma_correction<=0.999 || gamma_correction>=1.001)
+    color_correct(gamma_correction, GPixel::WHITE);
+}
+
+
+void 
+GPixmap::color_correct(double gamma_correction, GPixel white,
+                       GPixel *pix, int npixels)
+{
+  // Trivial corrections
+  if (gamma_correction>0.999 && gamma_correction<1.001 && white==GPixel::WHITE)
+    return;
+  // Compute correction table
+  unsigned char gtable[256][3];
+  color_correction_table_cache(gamma_correction, white, gtable);
+  // Perform correction
+  while (--npixels>=0)
+    {
+      pix->b = gtable[pix->b][0];
+      pix->g = gtable[pix->g][1];
+      pix->r = gtable[pix->r][2];
+      pix++;
+    }
+}
+
+
+void 
+GPixmap::color_correct(double gamma_correction, GPixel *pix, int npixels)
+{
+  // Trivial corrections
+  if (gamma_correction<=0.999 || gamma_correction>=1.001)
+    color_correct(gamma_correction,GPixel::WHITE,pix,npixels);
+}
+
+
+//////////////////////////////////////////////////
+// Dithering
+//////////////////////////////////////////////////
+
+
+void
+GPixmap::ordered_666_dither(int xmin, int ymin)
+{
+  static unsigned char quantize[256+0x33+0x33];
+  static unsigned char *quant = quantize + 0x33;
+  static char  dither_ok = 0;
+  static short dither[16][16] = 
+  {
+    {   0,192, 48,240, 12,204, 60,252,  3,195, 51,243, 15,207, 63,255 },
+    { 128, 64,176,112,140, 76,188,124,131, 67,179,115,143, 79,191,127 },
+    {  32,224, 16,208, 44,236, 28,220, 35,227, 19,211, 47,239, 31,223 },
+    { 160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95 },
+    {   8,200, 56,248,  4,196, 52,244, 11,203, 59,251,  7,199, 55,247 },
+    { 136, 72,184,120,132, 68,180,116,139, 75,187,123,135, 71,183,119 },
+    {  40,232, 24,216, 36,228, 20,212, 43,235, 27,219, 39,231, 23,215 },
+    { 168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87 },
+    {   2,194, 50,242, 14,206, 62,254,  1,193, 49,241, 13,205, 61,253 },
+    { 130, 66,178,114,142, 78,190,126,129, 65,177,113,141, 77,189,125 },
+    {  34,226, 18,210, 46,238, 30,222, 33,225, 17,209, 45,237, 29,221 },
+    { 162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93 },
+    {  10,202, 58,250,  6,198, 54,246,  9,201, 57,249,  5,197, 53,245 },
+    { 138, 74,186,122,134, 70,182,118,137, 73,185,121,133, 69,181,117 },
+    {  42,234, 26,218, 38,230, 22,214, 41,233, 25,217, 37,229, 21,213 },
+    { 170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85 }
+  };
+  // Prepare tables
+  if (!dither_ok)
+  {
+    int i, j;
+    for (i=0; i<16; i++)
+      for (j=0; j<16; j++)
+        dither[i][j] = ((255 - 2*dither[i][j]) * 0x33) / 512;    
+    j = -0x33;
+    for (i=0x19; i<256; i+=0x33)
+      while (j <= i)
+        quant[j++] = i-0x19;
+    assert(i-0x19 == 0xff);
+    while (j< 256+0x33)
+      quant[j++] = i-0x19;
+    dither_ok = 1;
+  }
+  // Go dithering
+  for (int y=0; y<nrows; y++)
+  {
+    GPixel *pix = (*this)[y];
+    for (int x=0; x<ncolumns; x++, pix++)
+    {
+      pix->r = quant[ pix->r + dither[(x+xmin+0)&0xf][(y+ymin+0)&0xf] ];
+      pix->g = quant[ pix->g + dither[(x+xmin+5)&0xf][(y+ymin+11)&0xf] ];
+      pix->b = quant[ pix->b + dither[(x+xmin+11)&0xf][(y+ymin+5)&0xf] ];
+    }
+  }
+}
+
+void
+GPixmap::ordered_32k_dither(int xmin, int ymin)
+{
+  static unsigned char quantize[256+8+8];
+  static unsigned char *quant = quantize + 8;
+  static char  dither_ok = 0;
+  static short dither[16][16] = 
+  {
+    {   0,192, 48,240, 12,204, 60,252,  3,195, 51,243, 15,207, 63,255 },
+    { 128, 64,176,112,140, 76,188,124,131, 67,179,115,143, 79,191,127 },
+    {  32,224, 16,208, 44,236, 28,220, 35,227, 19,211, 47,239, 31,223 },
+    { 160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95 },
+    {   8,200, 56,248,  4,196, 52,244, 11,203, 59,251,  7,199, 55,247 },
+    { 136, 72,184,120,132, 68,180,116,139, 75,187,123,135, 71,183,119 },
+    {  40,232, 24,216, 36,228, 20,212, 43,235, 27,219, 39,231, 23,215 },
+    { 168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87 },
+    {   2,194, 50,242, 14,206, 62,254,  1,193, 49,241, 13,205, 61,253 },
+    { 130, 66,178,114,142, 78,190,126,129, 65,177,113,141, 77,189,125 },
+    {  34,226, 18,210, 46,238, 30,222, 33,225, 17,209, 45,237, 29,221 },
+    { 162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93 },
+    {  10,202, 58,250,  6,198, 54,246,  9,201, 57,249,  5,197, 53,245 },
+    { 138, 74,186,122,134, 70,182,118,137, 73,185,121,133, 69,181,117 },
+    {  42,234, 26,218, 38,230, 22,214, 41,233, 25,217, 37,229, 21,213 },
+    { 170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85 }
+  };
+  // Prepare tables
+  if (!dither_ok)
+  {
+    int i, j;
+    for (i=0; i<16; i++)
+      for (j=0; j<16; j++)
+        dither[i][j] = ((255 - 2*dither[i][j]) * 8) / 512;    
+    j = -8;
+    for (i=3; i<256; i+=8)
+      while (j <= i)
+        quant[j++] = i;
+    while (j<256+8)
+      quant[j++] = 0xff;
+    dither_ok = 1;
+  }
+  // Go dithering
+  for (int y=0; y<nrows; y++)
+  {
+    GPixel *pix = (*this)[y];
+    for (int x=0; x<ncolumns; x++, pix++)
+    {
+      pix->r = quant[ pix->r + dither[(x+xmin+0)&0xf][(y+ymin+0)&0xf] ];
+      pix->g = quant[ pix->g + dither[(x+xmin+5)&0xf][(y+ymin+11)&0xf] ];
+      pix->b = quant[ pix->b + dither[(x+xmin+11)&0xf][(y+ymin+5)&0xf] ];
+    }
+  }
+}
+
+
+//////////////////////////////////////////////////
+// Upsample Downsample
+//////////////////////////////////////////////////
+
+
+void  
+GPixmap::downsample(const GPixmap *src, int factor, const GRect *pdr)
+{
+  // check arguments
+  GRect rect(0, 0, (src->columns()+factor-1)/factor, (src->rows()+factor-1)/factor);
+  if (pdr != 0)
+  {
+    if (pdr->xmin < rect.xmin || 
+        pdr->ymin < rect.ymin || 
+        pdr->xmax > rect.xmax || 
+        pdr->ymax > rect.ymax  )
+      G_THROW( ERR_MSG("GPixmap.overflow1") );
+    rect = *pdr;
+  }
+
+  // precompute inverse map
+  static int invmap[256];
+  static int invmapok = 0;
+  if (! invmapok)
+  {
+    invmapok = 1;
+    for (int i=1; i<(int)(sizeof(invmap)/sizeof(int)); i++)
+      invmap[i] = 0x10000 / i;
+  }
+  
+  // initialise pixmap
+  init(rect.height(), rect.width(), 0);
+
+  // determine starting and ending points in source rectangle
+  int sy = rect.ymin * factor;
+  int sxz = rect.xmin * factor;
+
+
+  // loop over source rows
+  const GPixel *sptr = (*src)[sy];
+  GPixel *dptr = (*this)[0];
+  for (int y=0; y<nrows; y++)
+  {
+    int sx = sxz;
+    // loop over source columns
+    for (int x=0; x<ncolumns; x++)
+    {
+      int r=0, g=0, b=0, s=0;
+      // compute average bounds
+      const GPixel *ksptr = sptr;
+      int lsy = sy + factor;
+      if (lsy > (int)src->rows())
+        lsy = (int)src->rows();
+      int lsx = sx + factor;
+      if (lsx > (int)src->columns())
+        lsx = (int)src->columns();
+      // compute average
+      for (int rsy=sy; rsy<lsy; rsy++)
+      {
+        for (int rsx = sx; rsx<lsx; rsx++)
+        {
+          r += ksptr[rsx].r;
+          g += ksptr[rsx].g;
+          b += ksptr[rsx].b;
+          s += 1;
+        }
+        ksptr += src->rowsize();
+      }
+      // set pixel color
+      if (s >= (int)(sizeof(invmap)/sizeof(int)))
+      {
+        dptr[x].r = r / s;
+        dptr[x].g = g / s;
+        dptr[x].b = b / s;
+      }
+      else
+      {
+        dptr[x].r = (r*invmap[s] + 0x8000) >> 16;
+        dptr[x].g = (g*invmap[s] + 0x8000) >> 16;
+        dptr[x].b = (b*invmap[s] + 0x8000) >> 16;
+      }
+      // next column
+      sx = sx + factor;
+    }
+    // next row
+    sy = sy + factor;
+    sptr = sptr + factor * src->rowsize();
+    dptr = dptr + rowsize();
+  }
+}
+
+void  
+GPixmap::upsample(const GPixmap *src, int factor, const GRect *pdr)
+{
+  // check arguments
+  GRect rect(0, 0, src->columns()*factor, src->rows()*factor);
+  if (pdr != 0)
+  {
+    if (pdr->xmin < rect.xmin || 
+        pdr->ymin < rect.ymin || 
+        pdr->xmax > rect.xmax || 
+        pdr->ymax > rect.ymax  )
+      G_THROW( ERR_MSG("GPixmap.overflow2") );
+    rect = *pdr;
+  }
+  // initialise pixmap
+  init(rect.height(), rect.width(), 0);
+  // compute starting point in source rectangle
+  int sy, sy1, sxz, sx1z;
+  euclidian_ratio(rect.ymin, factor, sy, sy1);
+  euclidian_ratio(rect.xmin, factor, sxz, sx1z);
+  // loop over rows
+  const GPixel *sptr = (*src)[sy];
+  GPixel *dptr = (*this)[0];
+  for (int y=0; y<nrows; y++)
+  {
+    // loop over columns
+    int sx = sxz;
+    int sx1 = sx1z;
+    for (int x=0; x<ncolumns; x++)
+    {
+      dptr[x] = sptr[sx];
+      // next column
+      if (++sx1 >= factor)
+      {
+        sx1 = 0;
+        sx += 1;
+      }
+    }
+    // next row
+    dptr += rowsize();
+    if (++sy1 >= factor)
+    {
+      sy1 = 0;
+      sptr += src->rowsize();
+    }
+  }
+}
+
+
+static inline void
+downsample_4x4_to_3x3 (const GPixel *s, int sadd, GPixel *d, int dadd)
+{
+  const GPixel *x = s;
+  const GPixel *y = x + sadd;
+  d[0].b = ( 11*x[0].b + 2*(x[1].b + y[0].b ) + y[1].b  + 8) >> 4;
+  d[0].g = ( 11*x[0].g + 2*(x[1].g + y[0].g ) + y[1].g  + 8) >> 4;
+  d[0].r = ( 11*x[0].r + 2*(x[1].r + y[0].r ) + y[1].r  + 8) >> 4;
+  d[1].b = ( 7*(x[1].b + x[2].b) + y[1].b + y[2].b + 8 )     >> 4;
+  d[1].g = ( 7*(x[1].g + x[2].g) + y[1].g + y[2].g + 8 )     >> 4;
+  d[1].r = ( 7*(x[1].r + x[2].r) + y[1].r + y[2].r + 8 )     >> 4;
+  d[2].b = ( 11*x[3].b + 2*(x[2].b + y[3].b ) + y[2].b  + 8) >> 4;
+  d[2].g = ( 11*x[3].g + 2*(x[2].g + y[3].g ) + y[2].g  + 8) >> 4;
+  d[2].r = ( 11*x[3].r + 2*(x[2].r + y[3].r ) + y[2].r  + 8) >> 4;
+  d = d + dadd;
+  x = x + sadd + sadd;
+  d[0].b = ( 7*(x[0].b + y[0].b) + x[1].b + y[1].b + 8 )     >> 4;
+  d[0].g = ( 7*(x[0].g + y[0].g) + x[1].g + y[1].g + 8 )     >> 4;
+  d[0].r = ( 7*(x[0].r + y[0].r) + x[1].r + y[1].r + 8 )     >> 4;
+  d[1].b = ( x[2].b + y[2].b + x[1].b + y[1].b + 2 )         >> 2;
+  d[1].g = ( x[2].g + y[2].g + x[1].g + y[1].g + 2 )         >> 2;
+  d[1].r = ( x[2].r + y[2].r + x[1].r + y[1].r + 2 )         >> 2;
+  d[2].b = ( 7*(x[3].b + y[3].b) + x[2].b + y[2].b + 8 )     >> 4;
+  d[2].g = ( 7*(x[3].g + y[3].g) + x[2].g + y[2].g + 8 )     >> 4;
+  d[2].r = ( 7*(x[3].r + y[3].r) + x[2].r + y[2].r + 8 )     >> 4;
+  d = d + dadd;
+  y = y + sadd + sadd;
+  d[0].b = ( 11*y[0].b + 2*(y[1].b + x[0].b ) + x[1].b  + 8) >> 4;
+  d[0].g = ( 11*y[0].g + 2*(y[1].g + x[0].g ) + x[1].g  + 8) >> 4;
+  d[0].r = ( 11*y[0].r + 2*(y[1].r + x[0].r ) + x[1].r  + 8) >> 4;
+  d[1].b = ( 7*(y[1].b + y[2].b) + x[1].b + x[2].b + 8 )     >> 4;
+  d[1].g = ( 7*(y[1].g + y[2].g) + x[1].g + x[2].g + 8 )     >> 4;
+  d[1].r = ( 7*(y[1].r + y[2].r) + x[1].r + x[2].r + 8 )     >> 4;
+  d[2].b = ( 11*y[3].b + 2*(y[2].b + x[3].b ) + x[2].b  + 8) >> 4;
+  d[2].g = ( 11*y[3].g + 2*(y[2].g + x[3].g ) + x[2].g  + 8) >> 4;
+  d[2].r = ( 11*y[3].r + 2*(y[2].r + x[3].r ) + x[2].r  + 8) >> 4;
+}
+
+
+static inline void
+upsample_2x2_to_3x3 (const GPixel *s, int sadd, GPixel *d, int dadd)
+{
+  const GPixel *x = s;
+  const GPixel *y = x + sadd;
+  d[0] = x[0];
+  d[1].b = (x[0].b + x[1].b + 1) >> 1;
+  d[1].g = (x[0].g + x[1].g + 1) >> 1;
+  d[1].r = (x[0].r + x[1].r + 1) >> 1;
+  d[2] = x[1];
+  d = d + dadd;
+  d[0].b = (x[0].b + y[0].b + 1) >> 1;
+  d[0].g = (x[0].g + y[0].g + 1) >> 1;
+  d[0].r = (x[0].r + y[0].r + 1) >> 1;
+  d[1].b = (x[0].b + y[0].b + x[1].b + y[1].b + 2) >> 2;
+  d[1].g = (x[0].g + y[0].g + x[1].g + y[1].g + 2) >> 2;
+  d[1].r = (x[0].r + y[0].r + x[1].r + y[1].r + 2) >> 2;
+  d[2].b = (x[1].b + y[1].b + 1) >> 1;
+  d[2].g = (x[1].g + y[1].g + 1) >> 1;
+  d[2].r = (x[1].r + y[1].r + 1) >> 1;
+  d = d + dadd;
+  d[0] = y[0];
+  d[1].b = (y[0].b + y[1].b + 1) >> 1;
+  d[1].g = (y[0].g + y[1].g + 1) >> 1;
+  d[1].r = (y[0].r + y[1].r + 1) >> 1;
+  d[2] = y[1];
+}
+
+
+static inline void
+copy_to_partial(int w, int h,
+                const GPixel *s, int sadd,
+                GPixel *d, int dadd, int xmin, int xmax, int ymin, int ymax)
+{
+  int y = 0;
+  while (y<ymin  && y<h)
+    {
+      y += 1;
+      s += sadd;
+      d += dadd;
+    }
+  while (y<ymax && y<h)
+    {
+      int x = (xmin>0 ? xmin : 0);
+      while (x<w && x<xmax)
+        {
+          d[x] = s[x];
+          x++;
+        }
+      y += 1;
+      s += sadd;
+      d += dadd;
+    }
+}
+
+
+static inline void
+copy_line(const GPixel *s, int smin, int smax,
+          GPixel *d, int dmin, int dmax)
+{
+  int x = dmin;
+  while (x < smin) 
+  { 
+    d[x] = s[smin]; 
+    x++; 
+  }
+  while (x < dmax && x < smax)  
+  { 
+    d[x] = s[x]; 
+    x++; 
+  }
+  while (x < dmax)              
+  {
+    d[x] = s[smax-1]; 
+    x++; 
+  }
+}
+
+
+static inline void
+copy_from_partial(int w, int h,
+                  const GPixel *s, int sadd, int xmin, int xmax, int ymin, int ymax,
+                  GPixel *d, int dadd)
+{
+  int y = 0;
+  s += (ymin>0 ? sadd * ymin : 0);
+  while (y<ymin  && y<h)
+    {
+      copy_line(s, xmin, xmax, d, 0, w);
+      y += 1;
+      d += dadd;
+    }
+  while (y<ymax && y<h)
+    {
+      copy_line(s, xmin, xmax, d, 0, w);
+      y += 1;
+      s += sadd;
+      d += dadd;
+    }
+  s -= sadd;
+  while (y < h)
+    {
+      copy_line(s, xmin, xmax, d, 0, w);
+      y += 1;
+      d += dadd;
+    }
+}
+
+
+
+
+
+void  
+GPixmap::downsample43(const GPixmap *src, const GRect *pdr)
+{
+  // check arguments
+  int srcwidth = src->columns();
+  int srcheight = src->rows();
+  int destwidth = (srcwidth * 3 + 3 ) / 4;
+  int destheight = (srcheight * 3 + 3) / 4;
+  GRect rect(0, 0, destwidth, destheight);
+  if (pdr != 0)
+  {
+    if (pdr->xmin < rect.xmin || 
+        pdr->ymin < rect.ymin || 
+        pdr->xmax > rect.xmax || 
+        pdr->ymax > rect.ymax  )
+      G_THROW( ERR_MSG("GPixmap.overflow3") );
+    rect = *pdr;
+    destwidth = rect.width();
+    destheight = rect.height();
+  }
+  // initialize pixmap
+  init(destheight, destwidth, 0);
+
+  // compute bounds
+  int dxz, dy;   // location of bottomleft block in destination image
+  int sxz, sy;   // location of bottomleft block in source image
+  euclidian_ratio(rect.ymin, 3, sy, dy);
+  euclidian_ratio(rect.xmin, 3, sxz, dxz);
+  sxz = 4 * sxz;   
+  sy  = 4 * sy;
+  dxz = - dxz;
+  dy  = - dy;
+
+  // prepare variables
+  int sadd = src->rowsize();
+  int dadd = this->rowsize();
+  const GPixel *sptr = (*src)[0]  + sy * sadd;
+  GPixel *dptr = (*this)[0] + dy * dadd;
+  int s4add = 4 * sadd;
+  int d3add = 3 * dadd;
+
+  // iterate over row blocks
+  while (dy < destheight)
+  {
+    int sx = sxz;
+    int dx = dxz;
+    // iterate over column blocks
+    while (dx < destwidth)
+    {
+      GPixel xin[16], xout[9];
+
+      if (dx>=0 && dy>=0 && dx+3<=destwidth && dy+3<=destheight)
+        {
+          if (sx+4<=srcwidth && sy+4<=srcheight)
+            {
+              downsample_4x4_to_3x3(sptr+sx, sadd, dptr+dx, dadd);
+            }
+          else
+            {
+              copy_from_partial(4,4, sptr+sx,sadd,-sx,srcwidth-sx,-sy,srcheight-sy, xin,4);
+              downsample_4x4_to_3x3(xin, 4, dptr+dx, dadd);
+            }
+        }
+      else
+        {
+          if (sx+4<=srcwidth && sy+4<=srcheight)
+            {
+              downsample_4x4_to_3x3(sptr+sx, sadd, xout, 3);  
+              copy_to_partial(3,3, xout, 3, dptr+dx, dadd,-dx,destwidth-dx,-dy,destheight-dy);
+            }
+          else
+            {
+              copy_from_partial(4,4, sptr+sx,sadd,-sx,srcwidth-sx,-sy,srcheight-sy, xin,4);
+              downsample_4x4_to_3x3(xin, 4, xout, 3);  
+              copy_to_partial(3,3, xout,3, dptr+dx,dadd,-dx,destwidth-dx,-dy,destheight-dy);
+            }
+        }
+      // next column
+      dx += 3;
+      sx += 4;
+    }
+    // next row
+    dy += 3;
+    dptr += d3add;
+    sy += 4;
+    sptr += s4add;
+  }
+}
+
+
+void  
+GPixmap::upsample23(const GPixmap *src, const GRect *pdr)
+{
+  // check arguments
+  int srcwidth = src->columns();
+  int srcheight = src->rows();
+  int destwidth = (srcwidth * 3 + 1 ) / 2;
+  int destheight = (srcheight * 3 + 1) / 2;
+  GRect rect(0, 0, destwidth, destheight);
+  if (pdr != 0)
+  {
+    if (pdr->xmin < rect.xmin || 
+        pdr->ymin < rect.ymin || 
+        pdr->xmax > rect.xmax || 
+        pdr->ymax > rect.ymax  )
+      G_THROW( ERR_MSG("GPixmap.overflow4") );
+    rect = *pdr;
+    destwidth = rect.width();
+    destheight = rect.height();
+  }
+  // initialize pixmap
+  init(destheight, destwidth, 0);
+
+  // compute bounds
+  int dxz, dy;   // location of bottomleft block in destination image
+  int sxz, sy;   // location of bottomleft block in source image
+  euclidian_ratio(rect.ymin, 3, sy, dy);
+  euclidian_ratio(rect.xmin, 3, sxz, dxz);
+  sxz = 2 * sxz;   
+  sy  = 2 * sy;
+  dxz = - dxz;
+  dy  = - dy;
+
+  // prepare variables
+  int sadd = src->rowsize();
+  int dadd = this->rowsize();
+  const GPixel *sptr = (*src)[0]  + sy * sadd;
+  GPixel *dptr = (*this)[0] + dy * dadd;
+  int s2add = 2 * sadd;
+  int d3add = 3 * dadd;
+
+  // iterate over row blocks
+  while (dy < destheight)
+  {
+    int sx = sxz;
+    int dx = dxz;
+    // iterate over column blocks
+    while (dx < destwidth)
+    {
+      GPixel xin[4], xout[9];
+
+      if (dx>=0 && dy>=0 && dx+3<=destwidth && dy+3<=destheight)
+      {
+        if (sx+2<=srcwidth && sy+2<=srcheight)
+        {
+          upsample_2x2_to_3x3( sptr+sx, sadd, dptr+dx, dadd);
+        }
+        else
+        {
+          copy_from_partial(2, 2, sptr+sx, sadd, -sx, srcwidth-sx, -sy, srcheight-sy, xin, 2);
+          upsample_2x2_to_3x3(xin, 2, dptr+dx, dadd);
+        }
+      }
+      else
+      {
+        if (sx+2<=srcwidth && sy+2<=srcheight)
+        {
+          upsample_2x2_to_3x3( sptr+sx, sadd, xout, 3);  
+          copy_to_partial(3,3, xout, 3, dptr+dx, dadd, -dx, destwidth-dx, -dy, destheight-dy);
+        }
+        else
+        {
+          copy_from_partial(2, 2, sptr+sx, sadd, -sx, srcwidth-sx, -sy, srcheight-sy, xin, 2);
+          upsample_2x2_to_3x3(xin, 2, xout, 3);  
+          copy_to_partial(3,3, xout, 3, dptr+dx, dadd, -dx, destwidth-dx, -dy, destheight-dy);
+        }
+      }
+      // next column
+      dx += 3;
+      sx += 2;
+    }
+    // next row
+    dy += 3;
+    dptr += d3add;
+    sy += 2;
+    sptr += s2add;
+  }
+}
+
+
+//////////////////////////////////////////////////
+// Blitting and attenuating
+//////////////////////////////////////////////////
+
+
+static unsigned char clip[512];
+static bool clipok = false;
+
+static void
+compute_clip()
+{
+  clipok = true;
+  for (unsigned int i=0; i<sizeof(clip); i++)
+    clip[i] = (i<256 ? i : 255);
+}
+
+
+void 
+GPixmap::attenuate(const GBitmap *bm, int xpos, int ypos)
+{
+  // Check
+  if (!bm) G_THROW( ERR_MSG("GPixmap.null_alpha") );
+  // Compute number of rows and columns
+  int xrows = mini(ypos + (int)bm->rows(), nrows) - maxi(0, ypos),
+    xcolumns = mini(xpos + (int) bm->columns(), ncolumns) - maxi(0, xpos);
+  if(xrows <= 0 || xcolumns <= 0)
+    return;
+  // Precompute multiplier map
+  unsigned int multiplier[256];
+  unsigned int maxgray = bm->get_grays() - 1;
+  for (unsigned int i=0; i<maxgray ; i++)
+    multiplier[i] = 0x10000 * i / maxgray;
+  // Compute starting point
+  const unsigned char *src = (*bm)[0] - mini(0,ypos)*bm->rowsize()-mini(0,xpos);
+  GPixel *dst = (*this)[0] + maxi(0, ypos)*rowsize()+maxi(0, xpos);
+  // Loop over rows
+  for (int y=0; y<xrows; y++)
+    {
+      // Loop over columns
+      for (int x=0; x<xcolumns; x++)
+        {
+          unsigned char srcpix = src[x];
+          // Perform pixel operation
+          if (srcpix > 0)
+            {
+              if (srcpix >= maxgray)
+                {
+                  dst[x].b = 0;
+                  dst[x].g = 0;
+                  dst[x].r = 0;
+                }
+              else
+                {
+                  unsigned int level = multiplier[srcpix];
+                  dst[x].b -=  (dst[x].b * level) >> 16;
+                  dst[x].g -=  (dst[x].g * level) >> 16;
+                  dst[x].r -=  (dst[x].r * level) >> 16;
+                }
+            }
+        }
+      // Next line
+      dst += rowsize();
+      src += bm->rowsize();
+    }
+}
+
+
+void 
+GPixmap::blit(const GBitmap *bm, int xpos, int ypos, const GPixel *color)
+{
+  // Check
+  if (!bm) G_THROW( ERR_MSG("GPixmap.null_alpha") );
+  if (!clipok) compute_clip();
+  if (!color) return;
+  // Compute number of rows and columns
+  int xrows = mini(ypos + (int)bm->rows(), nrows) - maxi(0, ypos),
+    xcolumns = mini(xpos + (int) bm->columns(), ncolumns) - maxi(0, xpos);
+  if(xrows <= 0 || xcolumns <= 0)
+    return;
+  // Precompute multiplier map
+  unsigned int multiplier[256];
+  unsigned int maxgray = bm->get_grays() - 1;
+  for (unsigned int i=1; i<maxgray ; i++)
+    multiplier[i] = 0x10000 * i / maxgray;
+  // Cache target color
+  unsigned char gr = color->r;
+  unsigned char gg = color->g;
+  unsigned char gb = color->b;
+  // Compute starting point
+  const unsigned char *src = (*bm)[0] - mini(0,ypos)*bm->rowsize()-mini(0,xpos);
+  GPixel *dst = (*this)[0] + maxi(0, ypos)*rowsize()+maxi(0, xpos);
+  // Loop over rows
+  for (int y=0; y<xrows; y++)
+    {
+      // Loop over columns
+      for (int x=0; x<xcolumns; x++)
+        {
+          unsigned char srcpix = src[x];
+          // Perform pixel operation
+          if (srcpix > 0)
+            {
+              if (srcpix >= maxgray)
+                {
+                  dst[x].b = clip[dst[x].b + gb];
+                  dst[x].g = clip[dst[x].g + gg];
+                  dst[x].r = clip[dst[x].r + gr];
+                }
+              else
+                {
+                  unsigned int level = multiplier[srcpix];
+                  dst[x].b = clip[dst[x].b + ((gb * level) >> 16)];
+                  dst[x].g = clip[dst[x].g + ((gg * level) >> 16)];
+                  dst[x].r = clip[dst[x].r + ((gr * level) >> 16)];
+                }
+            }
+        }
+      // Next line
+      dst += rowsize();
+      src += bm->rowsize();
+    }
+}
+
+
+void 
+GPixmap::blit(const GBitmap *bm, int xpos, int ypos, const GPixmap *color)
+{
+  // Check
+  if (!bm) G_THROW( ERR_MSG("GPixmap.null_alpha") );
+  if (!color) G_THROW( ERR_MSG("GPixmap.null_color") );
+  if (!clipok) compute_clip();
+  if (bm->rows()!=color->rows() || bm->columns()!=color->columns())
+    G_THROW( ERR_MSG("GPixmap.diff_size") );
+  // Compute number of rows and columns
+  int xrows = mini(ypos + (int)bm->rows(), nrows) - maxi(0, ypos),
+      xcolumns = mini(xpos + (int) bm->columns(), ncolumns) - maxi(0, xpos);
+  if(xrows <= 0 || xcolumns <= 0)
+    return;
+  // Precompute multiplier map
+  unsigned int multiplier[256];
+  unsigned int maxgray = bm->get_grays() - 1;
+  for (unsigned int i=1; i<maxgray ; i++)
+    multiplier[i] = 0x10000 * i / maxgray;
+  // Cache target color
+  // Compute starting point
+  const unsigned char *src = (*bm)[0] - mini(0,ypos)*bm->rowsize()-mini(0,xpos);
+  const GPixel *src2 = (*color)[0] + maxi(0, ypos)*color->rowsize()+maxi(0, xpos);
+  GPixel *dst = (*this)[0] + maxi(0, ypos)*rowsize()+maxi(0, xpos);
+  // Loop over rows
+  for (int y=0; y<xrows; y++)
+    {
+      // Loop over columns
+      for (int x=0; x<xcolumns; x++)
+        {
+          unsigned char srcpix = src[x];
+          // Perform pixel operation
+          if (srcpix > 0)
+            {
+              if (srcpix >= maxgray)
+                {
+                  dst[x].b = clip[dst[x].b + src2[x].b];
+                  dst[x].g = clip[dst[x].g + src2[x].g];
+                  dst[x].r = clip[dst[x].r + src2[x].r];
+                }
+              else
+                {
+                  unsigned int level = multiplier[srcpix];
+                  dst[x].b = clip[dst[x].b + ((src2[x].b * level) >> 16)];
+                  dst[x].g = clip[dst[x].g + ((src2[x].g * level) >> 16)];
+                  dst[x].r = clip[dst[x].r + ((src2[x].r * level) >> 16)];
+                }
+            }
+        }
+      // Next line
+      dst += rowsize();
+      src += bm->rowsize();
+      src2 += color->rowsize();
+    }
+}
+
+
+
+void 
+GPixmap::blend(const GBitmap *bm, int xpos, int ypos, const GPixmap *color)
+{
+  // Check
+  if (!bm) G_THROW( ERR_MSG("GPixmap.null_alpha") );
+  if (!color) G_THROW( ERR_MSG("GPixmap.null_color") );
+  if (!clipok) compute_clip();
+  if (bm->rows()!=color->rows() || bm->columns()!=color->columns())
+    G_THROW( ERR_MSG("GPixmap.diff_size") );
+  // Compute number of rows and columns
+  int xrows = mini(ypos + (int)bm->rows(), nrows) - maxi(0, ypos),
+      xcolumns = mini(xpos + (int) bm->columns(), ncolumns) - maxi(0, xpos);
+  if(xrows <= 0 || xcolumns <= 0)
+    return;
+  // Precompute multiplier map
+  unsigned int multiplier[256];
+  unsigned int maxgray = bm->get_grays() - 1;
+  for (unsigned int i=1; i<maxgray ; i++)
+    multiplier[i] = 0x10000 * i / maxgray;
+  // Cache target color
+  // Compute starting point
+  const unsigned char *src = (*bm)[0] - mini(0,ypos)*bm->rowsize()-mini(0,xpos);
+  const GPixel *src2 = (*color)[0] + maxi(0, ypos)*color->rowsize()+maxi(0, xpos);
+  GPixel *dst = (*this)[0] + maxi(0, ypos)*rowsize()+maxi(0, xpos);
+  // Loop over rows
+  for (int y=0; y<xrows; y++)
+    {
+      // Loop over columns
+      for (int x=0; x<xcolumns; x++)
+        {
+          unsigned char srcpix = src[x];
+          // Perform pixel operation
+          if (srcpix > 0)
+            {
+              if (srcpix >= maxgray)
+                {
+                  dst[x].b = src2[x].b;
+                  dst[x].g = src2[x].g;
+                  dst[x].r = src2[x].r;
+                }
+              else
+                {
+                  unsigned int level = multiplier[srcpix];
+                  dst[x].b -= (((int)dst[x].b - (int)src2[x].b) * level) >> 16;
+                  dst[x].g -= (((int)dst[x].g - (int)src2[x].g) * level) >> 16;
+                  dst[x].r -= (((int)dst[x].r - (int)src2[x].r) * level) >> 16;
+                }
+            }
+        }
+      // Next line
+      dst += rowsize();
+      src += bm->rowsize();
+      src2 += color->rowsize();
+    }
+}
+
+
+
+
+void 
+GPixmap::stencil(const GBitmap *bm, 
+                const GPixmap *pm, int pms, const GRect *pmr, 
+                 double corr, GPixel white)
+{
+  // Check arguments
+  GRect rect(0, 0, pm->columns()*pms, pm->rows()*pms);
+  if (pmr != 0)
+    {
+      if (pmr->xmin < rect.xmin || 
+          pmr->ymin < rect.ymin || 
+          pmr->xmax > rect.xmax || 
+          pmr->ymax > rect.ymax  )
+        G_THROW( ERR_MSG("GPixmap.overflow5") );
+      rect = *pmr;
+    }
+  // Compute number of rows
+  int xrows = nrows;
+  if ((int)bm->rows() < xrows)
+    xrows = bm->rows();
+  if (rect.height() < xrows)
+    xrows = rect.height();
+  // Compute number of columns
+  int xcolumns = ncolumns;
+  if ((int)bm->columns() < xcolumns)
+    xcolumns = bm->columns();
+  if (rect.width() < xcolumns)
+    xcolumns = rect.width();
+  // Precompute multiplier map
+  unsigned int multiplier[256];
+  unsigned int maxgray = bm->get_grays() - 1;
+  for (unsigned int i=1; i<maxgray ; i++)
+    multiplier[i] = 0x10000 * i / maxgray;
+  // Prepare color correction table
+  unsigned char gtable[256][3];
+  color_correction_table_cache(corr, white, gtable);
+  // Compute starting point in blown up foreground pixmap
+  int fgy, fgy1, fgxz, fgx1z;
+  euclidian_ratio(rect.ymin, pms, fgy, fgy1);
+  euclidian_ratio(rect.xmin, pms, fgxz, fgx1z);
+  const GPixel *fg = (*pm)[fgy];
+  const unsigned char *src = (*bm)[0];
+  GPixel *dst = (*this)[0];
+  // Loop over rows
+  for (int y=0; y<xrows; y++)
+  {
+    // Loop over columns
+    int fgx = fgxz;
+    int fgx1 = fgx1z;
+    for (int x=0; x<xcolumns; x++)
+    {
+      unsigned char srcpix = src[x];
+      // Perform pixel operation
+      if (srcpix > 0)
+      {
+        if (srcpix >= maxgray)
+        {
+          dst[x].b = gtable[fg[fgx].b][0];
+          dst[x].g = gtable[fg[fgx].g][1];
+          dst[x].r = gtable[fg[fgx].r][2];
+        }
+        else
+        {
+          unsigned int level = multiplier[srcpix];
+          dst[x].b -= (((int)dst[x].b-(int)gtable[fg[fgx].b][0])*level) >> 16;
+          dst[x].g -= (((int)dst[x].g-(int)gtable[fg[fgx].g][1])*level) >> 16;
+          dst[x].r -= (((int)dst[x].r-(int)gtable[fg[fgx].r][2])*level) >> 16;
+        }
+      }
+      // Next column
+      if (++fgx1 >= pms)
+      {
+        fgx1 = 0;
+        fgx += 1;
+      }
+    }
+    // Next line
+    dst += rowsize();
+    src += bm->rowsize();
+    if (++fgy1 >= pms)
+    {
+      fgy1 = 0;
+      fg += pm->rowsize();
+    } 
+  }
+}
+
+void 
+GPixmap::stencil(const GBitmap *bm, 
+                const GPixmap *pm, int pms, const GRect *pmr, 
+                double corr)
+{
+  stencil(bm, pm, pms, pmr, corr, GPixel::WHITE);
+}
+
+
+GP<GPixmap> GPixmap::rotate(int count)
+{
+  GP<GPixmap> newpixmap(this);
+  count = count & 3;
+  if(count)
+  {
+    if( count&0x01)
+      newpixmap = new GPixmap(ncolumns, nrows);
+    else
+      newpixmap = new GPixmap(nrows, ncolumns);
+
+    GPixmap &dpixmap = *newpixmap;
+
+    GMonitorLock lock(&pixmap_monitor());
+    switch(count)
+    {
+    case 3: //// rotate 90 counter clockwise
+        {
+            int lastrow = dpixmap.rows()-1;
+
+            for(int y=0; y<nrows; y++)
+            {
+                const GPixel *r=operator [] (y);
+                for(int x=0,xnew=lastrow; xnew>=0; x++,xnew--)
+                {
+                    dpixmap[xnew][y] = r[x];
+                }
+            }
+        }
+        break;
+    case 2: //// rotate 180 counter clockwise
+        {
+            int lastrow = dpixmap.rows()-1;
+            int lastcolumn = dpixmap.columns()-1;
+
+            for(int y=0,ynew=lastrow; ynew>=0; y++,ynew--)
+            {
+                const GPixel *r=operator [] (y);
+                GPixel *d=dpixmap[ynew];
+                for(int xnew=lastcolumn; xnew>=0; r++,xnew--)
+                {
+                    d[xnew] = *r;
+                }
+            }
+        }
+        break;
+    case 1: //// rotate 270 counter clockwise
+        {
+            int lastcolumn = dpixmap.columns()-1;
+
+            for(int y=0,ynew=lastcolumn; ynew>=0; y++,ynew--)
+            {
+                const GPixel *r=operator [] (y);
+                for(int x=0; x<ncolumns; x++)
+                {
+                    dpixmap[x][ynew] = r[x];
+                }
+            }
+        }
+        break;
+    }
+  }
+  return newpixmap;
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GPixmap.h b/libdjvu/GPixmap.h
new file mode 100644
index 0000000..9d26461
--- /dev/null
+++ b/libdjvu/GPixmap.h
@@ -0,0 +1,535 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GPIXMAP_H_
+#define _GPIXMAP_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name GPixmap.h
+
+    Files #"GPixmap.h"# and #"GPixmap.cpp"# implement class \Ref{GPixmap}.
+    Instances of this class represent color images.  Each RGB pixel is
+    represented by structure \Ref{GPixel}. The ``bottom left'' coordinate system
+    is used consistently in the DjVu library.  Line zero of a GPixmap is the
+    bottom line in the color image.  Pixels are organized from left to right
+    within each line.
+    
+    {\bf ToDo} --- More sophisticated color correction schemes. 
+    
+    @memo
+    Generic support for color images.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+
+
+#include "GSmartPointer.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+class GBitmap;
+class GRect;
+class ByteStream;
+
+
+/** Color pixel as a RGB triple.  
+    The colors are represented using three bytes named #r#, #g# and #b#.  The
+    value of these bytes represent additive amounts of light.  Color white is
+    represented by setting all three bytes to #255#.  Color black is
+    represented by setting all three bytes to #0#.  This convention should not
+    be confused with the convention adopted for class \Ref{GBitmap} where the
+    pixel values represent an ink level.  */
+
+struct DJVUAPI GPixel
+{
+  /** Blue component. */
+  unsigned char b;
+  /** Green component. */
+  unsigned char g;
+  /** Red component. */
+  unsigned char r;
+  /** Returns true iff colors are identical. */
+  friend int operator==(const GPixel & p1, const GPixel & p2);
+  /** Returns true iff colors are different. */
+  friend int operator!=(const GPixel & p1, const GPixel & p2);
+  /** Returns a hash code for the color. */
+  friend unsigned int hash(const GPixel &p);
+  /** @name Predefined colors. */
+  //@{ 
+  /// GPixel::WHITE is initialized to #rgb:255/255/255#.
+  static const GPixel WHITE; 
+  /// GPixel::BLACK is initialized to #rgb:0/0/0#.
+  static const GPixel BLACK; 
+  /// GPixel::BLUE is initialized to #rgb:0/0/255#.
+  static const GPixel BLUE;  
+  /// GPixel::GREEN is initialized to #rgb:0/255/0#.
+  static const GPixel GREEN; 
+  /// GPixel::RED is initialized to #rgb:255/0/0#.
+  static const GPixel RED;
+  //@}
+};
+
+
+/** RGB Color images.  
+    Instances of class #GPixmap# represent color images as a two dimensional
+    array of pixels \Ref{GPixel}.  The bracket operator returns a pointer to
+    the pixels composing one line of the image.  This pointer can be used as
+    an array to read or write the pixels of this particular line.  Following
+    the general convention of the DjVu Reference Library, line zero is always
+    the bottom line of the image.
+ */
+
+class DJVUAPI GPixmap : public GPEnabled
+{
+protected:
+  GPixmap(void);
+  GPixmap(int nrows, int ncolumns, const GPixel *filler=0);
+  GPixmap(const GBitmap &ref);
+  GPixmap(const GBitmap &ref, const GRect &rect);
+  GPixmap(const GPixmap &ref);
+  GPixmap(const GPixmap &ref, const GRect &rect);
+  GPixmap(ByteStream &ref);
+
+public:
+  /// Virtual destructor.
+  virtual ~GPixmap();
+
+  void destroy(void);
+  /** @name Construction. */
+  //@{
+  /** Creates an empty GBitmap object.  The returned GPixmap has zero rows
+      and zero columns.  Use function \Ref{init} to change the size of the
+      image. */
+  static GP<GPixmap> create(void) {return new GPixmap();}
+
+  /** Creates a GPixmap with #nrows# rows and #ncolumns# columns.  When the
+      optional argument #filler# is specified, all pixels are initialized 
+      with the corresponding color. */
+  static GP<GPixmap> create(
+    const int nrows, const int ncolumns, const GPixel *filler=0)
+  { return new GPixmap(nrows,ncolumns,filler); }
+
+  /** Creates a GPixmap by copying the gray level image #ref#.
+      The constructed GPixmap has the same size as #ref#.  The pixels
+      are initialized with shades of grays copied from #ref#. */
+  static GP<GPixmap> create(const GBitmap &ref)
+  { return new GPixmap(ref); }
+
+  /** Creates a GPixmap by copying the rectangle #rect# of the gray level
+      image #ref#.  The constructed GPixmap has the same size as rectangle
+      #rect#.  The pixels are initialized with shades of grays converted from
+      the ink levels represented in #ref#.  This conversion depends on the
+      number of gray levels in #ref#. */
+  static GP<GPixmap> create(const GBitmap &ref, const GRect &rect)
+  { return new GPixmap(ref,rect); }
+
+  /** Copy constructors. Creates a GPixmap by replicating the size and the
+      contents of GPixmap #ref#. */
+  static GP<GPixmap> create(const GPixmap &ref)
+  { return new GPixmap(ref); }
+
+  /** Creates a GPixmap by copying the rectangle #rect# of the color image #ref#.
+      The constructed GPixmap has the same size as rectangle #rect#.
+      The pixels are initialized with colors copied from #ref#. */
+  static GP<GPixmap> create(const GPixmap &ref, const GRect &rect)
+  { return new GPixmap(ref,rect); }
+
+  /** Creates a GPixmap by reading PPM data from ByteStream #ref#.
+      See \Ref{PNM and RLE file formats} for more information. */
+  static GP<GPixmap> create(ByteStream &ref)
+  { return new GPixmap(ref); }
+
+  //@}
+
+  /** @name Initialization. */
+  //@{
+  /** Resets the GPixmap to #nrows# rows and #ncolumns# columns.  When the
+      optional argument #filler# is specified, all pixels are initialized with
+      the corresponding color.  The previous content of the GPixmap is discarded. */
+  void init(int nrows, int ncolumns,  const GPixel *filler=0);
+  /** Resets the GPixmap by copying the size and the contents of the color
+      image #ref#.  The previous content of the GPixmap is discarded. */
+  void init(const GPixmap &ref);
+  /** Resets the GPixmap by copying the rectangle #rect# of the color image #ref#.
+      The previous content of the GPixmap is discarded. */
+  void init(const GPixmap &ref, const GRect &rect);
+  /** Resets the GPixmap by copying the size and the contents of the gray 
+      level image #ref#.  The optional argument #ramp# is an array of 256 
+      pixel values used for mapping the gray levels to color values. 
+      Setting #ramp# to zero selects a linear ramp of shades of gray. */
+  void init(const GBitmap &ref, const GPixel *ramp=0);
+  /** Resets the GPixmap by copying the rectangle #rect# of the gray level
+      image #ref#.  The optional argument #ramp# is an array of 256 pixel
+      values used for mapping the gray levels to color values.  Setting #ramp#
+      to zero selects a linear ramp computed according to the maximal number
+      of gray levels in #ref#. */
+  void init(const GBitmap &ref, const GRect &rect, const GPixel *ramp=0);
+  /** Resets the GPixmap by reading PPM data from ByteStream #ref#.  See
+      \Ref{PNM and RLE file formats} for more information. */
+  void init(ByteStream &ref);
+  /** Resets the GPixmap by copying the gray level image #ref#.  The pixels
+      are initialized with shades of grays copied from #ref#. */
+  GPixmap& operator=(const GBitmap &ref);
+  /** Copy operator. Resets the GPixmap by copying the size and the contents
+      of the color image #ref#.  The previous content of the GPixmap is
+      discarded. */
+  GPixmap& operator=(const GPixmap &ref);
+  //@}
+
+  /** @name Accessing pixels. */
+  //@{
+  /** Returns the number of rows (the image height). */
+  unsigned int rows() const;
+  /** Returns the number of columns (the image width). */
+  unsigned int columns() const;
+  /** Returns a constant pointer to the first GPixel in row #row#.  This
+      pointer can be used as an array to read the row elements. */
+  const GPixel * operator[] (int row) const;
+  /** Returns a pointer to the first GPixel in row #row#.  This pointer can be
+      used as an array to read or write the row elements. */
+  GPixel * operator[] (int row);
+  /** Returns the length (in pixels) of a row in memory.  This number is equal
+      to the difference between pointers to pixels located in the same column
+      in consecutive rows.  This difference may be larger than the number of
+      columns in the image. */
+  unsigned int rowsize() const;
+  //@}
+
+  /** @name Resampling images. */
+  //@{
+  /** Resets this GPixmap with a subsampled segment of color image #src#.
+      This function conceptually rescales image #src# by a factor #1:factor#,
+      and copies rectangle #rect# of the subsampled image into the current GPixmap.
+      The full subsampled image is copied if #rect# is a null pointer.
+      Both operations are however performed together for efficiency reasons.
+      Subsampling works by averaging the colors of the source pixels located
+      in small squares of size #factor# times #factor#. */
+  void downsample(const GPixmap *src, int factor, const GRect *rect=0);
+  /** Resets this GPixmap with a oversampled segment of color image #src#.
+      This function conceptually rescales image #src# by a factor #factor:1#,
+      and copies rectangle #rect# of the oversampled image into the current
+      GPixmap.  The full oversampled image is copied if #rect# is a null
+      pointer.  Both operations are however performed together for efficiency
+      reasons.  Oversampling works by replicating the color of the source
+      pixels into squares of size #factor# times #factor#. */
+  void upsample(const GPixmap *src, int factor, const GRect *rect=0);
+  /** Resets this GPixmap with a rescaled segment of #src# (zoom 75%).  This
+      function conceptually rescales image #src# by a factor #3:4#, and copies
+      rectangle #rect# of the rescaled image into the current GPixmap.  The
+      full rescaled image is copied if #rect# is a null pointer.  Both
+      operations are however performed together for efficiency reasons.  This
+      function has been superseded by class \Ref{GPixmapScaler}. */
+  void downsample43(const GPixmap *src, const GRect *rect=0); 
+  /** Resets this GPixmap with a rescaled segment of #src# (zoom 150%).  This
+      function conceptually rescales image #src# by a factor #3:2# and copies
+      rectangle #rect# of the rescaled image into the current GPixmap.  The
+      full rescaled image is copied if #rect# is a null pointer.  Both
+      operations are however performed together for efficiency reasons.  This
+      function has been superseded by class \Ref{GPixmapScaler}. */
+  void upsample23(const GPixmap *src, const GRect *rect=0);
+  //@}
+
+  /** @name Blitting and applying stencils.  
+      These function is essential for rendering DjVu images.  The elementary
+      functions are \Ref{attenuate} and \Ref{blit}.  The combined functions
+      \Ref{blend} and \Ref{stencil} should be viewed as optimizations.  */
+  //@{
+  /** Attenuates the color image in preparation for a blit.  
+      Bitmap #bm# is positionned at location #x#,#y# over this color image.
+      The matching color image pixels are then multiplied by #1.0-Alpha# where
+      #Alpha# denotes the gray value, in range #[0,1]#, represented by the
+      corresponding pixel of bitmap #bm#. */
+  void attenuate(const GBitmap *bm, int x, int y);
+  /** Blits solid color #color# through transparency mask #bm#.  
+      Bitmap #bm# is positionned at location #x#,#y# over this color image.
+      The matching color image pixels are then modified by adding color
+      #color# multiplied by #Alpha#, where #Alpha# denotes the gray value, in
+      range #[0,1]#, represented by the corresponding pixel of bitmap #bm#. */
+  void blit(const GBitmap *bm, int x, int y, const GPixel *color);
+  /** Blits pixmap #color# through transparency mask #bm#.
+      Bitmap #bm# is positionned at location #x#,#y# over this color image.
+      The matching color image pixels are then modified by adding the
+      corresponding pixel color in pixmap #color#, multiplied by #Alpha#,
+      where #Alpha# denotes the gray value, in range #[0,1]#, represented by
+      the corresponding pixel of bitmap #bm#. */
+  void blit(const GBitmap *bm, int x, int y, const GPixmap *color);
+  /** Performs alpha blending. This function is similar to first calling
+      \Ref{attenuate} with alpha map #bm# and then calling \Ref{blit} with
+      alpha map #bm# and color map #color#. Both operations are performed
+      together for efficiency reasons. */
+  void blend(const GBitmap *bm, int x, int y, const GPixmap *color);
+  /** Resample color pixmap and performs color corrected alpha blending.  This
+      function conceptually computes an intermediate color image by first
+      upsampling the GPixmap #pm# by a factor #pms:1# (see \Ref{upsample}),
+      extracting the sub-image designated by rectangle #pmr# and applying
+      color correction #corr# (see \Ref{color_correct}).  This intermediate
+      color image is then blended into this pixel map according to the alpha
+      map #bm# (see \Ref{blend}). */
+  void stencil(const GBitmap *bm, 
+               const GPixmap *pm, int pms, 
+               const GRect *pmr, double corr, GPixel white);
+  void stencil(const GBitmap *bm, 
+               const GPixmap *pm, int pms, 
+               const GRect *pmr, double corr=1.0);
+  //@}
+  
+  /** @name Manipulating colors. */
+  //@{
+  /** Dithers the image to 216 colors.  This function applies an ordered
+      dithering algorithm to reduce the image to 216 predefined colors.  These
+      predefined colors are located on a color cube of 6x6x6 colors: the color
+      RGB coordinates can only take the following values: #0#, #51#, #102#,
+      #163#, #214# or #255#.  This is useful for displaying images on a device
+      supporting a maximum of 256 colors. Arguments #xmin# and #ymin# control
+      the position of the dithering grids.  This is useful for dithering tiled
+      images. Arguments #xmin# and #ymin# must be the position of the bottom
+      left corner of the tile contained in this GPixmap. Properly setting
+      these arguments eliminates dithering artifacts on the tile
+      boundaries. */
+  void ordered_666_dither(int xmin=0, int ymin=0);
+  /** Dithers the image to 32768 colors.  This function applies an ordered
+      dithering algorithm to reduce the image to 32768 predefined colors.
+      These predefined colors are located on a color cube of 32x32x32 colors:
+      the color RGB coordinates can only take values in which the three least
+      significant bits are set to #1#.  This is useful for displaying images
+      with less than 24 bits per pixel.  Arguments #xmin# and #ymin# control
+      the position of the dithering grids.  This is useful for dithering tiled
+      images. Arguments #xmin# and #ymin# must be the position of the bottom
+      left corner of the tile contained in this GPixmap. Properly setting
+      these arguments eliminates dithering artifacts on the tile
+      boundaries. */
+  void ordered_32k_dither(int xmin=0, int ymin=0);
+  /** Applies a luminance gamma correction factor of #corr#.  
+      Values greater than #1.0# make the image brighter.  
+      Values smaller than #1.0# make the image darker.  
+      The documentation of program \Ref{ppmcoco} explains how to
+      properly use this function. */
+  void color_correct(double corr);
+  void color_correct(double corr, GPixel white);
+  /** Applies a luminance gamma correction to an array of pixels. 
+      This function is {\em static} and does not modify this pixmap. */
+  static void color_correct(double corr, GPixel *pix, int npix);
+  static void color_correct(double corr, GPixel white, GPixel *pix, int npix);
+
+  //@}
+  
+  /** @name Miscellaneous. */
+  //@{
+  /** Returns the number of bytes allocated for this image. */
+  inline unsigned int get_memory_usage() const;
+  /** Saves the image into ByteStream #bs# using the PPM format.
+      Argument #raw# selects the ``Raw PPM'' (1) or the ``Ascii PPM'' (0) format.
+      See \Ref{PNM and RLE file formats} for more information. */
+  void save_ppm(ByteStream &bs, int raw=1) const;
+  //@}
+
+  /** @name Stealing or borrowing the memory buffer (advanced). */
+  //@{
+  /** Steals the memory buffer of a GPixmap.  This function returns the
+      address of the memory buffer allocated by this GPixmap object.  The
+      offset of the first pixel in the bottom line is written into variable
+      #offset#.  Other lines can be accessed using pointer arithmetic (see
+      \Ref{rowsize}).  The GPixmap object no longer ``owns'' the buffer: you
+      must explicitly de-allocate the buffer using #operator delete []#.  This
+      de-allocation should take place after the destruction or the
+      re-initialization of the GPixmap object.  This function will return a
+      null pointer if the GPixmap object does not ``own'' the buffer in the
+      first place.  */
+  GPixel *take_data(size_t &offset);
+  /** Initializes this GPixmap by borrowing a memory segment.  The GPixmap
+      then directly addresses the memory buffer #data# provided by the user.
+      This buffer must be large enough to hold #w*h# GPixels.  The GPixmap
+      object does not ``own'' the buffer: you must explicitly de-allocate the
+      buffer using #operator delete []#.  This de-allocation should take place
+      after the destruction or the re-initialization of the GPixmap object.  */
+  inline void borrow_data(GPixel &data, int w, int h); 
+  /// Identical to the above, but GPixmap will do the delete []. 
+  void donate_data(GPixel *data, int w, int h); 
+  
+  /** Rotates pixmap by 90, 180 or 270 degrees anticlockwise
+      and returns a new pixmap, input pixmap is not changed. 
+      count can be 1, 2, or 3 for 90, 180, 270 degree rotation.
+      It returns the same pixmap if not rotated. */
+  GP<GPixmap> rotate(int count=0);
+
+  //@}
+  
+  // Please ignore these two functions. Their only purpose is to allow
+  // DjVu viewer compile w/o errors. eaf. 
+  // Is this still useful ?. lyb.
+  int get_grays(void) const { return 256; };
+  void set_grays(int) {};\
+  
+protected:
+  // data
+  unsigned short nrows;
+  unsigned short ncolumns;
+  unsigned short nrowsize;
+  GPixel *pixels;
+  GPixel *pixels_data;
+  friend class DjVu_PixImage;
+};
+
+//@}
+
+// INLINE --------------------------
+
+
+inline int 
+operator==(const GPixel & p1, const GPixel & p2)
+{
+  return p1.r==p2.r && p1.g==p2.g && p1.b==p2.b;
+}
+
+inline int 
+operator!=(const GPixel & p1, const GPixel & p2)
+{
+  return p1.r!=p2.r || p1.g!=p2.g || p1.b!=p2.b;
+}
+
+inline unsigned int 
+hash(const GPixel &p)
+{
+  unsigned int x = (p.b<<16)|(p.g<<8)|(p.r);
+  return x ^ (p.b<<4) ^ (p.r<<12);
+}
+
+inline unsigned int
+GPixmap::rows() const
+{
+  return nrows;
+}
+
+inline unsigned int
+GPixmap::columns() const
+{
+  return ncolumns;
+}
+
+inline unsigned int
+GPixmap::rowsize() const
+{
+  return nrowsize;
+}
+
+inline GPixel *
+GPixmap::operator[](int row)
+{
+  if (row<0 || row>=nrows || !pixels) return 0;
+  return &pixels[row * nrowsize];
+}
+
+inline const GPixel *
+GPixmap::operator[](int row) const
+{
+  if (row<0 || row>=nrows) return 0;
+  return &pixels[row * nrowsize];
+}
+
+inline GPixmap & 
+GPixmap::operator=(const GBitmap &ref)
+{
+  init(ref);
+  return *this;
+}
+
+inline GPixmap & 
+GPixmap::operator=(const GPixmap &ref)
+{
+  init(ref);
+  return *this;
+}
+
+inline void
+GPixmap::borrow_data(GPixel &data, int w, int h)
+{
+  donate_data(&data,w,h);
+  pixels_data=0;
+}
+
+//////////////////////////////////////////////////
+// Memory usage
+//////////////////////////////////////////////////
+
+
+inline unsigned int 
+GPixmap::get_memory_usage() const
+{
+  return  sizeof(GPixmap)+(nrows * ncolumns * sizeof(GPixel));
+}
+
+// ---------------------------------
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
+
diff --git a/libdjvu/GRect.cpp b/libdjvu/GRect.cpp
new file mode 100644
index 0000000..ebd3641
--- /dev/null
+++ b/libdjvu/GRect.cpp
@@ -0,0 +1,457 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// -- Implementation of class GRect and GRectMapper
+// - Author: Leon Bottou, 05/1997
+
+
+#include "GRect.h"
+#include "GException.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+// -- Local utilities
+
+static inline int 
+imin(int x, int y)
+{
+  if (x < y) 
+    return x;
+  else
+    return y;
+}
+
+static inline int 
+imax(int x, int y)
+{
+  if (x > y) 
+    return x;
+  else
+    return y;
+}
+
+static inline void
+iswap(int &x, int &y)
+{
+  int tmp = x; x = y; y = tmp;
+}
+
+// -- Class GRect
+
+int 
+operator==(const GRect & r1, const GRect & r2)
+{
+  bool isempty1 = r1.isempty();
+  bool isempty2 = r2.isempty();
+  if (isempty1 || isempty2)
+    if (isempty1 && isempty2)
+      return 1;
+  if ( r1.xmin==r2.xmin && r1.xmax==r2.xmax 
+       && r1.ymin==r2.ymin && r1.ymax==r2.ymax )
+    return 1;
+  return 0;
+}
+
+int 
+GRect::inflate(int dx, int dy)
+{
+  xmin -= dx;
+  xmax += dx;
+  ymin -= dy;
+  ymax += dy;
+  if (! isempty()) 
+    return 1;
+  xmin = ymin = xmax = ymax = 0;
+  return 0;
+}
+
+int 
+GRect::translate(int dx, int dy)
+{
+  xmin += dx;
+  xmax += dx;
+  ymin += dy;
+  ymax += dy;
+  if (! isempty()) 
+    return 1;
+  xmin = ymin = xmax = ymax = 0;
+  return 0;
+}
+
+int  
+GRect::intersect(const GRect &rect1, const GRect &rect2)
+{
+  xmin = imax(rect1.xmin, rect2.xmin);
+  xmax = imin(rect1.xmax, rect2.xmax);
+  ymin = imax(rect1.ymin, rect2.ymin);
+  ymax = imin(rect1.ymax, rect2.ymax);
+  if (! isempty()) 
+    return 1;
+  xmin = ymin = xmax = ymax = 0;
+  return 0;
+}
+
+int  
+GRect::recthull(const GRect &rect1, const GRect &rect2)
+{
+  if (rect1.isempty())
+    {
+      xmin = rect2.xmin;
+      xmax = rect2.xmax;
+      ymin = rect2.ymin;
+      ymax = rect2.ymax;
+      return !isempty();
+    }
+  if (rect2.isempty())
+    {
+      xmin = rect1.xmin;
+      xmax = rect1.xmax;
+      ymin = rect1.ymin;
+      ymax = rect1.ymax;
+      return !isempty();
+    }
+  xmin = imin(rect1.xmin, rect2.xmin);
+  xmax = imax(rect1.xmax, rect2.xmax);
+  ymin = imin(rect1.ymin, rect2.ymin);
+  ymax = imax(rect1.ymax, rect2.ymax);
+  return 1;
+}
+
+int
+GRect::contains(const GRect & rect) const
+{
+   GRect tmp_rect;
+   tmp_rect.intersect(*this, rect);
+   return tmp_rect==rect;
+}
+
+void
+GRect::scale(float factor)
+{
+	xmin = (int)(((float)xmin) * factor);
+	ymin = (int)(((float)ymin) * factor);
+	xmax = (int)(((float)xmax) * factor);
+	ymax = (int)(((float)ymax) * factor);
+}
+
+void
+GRect::scale(float xfactor, float yfactor)
+{
+	xmin = (int)(((float)xmin) * xfactor);
+	ymin = (int)(((float)ymin) * yfactor);
+	xmax = (int)(((float)xmax) * xfactor);
+	ymax = (int)(((float)ymax) * yfactor);
+}
+// -- Class GRatio
+
+
+inline
+GRectMapper::GRatio::GRatio()
+  : p(0), q(1)
+{
+}
+
+inline
+GRectMapper::GRatio::GRatio(int p, int q)
+  : p(p), q(q)
+{
+  if (q == 0) 
+    G_THROW( ERR_MSG("GRect.div_zero") );
+  if (p == 0)
+    q = 1;
+  if (q < 0)
+    {
+      p = -p; 
+      q = -q; 
+    }
+  int gcd = 1;
+  int g1 = p; 
+  int g2 = q; 
+  if (g1 > g2)
+    {
+      gcd = g1;
+      g1 = g2;
+      g2 = gcd;
+    }
+  while (g1 > 0)
+    {
+      gcd = g1;
+      g1 = g2 % g1;
+      g2 = gcd;
+    }
+  p /= gcd;
+  q /= gcd;
+}
+
+
+#ifdef HAVE_LONG_LONG_INT
+#define llint_t long long int
+#else
+#define llint_t long int
+#endif
+
+inline int 
+operator*(int n, GRectMapper::GRatio r )
+{ 
+  /* [LB] -- This computation is carried out with integers and
+     rational numbers because it must be exact.  Some lizard changed
+     it to double and this is wrong.  I suspect they did so because
+     they encountered overflow issues.  Let's use long long ints. */
+  llint_t x = (llint_t) n * (llint_t) r.p;
+  if (x >= 0)
+    return   ((r.q/2 + x) / r.q);
+  else
+    return - ((r.q/2 - x) / r.q);
+}
+
+inline int 
+operator/(int n, GRectMapper::GRatio r )
+{ 
+  /* [LB] -- See comment in operator*() above. */
+  llint_t x = (llint_t) n * (llint_t) r.q;
+  if (x >= 0)
+    return   ((r.p/2 + x) / r.p);
+  else
+    return - ((r.p/2 - x) / r.p);
+}
+
+
+// -- Class GRectMapper
+
+#define MIRRORX  1
+#define MIRRORY  2
+#define SWAPXY 4
+
+
+GRectMapper::GRectMapper()
+: rectFrom(0,0,1,1), 
+  rectTo(0,0,1,1),
+  code(0)
+{
+
+}
+
+void
+GRectMapper::clear()
+{
+  rectFrom = GRect(0,0,1,1);
+  rectTo = GRect(0,0,1,1);
+  code = 0;
+}
+
+void 
+GRectMapper::set_input(const GRect &rect)
+{
+  if (rect.isempty())
+    G_THROW( ERR_MSG("GRect.empty_rect1") );
+  rectFrom = rect;
+  if (code & SWAPXY)
+  {
+    iswap(rectFrom.xmin, rectFrom.ymin);
+    iswap(rectFrom.xmax, rectFrom.ymax);
+  }
+  rw = rh = GRatio();
+}
+
+void 
+GRectMapper::set_output(const GRect &rect)
+{
+  if (rect.isempty())
+    G_THROW( ERR_MSG("GRect.empty_rect2") );
+  rectTo = rect;
+  rw = rh = GRatio();
+}
+
+void 
+GRectMapper::rotate(int count)
+{
+  int oldcode = code;
+  switch (count & 0x3)
+    {
+    case 1:
+      code ^= (code & SWAPXY) ? MIRRORY : MIRRORX;
+      code ^= SWAPXY;
+      break;
+    case 2:
+      code ^= (MIRRORX|MIRRORY);
+      break;
+    case 3:
+      code ^= (code & SWAPXY) ? MIRRORX : MIRRORY;
+      code ^= SWAPXY;
+      break;
+    }
+  if ((oldcode ^ code) & SWAPXY)
+    { 
+      iswap(rectFrom.xmin, rectFrom.ymin);
+      iswap(rectFrom.xmax, rectFrom.ymax);
+      rw = rh = GRatio();
+    }
+}
+
+void 
+GRectMapper::mirrorx()
+{
+  code ^= MIRRORX;
+}
+
+void 
+GRectMapper::mirrory()
+{
+  code ^= MIRRORY;
+}
+
+void
+GRectMapper::precalc()
+{
+  if (rectTo.isempty() || rectFrom.isempty())
+    G_THROW( ERR_MSG("GRect.empty_rect3") );
+  rw = GRatio(rectTo.width(), rectFrom.width());
+  rh = GRatio(rectTo.height(), rectFrom.height());
+}
+
+void 
+GRectMapper::map(int &x, int &y)
+{
+  int mx = x;
+  int my = y;
+  // precalc
+  if (! (rw.p && rh.p))
+    precalc();
+  // swap and mirror
+  if (code & SWAPXY)
+    iswap(mx,my);
+  if (code & MIRRORX)
+    mx = rectFrom.xmin + rectFrom.xmax - mx;
+  if (code & MIRRORY)
+    my = rectFrom.ymin + rectFrom.ymax - my;
+  // scale and translate
+  x = rectTo.xmin + (mx - rectFrom.xmin) * rw;
+  y = rectTo.ymin + (my - rectFrom.ymin) * rh;
+}
+
+void 
+GRectMapper::unmap(int &x, int &y)
+{
+  // precalc 
+  if (! (rw.p && rh.p))
+    precalc();
+  // scale and translate
+  int mx = rectFrom.xmin + (x - rectTo.xmin) / rw;
+  int my = rectFrom.ymin + (y - rectTo.ymin) / rh;
+  //  mirror and swap
+  if (code & MIRRORX)
+    mx = rectFrom.xmin + rectFrom.xmax - mx;
+  if (code & MIRRORY)
+    my = rectFrom.ymin + rectFrom.ymax - my;
+  if (code & SWAPXY)
+    iswap(mx,my);
+  x = mx;
+  y = my;
+}
+
+void 
+GRectMapper::map(GRect &rect)
+{
+  map(rect.xmin, rect.ymin);
+  map(rect.xmax, rect.ymax);
+  if (rect.xmin >= rect.xmax)
+    iswap(rect.xmin, rect.xmax);
+  if (rect.ymin >= rect.ymax)
+    iswap(rect.ymin, rect.ymax);
+}
+
+void 
+GRectMapper::unmap(GRect &rect)
+{
+  unmap(rect.xmin, rect.ymin);
+  unmap(rect.xmax, rect.ymax);
+  if (rect.xmin >= rect.xmax)
+    iswap(rect.xmin, rect.xmax);
+  if (rect.ymin >= rect.ymax)
+    iswap(rect.ymin, rect.ymax);
+}
+
+GRect 
+GRectMapper::get_input()
+{
+    return rectFrom;
+}
+
+GRect 
+GRectMapper::get_output()
+{
+    return rectTo;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/GRect.h b/libdjvu/GRect.h
new file mode 100644
index 0000000..c1bd11e
--- /dev/null
+++ b/libdjvu/GRect.h
@@ -0,0 +1,354 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GRECT_H_
+#define _GRECT_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name GRect.h
+    Files #"GRect.h"# and #"GRect.cpp"# implement basic operations on
+    rectangles. Class \Ref{GRect} is used to represent rectangles.  Class
+    \Ref{GRectMapper} represent the correspondence between points relative to
+    given rectangles.  Class \Ref{GRatio} is used to represent scaling factors
+    as rational numbers.
+    @memo
+    Rectangle manipulation class.
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation.
+*/
+//@{
+
+#include "DjVuGlobal.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/* Flag to indicate that this djvulibre version
+   gets rid of all the crap about orientation bits.
+   All rotation code has been fixed and consistently
+   implements counter-clockwise rotations. */
+
+#define GRECT_WITHOUT_ORIENTATION_BITS 1
+
+
+/** @name Point Coordinates vs. Pixel Coordinates
+
+    The DjVu technology relies on the accurate superposition of images at
+    different resolutions.  Such an accuracy cannot be reached with the usual
+    assumption that pixels are small enough to be considered infinitesimally
+    small.  We must distinguish very precisely ``points'' and ``pixels''.
+    This distinction is essential for performing scaling operations.
+
+    The pixels of an image are identified by ``pixel coordinates''.  The
+    bottom-left corner pixel has coordinates #(0,0)# and the top-right corner
+    pixel has coordinates #(w-1,h-1)# where #w# and #h# are the image size.
+    Pixel coordinates are necessarily integers since pixels never overlap.
+
+    An infinitesimally small point is identified by its ``point coordinates''.
+    There may be fractional point coordinates, although this library does not
+    make use of them.  Points with integer coordinates are located {\em on the
+    corners of each pixel}.  They are not located on the pixel centers.  The
+    center of the pixel with pixel coordinates #(i,j)# is located at point
+    coordinates #(i+1/2,j+1/2)#.  In other words, the pixel #(i,j)# extends
+    from point #(i,j)# to point #(i+1,j+1)#.
+
+    Therefore, the point located on the bottom left corner of an image has
+    coordinates #(0,0)#.  This point is in fact the bottom left corner of the
+    bottom left pixel of the image.  The point located on the top right corner
+    of an image has coordinates #(w,h)# where #w# and #h# are the image size.
+    This is in fact the top right corner of pixel #(w-1,h-1)# which is the
+    image pixel with the highest coordinates.
+*/
+//@{
+//@}
+
+
+
+/** Rectangle class.  Each instance of this class represents a rectangle whose
+    sides are parallel to the axis. Such a rectangle represents all the points
+    whose coordinates lies between well defined minimal and maximal values.
+    Member functions can combine several rectangles by computing the
+    intersection of rectangles (\Ref{intersect}) or the smallest rectangle
+    enclosing two rectangles (\Ref{recthull}).  */
+
+class DJVUAPI GRect 
+{
+public:
+  /** Constructs an empty rectangle */
+  GRect();
+  /** Constructs a rectangle given its minimal coordinates #xmin# and #ymin#,
+      and its measurements #width# and #height#. Setting #width# or #height# to zero
+      produces an empty rectangle.  */
+  GRect(int xmin, int ymin, unsigned int width=0, unsigned int height=0);
+  /** Returns the rectangle width. */
+  int  width() const;
+  /** Returns the rectangle height. */
+  int  height() const;
+  /** Returns the area of the rectangle. */
+  int  area() const;
+  /** Returns true if the rectangle is empty. */
+  bool  isempty() const;
+  /** Returns true if the rectangle contains pixel (#x#,#y#).  A rectangle
+      contains all pixels with horizontal pixel coordinates in range #xmin#
+      (inclusive) to #xmax# (exclusive) and vertical coordinates #ymin#
+      (inclusive) to #ymax# (exclusive). */
+  int  contains(int x, int y) const;
+  /** Returns true if this rectangle contains the passed rectangle #rect#.
+      The function basically checks, that the intersection of this rectangle
+      with #rect# is #rect#. */
+  int  contains(const GRect & rect) const;
+  /** Returns true if rectangles #r1# and #r2# are equal. */
+  friend int operator==(const GRect & r1, const GRect & r2);
+  /** Returns true if rectangles #r1# and #r2# are not equal. */
+  friend int operator!=(const GRect & r1, const GRect & r2);
+  /** Resets the rectangle to the empty rectangle */
+  void clear();
+  /** Fatten the rectangle. Both vertical sides of the rectangle are pushed
+      apart by #dx# units. Both horizontal sides of the rectangle are pushed
+      apart by #dy# units. Setting arguments #dx# (resp. #dy#) to a negative
+      value reduces the rectangle horizontal (resp. vertical) size. */
+  int  inflate(int dx, int dy);
+  /** Translate the rectangle. The new rectangle is composed of all the points
+      of the old rectangle translated by #dx# units horizontally and #dy#
+      units vertically. */
+  int  translate(int dx, int dy);
+  /** Sets the rectangle to the intersection of rectangles #rect1# and #rect2#.
+      This function returns true if the intersection rectangle is not empty. */
+  int  intersect(const GRect &rect1, const GRect &rect2);
+  /** Sets the rectangle to the smallest rectangle containing the points of
+      both rectangles #rect1# and #rect2#. This function returns true if the
+      created rectangle is not empty. */
+  int  recthull(const GRect &rect1, const GRect &rect2);
+  /** Multiplies xmin, ymin, xmax, ymax by factor and scales the rectangle*/
+  void scale(float factor);
+  /** Multiplies xmin, xmax by xfactor and ymin, ymax by yfactor and scales the rectangle*/
+  void scale(float xfactor, float yfactor);
+  /** Minimal horizontal point coordinate of the rectangle. */
+  int xmin;
+  /** Minimal vertical point coordinate of the rectangle. */
+  int ymin;
+  /** Maximal horizontal point coordinate of the rectangle. */
+  int xmax;
+  /** Maximal vertical point coordinate of the rectangle. */
+  int ymax;
+};
+
+
+/** Maps points from one rectangle to another rectangle.  This class
+    represents a relation between the points of two rectangles. Given the
+    coordinates of a point in the first rectangle (input rectangle), function
+    \Ref{map} computes the coordinates of the corresponding point in the
+    second rectangle (the output rectangle).  This function actually implements
+    an affine transform which maps the corners of the first rectangle onto the
+    matching corners of the second rectangle. The scaling operation is
+    performed using integer fraction arithmetic in order to maximize
+    accuracy. */
+class DJVUAPI GRectMapper 
+{
+public:
+  /** Constructs a rectangle mapper. */
+  GRectMapper();
+  /** Resets the rectangle mapper state. Both the input rectangle
+      and the output rectangle are marked as undefined. */
+  void clear();
+  /** Sets the input rectangle. */
+  void set_input(const GRect &rect);
+  /** Returns the input rectangle. */
+  GRect get_input();
+  /** Sets the output rectangle. */
+  void set_output(const GRect &rect);
+  /** Returns the output rectangle. */
+  GRect get_output();
+  /** Composes the affine transform with a rotation of #count# quarter turns
+      counter-clockwise.  This operation essentially is a modification of the
+      match between the corners of the input rectangle and the corners of the
+      output rectangle. */
+  void rotate(int count=1);
+  /** Composes the affine transform with a symmetry with respect to the
+      vertical line crossing the center of the output rectangle.  This
+      operation essentially is a modification of the match between the corners
+      of the input rectangle and the corners of the output rectangle. */
+  void mirrorx();
+  /** Composes the affine transform with a symmetry with respect to the
+      horizontal line crossing the center of the output rectangle.  This
+      operation essentially is a modification of the match between the corners
+      of the input rectangle and the corners of the output rectangle. */
+  void mirrory();
+  /** Maps a point according to the affine transform.  Variables #x# and #y#
+      initially contain the coordinates of a point. This operation overwrites
+      these variables with the coordinates of a second point located in the
+      same position relative to the corners of the output rectangle as the
+      first point relative to the matching corners of the input rectangle.
+      Coordinates are rounded to the nearest integer. */
+  void map(int &x, int &y);
+  /** Maps a rectangle according to the affine transform. This operation
+      consists in mapping the rectangle corners and reordering the corners in
+      the canonical rectangle representation.  Variable #rect# is overwritten
+      with the new rectangle coordinates. */
+  void map(GRect &rect);
+  /** Maps a point according to the inverse of the affine transform.
+      Variables #x# and #y# initially contain the coordinates of a point. This
+      operation overwrites these variables with the coordinates of a second
+      point located in the same position relative to the corners of input
+      rectangle as the first point relative to the matching corners of the
+      input rectangle. Coordinates are rounded to the nearest integer. */
+  void unmap(int &x, int &y);
+  /** Maps a rectangle according to the inverse of the affine transform. This
+      operation consists in mapping the rectangle corners and reordering the
+      corners in the canonical rectangle representation.  Variable #rect# is
+      overwritten with the new rectangle coordinates. */
+  void unmap(GRect &rect);
+public:
+  // GRatio
+  struct GRatio {
+    GRatio ();
+    GRatio (int p, int q);
+    int p;
+    int q;
+  };
+private:
+  // Data
+  GRect rectFrom;
+  GRect rectTo;
+  int   code;
+  // Helper
+  void  precalc();
+  friend int operator*(int n, GRatio r ); 
+  friend int operator/(int n, GRatio r ); 
+  GRatio rw;
+  GRatio rh;
+};
+
+
+//@}
+
+
+
+// ---- INLINES
+
+inline
+GRect::GRect()
+: xmin(0), ymin(0), xmax(0), ymax(0)
+{
+}
+
+inline 
+GRect::GRect(int xmin, int ymin, unsigned int width, unsigned int height)
+: xmin(xmin), ymin(ymin), xmax(xmin+width), ymax(ymin+height)
+{
+}
+
+inline int 
+GRect::width() const
+{
+  return xmax - xmin;
+}
+
+inline int 
+GRect::height() const
+{
+  return ymax - ymin;
+}
+
+inline bool 
+GRect::isempty() const
+{
+  return (xmin>=xmax || ymin>=ymax);
+}
+
+inline int 
+GRect::area() const
+{
+  return isempty() ? 0 : (xmax-xmin)*(ymax-ymin);
+}
+
+inline int
+GRect::contains(int x, int y) const
+{
+  return (x>=xmin && x<xmax && y>=ymin && y<ymax);
+}
+  
+inline void 
+GRect::clear()
+{
+  xmin = xmax = ymin = ymax = 0;
+}
+
+inline int
+operator!=(const GRect & r1, const GRect & r2)
+{
+   return !(r1==r2);
+}
+
+// ---- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GScaler.cpp b/libdjvu/GScaler.cpp
new file mode 100644
index 0000000..de613b0
--- /dev/null
+++ b/libdjvu/GScaler.cpp
@@ -0,0 +1,706 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// Rescale images with fast bilinear interpolation
+// From: Leon Bottou, 1/31/2002
+// Almost equal to my initial code.
+
+#include "GScaler.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+////////////////////////////////////////
+// CONSTANTS
+
+
+#define FRACBITS  4
+#define FRACSIZE  (1<<FRACBITS)
+#define FRACSIZE2 (FRACSIZE>>1)
+#define FRACMASK  (FRACSIZE-1)
+
+
+
+
+
+
+////////////////////////////////////////
+// UTILITIES
+
+
+static int interp_ok = 0;
+static short interp[FRACSIZE][512];
+
+static void
+prepare_interp()
+{
+  if (! interp_ok)
+    {
+      interp_ok = 1;
+      for (int i=0; i<FRACSIZE; i++)
+        {
+          short *deltas = & interp[i][256];
+          for (int j = -255; j <= 255; j++)
+            deltas[j] = ( j*i + FRACSIZE2 ) >> FRACBITS;
+        }
+    }
+}
+
+
+static inline int
+mini(int x, int y) 
+{ 
+  return (x < y ? x : y);
+}
+
+
+static inline int
+maxi(int x, int y) 
+{ 
+  return (x > y ? x : y);
+}
+
+
+
+
+
+
+////////////////////////////////////////
+// GSCALER
+
+
+GScaler::GScaler()
+  : inw(0), inh(0), 
+    xshift(0), yshift(0), redw(0), redh(0), 
+    outw(0), outh(0),
+    gvcoord(vcoord,0), ghcoord(hcoord,0)
+{
+}
+
+
+GScaler::~GScaler()
+{
+}
+
+
+void
+GScaler::set_input_size(int w, int h)
+{ 
+  inw = w;
+  inh = h;
+  if (vcoord)
+  {
+    gvcoord.resize(0);
+  }
+  if (hcoord)
+  {
+    ghcoord.resize(0);
+  }
+}
+
+
+void
+GScaler::set_output_size(int w, int h)
+{ 
+  outw = w;
+  outh = h;
+  if (vcoord)
+  {
+    gvcoord.resize(0);
+  }
+  if (hcoord)
+  {
+    ghcoord.resize(0);
+  }
+}
+
+
+static void
+prepare_coord(int *coord, int inmax, int outmax, int in, int out)
+{
+  int len = (in*FRACSIZE);
+  int beg = (len+out)/(2*out) - FRACSIZE2;
+  // Bresenham algorithm
+  int y = beg;
+  int z = out/2;
+  int inmaxlim = (inmax-1)*FRACSIZE;
+  for  (int x=0; x<outmax; x++)
+    {
+      coord[x] = mini(y,inmaxlim);
+      z = z + len;
+      y = y + z / out;  
+      z = z % out;
+    }
+  // Result must fit exactly
+  if (out==outmax && y!=beg+len)
+    G_THROW( ERR_MSG("GScaler.assertion") );
+}
+
+
+void 
+GScaler::set_horz_ratio(int numer, int denom)
+{
+  if (! (inw>0 && inh>0 && outw>0 && outh>0))
+    G_THROW( ERR_MSG("GScaler.undef_size") );
+  // Implicit ratio (determined by the input/output sizes)
+  if (numer==0 && denom==0) {
+    numer = outw;
+    denom = inw;
+  } else if (numer<=0 || denom<=0)
+    G_THROW( ERR_MSG("GScaler.ratios") );
+  // Compute horz reduction
+  xshift = 0;
+  redw = inw;
+  while (numer+numer < denom) {
+    xshift += 1;
+    redw = (redw + 1) >> 1;
+   numer = numer << 1;
+  }
+  // Compute coordinate table
+  if (! hcoord)
+    ghcoord.resize(outw);
+  prepare_coord(hcoord, redw, outw, denom, numer);
+}
+
+
+void 
+GScaler::set_vert_ratio(int numer, int denom)
+{
+  if (! (inw>0 && inh>0 && outw>0 && outh>0))
+    G_THROW( ERR_MSG("GScaler.undef_size") );
+  // Implicit ratio (determined by the input/output sizes)
+  if (numer==0 && denom==0) {
+    numer = outh;
+    denom = inh;
+  } else if (numer<=0 || denom<=0)
+    G_THROW( ERR_MSG("GScaler.ratios") );
+  // Compute horz reduction
+  yshift = 0;
+  redh = inh;
+  while (numer+numer < denom) {
+    yshift += 1;
+    redh = (redh + 1) >> 1;
+    numer = numer << 1;
+  }
+  // Compute coordinate table
+  if (! vcoord)
+  {
+    gvcoord.resize(outh);
+  }
+  prepare_coord(vcoord, redh, outh, denom, numer);
+}
+
+
+void
+GScaler::make_rectangles(const GRect &desired, GRect &red, GRect &inp)
+{
+  // Parameter validation
+  if (desired.xmin<0 || desired.ymin<0 ||
+      desired.xmax>outw || desired.ymax>outh )
+    G_THROW( ERR_MSG("GScaler.too_big") );
+  // Compute ratio (if not done yet)
+  if (!vcoord) 
+    set_vert_ratio(0,0);
+  if (!hcoord) 
+    set_horz_ratio(0,0);
+  // Compute reduced bounds
+  red.xmin = (hcoord[desired.xmin]) >> FRACBITS;
+  red.ymin = (vcoord[desired.ymin]) >> FRACBITS;
+  red.xmax = (hcoord[desired.xmax-1]+FRACSIZE-1) >> FRACBITS;
+  red.ymax = (vcoord[desired.ymax-1]+FRACSIZE-1) >> FRACBITS;
+  // Borders
+  red.xmin = maxi(red.xmin, 0);
+  red.xmax = mini(red.xmax+1, redw);
+  red.ymin = maxi(red.ymin, 0);
+  red.ymax = mini(red.ymax+1, redh);
+  // Input
+  inp.xmin = maxi(red.xmin<<xshift, 0); 
+  inp.xmax = mini(red.xmax<<xshift, inw); 
+  inp.ymin = maxi(red.ymin<<yshift, 0); 
+  inp.ymax = mini(red.ymax<<yshift, inh); 
+}
+
+
+void 
+GScaler::get_input_rect( const GRect &desired_output, GRect &required_input )
+{
+  GRect red;
+  make_rectangles(desired_output, red, required_input);
+}
+
+
+
+
+
+
+////////////////////////////////////////
+// GBITMAPSCALER
+
+
+GBitmapScaler::GBitmapScaler()
+  : glbuffer(lbuffer,0), gconv(conv,0), gp1(p1,0), gp2(p2,0)
+{
+}
+
+
+GBitmapScaler::GBitmapScaler(int inw, int inh, int outw, int outh)
+  : glbuffer(lbuffer,0), gconv(conv,0), gp1(p1,0), gp2(p2,0)
+{
+  set_input_size(inw, inh);
+  set_output_size(outw, outh);
+}
+
+
+GBitmapScaler::~GBitmapScaler()
+{
+}
+
+
+unsigned char *
+GBitmapScaler::get_line(int fy, 
+                        const GRect &required_red, 
+                        const GRect &provided_input,
+                        const GBitmap &input )
+{
+  if (fy < required_red.ymin)
+    fy = required_red.ymin; 
+  else if (fy >= required_red.ymax)
+    fy = required_red.ymax - 1;
+  // Cached line
+  if (fy == l2)
+    return p2;
+  if (fy == l1)
+    return p1;
+  // Shift
+  unsigned char *p = p1;
+  p1 = p2;
+  l1 = l2;
+  p2 = p;
+  l2 = fy;
+  if (xshift==0 && yshift==0)
+    {
+      // Fast mode
+      int dx = required_red.xmin-provided_input.xmin;
+      int dx1 = required_red.xmax-provided_input.xmin;
+      const unsigned char *inp1 = input[fy-provided_input.ymin] + dx;
+      while (dx++ < dx1)
+        *p++ = conv[*inp1++];
+      return p2;
+    }
+  else
+    {
+      // Compute location of line
+      GRect line;
+      line.xmin = required_red.xmin << xshift;
+      line.xmax = required_red.xmax << xshift;
+      line.ymin = fy << yshift;
+      line.ymax = (fy+1) << yshift;
+      line.intersect(line, provided_input);
+      line.translate(-provided_input.xmin, -provided_input.ymin);
+      // Prepare variables
+      const unsigned char *botline = input[line.ymin];
+      int rowsize = input.rowsize();
+      int sw = 1<<xshift;
+      int div = xshift+yshift;
+      int rnd = 1<<(div-1);
+      // Compute averages
+      for (int x=line.xmin; x<line.xmax; x+=sw,p++)
+        {
+          int g=0, s=0;
+          const unsigned char *inp0 = botline + x;
+          int sy1 = mini(line.height(), (1<<yshift));
+          for (int sy=0; sy<sy1; sy++,inp0+=rowsize)
+	    {
+	      const unsigned char *inp1;
+	      const unsigned char *inp2 = inp0 + mini(x+sw, line.xmax) - x;
+	      for (inp1=inp0; inp1<inp2; inp1++)
+		{
+		  g += conv[*inp1];
+		  s += 1;
+		}
+	    }
+          if (s == rnd+rnd)
+            *p = (g+rnd)>>div;
+          else
+            *p = (g+s/2)/s;
+        }
+      // Return
+      return p2;
+    }
+}
+
+
+void 
+GBitmapScaler::scale( const GRect &provided_input, const GBitmap &input,
+                      const GRect &desired_output, GBitmap &output )
+{
+  // Compute rectangles
+  GRect required_input; 
+  GRect required_red;
+  make_rectangles(desired_output, required_red, required_input);
+  // Parameter validation
+  if (provided_input.width() != (int)input.columns() ||
+      provided_input.height() != (int)input.rows() )
+    G_THROW( ERR_MSG("GScaler.no_match") );
+  if (provided_input.xmin > required_input.xmin ||
+      provided_input.ymin > required_input.ymin ||
+      provided_input.xmax < required_input.xmax ||
+      provided_input.ymax < required_input.ymax  )
+    G_THROW( ERR_MSG("GScaler.too_small") );
+  // Adjust output pixmap
+  if (desired_output.width() != (int)output.columns() ||
+      desired_output.height() != (int)output.rows() )
+    output.init(desired_output.height(), desired_output.width());
+  output.set_grays(256);
+  // Prepare temp stuff
+  gp1.resize(0);
+  gp2.resize(0);
+  glbuffer.resize(0);
+  prepare_interp();
+  const int bufw = required_red.width();
+  glbuffer.resize(bufw+2);
+  gp1.resize(bufw);
+  gp2.resize(bufw);
+  l1 = l2 = -1;
+  // Prepare gray conversion array (conv)
+  gconv.resize(0);
+  gconv.resize(256);
+  int maxgray = input.get_grays()-1;
+  for (int i=0; i<256; i++) 
+    {
+      conv[i]=(i<= maxgray)
+        ?(((i*255) + (maxgray>>1)) / maxgray)
+        :255;
+    }
+  // Loop on output lines
+  for (int y=desired_output.ymin; y<desired_output.ymax; y++)
+    {
+      // Perform vertical interpolation
+      {
+        int fy = vcoord[y];
+        int fy1 = fy>>FRACBITS;
+        int fy2 = fy1+1;
+        const unsigned char *lower, *upper;
+        // Obtain upper and lower line in reduced image
+        lower = get_line(fy1, required_red, provided_input, input);
+        upper = get_line(fy2, required_red, provided_input, input);
+        // Compute line
+        unsigned char *dest = lbuffer+1;
+        const short *deltas = & interp[fy&FRACMASK][256];
+        for(unsigned char const * const edest=(unsigned char const *)dest+bufw;
+          dest<edest;upper++,lower++,dest++)
+        {
+          const int l = *lower;
+          const int u = *upper;
+          *dest = l + deltas[u-l];
+        }
+      }
+      // Perform horizontal interpolation
+      {
+        // Prepare for side effects
+        lbuffer[0]   = lbuffer[1];
+        lbuffer[bufw+1] = lbuffer[bufw];
+        unsigned char *line = lbuffer+1-required_red.xmin;
+        unsigned char *dest  = output[y-desired_output.ymin];
+        // Loop horizontally
+        for (int x=desired_output.xmin; x<desired_output.xmax; x++)
+          {
+            int n = hcoord[x];
+            const unsigned char *lower = line + (n>>FRACBITS);
+            const short *deltas = &interp[n&FRACMASK][256];
+            int l = lower[0];
+            int u = lower[1];
+            *dest = l + deltas[u-l];
+            dest++;
+          }
+      }
+    }
+  // Free temporaries
+  gp1.resize(0);
+  gp2.resize(0);
+  glbuffer.resize(0);
+  gconv.resize(0);
+}
+
+
+
+
+
+
+////////////////////////////////////////
+// GPIXMAPSCALER
+
+
+GPixmapScaler::GPixmapScaler()
+  : glbuffer(lbuffer,0), 
+    gp1(p1,0), 
+    gp2(p2,0)
+{
+}
+
+
+GPixmapScaler::GPixmapScaler(int inw, int inh, int outw, int outh)
+  : glbuffer(lbuffer,0), 
+    gp1(p1,0), 
+    gp2(p2,0)
+{
+  set_input_size(inw, inh);
+  set_output_size(outw, outh);
+}
+
+
+GPixmapScaler::~GPixmapScaler()
+{
+}
+
+
+GPixel *
+GPixmapScaler::get_line(int fy, 
+                        const GRect &required_red, 
+                        const GRect &provided_input,
+                        const GPixmap &input )
+{
+  if (fy < required_red.ymin)
+    fy = required_red.ymin; 
+  else if (fy >= required_red.ymax)
+    fy = required_red.ymax - 1;
+  // Cached line
+  if (fy == l2)
+    return p2;
+  if (fy == l1)
+    return p1;
+  // Shift
+  GPixel *p=p1;
+  p1 = p2;
+  l1 = l2;
+  p2 = p;
+  l2 = fy;
+  // Compute location of line
+  GRect line;
+  line.xmin = required_red.xmin << xshift;
+  line.xmax = required_red.xmax << xshift;
+  line.ymin = fy << yshift;
+  line.ymax = (fy+1) << yshift;
+  line.intersect(line, provided_input);
+  line.translate(-provided_input.xmin, -provided_input.ymin);
+  // Prepare variables
+  const GPixel *botline = input[line.ymin];
+  int rowsize = input.rowsize();
+  int sw = 1<<xshift;
+  int div = xshift+yshift;
+  int rnd = 1<<(div-1);
+  // Compute averages
+  for (int x=line.xmin; x<line.xmax; x+=sw,p++)
+    {
+      int r=0, g=0, b=0, s=0;
+      const GPixel *inp0 = botline + x;
+      int sy1 = mini(line.height(), (1<<yshift));
+      for (int sy=0; sy<sy1; sy++,inp0+=rowsize)
+        {
+	  const GPixel *inp1;
+	  const GPixel *inp2 = inp0 + mini(x+sw, line.xmax) - x;
+          for (inp1 = inp0; inp1<inp2; inp1++)
+            {
+              r += inp1->r;  
+              g += inp1->g;  
+              b += inp1->b; 
+              s += 1;
+            }
+        }
+      if (s == rnd+rnd)
+        {
+          p->r = (r+rnd) >> div;
+          p->g = (g+rnd) >> div;
+          p->b = (b+rnd) >> div;
+        }
+      else
+        {
+          p->r = (r+s/2)/s;
+          p->g = (g+s/2)/s;
+          p->b = (b+s/2)/s;
+        }
+    }
+  // Return
+  return (GPixel *)p2;
+}
+
+
+void 
+GPixmapScaler::scale( const GRect &provided_input, const GPixmap &input,
+                      const GRect &desired_output, GPixmap &output )
+{
+  // Compute rectangles
+  GRect required_input; 
+  GRect required_red;
+  make_rectangles(desired_output, required_red, required_input);
+  // Parameter validation
+  if (provided_input.width() != (int)input.columns() ||
+      provided_input.height() != (int)input.rows() )
+    G_THROW( ERR_MSG("GScaler.no_match") );
+  if (provided_input.xmin > required_input.xmin ||
+      provided_input.ymin > required_input.ymin ||
+      provided_input.xmax < required_input.xmax ||
+      provided_input.ymax < required_input.ymax  )
+    G_THROW( ERR_MSG("GScaler.too_small") );
+  // Adjust output pixmap
+  if (desired_output.width() != (int)output.columns() ||
+      desired_output.height() != (int)output.rows() )
+    output.init(desired_output.height(), desired_output.width());
+  // Prepare temp stuff 
+  gp1.resize(0);
+  gp2.resize(0);
+  glbuffer.resize(0);
+  prepare_interp();
+  const int bufw = required_red.width();
+  glbuffer.resize(bufw+2);
+  if (xshift>0 || yshift>0)
+    {
+      gp1.resize(bufw);
+      gp2.resize(bufw);
+      l1 = l2 = -1;
+    }
+  // Loop on output lines
+  for (int y=desired_output.ymin; y<desired_output.ymax; y++)
+    {
+      // Perform vertical interpolation
+      {
+        int fy = vcoord[y];
+        int fy1 = fy>>FRACBITS;
+        int fy2 = fy1+1;
+        const GPixel *lower, *upper;
+        // Obtain upper and lower line in reduced image
+        if (xshift>0 || yshift>0)
+          {
+            lower = get_line(fy1, required_red, provided_input, input);
+            upper = get_line(fy2, required_red, provided_input, input);
+          }
+        else
+          {
+            int dx = required_red.xmin-provided_input.xmin;
+            fy1 = maxi(fy1, required_red.ymin);
+            fy2 = mini(fy2, required_red.ymax-1);
+            lower = input[fy1-provided_input.ymin] + dx;
+            upper = input[fy2-provided_input.ymin] + dx;
+          }
+        // Compute line
+        GPixel *dest = lbuffer+1;
+        const short *deltas = & interp[fy&FRACMASK][256];
+        for(GPixel const * const edest = (GPixel const *)dest+bufw;
+          dest<edest;upper++,lower++,dest++)
+        {
+          const int lower_r = lower->r;
+          const int delta_r = deltas[(int)upper->r - lower_r];
+          dest->r = lower_r + delta_r;
+          const int lower_g = lower->g;
+          const int delta_g = deltas[(int)upper->g - lower_g];
+          dest->g = lower_g + delta_g;
+          const int lower_b = lower->b;
+          const int delta_b = deltas[(int)upper->b - lower_b];
+          dest->b = lower_b + delta_b;
+        }
+      }
+      // Perform horizontal interpolation
+      {
+        // Prepare for side effects
+        lbuffer[0]   = lbuffer[1];
+        lbuffer[bufw+1] = lbuffer[bufw];
+        GPixel *line = lbuffer+1-required_red.xmin;
+        GPixel *dest  = output[y-desired_output.ymin];
+        // Loop horizontally
+        for (int x=desired_output.xmin; x<desired_output.xmax; x++,dest++)
+          {
+            const int n = hcoord[x];
+            const GPixel *lower = line + (n>>FRACBITS);
+            const short *deltas = &interp[n&FRACMASK][256];
+            const int lower_r = lower[0].r;
+            const int delta_r = deltas[(int)lower[1].r - lower_r];
+            dest->r = lower_r + delta_r;
+            const int lower_g = lower[0].g;
+            const int delta_g = deltas[(int)lower[1].g - lower_g];
+            dest->g = lower_g + delta_g;
+            const int lower_b = lower[0].b;
+            const int delta_b = deltas[(int)lower[1].b - lower_b];
+            dest->b = lower_b + delta_b;
+          }
+      }
+    }
+  // Free temporaries
+  gp1.resize(0);
+  gp2.resize(0);
+  glbuffer.resize(0);
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GScaler.h b/libdjvu/GScaler.h
new file mode 100644
index 0000000..2b200fa
--- /dev/null
+++ b/libdjvu/GScaler.h
@@ -0,0 +1,319 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GSCALER_H_
+#define _GSCALER_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// Almost equal to my initial code.
+
+#include "GException.h"
+#include "GRect.h"
+#include "GBitmap.h"
+#include "GPixmap.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/** @name GScaler.h 
+
+    Files #"GScaler.h"# and #"GScaler.cpp"# implement a fast bilinear
+    interpolation scheme to rescale a \Ref{GBitmap} or a \Ref{GPixmap}.
+    Common setup functions are implemented by the base class \Ref{GScaler}.
+    The actual function for rescaling a gray level image is implemented by
+    class \Ref{GBitmapScaler}.  The actual function for rescaling a color
+    image is implemented by class \Ref{GPixmapScaler}.
+
+    {\bf Remark} --- The bilinear interpolation code relies on fixed precision
+    tables.  It becomes suboptimal when upsampling (i.e. zooming into) an
+    image by a factor greater than eight.  High contrast images displayed at
+    high magnification may contain visible jaggies.
+
+    @memo
+    Rescaling images with bilinear interpolation.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+
+
+/** Base class for GBitmapScaler and GPixmapScaler.  This base class
+    implements the common elements of class \Ref{GBitmapScaler} and
+    \Ref{GPixmapScaler}.  Functions \Ref{set_input_size} and
+    \Ref{set_output_size} are used to specify the size of the input image and
+    the size of the output image.  Functions \Ref{set_horz_ratio} and
+    \Ref{set_vert_ratio} may be used to override the scaling ratios computed
+    from the image sizes.  You can then call function \Ref{get_input_rect} to
+    know which pixels of the input image are necessary to compute a specified
+    rectangular zone of the output image.  The actual computation is then
+    performed by calling function #scale# in class \Ref{GBitmapScaler} and
+    \Ref{GPixmapScaler}.  
+*/
+class DJVUAPI GScaler  : public GPEnabled
+{
+protected:  
+  GScaler();
+public:
+  virtual ~GScaler();
+  /** Sets the size of the input image. Argument #w# (resp. #h#) contains the
+      horizontal (resp. vertical) size of the input image.  This size is used
+      to initialize the internal data structures of the scaler object. */
+  void set_input_size(int w, int h);
+  /** Sets the size of the output image. Argument #w# (resp. #h#) contains the
+      horizontal (resp. vertical) size of the output image. This size is used
+      to initialize the internal data structures of the scaler object. */
+  void set_output_size(int w, int h);
+  /** Sets the horizontal scaling ratio #numer/denom#.  This function may be
+      used to force an exact scaling ratio.  The scaling ratios are otherwise
+      derived from the sizes of the input and output images. */
+  void set_horz_ratio(int numer, int denom);
+  /** Sets the vertical scaling ratio to #numer/denom#.  This function may be
+      used to force an exact scaling ratio.  The scaling ratios are otherwise
+      derived from the sizes of the input and output images. */
+  void set_vert_ratio(int numer, int denom);
+  /** Computes which input pixels are required to compute specified output
+      pixels.  Let us assume that we only need a part of the output
+      image. This part is defined by rectangle #desired_output#.  Only a part
+      of the input image is necessary to compute the output pixels.  Function
+      #get_input_rect# computes the coordinates of that part of the input
+      image, and stores them into rectangle #required_input#.  */
+  void get_input_rect( const GRect &desired_output, GRect &required_input );
+protected:
+  // The sizes
+  int inw, inh;
+  int xshift, yshift;
+  int redw, redh;
+  int outw, outh;
+  // Fixed point coordinates
+  int *vcoord;
+  GPBuffer<int> gvcoord;
+  int *hcoord;
+  GPBuffer<int> ghcoord;
+  // Helper
+  void make_rectangles(const GRect &desired, GRect &red, GRect &inp);
+};
+
+
+
+/** Fast rescaling code for gray level images.  This class augments the base
+    class \Ref{GScaler} with a function for rescaling gray level
+    images.  Function \Ref{GBitmapScaler::scale} computes an arbitrary segment
+    of the output image given the corresponding pixels in the input image.
+
+    {\bf Example} --- The following functions returns an gray level image
+    (sixteen gray levels, size #nw# by #nh#) containing a rescaled version of
+    the input image #in#.
+    \begin{verbatim}
+    GBitmap *rescale_bitmap(const GBitmap &in, int nw, int nh)
+    {
+      int w = in.columns();       // Get input width
+      int h = in.raws();          // Get output width
+      GBitmapScaler scaler(w,h,nw,nh);  // Creates bitmap scaler
+      GRect desired(0,0,nw,nh);   // Desired output = complete bitmap
+      GRect provided(0,0,w,h);    // Provided input = complete bitmap
+      GBitmap *out = new GBitmap;
+      scaler.scale(provided, in, desired, *out);  // Rescale
+      out->change_grays(16);      // Reduce to 16 gray levels
+      return out;
+    }
+    \end{verbatim} */
+class DJVUAPI GBitmapScaler : public GScaler
+{
+protected:
+  GBitmapScaler(void);
+  GBitmapScaler(int inw, int inh, int outw, int outh);
+public:
+  /// Virtual destructor.
+  virtual ~GBitmapScaler();
+
+  /** Creates an empty GBitmapScaler. You must call functions
+      \Ref{GScaler::set_input_size} and \Ref{GScaler::set_output_size} before
+      calling any of the scaling functions. */
+  static GP<GBitmapScaler> create(void) {return new GBitmapScaler(); }
+
+  /** Creates a GBitmapScaler. The size of the input image is given by
+      #inw# and #inh#.  This function internally calls
+      \Ref{GScaler::set_input_size} and \Ref{GScaler::set_output_size}. The
+      size of the output image is given by #outw# and #outh#.  . */
+  static GP<GBitmapScaler> create(
+    const int inw, const int inh, const int outw, const int outh)
+  { return new GBitmapScaler(inw,inh,outw,outh); }
+
+  /** Computes a segment of the rescaled output image.  The GBitmap object
+      #output# is overwritten with the segment of the output image specified
+      by the rectangle #desired_output#.  The rectangle #provided_input#
+      specifies which segment of the input image is provided by the GBitmap
+      object #input#.  An exception \Ref{GException} is thrown if the
+      rectangle #provided_input# is smaller then the rectangle
+      #required_input# returned by function \Ref{GScaler::get_input_rect}.
+      Note that the output image always contain 256 gray levels. You may want
+      to use function \Ref{GBitmap::change_grays} to reduce the number of gray
+      levels. */
+  void scale( const GRect &provided_input, const GBitmap &input,
+              const GRect &desired_output, GBitmap &output );
+protected:
+  // Helpers
+  unsigned char *get_line(int, const GRect &, const GRect &, const GBitmap &);
+  // Temporaries
+  unsigned char *lbuffer;
+  GPBuffer<unsigned char> glbuffer;
+  unsigned char *conv;
+  GPBuffer<unsigned char> gconv;
+  unsigned char *p1;
+  GPBuffer<unsigned char> gp1;
+  unsigned char *p2;
+  GPBuffer<unsigned char> gp2;
+  int l1;
+  int l2;
+};
+
+
+/** Fast rescaling code for color images.  This class augments the base class
+    \Ref{GScaler} with a function for rescaling color images.  Function
+    \Ref{GPixmapScaler::scale} computes an arbitrary segment of the output
+    image given the corresponding pixels in the input image.
+
+    {\bf Example} --- The following functions returns a color image
+    of size #nw# by #nh# containing a rescaled version of
+    the input image #in#.
+    \begin{verbatim}
+    GPixmap *rescale_pixmap(const GPixmap &in, int nw, int nh)
+    {
+      int w = in.columns();       // Get input width
+      int h = in.raws();          // Get output width
+      GPixmapScaler scaler(w,h,nw,nh);  // Creates bitmap scaler
+      GRect desired(0,0,nw,nh);   // Desired output = complete image
+      GRect provided(0,0,w,h);    // Provided input = complete image
+      GPixmap *out = new GPixmap;
+      scaler.scale(provided, in, desired, *out);  // Rescale
+      return out;
+    }
+    \end{verbatim}
+
+ */
+class DJVUAPI GPixmapScaler : public GScaler
+{
+protected:
+  GPixmapScaler(void);
+  GPixmapScaler(int inw, int inh, int outw, int outh);
+public:
+  /// Virtual destructor.
+  virtual ~GPixmapScaler();
+
+  /** Creates an empty GPixmapScaler. You must call functions
+      \Ref{GScaler::set_input_size} and \Ref{GScaler::set_output_size} before
+      calling any of the scaling functions. */
+  static GP<GPixmapScaler> create(void) {return new GPixmapScaler(); }
+
+  /** Creates a GPixmapScaler. The size of the input image is given by
+      #inw# and #inh#.  This function internally calls
+      \Ref{GScaler::set_input_size} and \Ref{GScaler::set_output_size}. The
+      size of the output image is given by #outw# and #outh#.  . */
+  static GP<GPixmapScaler> create(
+    const int inw, const int inh, const int outw, const int outh)
+  { return new GPixmapScaler(inw,inh,outw,outh); }
+
+  /** Computes a segment of the rescaled output image.  The pixmap #output# is
+      overwritten with the segment of the output image specified by the
+      rectangle #desired_output#.  The rectangle #provided_input# specifies
+      which segment of the input image is provided in the pixmap #input#.  An
+      exception \Ref{GException} is thrown if the rectangle #provided_input#
+      is smaller then the rectangle #required_input# returned by function
+      \Ref{GScaler::get_input_rect}. */
+  void scale( const GRect &provided_input, const GPixmap &input,
+              const GRect &desired_output, GPixmap &output );
+protected:
+  // Helpers
+  GPixel *get_line(int, const GRect &, const GRect &, const GPixmap &);
+  // Temporaries
+  GPixel *lbuffer;
+  GPBuffer<GPixel> glbuffer;
+  GPixel *p1;
+  GPBuffer<GPixel> gp1;
+  GPixel *p2;
+  GPBuffer<GPixel> gp2;
+  int    l1;
+  int    l2;
+};
+
+
+
+
+
+//@}
+    
+
+
+
+// -------- END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp
new file mode 100644
index 0000000..9e2695d
--- /dev/null
+++ b/libdjvu/GSmartPointer.cpp
@@ -0,0 +1,208 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// - Author: Leon Bottou, 05/1997
+
+// From: Leon Bottou, 1/31/2002
+// Class GPBuffer has been added (but not documented) by Lizardtech.
+// Our original implementation consisted of multiple classes.
+// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+
+#include <stddef.h>
+#include <string.h>
+#if PARANOID_DEBUG
+# include <assert.h>
+#endif
+
+#include "GThreads.h"
+#include "GSmartPointer.h"
+#include "GException.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// ------ GPENABLED
+
+GPEnabled::~GPEnabled()
+{
+  if (count > 0)
+    G_THROW( ERR_MSG("GSmartPointer.suspicious") );
+}
+
+void
+GPEnabled::destroy()
+{
+  // Only delete if the counter is still zero.
+  // because someone may have rescued the object...
+  // If yes, set the counter to -0x7fff to mark 
+  // the object as doomed and make sure things
+  // will work if the destructor uses a GP...
+  if (! atomicCompareAndSwap(&count, 0, -0x7fff))
+    delete this;
+}
+
+
+// ------ GPBASE
+
+
+GPBase&
+GPBase::assign (const GPBase &sptr)
+{
+  GPEnabled *nptr = sptr.ptr;
+  if (nptr && atomicIncrement(&nptr->count) <= 0)
+    nptr = 0;
+  GPEnabled *optr = (GPEnabled*)atomicExchangePointer((void**)&ptr, (void*)nptr);
+  if (optr)
+    optr->unref();
+  return *this;
+}
+
+GPBase&
+GPBase::assign (GPEnabled *nptr)
+{
+  if (nptr && atomicIncrement(&nptr->count) <= 0)
+    nptr = 0;
+  GPEnabled *optr = (GPEnabled*)atomicExchangePointer((void**)&ptr, (void*)nptr);
+  if (optr)
+    optr->unref();
+  return *this;
+}
+
+
+
+
+// ------ GPBUFFERBASE
+
+
+void
+GPBufferBase::replace(void *nptr,const size_t n)
+{
+  resize(0,0);
+  ptr=nptr;
+  num=n;
+}
+
+GPBufferBase::GPBufferBase(void *&xptr,const size_t n,const size_t t) 
+  : ptr(xptr), num(n)
+{
+  if (n)
+    xptr = ::operator new(n*t);
+  else
+    xptr = 0;
+}
+
+GPBufferBase::~GPBufferBase()
+{
+  ::operator delete(ptr);
+}
+
+void 
+GPBufferBase::swap(GPBufferBase &other)
+{
+  void * const temp_ptr=ptr;
+  ptr=other.ptr;
+  other.ptr=temp_ptr;
+  const size_t temp_num=num;
+  num=other.num;
+  other.num=temp_num;
+}
+
+void
+GPBufferBase::resize(const size_t n, const size_t t)
+{
+  if(!n && !ptr)
+    {
+      num=0;
+    }
+  else
+    {
+      const size_t s=ptr?(((num<n)?num:n)*t):0;
+      void *nptr;
+      GPBufferBase gnptr(nptr, n, t);
+      if(s)
+        {
+          memcpy(nptr, ptr, s);
+        }
+      swap(gnptr);
+    }
+}
+
+void
+GPBufferBase::set(const size_t t,const char c)
+{
+  if(num)
+    memset(ptr,c,num*t);
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h
new file mode 100644
index 0000000..8a8bb8a
--- /dev/null
+++ b/libdjvu/GSmartPointer.h
@@ -0,0 +1,526 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GSMARTPOINTER_H_
+#define _GSMARTPOINTER_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name GSmartPointer.h
+
+    Files #"GSmartPointer.h"# and #"GSmartPointer.cpp"# define a smart-pointer
+    class which automatically performs thread-safe reference counting.  Class
+    \Ref{GP} implements smart-pointers by overloading the usual pointer
+    assignment and dereferencing operators. The overloaded operators maintain
+    the reference counters and destroy the pointed objects as soon as their
+    reference counter reaches zero.  Transparent type conversions are provided
+    between smart-pointers and regular pointers.  Objects referenced by
+    smart-pointers must be derived from class \Ref{GPEnabled}.
+
+    @memo 
+    Thread-Safe reference counting smart-pointers.
+    @author 
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation\\
+    Andrei Erofeev <eaf@geocities.com> -- bug fix.
+
+// From: Leon Bottou, 1/31/2002
+// Class GPBuffer has been added (but not documented) by Lizardtech.
+// Our original implementation consisted of multiple classes.
+// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+
+    @args
+*/
+//@{
+
+#if defined(_MSC_VER)
+// Language lawyer say MSVC6 is wrong on that one. 
+// Cf section 5.4.7 in november 1997 draft.
+#pragma warning( disable : 4243 )
+#endif
+
+#include "DjVuGlobal.h"
+#include "atomic.h"
+
+#include <stddef.h>
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+/** Base class for reference counted objects.  
+    This is the base class for all reference counted objects.
+    Any instance of a subclass of #GPEnabled# can be used with 
+    smart-pointers (see \Ref{GP}).  
+ */
+class DJVUAPI GPEnabled
+{
+  friend class GPBase;
+  void destroy();
+  void unref();
+  void ref();
+public:
+  /// Null constructor.
+  GPEnabled();
+  /// Copy construcotr
+  GPEnabled(const GPEnabled & obj);
+  /// Virtual destructor.
+  virtual ~GPEnabled();
+  /// Copy operator
+  GPEnabled & operator=(const GPEnabled & obj);
+  /** Returns the number of references to this object.  This should be only
+      used for debugging purposes. Other uses are not thread-safe. */
+  int get_count(void) const;
+protected:
+  /// The reference counter
+  volatile int count;
+};
+
+
+
+/** Base class for all smart-pointers.
+    This class implements common mechanisms for all
+    smart-pointers (see \Ref{GP}). There should be no need
+    to use this class directly.  Its sole purpose consists
+    in reducing the template expansion overhead.
+*/
+
+class DJVUAPI GPBase
+{
+public:
+  /** Null Constructor. */
+  GPBase();
+  /** Copy Constructor.
+      Increments the reference count. 
+      @param sptr reference to a #GPBase# object. */
+  GPBase(const GPBase &sptr);
+  /** Construct a GPBase from a pointer.
+      Increments the reference count.
+      @param nptr pointer to a #GPEnabled# object. */
+  GPBase(GPEnabled *nptr);
+  /** Destructor. Decrements the reference count. */
+  ~GPBase();
+  /** Accesses the actual pointer. */
+  GPEnabled* get() const;
+  /** Assignment from smartpointer. 
+      Increments the counter of the new value of the pointer.
+      Decrements the counter of the previous value of the pointer. */
+  GPBase& assign(const GPBase &sptr);
+  /** Assignment from pointer. 
+      Checks that the object is not being destroyed.
+      Increments the counter of the new value of the pointer.
+      Decrements the counter of the previous value of the pointer. */
+  GPBase& assign(GPEnabled *nptr);
+  /** Assignment operator. */
+  GPBase & operator=(const GPBase & obj);
+  /** Comparison operator. */
+  int operator==(const GPBase & g2) const;
+protected:
+  /** Actual pointer */
+  GPEnabled *ptr;
+};
+
+
+/** Reference counting pointer.
+    Class #GP<TYPE># represents a smart-pointer to an object of type #TYPE#.
+    Type #TYPE# must be a subclass of #GPEnabled#.  This class overloads the
+    usual pointer assignment and dereferencing operators. The overloaded
+    operators maintain the reference counters and destroy the pointed object
+    as soon as their reference counter reaches zero.  Transparent type
+    conversions are provided between smart-pointers and regular pointers.
+
+    Using a smart-pointer is a convenience and not an obligation.  There is no
+    need to use a smart-pointer to access a #GPEnabled# object.  As long as
+    you never use a smart-pointer to access a #GPEnabled# object, its
+    reference counter remains zero.  Since the reference counter is never
+    decremented from one to zero, the object is never destroyed by the
+    reference counting code.  You can therefore choose to only use regular
+    pointers to access objects allocated on the stack (automatic variables) or
+    objects allocated dynamically.  In the latter case you must explicitly
+    destroy the dynamically allocated object with operator #delete#.
+
+    The first time you use a smart-pointer to access #GPEnabled# object, the
+    reference counter is incremented to one. Object destruction will then
+    happen automatically when the reference counter is decremented back to
+    zero (i.e. when the last smart-pointer referencing 
+    this object stops doing so).
+    This will happen regardless of how many regular pointers 
+    reference this object.
+    In other words, if you start using smart-pointers with a #GPEnabled#
+    object, you engage automatic mode for this object.  You should only do
+    this with objects dynamically allocated with operator #new#.  You should
+    never destroy the object yourself, but let the smart-pointers control the
+    life of the object.
+    
+    {\bf Performance considerations} --- Thread safe reference counting incurs
+    a significant overhead. Smart-pointer are best used with sizeable objects
+    for which the cost of maintaining the counters represent a small fraction
+    of the processing time.  It is always possible to cache a smart-pointer
+    into a regular pointer.  The cached pointer will remain valid until the
+    smart-pointer object is destroyed or the smart-pointer value is changed.
+
+    {\bf Safety considerations} --- As explained above, a #GPEnabled# object
+    switches to automatic mode as soon as it becomes referenced by a
+    smart-pointer.  There is no way to switch the object back to manual mode.
+    Suppose that you have decided to only use regular pointers with a
+    particular #GPEnabled# object.  You therefore plan to destroy the object
+    explicitly when you no longer need it.  When you pass a regular pointer to
+    this object as argument to a function, you really need to be certain that
+    the function implementation will not assign this pointer to a
+    smart-pointer.  Doing so would indeed destroy the object as soon as the
+    function returns.  The bad news is that the fact that a function assigns a
+    pointer argument to a smart-pointer does not necessarily appear in the
+    function prototype.  Such a behavior must be {\em documented} with the
+    function public interface.  As a convention, we usually write such
+    functions with smart-pointer arguments instead of a regular pointer
+    arguments.  This is not enough to catch the error at compile time, but
+    this is a simple way to document such a behavior.  We still believe that
+    this is a small problem in regard to the benefits of the smart-pointer.
+    But one has to be aware of its existence.  */
+
+template <class TYPE>
+class GP : protected GPBase
+{
+public:
+  /** Constructs a null smart-pointer. */
+  GP();
+  /** Constructs a copy of a smart-pointer.
+      @param sptr smart-pointer to copy. */
+  GP(const GP<TYPE> &sptr);
+  /** Constructs a smart-pointer from a regular pointer.
+      The pointed object must be dynamically allocated (with operator #new#).
+      You should no longer explicitly destroy the object referenced by #sptr#
+      since the object life is now controlled by smart-pointers.  
+      @param nptr regular pointer to a {\em dynamically allocated object}. */
+  GP(TYPE *nptr);
+  /** Converts a smart-pointer into a regular pointer.  
+      This is useful for caching the value of a smart-pointer for performances
+      purposes.  The cached pointer will remain valid until the smart-pointer
+      is destroyed or until the smart-pointer value is changed. */
+  operator TYPE* () const;
+  /** Assigns a regular pointer to a smart-pointer lvalue.
+      The pointed object must be dynamically allocated (with operator #new#).
+      You should no longer explicitly destroy the object referenced by #sptr#
+      since the object life is now controlled by smart-pointers.  
+      @param nptr regular pointer to a {\em dynamically allocated object}. */
+  GP<TYPE>& operator= (TYPE *nptr);
+  /** Assigns a smart-pointer to a smart-pointer lvalue.
+      @param sptr smart-pointer copied into this smart-pointer. */
+  GP<TYPE>& operator= (const GP<TYPE> &sptr);
+  /** Indirection operator.
+      This operator provides a convenient access to the members
+      of a smart-pointed object. Operator #-># works with smart-pointers
+      exactly as with regular pointers. */
+  TYPE* operator->() const;
+  /** Dereferencement operator.
+      This operator provides a convenient access to the smart-pointed object. 
+      Operator #*# works with smart-pointers exactly as with regular pointers. */
+  TYPE& operator*() const;
+  /** Comparison operator. 
+      Returns true if both this smart-pointer and pointer #nptr# point to the
+      same object.  The automatic conversion from smart-pointers to regular
+      pointers allows you to compare two smart-pointers as well.  
+      @param nptr pointer to compare with. */
+  int operator== (TYPE *nptr) const;
+  /** Comparison operator.  
+      Returns true if this smart-pointer and pointer #nptr# point to different
+      objects. The automatic conversion from smart-pointers to regular
+      pointers allows you to compare two smart-pointers as well.  
+      @param nptr pointer to compare with. */
+  int operator!= (TYPE *nptr) const;
+  /** Test operator.
+      Returns true if the smart-pointer is null.  The automatic conversion 
+      from smart-pointers to regular pointers allows you to test whether 
+      a smart-pointer is non-null.  You can use both following constructs:
+      \begin{verbatim}
+      if (gp) { ... }
+      while (! gp) { ... }
+      \end{verbatim} */
+  int operator! () const;
+};
+
+//@}
+
+// INLINE FOR GPENABLED
+
+inline
+GPEnabled::GPEnabled()
+  : count(0)
+{
+}
+
+inline
+GPEnabled::GPEnabled(const GPEnabled & obj) 
+  : count(0) 
+{
+
+}
+
+inline int
+GPEnabled::get_count(void) const
+{
+   return count;
+}
+
+inline GPEnabled & 
+GPEnabled::operator=(const GPEnabled & obj)
+{ 
+  /* The copy operator should do nothing because the count should not be
+     changed.  Subclasses of GPEnabled will call this version of the copy
+     operator as part of the default 'memberwise copy' strategy. */
+  return *this; 
+}
+
+inline void 
+GPEnabled::ref()
+{
+#if PARANOID_DEBUG
+  assert (count >= 0);
+#endif
+  atomicIncrement(&count);
+}
+
+inline void 
+GPEnabled::unref()
+{
+#if PARANOID_DEBUG
+  assert (count > 0);
+#endif
+  if (! atomicDecrement(&count))
+    destroy();
+}
+
+// INLINE FOR GPBASE
+
+inline
+GPBase::GPBase()
+  : ptr(0)
+{
+}
+
+inline
+GPBase::GPBase(GPEnabled *nptr)
+  : ptr(0)
+{
+  assign(nptr);
+}
+
+inline
+GPBase::GPBase(const GPBase &sptr)
+{
+  if (sptr.ptr)
+    sptr.ptr->ref();
+  ptr = sptr.ptr;
+}
+
+inline
+GPBase::~GPBase()
+{
+  GPEnabled *old = ptr;
+  ptr = 0;
+  if (old)
+    old->unref();
+}
+
+inline GPEnabled* 
+GPBase::get() const
+{
+#if PARANOID_DEBUG
+  if (ptr && ptr->get_count() <= 0)
+    *(int*)0=0;
+#endif
+  return ptr;
+}
+
+inline GPBase &
+GPBase::operator=(const GPBase & obj)
+{
+  return assign(obj);
+}
+
+inline int 
+GPBase::operator==(const GPBase & g2) const
+{
+  return ptr == g2.ptr;
+}
+
+
+
+
+// INLINE FOR GP<TYPE>
+
+template <class TYPE> inline
+GP<TYPE>::GP()
+{
+}
+
+template <class TYPE> inline
+GP<TYPE>::GP(TYPE *nptr)
+: GPBase((GPEnabled*)nptr)
+{
+}
+
+template <class TYPE> inline
+GP<TYPE>::GP(const GP<TYPE> &sptr)
+: GPBase((const GPBase&) sptr)
+{
+}
+
+template <class TYPE> inline
+GP<TYPE>::operator TYPE* () const
+{
+  return (TYPE*) ptr;
+}
+
+template <class TYPE> inline TYPE*
+GP<TYPE>::operator->() const
+{
+#if PARANOID_DEBUG
+  if (ptr && ptr->get_count() <= 0)
+    *(int*)0=0;
+#endif
+  return (TYPE*) ptr;
+}
+
+template <class TYPE> inline TYPE&
+GP<TYPE>::operator*() const
+{
+#if PARANOID_DEBUG
+  if (ptr && ptr->get_count() <= 0)
+    *(int*)0=0;
+#endif
+  return *(TYPE*) ptr;
+}
+
+template <class TYPE> inline GP<TYPE>& 
+GP<TYPE>::operator= (TYPE *nptr)
+{
+  return (GP<TYPE>&)( assign(nptr) );
+}
+
+template <class TYPE> inline GP<TYPE>& 
+GP<TYPE>::operator= (const GP<TYPE> &sptr)
+{
+  return (GP<TYPE>&)( assign((const GPBase&)sptr) );
+}
+
+template <class TYPE> inline int
+GP<TYPE>::operator== (TYPE *nptr) const
+{
+  return ( (TYPE*)ptr == nptr );
+}
+
+template <class TYPE> inline int
+GP<TYPE>::operator!= (TYPE *nptr) const
+{
+  return ( (TYPE*)ptr != nptr );
+}
+
+template <class TYPE> inline int
+GP<TYPE>::operator! () const
+{
+  return !ptr;
+}
+
+/* GPBUFFER */
+
+/* What is this LT innovation ? 
+   What does it do that a GArray does not do ? 
+   What about the objects construction and destruction ? */
+
+class DJVUAPI GPBufferBase
+{
+public:
+  GPBufferBase(void *&,const size_t n,const size_t t);
+  void swap(GPBufferBase &p);
+  void resize(const size_t n,const size_t t);
+  void replace(void *nptr,const size_t n);
+  void set(const size_t t,const char c);
+  ~GPBufferBase();
+  operator int(void) const { return ptr ? num : 0; }
+private:
+  void *&ptr;
+  size_t num;
+};
+
+template<class TYPE>
+class GPBuffer : public GPBufferBase
+{
+public:
+  GPBuffer(TYPE *&xptr,const size_t n=0) 
+    : GPBufferBase((void *&)xptr,n,sizeof(TYPE)) {}
+  inline void resize(const size_t n) {GPBufferBase::resize(n,sizeof(TYPE));}
+  inline void clear(void) {GPBufferBase::set(sizeof(TYPE),0);}
+  inline void set(const char c) {GPBufferBase::set(sizeof(TYPE),c);}
+  inline operator int(void) const {return GPBufferBase::operator int();}
+};
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp
new file mode 100644
index 0000000..181c0b2
--- /dev/null
+++ b/libdjvu/GString.cpp
@@ -0,0 +1,2719 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+// From: Leon Bottou, 1/31/2002
+// This file has very little to do with my initial implementation.
+// It has been practically rewritten by Lizardtech for i18n changes.
+// My original implementation was very small in comparison
+// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+// In my opinion, the duplication of the string classes is a failed
+// attempt to use the type system to enforce coding policies.
+// This could be fixed.  But there are better things to do in djvulibre.
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GString.h"
+#include "GThreads.h"
+#include "debug.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#if HAS_WCHAR
+# include <locale.h>
+# if !defined(AUTOCONF) || HAVE_WCHAR_H
+#  include <wchar.h>
+# endif
+# if HAS_WCTYPE
+#  include <wctype.h>
+# endif
+#endif
+#include <ctype.h>
+
+#ifndef LC_NUMERIC          //MingW
+# undef DO_CHANGELOCALE
+# define LC_NUMERIC 0
+#endif
+#ifndef DO_CHANGELOCALE
+# define DO_CHANGELOCALE 0
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+GBaseString::~GBaseString() {}
+GNativeString::~GNativeString() {}
+GUTF8String::~GUTF8String() {}
+
+#if !HAS_MBSTATE && HAS_WCHAR
+// Under some systems, wctomb() and mbtowc() are not thread
+// safe.  In those cases, wcrtomb and mbrtowc are preferred.
+// For Solaris, wctomb() and mbtowc() are thread safe, and 
+// wcrtomb() and mbrtowc() don't exist.
+
+#define wcrtomb MYwcrtomb
+#define mbrtowc MYmbrtowc
+#define mbrlen  MYmbrlen
+
+static inline int
+wcrtomb(char *bytes,wchar_t w,mbstate_t *)
+{
+  return wctomb(bytes,w);
+}
+
+static inline int
+mbrtowc(wchar_t *w,const char *source, size_t n, mbstate_t *)
+{
+  return mbtowc(w,source,n);
+}
+
+static inline size_t
+mbrlen(const char *s, size_t n, mbstate_t *)
+{
+  return mblen(s,n);
+}
+#endif // !HAS_MBSTATE || HAS_WCHAR
+
+
+GP<GStringRep>
+GStringRep::upcase(void) const
+{ return tocase(giswupper,gtowupper); }
+
+GP<GStringRep>
+GStringRep::downcase(void) const
+{ return tocase(giswlower,gtowlower); }
+
+GP<GStringRep>
+GStringRep::UTF8::create(const unsigned int sz)
+{
+  return GStringRep::create(sz,(GStringRep::UTF8 *)0);
+}
+
+GP<GStringRep>
+GStringRep::UTF8::create(const char *s)
+{
+  GStringRep::UTF8 dummy;
+  return dummy.strdup(s);
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::create(const GP<GStringRep> &s1,const GP<GStringRep> &s2)
+{
+  GStringRep::UTF8 dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::create( const GP<GStringRep> &s1,const char *s2)
+{
+  GStringRep::UTF8 dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::create( const char *s1, const GP<GStringRep> &s2)
+{
+  GStringRep::UTF8 dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::create( const char *s1,const char *s2)
+{ 
+  GStringRep::UTF8 dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::create(const char *s,const int start,const int length)
+{
+  GStringRep::UTF8 dummy;
+  return dummy.substr(s,start,length);
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::create(
+  const uint16_t *s,const int start,const int length)
+{
+  GStringRep::UTF8 dummy;
+  return dummy.substr(s,start,length);
+}
+
+GP<GStringRep>
+GStringRep::UTF8::create(
+  const uint32_t *s,const int start,const int length)
+{
+  GStringRep::UTF8 dummy;
+  return dummy.substr(s,start,length);
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::blank(const unsigned int sz) const
+{
+   return GStringRep::create(sz,(GStringRep::UTF8 *)0);
+}
+
+bool
+GStringRep::UTF8::isUTF8(void) const
+{
+  return true;
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::toThis(
+    const GP<GStringRep> &rep,const GP<GStringRep> &) const
+{
+  return rep?(rep->toUTF8(true)):rep;
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::create(const char fmt[],va_list& args)
+{ 
+  const GP<GStringRep> s(create(fmt));
+  return (s?(s->vformat(args)):s);
+}
+
+#if !HAS_WCHAR
+
+#define NATIVE_CREATE(x) UTF8::create( x );
+
+#ifdef LC_ALL
+#undef LC_ALL
+#endif
+#define LC_ALL 0
+
+class GStringRep::ChangeLocale
+{
+public:
+  ChangeLocale(const int,const char *) {}
+  ~ChangeLocale() {};
+};
+
+GP<GStringRep>
+GStringRep::NativeToUTF8( const char *s )
+{
+  return GStringRep::UTF8::create(s);
+}
+
+#else
+
+#define NATIVE_CREATE(x) Native::create( x );
+
+// The declaration and implementation of GStringRep::ChangeLocale
+// Not used in WinCE
+
+class GStringRep::ChangeLocale
+{
+public:
+  ChangeLocale(const int category,const char locale[]);
+  ~ChangeLocale();
+private:
+  GUTF8String locale;
+  int category;
+};
+
+class GStringRep::Native : public GStringRep
+{
+public:
+  // default constructor
+  Native(void);
+  // virtual destructor
+  virtual ~Native();
+
+    // Other virtual methods.
+      // Create an empty string.
+  virtual GP<GStringRep> blank(const unsigned int sz = 0) const;
+      // Append a string.
+  virtual GP<GStringRep> append(const GP<GStringRep> &s2) const;
+      // Test if Native.
+  virtual bool isNative(void) const;
+      // Convert to Native.
+  virtual GP<GStringRep> toNative(
+    const EscapeMode escape=UNKNOWN_ESCAPED) const;
+      // Convert to UTF8.
+  virtual GP<GStringRep> toUTF8(const bool nothrow=false) const;
+      // Convert to UTF8.
+  virtual GP<GStringRep> toThis(
+     const GP<GStringRep> &rep,const GP<GStringRep> &) const;
+      // Compare with #s2#.
+  virtual int cmp(const GP<GStringRep> &s2, const int len=(-1)) const;
+
+  // Convert strings to numbers.
+  virtual int toInt(void) const;
+  virtual long toLong(
+    const int pos, int &endpos, const int base=10) const;
+  virtual unsigned long toULong(
+    const int pos, int &endpos, const int base=10) const;
+  virtual double toDouble(
+    const int pos, int &endpos) const;
+
+    // Create an empty string
+  static GP<GStringRep> create(const unsigned int sz = 0);
+
+    // Create a strdup string.
+  static GP<GStringRep> create(const char *s);
+
+  // Creates by appending to the current string
+
+   // Creates with a concat operation.
+  static GP<GStringRep> create(
+    const GP<GStringRep> &s1,const GP<GStringRep> &s2);
+  static GP<GStringRep> create( const GP<GStringRep> &s1,const char *s2);
+  static GP<GStringRep> create( const char *s1, const GP<GStringRep> &s2);
+  static GP<GStringRep> create(const char *s1,const char *s2);
+
+    // Create with a strdup and substr operation.
+  static GP<GStringRep> create(
+    const char *s,const int start,const int length=(-1));
+  static GP<GStringRep> create(
+    const uint16_t *s,const int start,const int length=(-1));
+  static GP<GStringRep> create(
+    const uint32_t *s,const int start,const int length=(-1));
+
+    // Create with an sprintf()
+  static GP<GStringRep> create_format(const char fmt[],...);
+  static GP<GStringRep> create(const char fmt[],va_list &args);
+
+  virtual unsigned char *UCS4toString(
+    const uint32_t w,unsigned char *ptr, mbstate_t *ps=0) const;
+
+  // Tests if a string is legally encoded in the current character set.
+  virtual bool is_valid(void) const;
+
+  virtual int ncopy(wchar_t * const buf, const int buflen) const;
+
+  friend class GBaseString;
+protected:
+  // Return the next character and increment the source pointer.
+  virtual uint32_t getValidUCS4(const char *&source) const;
+};
+
+GP<GStringRep>
+GStringRep::Native::create(const unsigned int sz)
+{
+  return GStringRep::create(sz,(GStringRep::Native *)0);
+}
+
+    // Create a strdup string.
+GP<GStringRep>
+GStringRep::Native::create(const char *s)
+{
+  GStringRep::Native dummy;
+  return dummy.strdup(s);
+}
+
+GP<GStringRep>
+GStringRep::Native::create(const GP<GStringRep> &s1,const GP<GStringRep> &s2)
+{
+  GStringRep::Native dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep> 
+GStringRep::Native::create( const GP<GStringRep> &s1,const char *s2)
+{
+  GStringRep::Native dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep>
+GStringRep::Native::create( const char *s1, const GP<GStringRep> &s2)
+{
+  GStringRep::Native dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep>
+GStringRep::Native::create(const char *s1,const char *s2)
+{
+  GStringRep::Native dummy;
+  return dummy.concat(s1,s2);
+}
+
+GP<GStringRep>
+GStringRep::Native::create(
+  const char *s,const int start,const int length)
+{
+  GStringRep::Native dummy;
+  return dummy.substr(s,start,length);
+}
+
+GP<GStringRep>
+GStringRep::Native::create(
+    const uint16_t *s,const int start,const int length)
+{
+  GStringRep::Native dummy;
+  return dummy.substr(s,start,length);
+}
+
+GP<GStringRep>
+GStringRep::Native::create(
+  const uint32_t *s,const int start,const int length)
+{
+  GStringRep::Native dummy;
+  return dummy.substr(s,start,length);
+}
+
+GP<GStringRep> 
+GStringRep::Native::blank(const unsigned int sz) const
+{
+  return GStringRep::create(sz,(GStringRep::Native *)0);
+}
+
+bool
+GStringRep::Native::isNative(void) const
+{
+  return true;
+}
+
+GP<GStringRep>
+GStringRep::Native::toThis(
+     const GP<GStringRep> &rep,const GP<GStringRep> &) const
+{
+  return rep?(rep->toNative(NOT_ESCAPED)):rep;
+}
+
+GP<GStringRep> 
+GStringRep::Native::create(const char fmt[],va_list &args)
+{ 
+  const GP<GStringRep> s(create(fmt));
+  return (s?(s->vformat(args)):s);
+}
+
+int
+GStringRep::Native::ncopy(
+  wchar_t * const buf, const int buflen ) const
+{
+  return toUTF8()->ncopy(buf,buflen);
+}
+
+GStringRep::ChangeLocale::ChangeLocale(const int xcategory, const char xlocale[] )
+  : category(xcategory)
+{
+#if DO_CHANGELOCALE
+  // This is disabled under UNIX because 
+  // it does not play nice with MT.
+  if(xlocale)
+    {
+      locale=setlocale(xcategory,0);
+      if(locale.length() &&(locale!=xlocale))
+        {
+          if(locale == setlocale(category,xlocale))
+            {
+              locale.empty();
+            }
+        }
+      else
+        {
+          locale.empty();
+        }
+    }
+#endif
+}
+
+GStringRep::ChangeLocale::~ChangeLocale()
+{
+#if DO_CHANGELOCALE
+  if(locale.length())
+    {
+      setlocale(category,(const char *)locale);
+    }
+#endif
+}
+
+GNativeString &
+GNativeString::format(const char fmt[], ... )
+{
+  va_list args;
+  va_start(args, fmt);
+  return init(GStringRep::Native::create(fmt,args));
+}
+
+// Gather the native implementations here. Not used in WinCE.
+
+GStringRep::Native::Native(void) {}
+GStringRep::Native::~Native() {}
+
+GP<GStringRep>
+GStringRep::Native::append(const GP<GStringRep> &s2) const
+{
+  GP<GStringRep> retval;
+  if(s2)
+  {
+    if(s2->isUTF8())
+    {
+      G_THROW( ERR_MSG("GStringRep.appendUTF8toNative") );
+    }
+    retval=concat(data,s2->data);
+  }else
+  {
+    retval=const_cast<GStringRep::Native *>(this); 
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::Native::create_format(const char fmt[],...)
+{
+  va_list args;
+  va_start(args, fmt);
+  return create(fmt,args);
+}
+
+unsigned char *
+GStringRep::Native::UCS4toString(
+  const uint32_t w0,unsigned char *ptr, mbstate_t *ps) const
+{
+  return UCS4toNative(w0,ptr,ps);
+}
+
+// Convert a UCS4 to a multibyte string in the value bytes.  
+// The data pointed to by ptr should be long enough to contain
+// the results with a nill termination.  (Normally 7 characters
+// is enough.)
+unsigned char *
+GStringRep::UCS4toNative(const uint32_t w0,unsigned char *ptr, mbstate_t *ps)
+{
+  uint16_t w1;
+  uint16_t w2=1;
+  for(int count=(sizeof(wchar_t)==sizeof(w1)) 
+        ? UCS4toUTF16(w0,w1,w2) : 1;
+      count;
+      --count,w1=w2)
+    {
+      // wchar_t can be either UCS4 or UCS2
+      const wchar_t w=(sizeof(wchar_t) == sizeof(w1))?(wchar_t)w1:(wchar_t)w0;
+      int i=wcrtomb((char *)ptr,w,ps);
+      if(i<0)
+        break;
+      ptr[i]=0;
+      ptr += i;
+    }
+  ptr[0]=0;
+  return ptr;
+}
+
+GP<GStringRep>
+GStringRep::Native::toNative(const EscapeMode escape) const
+{
+  if(escape == UNKNOWN_ESCAPED)
+    G_THROW( ERR_MSG("GStringRep.NativeToNative") );
+  return const_cast<GStringRep::Native *>(this);
+}
+
+GP<GStringRep>
+GStringRep::Native::toUTF8(const bool) const
+{
+  unsigned char *buf;
+  GPBuffer<unsigned char> gbuf(buf,size*6+1);
+  buf[0]=0;
+  if(data && size)
+  {
+    size_t n=size;
+    const char *source=data;
+    mbstate_t ps;
+    unsigned char *ptr=buf;
+    //(void)mbrlen(source, n, &ps);
+    memset(&ps,0,sizeof(mbstate_t));
+    int i=0;
+    if(sizeof(wchar_t) == sizeof(uint32_t))
+      {
+        wchar_t w = 0;
+        for(;(n>0)&&((i=mbrtowc(&w,source,n,&ps))>=0); n-=i,source+=i)
+          {
+            ptr=UCS4toUTF8((uint32_t)w,ptr);
+          }
+      }
+    else
+      { 
+        wchar_t w = 0;
+        for(;(n>0)&&((i=mbrtowc(&w,source,n,&ps))>=0);n-=i,source+=i)
+          {
+            uint16_t s[2];
+            s[0]=w;
+            uint32_t w0;
+            if(UTF16toUCS4(w0,s,s+1)<=0)
+              {
+                source+=i;
+                n-=i;
+                if((n>0)&&((i=mbrtowc(&w,source,n,&ps))>=0))
+                  {
+                    s[1]=w;
+                    if(UTF16toUCS4(w0,s,s+2)<=0)
+                      {
+                        i=(-1);
+                        break;
+                      }
+                  }
+                else
+                  {
+                    i=(-1);
+                    break;
+                  }
+              }
+            ptr=UCS4toUTF8(w0,ptr);
+          }
+      }
+    if(i<0)
+      {
+        gbuf.resize(0);
+      }
+    else
+      {
+        ptr[0]=0;
+      }
+  }
+  return GStringRep::UTF8::create((const char *)buf);
+}
+
+GNativeString
+GBaseString::UTF8ToNative(
+  const bool currentlocale,const EscapeMode escape) const
+{
+  const char *source=(*this);
+  GP<GStringRep> retval;
+  if(source && source[0]) 
+    {
+#if DO_CHANGELOCALE
+      GUTF8String lc_ctype(setlocale(LC_CTYPE,0));
+      bool repeat;
+      for(repeat=!currentlocale;;repeat=false)
+        {
+#endif
+          retval=(*this)->toNative((GStringRep::EscapeMode)escape);
+#if DO_CHANGELOCALE
+          if (!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
+            break;
+        }
+      if(!repeat)
+        setlocale(LC_CTYPE,(const char *)lc_ctype);
+#endif
+    }
+  return GNativeString(retval);
+}
+
+/*MBCS*/
+GNativeString
+GBaseString::getUTF82Native( EscapeMode escape ) const
+{ //MBCS cvt
+  GNativeString retval;
+
+  // We don't want to convert this if it 
+  // already is known to be native...
+//  if (isNative()) return *this;
+
+  const size_t slen=length()+1;
+  if(slen>1)
+  {
+    retval=UTF8ToNative(false,escape) ;
+    if(!retval.length())
+    {
+      retval=(const char*)*this;
+    }
+  }
+  return retval;
+}
+
+GUTF8String
+GBaseString::NativeToUTF8(void) const
+{
+  GP<GStringRep> retval;
+  if(length())
+  {
+    const char *source=(*this);
+#if DO_CHANGELOCALE
+    GUTF8String lc_ctype=setlocale(LC_CTYPE,0);
+    bool repeat;
+    for(repeat=true;;repeat=false)
+      {
+#endif
+        if( (retval=GStringRep::NativeToUTF8(source)) )
+          if(GStringRep::cmp(retval->toNative(),source))
+            retval=GStringRep::UTF8::create((unsigned int)0);
+#if DO_CHANGELOCALE
+        if(!repeat || retval || (lc_ctype == setlocale(LC_CTYPE,"")))
+          break;
+      }
+    if(!repeat)
+      setlocale(LC_CTYPE,(const char *)lc_ctype);
+#endif
+  }
+  return GUTF8String(retval);
+}
+
+GUTF8String
+GBaseString::getNative2UTF8(void) const
+{ //MBCS cvt
+
+   // We don't want to do a transform this
+   // if we already are in the given type.
+//   if (isUTF8()) return *this;
+   
+  const size_t slen=length()+1;
+  GUTF8String retval;
+  if(slen > 1)
+  {
+    retval=NativeToUTF8();
+    if(!retval.length())
+    {
+      retval=(const char *)(*this);
+    }
+  }
+  return retval;
+} /*MBCS*/
+
+int
+GStringRep::Native::cmp(const GP<GStringRep> &s2,const int len) const
+{
+  int retval;
+  if(s2)
+  {
+    if(s2->isUTF8())
+    {
+      const GP<GStringRep> r(toUTF8(true));
+      if(r)
+      {
+        retval=GStringRep::cmp(r->data,s2->data,len);
+      }else
+      {
+        retval=cmp(s2->toNative(NOT_ESCAPED),len);
+      }
+    }else
+    {
+      retval=GStringRep::cmp(data,s2->data,len);
+    }
+  }else
+  {
+    retval=GStringRep::cmp(data,0,len);
+  }
+  return retval;
+}
+
+int
+GStringRep::Native::toInt() const
+{
+  return atoi(data);
+}
+
+long
+GStringRep::Native::toLong(
+  const int pos, int &endpos, const int base) const
+{
+   char *edata=0;
+   const long retval=strtol(data+pos, &edata, base);
+   if(edata)
+   {
+     endpos=(int)((size_t)edata-(size_t)data);
+   }else
+   {
+     endpos=(-1);
+   }
+   return retval;
+}
+
+unsigned long
+GStringRep::Native::toULong(
+  const int pos, int &endpos, const int base) const
+{
+   char *edata=0;
+   const unsigned long retval=strtoul(data+pos, &edata, base);
+   if(edata)
+   {
+     endpos=(int)((size_t)edata-(size_t)data);
+   }else
+   {
+     endpos=(-1);
+   }
+   return retval;
+}
+
+double
+GStringRep::Native::toDouble(
+  const int pos, int &endpos) const
+{
+   char *edata=0;
+   const double retval=strtod(data+pos, &edata);
+   if(edata)
+   {
+     endpos=(int)((size_t)edata-(size_t)data);
+   }else
+   {
+     endpos=(-1);
+   }
+   return retval;
+}
+
+uint32_t
+GStringRep::Native::getValidUCS4(const char *&source) const
+{
+  uint32_t retval=0;
+  int n=(int)((size_t)size+(size_t)data-(size_t)source);
+  if(source && (n > 0))
+  {
+    mbstate_t ps;
+    //(void)mbrlen(source, n, &ps);
+    memset(&ps,0,sizeof(mbstate_t));
+    wchar_t wt;
+    const int len=mbrtowc(&wt,source,n,&ps); 
+    if(len>=0)
+    {
+      if(sizeof(wchar_t) == sizeof(uint16_t))
+      {
+        source+=len;
+        uint16_t s[2];
+        s[0]=(uint16_t)wt;
+        if(UTF16toUCS4(retval,s,s+1)<=0)
+        {
+          if((n-=len)>0)
+          {
+            const int len=mbrtowc(&wt,source,n,&ps);
+            if(len>=0)
+            {
+              s[1]=(uint16_t)wt;
+              uint32_t w;
+              if(UTF16toUCS4(w,s,s+2)>0)
+              {
+                source+=len;
+                retval=w;
+              }
+            }
+          }
+        }
+      }else
+      {
+        retval=(uint32_t)wt;
+        source++;
+      } 
+    }else
+    {
+      source++;
+    }
+  }
+  return retval;
+}
+
+// Tests if a string is legally encoded in the current character set.
+bool 
+GStringRep::Native::is_valid(void) const
+{
+  bool retval=true;
+  if(data && size)
+  {
+    size_t n=size;
+    const char *s=data;
+    mbstate_t ps;
+    //(void)mbrlen(s, n, &ps);
+    memset(&ps,0,sizeof(mbstate_t));
+    do
+    {
+      size_t m=mbrlen(s,n,&ps);
+      if(m > n)
+      {
+        retval=false;
+        break;
+      }else if(m)
+      {
+        s+=m;
+        n-=m;
+      }else
+      {
+        break;
+      }
+    } while(n);
+  }
+  return retval;
+}
+
+// These are dummy functions.
+void 
+GStringRep::set_remainder(void const * const, const unsigned int,
+  const EncodeType) {}
+void 
+GStringRep::set_remainder(void const * const, const unsigned int,
+  const GP<GStringRep> &encoding) {}
+void
+GStringRep::set_remainder( const GP<GStringRep::Unicode> &) {}
+
+GP<GStringRep::Unicode>
+GStringRep::get_remainder( void ) const
+{
+  return 0;
+}
+
+GNativeString::GNativeString(const char dat)
+{
+  init(GStringRep::Native::create(&dat,0,1));
+}
+
+GNativeString::GNativeString(const char *str)
+{
+  init(GStringRep::Native::create(str));
+}
+
+GNativeString::GNativeString(const unsigned char *str)
+{
+  init(GStringRep::Native::create((const char *)str));
+}
+
+GNativeString::GNativeString(const uint16_t *str)
+{
+  init(GStringRep::Native::create(str,0,-1));
+}
+
+GNativeString::GNativeString(const uint32_t *str)
+{
+  init(GStringRep::Native::create(str,0,-1));
+}
+
+GNativeString::GNativeString(const char *dat, unsigned int len)
+{
+  init(
+    GStringRep::Native::create(dat,0,((int)len<0)?(-1):(int)len));
+}
+
+GNativeString::GNativeString(const uint16_t *dat, unsigned int len)
+{
+  init(
+    GStringRep::Native::create(dat,0,((int)len<0)?(-1):(int)len));
+}
+
+GNativeString::GNativeString(const uint32_t *dat, unsigned int len)
+{
+  init(
+    GStringRep::Native::create(dat,0,((int)len<0)?(-1):(int)len));
+}
+
+GNativeString::GNativeString(const GNativeString &str)
+{
+  init(str);
+}
+
+GNativeString::GNativeString(const GBaseString &gs, int from, int len)
+{
+  init(
+    GStringRep::Native::create(gs,from,((int)len<0)?(-1):(int)len));
+}
+
+GNativeString::GNativeString(const int number)
+{
+  init(GStringRep::Native::create_format("%d",number));
+}
+
+GNativeString::GNativeString(const double number)
+{
+  init(GStringRep::Native::create_format("%f",number));
+}
+
+GNativeString&
+GNativeString::operator= (const char str)
+{ return init(GStringRep::Native::create(&str,0,1)); }
+
+GNativeString&
+GNativeString::operator= (const char *str)
+{ return init(GStringRep::Native::create(str)); }
+
+GNativeString
+GBaseString::operator+(const GNativeString &s2) const
+{
+  return GStringRep::Native::create(*this,s2);
+}
+
+GP<GStringRep>
+GStringRep::NativeToUTF8( const char *s )
+{
+  return GStringRep::Native::create(s)->toUTF8();
+}
+
+#endif // HAS_WCHAR
+
+template <class TYPE>
+GP<GStringRep>
+GStringRep::create(const unsigned int sz, TYPE *)
+{
+  GP<GStringRep> gaddr;
+  if (sz > 0)
+  {
+    GStringRep *addr;
+    gaddr=(addr=new TYPE);
+    addr->data=(char *)(::operator new(sz+1));
+    addr->size = sz;
+    addr->data[sz] = 0;
+  }
+  return gaddr;
+}
+
+GP<GStringRep>
+GStringRep::strdup(const char *s) const
+{
+  GP<GStringRep> retval;
+  const int length=s?strlen(s):0;
+  if(length>0)
+  {
+    retval=blank(length);
+    char const * const end=s+length;
+    char *ptr=retval->data;
+    for(;*s&&(s!=end);ptr++)
+    {
+      ptr[0]=s++[0];
+    }
+    ptr[0]=0;
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::substr(const char *s,const int start,const int len) const
+{
+  GP<GStringRep> retval;
+  if(s && s[0])
+  {
+    const unsigned int length=(start<0 || len<0)?(unsigned int)strlen(s):(unsigned int)(-1);
+    const char *startptr, *endptr;
+    if(start<0)
+    {
+      startptr=s+length+start;
+      if(startptr<s)
+        startptr=s;
+    }else
+    { 
+      startptr=s;
+      for(const char * const ptr=s+start;(startptr<ptr)&&*startptr;++startptr)
+        EMPTY_LOOP;
+    }
+    if(len<0)
+    {
+      if(s+length+1 < startptr+len)
+      {
+        endptr=startptr;
+      }else
+      {
+        endptr=s+length+1+len;
+      } 
+    }else
+    {
+      endptr=startptr;
+      for(const char * const ptr=startptr+len;(endptr<ptr)&&*endptr;++endptr)
+        EMPTY_LOOP;
+    }
+    if(endptr>startptr)
+    {
+      retval=blank((size_t)(endptr-startptr));
+      char *data=retval->data;
+      for(; (startptr<endptr) && *startptr; ++startptr,++data)
+      {
+        data[0]=startptr[0];
+      }
+      data[0]=0;
+    }
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::substr(const uint16_t *s,const int start,const int len) const
+{
+  GP<GStringRep> retval;
+  if(s && s[0])
+  {
+    uint16_t const *eptr;
+    if(len<0)
+    {
+      for(eptr=s;eptr[0];++eptr)
+        EMPTY_LOOP;
+    }else
+    {
+      eptr=&(s[len]);
+    }
+    s=&s[start];
+    if((size_t)s<(size_t)eptr)
+    {
+      mbstate_t ps;
+      memset(&ps,0,sizeof(mbstate_t));
+      unsigned char *buf,*ptr;
+      GPBuffer<unsigned char> gbuf(buf,(((size_t)eptr-(size_t)s)/2)*3+7);
+      for(ptr=buf;s[0];)
+      {
+        uint32_t w;
+        int i=UTF16toUCS4(w,s,eptr);
+        if(i<=0)
+          break;
+        s+=i;
+        ptr=UCS4toString(w,ptr,&ps);
+      }
+      ptr[0]=0;
+      retval = strdup( (const char *)buf );
+    }
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::substr(const uint32_t *s,const int start,const int len) const
+{
+  GP<GStringRep> retval;
+  if(s && s[0])
+  {
+    uint32_t const *eptr;
+    if(len<0)
+    {
+      for(eptr=s;eptr[0];++eptr)
+        EMPTY_LOOP;
+    }else
+    {
+      eptr=&(s[len]);
+    }
+    s=&s[start];
+    if((size_t)s<(size_t)eptr)
+    {
+      mbstate_t ps;
+      memset(&ps,0,sizeof(mbstate_t));
+      unsigned char *buf,*ptr;
+      GPBuffer<unsigned char> gbuf(buf,((((size_t)eptr-(size_t)s))/4)*6+7);
+      for(ptr=buf;s[0];++s)
+      {
+        ptr=UCS4toString(s[0],ptr,&ps);
+      }
+      ptr[0]=0;
+      retval = strdup( (const char *)buf );
+    }
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::append(const char *s2) const
+{
+  GP<GStringRep> retval;
+  if(s2)
+  {
+    retval=concat(data,s2);
+  }else
+  {
+    retval=const_cast<GStringRep *>(this);
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::UTF8::append(const GP<GStringRep> &s2) const
+{
+  GP<GStringRep> retval;
+  if(s2)
+  {
+    if(s2->isNative())
+    {
+      G_THROW( ERR_MSG("GStringRep.appendNativeToUTF8") );
+    }
+    retval=concat(data,s2->data);
+  }else
+  {
+    retval=const_cast<GStringRep::UTF8 *>(this); 
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::concat(const char *s1,const char *s2) const
+{
+  const int length1=(s1?strlen(s1):0);
+  const int length2=(s2?strlen(s2):0);
+  const int length=length1+length2;
+  GP<GStringRep> retval;
+  if(length>0)
+  {
+    retval=blank(length);
+    GStringRep &r=*retval;
+    if(length1)
+    {
+      strcpy(r.data,s1);
+      if(length2)
+        strcat(r.data,s2);
+    }else
+    {
+      strcpy(r.data,s2);
+    }
+  }
+  return retval;
+}
+
+const char *GBaseString::nullstr = "";
+
+void
+GBaseString::empty( void )
+{
+  init(0);
+}
+
+GP<GStringRep>
+GStringRep::getbuf(int n) const
+{
+  GP<GStringRep> retval;
+  if(n< 0)
+    n=strlen(data);
+  if(n>0)
+  {
+    retval=blank(n);
+    char *ndata=retval->data;
+    strncpy(ndata,data,n);
+    ndata[n]=0;
+  }
+  return retval;
+}
+
+const char *
+GStringRep::isCharType(bool (*xiswtest)(const unsigned long wc), 
+                       const char *ptr, 
+                       const bool reverse) const
+{
+  const char *xptr = ptr;
+  unsigned long w=getValidUCS4(xptr);
+  if(ptr != xptr)
+    {
+      if (sizeof(wchar_t) == 2)
+        w &= 0xffff;
+      if (reverse ^ xiswtest(w))
+        ptr = xptr;
+    }
+  return ptr;
+}
+
+int
+GStringRep::nextCharType(
+  bool (*xiswtest)(const unsigned long wc), const int from, const int len,
+  const bool reverse) const
+{
+  // We want to return the position of the next
+  // non white space starting from the #from#
+  // location.  isspace should work in any locale
+  // so we should only need to do this for the non-
+  // native locales (UTF8)
+  int retval;
+  if(from<size)
+  {
+    retval=from;
+    const char * ptr = data+from;
+    for( const char * const eptr=ptr+((len<0)?(size-from):len);
+      (ptr<eptr) && *ptr;)
+    {
+       // Skip characters that fail the isCharType test
+      char const * const xptr=isCharType(xiswtest,ptr,!reverse);
+      if(xptr == ptr)
+        break;
+      ptr=xptr;
+    }
+    retval=(int)((size_t)ptr-(size_t)data);
+  }else
+  {
+    retval=size;
+  }
+  return retval;
+}
+
+bool
+GStringRep::giswspace(const unsigned long w)
+{
+#if HAS_WCTYPE
+  return !!iswspace((wchar_t)w);
+#else
+  return (w & ~0xff) ? false : !!isspace((int)(w & 0xff));
+#endif
+}
+
+bool
+GStringRep::giswupper(const unsigned long w)
+{
+#if HAS_WCTYPE
+  return !!iswupper((wchar_t)w);
+#else
+  return (w & ~0xff) ? false : !!isupper((int)(w & 0xff));
+#endif
+}
+
+bool
+GStringRep::giswlower(const unsigned long w)
+{
+#if HAS_WCTYPE
+  return !!iswlower((wchar_t)w);
+#else
+  return (w & ~0xff) ? false : !!islower((int)(w & 0xff));
+#endif
+}
+
+unsigned long
+GStringRep::gtowupper(const unsigned long w)
+{
+#if HAS_WCTYPE
+  return (unsigned long)towupper((wchar_t)w);
+#else
+  return (w&~0xff) ? w : (unsigned long)toupper(w & 0xff);
+#endif
+}
+
+unsigned long
+GStringRep::gtowlower(const unsigned long w)
+{
+#if HAS_WCTYPE
+  return (unsigned long)towlower((wchar_t)w);
+#else
+  return (w&~0xff) ? w : (unsigned long)tolower(w & 0xff);
+#endif
+}
+
+GP<GStringRep>
+GStringRep::tocase(
+  bool (*xiswcase)(const unsigned long wc),
+  unsigned long (*xtowcase)(const unsigned long wc)) const
+{
+  GP<GStringRep> retval;
+  char const * const eptr=data+size;
+  char const *ptr=data;
+  while(ptr<eptr)
+  {
+    char const * const xptr=isCharType(xiswcase,ptr,false);
+    if(ptr == xptr)
+      break;
+    ptr=xptr;
+  }
+  if(ptr<eptr)
+  {
+    const int n=(int)((size_t)ptr-(size_t)data);
+    unsigned char *buf;
+    GPBuffer<unsigned char> gbuf(buf,n+(1+size-n)*6);
+    if(n>0)
+    {
+      strncpy((char *)buf,data,n);
+    }
+    unsigned char *buf_ptr=buf+n;
+    for(char const *ptr=data+n;ptr<eptr;)
+    {
+      char const * const xptr=ptr;
+      const unsigned long w=getValidUCS4(ptr);
+      if(ptr == xptr)
+        break;
+      if(xiswcase(w))
+      {
+        const int len=(int)((size_t)ptr-(size_t)xptr);
+        strncpy((char *)buf_ptr,xptr,len);
+        buf_ptr+=len;
+      }else
+      {
+        mbstate_t ps;
+        memset(&ps,0,sizeof(mbstate_t));
+        buf_ptr=UCS4toString(xtowcase(w),buf_ptr,&ps);
+      }
+    }
+    buf_ptr[0]=0;
+    retval=substr((const char *)buf,0,(int)((size_t)buf_ptr-(size_t)buf));
+  }else
+  {
+    retval=const_cast<GStringRep *>(this);
+  }
+  return retval;
+}
+
+// Returns a copy of this string with characters used in XML escaped as follows:
+//      '<'  -->  "&lt;"
+//      '>'  -->  "&gt;"
+//      '&'  -->  "&amp;"
+//      '\'' -->  "&apos;"
+//      '\"' -->  "&quot;"
+//  Also escapes characters 0x00 through 0x1f and 0x7e through 0x7f.
+GP<GStringRep>
+GStringRep::toEscaped( const bool tosevenbit ) const
+{
+  bool modified=false;
+  char *ret;
+  GPBuffer<char> gret(ret,size*7);
+  ret[0]=0;
+  char *retptr=ret;
+  char const *start=data;
+  char const *s=start;
+  char const *last=s;
+  GP<GStringRep> special;
+  for(unsigned long w;(w=getValidUCS4(s));last=s)  
+    // Whoever wrote this for statement should be __complete_here__
+  {
+    char const *ss=0;
+    switch(w)
+    {
+    case '<':
+      ss="&lt;";
+      break;
+    case '>':
+      ss="&gt;";
+      break;
+    case '&':
+      ss="&amp;";
+      break;
+    case '\47':
+      ss="&apos;";
+      break;
+    case '\42':
+      ss="&quot;";
+      break;
+    default:
+      if((w<' ')||(w>=0x7e && (tosevenbit || (w < 0x80))))
+      {
+        special=toThis(UTF8::create_format("&#%lu;",w));
+        ss=special->data;
+      }
+      break;
+    }
+    if(ss)
+    {
+      modified=true;
+      if(s!=start)
+      {
+        size_t len=(size_t)last-(size_t)start;
+        strncpy(retptr,start,len);
+        retptr+=len;
+        start=s;
+      }
+      if(ss[0])
+      {
+        size_t len=strlen(ss);
+        strcpy(retptr,ss);
+        retptr+=len;
+      }
+    }
+  }
+  GP<GStringRep> retval;
+  if(modified)
+  {
+    strcpy(retptr,start);
+    retval=strdup( ret );
+  }else
+  {
+    retval=const_cast<GStringRep *>(this);
+  }
+//  DEBUG_MSG( "Escaped string is '" << ret << "'\n" );
+  return retval;
+}
+
+
+static const GMap<GUTF8String,GUTF8String> &
+BasicMap( void )
+{
+  static GMap<GUTF8String,GUTF8String> Basic;
+  if (! Basic.size())
+    {
+      Basic["lt"]   = GUTF8String('<');
+      Basic["gt"]   = GUTF8String('>');
+      Basic["amp"]  = GUTF8String('&');
+      Basic["apos"] = GUTF8String('\47');
+      Basic["quot"] = GUTF8String('\42');
+    }
+  return Basic;
+}
+
+GUTF8String
+GUTF8String::fromEscaped( const GMap<GUTF8String,GUTF8String> ConvMap ) const
+{
+  GUTF8String ret;                  // Build output string here
+  int start_locn = 0;           // Beginning of substring to skip
+  int amp_locn;                 // Location of a found ampersand
+
+  while( (amp_locn = search( '&', start_locn )) > -1 )
+  {
+      // Found the next apostrophe
+      // Locate the closing semicolon
+    const int semi_locn = search( ';', amp_locn );
+      // No closing semicolon, exit and copy
+      //  the rest of the string.
+    if( semi_locn < 0 )
+      break;
+    ret += substr( start_locn, amp_locn - start_locn );
+    int const len = semi_locn - amp_locn - 1;
+    if(len)
+    {
+      GUTF8String key = substr( amp_locn+1, len);
+      //DEBUG_MSG( "key = '" << key << "'\n" );
+      char const * s=key;
+      if( s[0] == '#')
+      {
+        unsigned long value;
+        char *ptr=0;
+        if(s[1] == 'x' || s[1] == 'X')
+        {
+          value=strtoul((char const *)(s+2),&ptr,16);
+        }else
+        {
+          value=strtoul((char const *)(s+1),&ptr,10);
+        }
+        if(ptr)
+        {
+          unsigned char utf8char[7];
+          unsigned char const * const end=GStringRep::UCS4toUTF8(value,utf8char);
+          ret+=GUTF8String((char const *)utf8char,(size_t)end-(size_t)utf8char);
+        }else
+        {
+          ret += substr( amp_locn, semi_locn - amp_locn + 1 );
+        }
+      }else
+      {  
+        GPosition map_entry = ConvMap.contains( key );
+        if( map_entry )
+        {                           // Found in the conversion map, substitute
+          ret += ConvMap[map_entry];
+        } else
+        {
+          static const GMap<GUTF8String,GUTF8String> &Basic = BasicMap();
+          GPosition map_entry = Basic.contains( key );
+          if ( map_entry )
+          {
+            ret += Basic[map_entry];
+          }else
+          {
+            ret += substr( amp_locn, len+2 );
+          }
+        }
+      }
+    }else
+    {
+      ret += substr( amp_locn, len+2 );
+    }
+    start_locn = semi_locn + 1;
+//    DEBUG_MSG( "ret = '" << ret << "'\n" );
+  }
+
+                                // Copy the end of the string to the output
+  ret += substr( start_locn, length()-start_locn );
+
+//  DEBUG_MSG( "Unescaped string is '" << ret << "'\n" );
+  return (ret == *this)?(*this):ret;
+}
+
+GUTF8String
+GUTF8String::fromEscaped(void) const
+{
+  const GMap<GUTF8String,GUTF8String> nill;
+  return fromEscaped(nill);
+}
+
+GP<GStringRep>
+GStringRep::setat(int n, char ch) const
+{
+  GP<GStringRep> retval;
+  if(n<0)
+    n+=size;
+  if (n < 0 || n>size) 
+    GBaseString::throw_illegal_subscript();
+  if(ch == data[n])
+  {
+    retval=const_cast<GStringRep *>(this);
+  }else if(!ch)
+  {
+    retval=getbuf(n);
+  }else
+  {
+    retval=getbuf((n<size)?size:n);
+    retval->data[n]=ch;
+    if(n == size)
+      retval->data[n+1]=0;
+  }
+  return retval;
+}
+
+#if defined(AUTOCONF) && defined(HAVE_VSNPRINTF)
+# define USE_VSNPRINTF vsnprintf
+#elif defined(_WIN32) && !defined(__CYGWIN32__)
+# define USE_VSNPRINTF _vsnprintf
+#elif defined(linux)
+# define USE_VSNPRINTF vsnprintf
+#endif
+ 
+GUTF8String &
+GUTF8String::format(const char fmt[], ... )
+{
+  va_list args;
+  va_start(args, fmt);
+  return init(GStringRep::UTF8::create(fmt,args));
+}
+
+GP<GStringRep>
+GStringRep::UTF8::create_format(const char fmt[],...)
+{
+  va_list args;
+  va_start(args, fmt);
+  return create(fmt,args);
+}
+
+GP<GStringRep>
+GStringRep::vformat(va_list args) const
+{
+  GP<GStringRep> retval;
+  if(size)
+  {
+    char const * const fmt=data;
+    int buflen=32768;
+    char *buffer;
+    GPBuffer<char> gbuffer(buffer,buflen);
+    ChangeLocale locale(LC_NUMERIC,(isNative()?0:"C"));
+    // Format string
+#ifdef USE_VSNPRINTF
+    while(USE_VSNPRINTF(buffer, buflen, fmt, args)<0)
+      {
+        gbuffer.resize(0);
+        gbuffer.resize(buflen+32768);
+      }
+    va_end(args);
+#else
+    buffer[buflen-1] = 0;
+    vsprintf(buffer, fmt, args);
+    va_end(args);
+    if (buffer[buflen-1])
+      {
+        // This isn't as fatal since it is on the stack, but we
+        // definitely should stop the current operation.
+        G_THROW( ERR_MSG("GString.overwrite") );
+      }
+#endif
+    retval=strdup((const char *)buffer);
+  }
+  // Go altering the string
+  return retval;
+}
+
+int 
+GStringRep::search(char c, int from) const
+{
+  if (from<0)
+    from += size;
+  int retval=(-1);
+  if (from>=0 && from<size)
+  {
+    char const *const s = strchr(data+from,c);
+    if(s)
+      retval=(int)((size_t)s-(size_t)data);
+  }
+  return retval;
+}
+
+int 
+GStringRep::search(char const *ptr, int from) const
+{
+  if(from<0)
+  {
+    from+=size;
+    if(from<0)
+      G_THROW( ERR_MSG("GString.bad_subscript") );
+  }
+  int retval=(-1);
+  if (from>=0 && from<size)
+  {
+    char const *const s = strstr(data+from,ptr);
+    if(s)
+      retval=(int)((size_t)s-(size_t)data);
+  }
+  return retval;
+}
+
+int 
+GStringRep::rsearch(char c, int from) const
+{
+  if(from<0)
+  {
+    from+=size;
+    if(from<0)
+      G_THROW( ERR_MSG("GString.bad_subscript") );
+  }
+  int retval=(-1);
+  if ((from>=0) && (from<size))
+  {
+    char const *const s = strrchr(data+from,c);
+    if(s)
+      retval=(int)((size_t)s-(size_t)data);
+  }
+  return retval;
+}
+
+int 
+GStringRep::rsearch(char const *ptr, int from) const
+{
+  if(from<0)
+  {
+    from+=size;
+    if(from<0)
+      G_THROW( ERR_MSG("GString.bad_subscript") );
+  }
+  int retval=(-1);
+  for(int loc=from;(loc=search(ptr,loc)) >= 0;++loc)
+    retval=loc;
+  return retval;
+}
+
+int
+GStringRep::contains(const char accept[],int from) const
+{
+  if(from<0)
+  {
+    from+=size;
+    if(from<0)
+      G_THROW( ERR_MSG("GString.bad_subscript") );
+  }
+  int retval=(-1);
+  if (accept && accept[0] && from>=0 && from<size)
+  {
+    char const * const src = data+from;
+    char const *ptr=strpbrk(src,accept);
+    if(ptr)
+    {
+      retval=(int)(ptr-src)+from;
+    }
+  }
+  return retval;
+}
+
+int
+GStringRep::rcontains(const char accept[],int from) const
+{
+  int retval=(-1);
+  while((from=contains(accept,from)) >= 0)
+  {
+    retval=from++;
+  }
+  return retval;
+}
+
+bool
+GBaseString::is_int(void) const
+{
+  bool isLong=!!ptr;
+  if(isLong)
+  {
+    int endpos;
+    (*this)->toLong(0,endpos);
+    if(endpos>=0)
+    {
+      isLong=((*this)->nextNonSpace(endpos) == (int)length());
+    }
+  }
+  return isLong;
+}
+
+bool
+GBaseString::is_float(void) const
+{
+  bool isDouble=!!ptr;
+  if(isDouble)
+  {
+    int endpos;
+    (*this)->toDouble(0,endpos);
+    if(endpos>=0)
+    {
+      isDouble=((*this)->nextNonSpace(endpos) == (int)length());
+    }
+  }
+  return isDouble;
+}
+
+unsigned int 
+hash(const GBaseString &str)
+{
+  unsigned int x = 0;
+  const char *s = (const char*)str;
+  while (*s) 
+    x = x ^ (x<<6) ^ (unsigned char)(*s++);
+  return x;
+}
+
+void 
+GBaseString::throw_illegal_subscript()
+{
+  G_THROW( ERR_MSG("GString.bad_subscript") );
+}
+
+unsigned char *
+GStringRep::UTF8::UCS4toString(
+  const uint32_t w0,unsigned char *ptr, mbstate_t *) const
+{
+  return UCS4toUTF8(w0,ptr);
+}
+
+int
+GStringRep::UTF8::ncopy(wchar_t * const buf, const int buflen ) const
+{
+  int retval=(-1);
+  if(buf && buflen)
+    {
+      buf[0]=0;
+      if(data[0])
+	{
+          const size_t length=strlen(data);
+          const unsigned char * const eptr=(const unsigned char *)(data+length);
+	  wchar_t *r=buf;
+	  wchar_t const * const rend=buf+buflen;
+          for(const unsigned char *s=(const unsigned char *)data;
+              (r<rend)&&(s<eptr)&&*s;)
+            {
+              const uint32_t w0=UTF8toUCS4(s,eptr);
+              uint16_t w1;
+              uint16_t w2=1;
+              for(int count=(sizeof(wchar_t)==sizeof(w1))
+                    ?UCS4toUTF16(w0,w1,w2):1;
+                  count&&(r<rend);
+                  --count,w1=w2,++r)
+		{
+		  r[0]=(sizeof(wchar_t) == sizeof(w1))?(wchar_t)w1:(wchar_t)w0;
+		}
+            }
+	  if(r<rend)
+            {
+              r[0]=0;
+              retval=((size_t)r-(size_t)buf)/sizeof(wchar_t);
+            }
+	}
+      else
+	{
+	  retval=0;
+	}
+    }
+  return retval;
+}
+
+GP<GStringRep> 
+GStringRep::UTF8::toNative(const EscapeMode escape) const
+{
+  GP<GStringRep> retval;
+  if(data[0])
+  {
+    const size_t length=strlen(data);
+    const unsigned char * const eptr=(const unsigned char *)(data+length);
+    unsigned char *buf;
+    GPBuffer<unsigned char> gbuf(buf,12*length+12); 
+    unsigned char *r=buf;
+    mbstate_t ps;
+    memset(&ps,0,sizeof(mbstate_t));
+    for(const unsigned char *s=(const unsigned char *)data;(s<eptr)&& *s;)
+      {
+        const unsigned char * const s0 = s;
+        const uint32_t w0=UTF8toUCS4(s,eptr);
+        if (s == s0)
+          {
+            s += 1;
+            *r++ = '?';
+          }
+        else
+          {
+            const unsigned char * const r0 = r;
+            r=UCS4toNative(w0,r,&ps);
+            if(r == r0)
+              {
+                if (escape == IS_ESCAPED)
+                  {
+                    sprintf((char *)r,"&#%lu;",(unsigned long)w0);
+                    r += strlen((char *)r);
+                  }
+                else
+                  {
+                    *r++ = '?';
+                  }
+              }
+          }
+      }
+    r[0]=0;
+    retval = NATIVE_CREATE( (const char *)buf );
+  } 
+  else
+  {
+    retval = NATIVE_CREATE( (unsigned int)0 );
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::UTF8::toUTF8(const bool nothrow) const
+{
+  if(!nothrow)
+    G_THROW( ERR_MSG("GStringRep.UTF8ToUTF8") );
+  return const_cast<GStringRep::UTF8 *>(this);
+}
+
+// Tests if a string is legally encoded in the current character set.
+bool 
+GStringRep::UTF8::is_valid(void) const
+{
+  bool retval=true;
+  if(data && size)
+  {
+    const unsigned char * const eptr=(const unsigned char *)(data+size);
+    for(const unsigned char *s=(const unsigned char *)data;(s<eptr)&& *s;)
+    {
+      const unsigned char * const r=s;
+      (void)UTF8toUCS4(s,eptr);
+      if(r == s)
+      {
+        retval=false;
+        break;
+      }
+    }
+  }
+  return retval;
+}
+
+static inline uint32_t
+add_char(uint32_t const U, unsigned char const * const r)
+{
+  uint32_t const C=r[0];
+  return ((C|0x3f) == 0xbf)?((U<<6)|(C&0x3f)):0;
+}
+
+uint32_t
+GStringRep::UTF8toUCS4(
+  unsigned char const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  unsigned char const *r=s;
+  if(r < eptr)
+  {
+    uint32_t const C1=r++[0];
+    if(C1&0x80)
+    {
+      if(r < eptr)
+      {
+        U=C1;
+        if((U=((C1&0x40)?add_char(U,r++):0)))
+        {
+          if(C1&0x20)
+          {
+            if(r < eptr)
+            {
+              if((U=add_char(U,r++)))
+              {
+                if(C1&0x10)
+                {
+                  if(r < eptr)
+                  {
+                    if((U=add_char(U,r++)))
+                    {
+                      if(C1&0x8)
+                      {
+                        if(r < eptr)
+                        {
+                          if((U=add_char(U,r++)))
+                          {
+                            if(C1&0x4)
+                            {
+                              if(r < eptr)
+                              {
+                                if((U=((!(C1&0x2))?(add_char(U,r++)&0x7fffffff):0)))
+                                {
+                                  s=r;
+                                }else
+                                {
+                                  U=(unsigned int)(-1)-s++[0];
+                                }
+                              }else
+                              {
+                                U=0;
+                              }
+                            }else if((U=((U&0x4000000)?0:(U&0x3ffffff))))
+                            {
+                              s=r;
+                            }
+                          }else
+                          {
+                            U=(unsigned int)(-1)-s++[0];
+                          }
+                        }else
+                        {
+                          U=0;
+                        }
+                      }else if((U=((U&0x200000)?0:(U&0x1fffff))))
+                      {
+                        s=r;
+                      }
+                    }else
+                    {
+                      U=(unsigned int)(-1)-s++[0];
+                    }
+                  }else
+                  {
+                    U=0;
+                  }
+                }else if((U=((U&0x10000)?0:(U&0xffff))))
+                {
+                  s=r;
+                }
+              }else
+              {
+                U=(unsigned int)(-1)-s++[0];
+              }
+            }else
+            {
+              U=0;
+            }
+          }else if((U=((U&0x800)?0:(U&0x7ff))))
+          {
+            s=r;
+          }
+        }else
+        {
+          U=(unsigned int)(-1)-s++[0];
+        }
+      }else
+      {
+        U=0;
+      }
+    }else if((U=C1))
+    {
+      s=r;
+    }
+  }
+  return U;
+}
+
+unsigned char *
+GStringRep::UCS4toUTF8(const uint32_t w,unsigned char *ptr)
+{
+  if(w <= 0x7f)
+  {
+    *ptr++ = (unsigned char)w;
+  }
+  else if(w <= 0x7ff)
+  {
+    *ptr++ = (unsigned char)((w>>6)|0xC0);
+    *ptr++ = (unsigned char)((w|0x80)&0xBF);
+  }
+  else if(w <= 0xFFFF)
+  {
+    *ptr++ = (unsigned char)((w>>12)|0xE0);
+    *ptr++ = (unsigned char)(((w>>6)|0x80)&0xBF);
+    *ptr++ = (unsigned char)((w|0x80)&0xBF);
+  }
+  else if(w <= 0x1FFFFF)
+  {
+    *ptr++ = (unsigned char)((w>>18)|0xF0);
+    *ptr++ = (unsigned char)(((w>>12)|0x80)&0xBF);
+    *ptr++ = (unsigned char)(((w>>6)|0x80)&0xBF);
+    *ptr++ = (unsigned char)((w|0x80)&0xBF);
+  }
+  else if(w <= 0x3FFFFFF)
+  {
+    *ptr++ = (unsigned char)((w>>24)|0xF8);
+    *ptr++ = (unsigned char)(((w>>18)|0x80)&0xBF);
+    *ptr++ = (unsigned char)(((w>>12)|0x80)&0xBF);
+    *ptr++ = (unsigned char)(((w>>6)|0x80)&0xBF);
+    *ptr++ = (unsigned char)((w|0x80)&0xBF);
+  }
+  else if(w <= 0x7FFFFFFF)
+  {
+    *ptr++ = (unsigned char)((w>>30)|0xFC);
+    *ptr++ = (unsigned char)(((w>>24)|0x80)&0xBF);
+    *ptr++ = (unsigned char)(((w>>18)|0x80)&0xBF);
+    *ptr++ = (unsigned char)(((w>>12)|0x80)&0xBF);
+    *ptr++ = (unsigned char)(((w>>6)|0x80)&0xBF);
+    *ptr++ = (unsigned char)((w|0x80)&0xBF);
+  }
+  else
+  { 
+    *ptr++ = '?';
+  }
+  return ptr;
+}
+
+   // Creates with a concat operation.
+GP<GStringRep> 
+GStringRep::concat( const char *s1, const GP<GStringRep> &s2) const
+{
+  GP<GStringRep> retval;
+  if(s2)
+  {
+    retval=toThis(s2);
+    if(s1 && s1[0])
+    {
+      if(retval)
+      {
+        retval=concat(s1,retval->data);
+      }else
+      {
+        retval=strdup(s1);
+      }
+    }
+  }else if(s1 && s1[0])
+  {
+    retval=strdup(s1);
+  }
+  return retval;
+}
+
+   // Creates with a concat operation.
+
+GP<GStringRep> 
+GStringRep::concat( const GP<GStringRep> &s1,const char *s2) const
+{
+  GP<GStringRep> retval;
+  if(s1)
+  {
+    retval=toThis(s1);
+    if(s2 && s2[0])
+    {
+      if(retval)
+      {
+        retval=retval->append(s2);
+      }else
+      {
+        retval=strdup(s2);
+      }
+    }
+  }else if(s2 && s2[0])
+  {
+    retval=strdup(s2);
+  }
+  return retval;
+}
+
+GP<GStringRep> 
+GStringRep::concat(const GP<GStringRep> &s1,const GP<GStringRep> &s2) const
+{ 
+  GP<GStringRep> retval; 
+  if(s1)
+  {
+    retval=toThis(s1,s2);
+    if(retval && s2)
+    {
+      retval=retval->append(toThis(s2));
+    }
+  }else if(s2)
+  {
+    retval=toThis(s2);
+  }
+  return retval;
+}
+
+GStringRep::GStringRep(void)
+{
+  size=0;
+  data=0;
+}
+
+GStringRep::~GStringRep()
+{
+  if(data)
+  {
+    data[0]=0;
+    ::operator delete(data);
+  }
+  data=0;
+}
+
+GStringRep::UTF8::UTF8(void) {}
+
+GStringRep::UTF8::~UTF8() {}
+
+int
+GStringRep::cmp(const char *s1,const int len) const
+{
+  return cmp(data,s1,len);
+}
+
+int
+GStringRep::cmp(const char *s1, const char *s2,const int len)
+{
+  return (len
+   ?((s1&&s1[0])
+      ?((s2&&s2[0])
+        ?((len>0)
+          ?strncmp(s1,s2,len)
+          :strcmp(s1,s2))
+        :1)
+      :((s2&&s2[0])?(-1):0))
+   :0);
+}
+
+int 
+GStringRep::cmp(const GP<GStringRep> &s1, const GP<GStringRep> &s2,
+  const int len )
+{
+  return (s1?(s1->cmp(s2,len)):cmp(0,(s2?(s2->data):0),len));
+}
+
+int 
+GStringRep::cmp(const GP<GStringRep> &s1, const char *s2, 
+  const int len )
+{
+  return cmp((s1?s1->data:0),s2,len);
+}
+
+int 
+GStringRep::cmp(const char *s1, const GP<GStringRep> &s2,
+  const int len )
+{
+  return cmp(s1,(s2?(s2->data):0),len);
+}
+
+int
+GStringRep::UTF8::cmp(const GP<GStringRep> &s2,const int len) const
+{
+  int retval;
+  if(s2)
+  {
+    if(s2->isNative())
+    {
+      GP<GStringRep> r(s2->toUTF8(true));
+      if(r)
+      {
+        retval=GStringRep::cmp(data,r->data,len);
+      }else
+      {
+        retval=-(s2->cmp(toNative(NOT_ESCAPED),len));
+      }
+    }else
+    {
+      retval=GStringRep::cmp(data,s2->data,len);
+    }
+  }else
+  { 
+    retval=GStringRep::cmp(data,0,len);
+  }
+  return retval;
+} 
+
+int
+GStringRep::UTF8::toInt() const
+{
+  int endpos;
+  return (int)toLong(0,endpos);
+}
+
+static inline long
+Cstrtol(char *data,char **edata, const int base)
+{
+  GStringRep::ChangeLocale locale(LC_NUMERIC,"C");
+  while (data && *data==' ') data++;
+  return strtol(data,edata,base);
+}
+
+long 
+GStringRep::UTF8::toLong(
+  const int pos, int &endpos, const int base) const
+{
+  char *edata=0;
+  long retval=Cstrtol(data+pos,&edata, base);
+  if(edata)
+  {
+    endpos=edata-data;
+  }else
+  {
+    GP<GStringRep> ptr = GStringRep::UTF8::create();
+    endpos=(-1);
+    ptr=ptr->strdup(data+pos);
+    if(ptr)
+      ptr=ptr->toNative(NOT_ESCAPED);
+    if(ptr)
+    {
+      int xendpos;
+      retval=ptr->toLong(0,xendpos,base);
+      if(xendpos> 0)
+      {
+        endpos=(int)size;
+        ptr=ptr->strdup(data+xendpos);
+        if(ptr)
+        {
+          ptr=ptr->toUTF8(true);
+          if(ptr)
+          {
+            endpos-=(int)(ptr->size);
+          }
+        }
+      }
+    }
+  }
+  return retval;
+}
+
+static inline unsigned long
+Cstrtoul(char *data,char **edata, const int base)
+{
+  GStringRep::ChangeLocale locale(LC_NUMERIC,"C");
+  while (data && *data==' ') data++;
+  return strtoul(data,edata,base);
+}
+
+unsigned long 
+GStringRep::UTF8::toULong(
+  const int pos, int &endpos, const int base) const
+{
+  char *edata=0;
+  unsigned long retval=Cstrtoul(data+pos,&edata, base);
+  if(edata)
+  {
+    endpos=edata-data;
+  }else
+  {
+    GP<GStringRep> ptr = GStringRep::UTF8::create();
+    endpos=(-1);
+    ptr=ptr->strdup(data+pos);
+    if(ptr)
+      ptr=ptr->toNative(NOT_ESCAPED);
+    if(ptr)
+    {
+      int xendpos;
+      retval=ptr->toULong(0,xendpos,base);
+      if(xendpos> 0)
+      {
+        endpos=(int)size;
+        ptr=ptr->strdup(data+xendpos);
+        if(ptr)
+        {
+          ptr=ptr->toUTF8(true);
+          if(ptr)
+          {
+            endpos-=(int)(ptr->size);
+          }
+        }
+      }
+    }
+  }
+  return retval;
+}
+
+static inline double
+Cstrtod(char *data,char **edata)
+{
+  GStringRep::ChangeLocale locale(LC_NUMERIC,"C");
+  while (data && *data==' ') data++;
+  return strtod(data,edata);
+}
+
+double
+GStringRep::UTF8::toDouble(const int pos, int &endpos) const
+{
+  char *edata=0;
+  double retval=Cstrtod(data+pos,&edata);
+  if(edata)
+  {
+    endpos=edata-data;
+  }else
+  {
+    GP<GStringRep> ptr = GStringRep::UTF8::create();
+    endpos=(-1);
+    ptr=ptr->strdup(data+pos);
+    if(ptr)
+      ptr=ptr->toNative(NOT_ESCAPED);
+    if(ptr)
+    {
+      int xendpos;
+      retval=ptr->toDouble(0,xendpos);
+      if(xendpos >= 0)
+      {
+        endpos=(int)size;
+        ptr=ptr->strdup(data+xendpos);
+        if(ptr)
+        {
+          ptr=ptr->toUTF8(true);
+          if(ptr)
+          {
+            endpos-=(int)(ptr->size);
+          }
+        }
+      }
+    }
+  }
+  return retval;
+}
+
+int 
+GStringRep::getUCS4(uint32_t &w, const int from) const
+{
+  int retval;
+  if(from>=size)
+  {
+    w=0;
+    retval=size;
+  }else if(from<0)
+  {
+    w=(unsigned int)(-1);
+    retval=(-1);
+  }else
+  {
+    const char *source=data+from;
+    w=getValidUCS4(source);
+    retval=(int)((size_t)source-(size_t)data);
+  } 
+  return retval;
+}
+
+
+uint32_t
+GStringRep::UTF8::getValidUCS4(const char *&source) const
+{
+  return GStringRep::UTF8toUCS4((const unsigned char *&)source,data+size);
+}
+
+int
+GStringRep::nextNonSpace(const int from,const int len) const
+{
+  return nextCharType(giswspace,from,len,true);
+}
+
+int
+GStringRep::nextSpace(const int from,const int len) const
+{
+  return nextCharType(giswspace,from,len,false);
+}
+
+int
+GStringRep::nextChar(const int from) const
+{
+  char const * xptr=data+from;
+  (void)getValidUCS4(xptr);
+  return (int)((size_t)xptr-(size_t)data);
+}
+
+int 
+GStringRep::firstEndSpace(int from,const int len) const
+{
+  const int xsize=(len<0)?size:(from+len);
+  const int ysize=(size<xsize)?size:xsize;
+  int retval=ysize;
+  while(from<ysize)
+  {
+    from=nextNonSpace(from,ysize-from);
+    if(from < size)
+    {
+      const int r=nextSpace(from,ysize-from);
+      // If a character isn't legal, then it will return
+      // tru for both nextSpace and nextNonSpace.
+      if(r == from)
+      {
+        from++;
+      }else
+      {
+        from=retval=r;
+      }
+    }
+  }
+  return retval;
+}
+
+int
+GStringRep::UCS4toUTF16(
+  const uint32_t w,uint16_t &w1, uint16_t &w2)
+{
+  int retval;
+  if(w<0x10000)
+  {
+    w1=(uint16_t)w;
+    w2=0;
+    retval=1;
+  }else
+  {
+    w1=(uint16_t)((((w-0x10000)>>10)&0x3ff)+0xD800);
+    w2=(uint16_t)((w&0x3ff)+0xDC00);
+    retval=2;
+  }
+  return retval;
+}
+
+int
+GStringRep::UTF16toUCS4(
+  uint32_t &U,uint16_t const * const s,void const * const eptr)
+{
+  int retval=0;
+  U=0;
+  uint16_t const * const r=s+1;
+  if(r <= eptr)
+  {
+    uint32_t const W1=s[0];
+    if((W1<0xD800)||(W1>0xDFFF))
+    {
+      if((U=W1))
+      {
+        retval=1;
+      }
+    }else if(W1<=0xDBFF)
+    {
+      uint16_t const * const rr=r+1;
+      if(rr <= eptr)
+      {
+        uint32_t const W2=s[1];
+        if(((W2>=0xDC00)||(W2<=0xDFFF))&&((U=(0x10000+((W1&0x3ff)<<10))|(W2&0x3ff))))
+        {
+          retval=2;
+        }else
+        {
+          retval=(-1);
+        }
+      }
+    }
+  }
+  return retval;
+}
+
+
+//bcr
+
+GUTF8String&
+GUTF8String::operator+= (char ch)
+{
+  return init(
+    GStringRep::UTF8::create((const char*)*this,
+    GStringRep::UTF8::create(&ch,0,1)));
+}
+
+GUTF8String&
+GUTF8String::operator+= (const char *str)
+{
+  return init(GStringRep::UTF8::create(*this,str));
+}
+
+GUTF8String&
+GUTF8String::operator+= (const GBaseString &str)
+{
+  return init(GStringRep::UTF8::create(*this,str));
+}
+
+GUTF8String
+GUTF8String::substr(int from, int len) const
+{ return GUTF8String(*this, from, len); }
+
+GUTF8String
+GUTF8String::operator+(const GBaseString &s2) const
+{ return GStringRep::UTF8::create(*this,s2); }
+
+GUTF8String
+GUTF8String::operator+(const GUTF8String &s2) const
+{ return GStringRep::UTF8::create(*this,s2); }
+
+GUTF8String
+GUTF8String::operator+(const char    *s2) const
+{ return GStringRep::UTF8::create(*this,s2); }
+
+char *
+GUTF8String::getbuf(int n)
+{
+  if(ptr)
+    init((*this)->getbuf(n));
+  else if(n>0)
+    init(GStringRep::UTF8::create(n));
+  else
+    init(0);
+  return ptr?((*this)->data):0;
+}
+
+void 
+GUTF8String::setat(const int n, const char ch)
+{
+  if((!n)&&(!ptr))
+  {
+    init(GStringRep::UTF8::create(&ch,0,1));
+  }else
+  {
+    init((*this)->setat(CheckSubscript(n),ch));
+  }
+}
+
+GP<GStringRep>
+GStringRep::UTF8ToNative( const char *s, const EscapeMode escape )
+{
+  return GStringRep::UTF8::create(s)->toNative(escape);
+}
+
+GUTF8String::GUTF8String(const char dat)
+{ init(GStringRep::UTF8::create(&dat,0,1)); }
+
+GUTF8String::GUTF8String(const GUTF8String &fmt, va_list &args)
+{ 
+  if (fmt.ptr)
+    init(fmt->vformat(args));
+  else 
+    init(fmt); 
+}
+
+GUTF8String::GUTF8String(const char *str)
+{ init(GStringRep::UTF8::create(str)); }
+
+GUTF8String::GUTF8String(const unsigned char *str)
+{ init(GStringRep::UTF8::create((const char *)str)); }
+
+GUTF8String::GUTF8String(const uint16_t *str)
+{ init(GStringRep::UTF8::create(str,0,-1)); }
+
+GUTF8String::GUTF8String(const uint32_t *str)
+{ init(GStringRep::UTF8::create(str,0,-1)); }
+
+GUTF8String::GUTF8String(const char *dat, unsigned int len)
+{ init(GStringRep::UTF8::create(dat,0,((int)len<0)?(-1):(int)len)); }
+
+GUTF8String::GUTF8String(const uint16_t *dat, unsigned int len)
+{ init(GStringRep::UTF8::create(dat,0,((int)len<0)?(-1):(int)len)); }
+
+GUTF8String::GUTF8String(const uint32_t *dat, unsigned int len)
+{ init(GStringRep::UTF8::create(dat,0,((int)len<0)?(-1):(int)len)); }
+
+GUTF8String::GUTF8String(const GBaseString &gs, int from, int len)
+{ init(GStringRep::UTF8::create(gs,from,((int)len<0)?(-1):(int)len)); }
+
+GUTF8String::GUTF8String(const int number)
+{ init(GStringRep::UTF8::create_format("%d",number)); }
+
+GUTF8String::GUTF8String(const double number)
+{ init(GStringRep::UTF8::create_format("%f",number)); }
+
+GUTF8String& GUTF8String::operator= (const char str)
+{ return init(GStringRep::UTF8::create(&str,0,1)); }
+
+GUTF8String& GUTF8String::operator= (const char *str)
+{ return init(GStringRep::UTF8::create(str)); }
+
+GUTF8String GBaseString::operator+(const GUTF8String &s2) const
+{ return GStringRep::UTF8::create(*this,s2); }
+
+#if HAS_WCHAR
+GUTF8String
+GNativeString::operator+(const GUTF8String &s2) const
+{
+  if (ptr)
+    return GStringRep::UTF8::create((*this)->toUTF8(true),s2);
+  else
+    return GStringRep::UTF8::create((*this),s2);
+}
+#endif
+
+GUTF8String
+GUTF8String::operator+(const GNativeString &s2) const
+{
+  GP<GStringRep> g = s2;
+  if (s2.ptr)
+    g = s2->toUTF8(true);
+  return GStringRep::UTF8::create(*this,g);
+}
+
+GUTF8String
+operator+(const char    *s1, const GUTF8String &s2)
+{ return GStringRep::UTF8::create(s1,s2); }
+
+#if HAS_WCHAR
+GNativeString
+operator+(const char    *s1, const GNativeString &s2)
+{ return GStringRep::Native::create(s1,s2); }
+
+GNativeString&
+GNativeString::operator+= (char ch)
+{
+  char s[2]; s[0]=ch; s[1]=0;
+  return init(GStringRep::Native::create((const char*)*this, s));
+}
+
+GNativeString&
+GNativeString::operator+= (const char *str)
+{
+  return init(GStringRep::Native::create(*this,str));
+}
+
+GNativeString&
+GNativeString::operator+= (const GBaseString &str)
+{
+  return init(GStringRep::Native::create(*this,str));
+}
+
+GNativeString
+GNativeString::operator+(const GBaseString &s2) const
+{ return GStringRep::Native::create(*this,s2); }
+
+GNativeString
+GNativeString::operator+(const GNativeString &s2) const
+{ return GStringRep::Native::create(*this,s2); }
+
+GNativeString
+GNativeString::operator+(const char    *s2) const
+{ return GStringRep::Native::create(*this,s2); }
+
+char *
+GNativeString::getbuf(int n)
+{
+  if(ptr)
+    init((*this)->getbuf(n));
+  else if(n>0)
+    init(GStringRep::Native::create(n));
+  else
+    init(0);
+  return ptr?((*this)->data):0;
+}
+
+void
+GNativeString::setat(const int n, const char ch)
+{
+  if((!n)&&(!ptr))
+  {
+    init(GStringRep::Native::create(&ch,0,1));
+  }else
+  {
+    init((*this)->setat(CheckSubscript(n),ch));
+  }
+}
+
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/GString.h b/libdjvu/GString.h
new file mode 100644
index 0000000..6cf65f2
--- /dev/null
+++ b/libdjvu/GString.h
@@ -0,0 +1,1695 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GSTRING_H_
+#define _GSTRING_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name GString.h
+
+    Files #"GString.h"# and #"GString.cpp"# implement a general
+    purpose string class \Ref{GBaseString}, with dirived types
+    \Ref{GUTF8String} and \Ref{GNativeString} for UTF8 MBS encoding
+    and the current Native MBS encoding respectively.  This
+    implementation relies on smart pointers (see
+    \Ref{GSmartPointer.h}).
+
+    {\bf Historical Comments} --- At some point during the DjVu
+    research era, it became clear that C++ compilers rarely provided
+    portable libraries. We then decided to avoid fancy classes (like
+    #iostream# or #string#) and to rely only on the good old C
+    library.  A good string class however is very useful.  We had
+    already randomly picked letter 'G' to prefix class names and we
+    logically derived the new class name.  Native English speakers
+    kept laughing in hiding.  This is ironic because we completely
+    forgot this letter 'G' when creating more challenging things
+    like the ZP Coder or the IW44 wavelets.  
+
+    {\bf Later Changes} 
+    When converting to I18N, we (Lizardtech) decided that two string classes
+    where needing, replacing the original GString with \Ref{GUTF8String} and
+    \Ref{GNativeString}.
+
+    @memo
+    General purpose string class.
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation.\\
+
+// From: Leon Bottou, 1/31/2002
+// This file has very little to do with my initial implementation.
+// It has been practically rewritten by Lizardtech for i18n changes.
+// My original implementation was very small in comparison
+// <http://prdownloads.sourceforge.net/djvu/DjVu2_2b-src.tgz>.
+// In my opinion, the duplication of the string classes is a failed
+// attempt to use the type system to enforce coding policies.
+// This could be fixed.  But there are better things to do in djvulibre.
+    
+*/
+//@{
+
+
+#include "DjVuGlobal.h"
+#include "GContainer.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#ifdef _WIN32
+# include <windows.h>
+# ifndef AUTOCONF
+#  define HAS_WCHAR 1
+#  define HAS_WCTYPE 1
+#  define HAS_MBSTATE 1
+# endif
+#endif
+
+#if HAS_WCHAR
+# include <wchar.h>
+#elif HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+#if HAVE_STDINT_H
+# include <stdint.h>
+#elif HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# ifdef _WIN32
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int16 uint16_t;
+# else
+# pragma message("Please verify defs for uint32_t and uint16_t")
+typedef unsigned int   uint32_t // verify
+typedef unsigned short uint16_t // verify
+# endif
+#endif
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+#if !HAS_MBSTATE
+# ifndef HAVE_MBSTATE_T
+typedef int mbstate_t;
+# endif
+#endif
+
+class GBaseString;
+class GUTF8String;
+class GNativeString;
+
+// Internal string representation.
+class DJVUAPI GStringRep : public GPEnabled
+{
+public:
+  enum EncodeType { XUCS4, XUCS4BE, XUCS4LE, XUCS4_2143, XUCS4_3412,
+    XUTF16, XUTF16BE, XUTF16LE, XUTF8, XEBCDIC, XOTHER } ;
+
+  enum EscapeMode { UNKNOWN_ESCAPED=0,  IS_ESCAPED=1, NOT_ESCAPED=2 };
+
+  class UTF8;
+  friend class UTF8;
+  class Unicode;
+  friend class Unicode;
+
+  class ChangeLocale;
+#if HAS_WCHAR
+  class Native;
+  friend class Native;
+#endif // HAS_WCHAR
+  friend class GBaseString;
+  friend class GUTF8String;
+  friend class GNativeString;
+  friend DJVUAPI unsigned int hash(const GBaseString &ref);
+
+public:
+  // default constructor
+  GStringRep(void);
+  // virtual destructor
+  virtual ~GStringRep();
+
+    // Other virtual methods.
+      // Create an empty string.
+  virtual GP<GStringRep> blank(const unsigned int sz) const = 0;
+      // Create a duplicate at the given size.
+  GP<GStringRep>  getbuf(int n) const;
+      // Change the value of one of the bytes.
+  GP<GStringRep> setat(int n, char ch) const;
+      // Append a string.
+  virtual GP<GStringRep> append(const GP<GStringRep> &s2) const = 0;
+      // Test if isUTF8.
+  virtual bool isUTF8(void) const { return false; }
+      // Test if Native.
+  virtual bool isNative(void) const { return false; }
+      // Convert to Native.
+  virtual GP<GStringRep> toNative(
+    const EscapeMode escape=UNKNOWN_ESCAPED ) const = 0;
+      // Convert to UTF8.
+  virtual GP<GStringRep> toUTF8(const bool nothrow=false) const = 0;
+      // Convert to same as current class.
+  virtual GP<GStringRep> toThis(
+    const GP<GStringRep> &rep,const GP<GStringRep> &locale=0) const = 0;
+      // Compare with #s2#.
+  virtual int cmp(const GP<GStringRep> &s2,const int len=(-1)) const = 0;
+
+  // Convert strings to numbers.
+  virtual int toInt(void) const = 0;
+  virtual long int toLong(
+    const int pos, int &endpos, const int base=10) const = 0;
+  virtual unsigned long toULong(
+    const int pos, int &endpos, const int base=10) const = 0;
+  virtual double toDouble(const int pos, int &endpos) const = 0;
+
+  // return the position of the next character
+  int nextChar( const int from=0 ) const;
+
+  // return next non space position
+  int nextNonSpace( const int from=0, const int len=(-1) ) const;
+
+  // return next white space position
+  int nextSpace( const int from=0, const int len=(-1) ) const;
+
+  // return the position after the last non-whitespace character.
+  int firstEndSpace( int from=0, const int len=(-1) ) const;
+
+    // Create an empty string.
+  template <class TYPE> static GP<GStringRep> create(
+    const unsigned int sz,TYPE *);
+    // Creates with a strdup string.
+  GP<GStringRep> strdup(const char *s) const;
+
+    // Creates by appending to the current string
+  GP<GStringRep> append(const char *s2) const;
+
+    // Creates with a concat operation.
+  GP<GStringRep> concat(const GP<GStringRep> &s1,const GP<GStringRep> &s2) const;
+  GP<GStringRep> concat(const char *s1,const GP<GStringRep> &s2) const;
+  GP<GStringRep> concat(const GP<GStringRep> &s1,const char *s2) const;
+  GP<GStringRep> concat(const char *s1,const char *s2) const;
+
+   /* Creates with a strdup and substr.  Negative values have strlen(s)+1
+      added to them.
+   */
+  GP<GStringRep> substr(
+    const char *s,const int start,const int length=(-1)) const;
+
+  GP<GStringRep> substr(
+    const uint16_t *s,const int start,const int length=(-1)) const;
+
+  GP<GStringRep> substr(
+    const uint32_t *s,const int start,const int length=(-1)) const;
+
+  /** Initializes a string with a formatted string (as in #vprintf#).  The
+      string is re-initialized with the characters generated according to the
+      specified format #fmt# and using the optional arguments.  See the ANSI-C
+      function #vprintf()# for more information. The current implementation
+      will cause a segmentation violation if the resulting string is longer
+      than 32768 characters. */
+  GP<GStringRep> vformat(va_list args) const;
+  // -- SEARCHING
+
+  static GP<GStringRep> UTF8ToNative( const char *s,
+    const EscapeMode escape=UNKNOWN_ESCAPED );
+  static GP<GStringRep> NativeToUTF8( const char *s );
+
+  // Creates an uppercase version of the current string.
+  GP<GStringRep> upcase(void) const;
+  // Creates a lowercase version of the current string.
+  GP<GStringRep> downcase(void) const;
+
+  /** Returns the next UCS4 character, and updates the pointer s. */
+  static uint32_t UTF8toUCS4(
+    unsigned char const *&s, void const * const endptr );
+
+  /** Returns the number of bytes in next UCS4 character,
+      and sets #w# to the next UCS4 chacter.  */
+  static int UTF8toUCS4(
+    uint32_t &w, unsigned char const s[], void const * const endptr )
+  { unsigned char const *r=s;w=UTF8toUCS4(r,endptr);return (int)((size_t)r-(size_t)s); }
+
+  /** Returns the next UCS4 word from the UTF16 string. */
+  static int UTF16toUCS4(
+     uint32_t &w, uint16_t const * const s,void const * const eptr);
+
+  static int UCS4toUTF16(
+    uint32_t w, uint16_t &w1, uint16_t &w2);
+
+  int cmp(const char *s2, const int len=(-1)) const;
+  static int cmp(
+    const GP<GStringRep> &s1, const GP<GStringRep> &s2, const int len=(-1)) ;
+  static int cmp(
+    const GP<GStringRep> &s1, const char *s2, const int len=(-1));
+  static int cmp(
+    const char *s1, const GP<GStringRep> &s2, const int len=(-1));
+  static int cmp(
+    const char *s1, const char *s2, const int len=(-1));
+
+  // Lookup the next character, and return the position of the next character.
+  int getUCS4(uint32_t &w, const int from) const;
+
+  virtual unsigned char *UCS4toString(
+    const uint32_t w, unsigned char *ptr, mbstate_t *ps=0) const = 0;
+
+  static unsigned char *UCS4toUTF8(
+    const uint32_t w,unsigned char *ptr);
+
+  static unsigned char *UCS4toNative(
+    const uint32_t w,unsigned char *ptr, mbstate_t *ps);
+
+  int search(char c, int from=0) const;
+
+  int search(char const *str, int from=0) const;
+
+  int rsearch(char c, int from=0) const;
+
+  int rsearch(char const *str, int from=0) const;
+
+  int contains(char const accept[], int from=0) const;
+
+  int rcontains(char const accept[], int from=0) const;
+
+protected:
+  // Return the next character and increment the source pointer.
+  virtual uint32_t getValidUCS4(const char *&source) const = 0;
+
+  GP<GStringRep> tocase(
+    bool (*xiswcase)(const unsigned long wc),
+    unsigned long (*xtowcase)(const unsigned long wc)) const;
+
+  // Tests if the specified character passes the xiswtest.  If so, the
+  // return pointer is incremented to the next character, otherwise the
+  // specified #ptr# is returned.
+  const char * isCharType( bool (*xiswtest)(const unsigned long wc), const char *ptr,
+    const bool reverse=false) const;
+
+  // Find the next character position that passes the isCharType test.
+  int nextCharType(
+    bool (*xiswtest)(const unsigned long wc),const int from,const int len,
+    const bool reverse=false) const;
+
+  static bool giswspace(const unsigned long w);
+  static bool giswupper(const unsigned long w);
+  static bool giswlower(const unsigned long w);
+  static unsigned long gtowupper(const unsigned long w);
+  static unsigned long gtowlower(const unsigned long w);
+
+  virtual void set_remainder( void const * const buf, const unsigned int size,
+    const EncodeType encodetype);
+  virtual void set_remainder( void const * const buf, const unsigned int size,
+    const GP<GStringRep> &encoding );
+  virtual void set_remainder ( const GP<Unicode> &remainder );
+
+  virtual GP<Unicode> get_remainder( void ) const;
+
+public:
+  /* Returns a copy of this string with characters used in XML with
+      '<'  to "&lt;", '>'  to "&gt;",  '&' to "&amp;" '\'' to
+      "&apos;", and  '\"' to  "&quot;".   Characters 0x01 through
+      0x1f are also escaped. */
+  GP<GStringRep> toEscaped( const bool tosevenbit ) const;
+
+  // Tests if a string is legally encoded in the current character set.
+  virtual bool is_valid(void) const = 0;
+#if HAS_WCHAR
+  virtual int ncopy(wchar_t * const buf, const int buflen) const = 0;
+#endif
+protected:
+
+// Actual string data.
+  int  size;
+  char *data;
+};
+
+class DJVUAPI GStringRep::UTF8 : public GStringRep
+{
+public:
+  // default constructor
+  UTF8(void);
+  // virtual destructor
+  virtual ~UTF8();
+
+    // Other virtual methods.
+  virtual GP<GStringRep> blank(const unsigned int sz = 0) const;
+  virtual GP<GStringRep> append(const GP<GStringRep> &s2) const;
+      // Test if Native.
+  virtual bool isUTF8(void) const;
+      // Convert to Native.
+  virtual GP<GStringRep> toNative(
+    const EscapeMode escape=UNKNOWN_ESCAPED) const;
+      // Convert to UTF8.
+  virtual GP<GStringRep> toUTF8(const bool nothrow=false) const;
+      // Convert to same as current class.
+  virtual GP<GStringRep> toThis(
+    const GP<GStringRep> &rep,const GP<GStringRep> &) const;
+      // Compare with #s2#.
+  virtual int cmp(const GP<GStringRep> &s2,const int len=(-1)) const;
+
+  static GP<GStringRep> create(const unsigned int sz = 0);
+
+  // Convert strings to numbers.
+  virtual int toInt(void) const;
+  virtual long int toLong(
+    const int pos, int &endpos, const int base=10) const;
+  virtual unsigned long toULong(
+    const int pos, int &endpos, const int base=10) const;
+  virtual double toDouble(
+    const int pos, int &endpos) const;
+
+    // Create a strdup string.
+  static GP<GStringRep> create(const char *s);
+
+   // Creates with a concat operation.
+  static GP<GStringRep> create(
+    const GP<GStringRep> &s1,const GP<GStringRep> &s2);
+  static GP<GStringRep> create( const GP<GStringRep> &s1,const char *s2);
+  static GP<GStringRep> create( const char *s1, const GP<GStringRep> &s2);
+  static GP<GStringRep> create( const char *s1,const char *s2);
+
+    // Create with a strdup and substr operation.
+  static GP<GStringRep> create(
+    const char *s,const int start,const int length=(-1));
+
+  static GP<GStringRep> create(
+    const uint16_t *s,const int start,const int length=(-1));
+
+  static GP<GStringRep> create(
+    const uint32_t *s,const int start,const int length=(-1));
+
+  static GP<GStringRep> create_format(const char fmt[],...);
+  static GP<GStringRep> create(const char fmt[],va_list& args);
+
+  virtual unsigned char *UCS4toString(
+    const uint32_t w,unsigned char *ptr, mbstate_t *ps=0) const;
+
+  // Tests if a string is legally encoded in the current character set.
+  virtual bool is_valid(void) const;
+#if HAS_WCHAR
+  virtual int ncopy(wchar_t * const buf, const int buflen) const;
+#endif
+  friend class GBaseString;
+
+protected:
+  // Return the next character and increment the source pointer.
+  virtual uint32_t getValidUCS4(const char *&source) const;
+};
+
+
+/** General purpose character string.
+    Each dirivied instance of class #GBaseString# represents a
+    character string.  Overloaded operators provide a value semantic
+    to #GBaseString# objects.  Conversion operators and constructors
+    transparently convert between #GBaseString# objects and
+    #const char*# pointers.  The #GBaseString# class has no public
+    constructors, since a dirived type should always be used
+    to specify the desired multibyte character encoding.
+
+    Functions taking strings as arguments should declare their
+    arguments as "#const char*#".  Such functions will work equally
+    well with dirived #GBaseString# objects since there is a fast
+    conversion operator from the dirivied #GBaseString# objects
+    to "#const char*#".  Functions returning strings should return
+    #GUTF8String# or #GNativeString# objects because the class will
+    automatically manage the necessary memory.
+
+    Characters in the string can be identified by their position.  The
+    first character of a string is numbered zero. Negative positions
+    represent characters relative to the end of the string (i.e.
+    position #-1# accesses the last character of the string,
+    position #-2# represents the second last character, etc.)  */
+
+class DJVUAPI GBaseString : protected GP<GStringRep>
+{
+public:
+  enum EscapeMode {
+    UNKNOWN_ESCAPED=GStringRep::UNKNOWN_ESCAPED,
+    IS_ESCAPED=GStringRep::IS_ESCAPED,
+    NOT_ESCAPED=GStringRep::NOT_ESCAPED };
+
+  friend class GUTF8String;
+  friend class GNativeString;
+protected:
+  // Sets the gstr pointer;
+  inline void init(void);
+
+  ~GBaseString();
+  inline GBaseString &init(const GP<GStringRep> &rep);
+
+  // -- CONSTRUCTORS
+  /** Null constructor. Constructs an empty string. */
+  GBaseString( void );
+
+public:
+  // -- ACCESS
+  /** Converts a string into a constant null terminated character
+      array.  This conversion operator is very efficient because
+      it simply returns a pointer to the internal string data. The
+      returned pointer remains valid as long as the string is
+      unmodified. */
+  operator const char* ( void ) const  ;
+  /// Returns the string length.
+  unsigned int length( void ) const;
+  /** Returns true if and only if the string contains zero characters.
+      This operator is useful for conditional expression in control
+      structures.
+      \begin{verbatim}
+         if (! str) { ... }
+         while (!! str) { ... }  -- Note the double operator!
+      \end{verbatim}
+      Class #GBaseString# does not to support syntax
+      "#if# #(str)# #{}#" because the required conversion operator
+      introduces dangerous ambiguities with certain compilers. */
+  bool operator! ( void ) const;
+
+  // -- INDEXING
+  /** Returns the character at position #n#. An exception
+      \Ref{GException} is thrown if number #n# is not in range #-len#
+      to #len-1#, where #len# is the length of the string.  The first
+      character of a string is numbered zero.  Negative positions
+      represent characters relative to the end of the string. */
+  char operator[] (int n) const;
+  /// Returns #TRUE# if the string contains an integer number.
+  bool is_int(void) const;
+  /// Returns #TRUE# if the string contains a float number.
+  bool is_float(void) const;
+
+  /** Converts strings between native & UTF8 **/
+  GNativeString getUTF82Native( EscapeMode escape=UNKNOWN_ESCAPED ) const;
+  GUTF8String getNative2UTF8( void ) const;
+
+  // -- ALTERING
+  /// Reinitializes a string with the null string.
+  void empty( void );
+  // -- SEARCHING
+  /** Searches character #c# in the string, starting at position
+      #from# and scanning forward until reaching the end of the
+      string.  This function returns the position of the matching
+      character.  It returns #-1# if character #c# cannot be found. */
+  int search(char c, int from=0) const;
+
+  /** Searches sub-string #str# in the string, starting at position
+      #from# and scanning forward until reaching the end of the
+      string.  This function returns the position of the first
+      matching character of the sub-string.  It returns #-1# if
+      string #str# cannot be found. */
+  int search(const char *str, int from=0) const;
+
+  /** Searches character #c# in the string, starting at position
+      #from# and scanning backwards until reaching the beginning of
+      the string.  This function returns the position of the matching
+      character.  It returns #-1# if character #c# cannot be found. */
+  int rsearch(char c, const int from=0) const;
+  /** Searches sub-string #str# in the string, starting at position
+      #from# and scanning backwards until reaching the beginning of
+      the string.  This function returns the position of the first
+      matching character of the sub-string. It returns #-1# if
+      string #str# cannot be found. */
+  int rsearch(const char *str, const int from=0) const;
+  /** Searches for any of the specified characters in the accept
+      string.  It returns #-1# if the none of the characters and
+      be found, otherwise the position of the first match. */
+  int contains(const char accept[], const int from=0) const;
+  /** Searches for any of the specified characters in the accept
+      string.  It returns #-1# if the none of the characters and be
+      found, otherwise the position of the last match. */
+  int rcontains(const char accept[], const int from=0) const;
+
+  /** Concatenates strings. Returns a string composed by concatenating
+      the characters of strings #s1# and #s2#. */
+  GUTF8String operator+(const GUTF8String &s2) const;
+  GNativeString operator+(const GNativeString &s2) const;
+
+  /** Returns an integer.  Implements i18n atoi.  */
+  int toInt(void) const;
+
+  /** Returns a long intenger.  Implments i18n strtol.  */
+  long toLong(const int pos, int &endpos, const int base=10) const;
+
+  /** Returns a unsigned long integer.  Implements i18n strtoul. */
+  unsigned long toULong(
+    const int pos, int &endpos, const int base=10) const;
+
+  /** Returns a double.  Implements the i18n strtod.  */
+  double toDouble(
+    const int pos, int &endpos ) const;
+
+  /** Returns a long intenger.  Implments i18n strtol.  */
+  static long toLong(
+    const GUTF8String& src, const int pos, int &endpos, const int base=10);
+
+  static unsigned long toULong(
+    const GUTF8String& src, const int pos, int &endpos, const int base=10);
+
+  static double toDouble(
+    const GUTF8String& src, const int pos, int &endpos);
+
+  /** Returns a long intenger.  Implments i18n strtol.  */
+  static long toLong(
+    const GNativeString& src, const int pos, int &endpos, const int base=10);
+
+  static unsigned long toULong(
+    const GNativeString& src, const int pos, int &endpos, const int base=10);
+
+  static double toDouble(
+    const GNativeString& src, const int pos, int &endpos);
+
+  // -- HASHING
+
+  // -- COMPARISONS
+    /** Returns an #int#.  Compares string with #s2# and returns
+        sorting order. */
+  int cmp(const GBaseString &s2, const int len=(-1)) const;
+    /** Returns an #int#.  Compares string with #s2# and returns
+        sorting order. */
+  int cmp(const char *s2, const int len=(-1)) const;
+    /** Returns an #int#.  Compares string with #s2# and returns
+        sorting order. */
+  int cmp(const char s2) const;
+    /** Returns an #int#.  Compares #s2# with #s2# and returns
+        sorting order. */
+  static int cmp(const char *s1, const char *s2, const int len=(-1));
+  /** Returns a boolean. The Standard C strncmp takes two string and
+      compares the first N characters.  static bool GBaseString::ncmp
+      will compare #s1# with #s2# with the #len# characters starting
+      from the beginning of the string. */
+  /** String comparison. Returns true if and only if character
+      strings #s1# and #s2# are equal (as with #strcmp#.)
+    */
+  bool operator==(const GBaseString &s2) const;
+  bool operator==(const char *s2) const;
+  friend bool operator==(const char    *s1, const GBaseString &s2);
+
+  /** String comparison. Returns true if and only if character
+      strings #s1# and #s2# are not equal (as with #strcmp#.)
+    */
+  bool operator!=(const GBaseString &s2) const;
+  bool operator!=(const char *s2) const;
+  friend bool operator!=(const char *s1, const GBaseString &s2);
+
+  /** String comparison. Returns true if and only if character
+      strings #s1# is lexicographically greater than or equal to
+      string #s2# (as with #strcmp#.) */
+  bool operator>=(const GBaseString &s2) const;
+  bool operator>=(const char *s2) const;
+  bool operator>=(const char s2) const;
+  friend bool operator>=(const char    *s1, const GBaseString &s2);
+  friend bool operator>=(const char s1, const GBaseString &s2);
+
+  /** String comparison. Returns true if and only if character
+      strings #s1# is lexicographically less than string #s2#
+      (as with #strcmp#.)
+   */
+  bool operator<(const GBaseString &s2) const;
+  bool operator<(const char *s2) const;
+  bool operator<(const char s2) const;
+  friend bool operator<(const char *s1, const GBaseString &s2);
+  friend bool operator<(const char s1, const GBaseString &s2);
+
+  /** String comparison. Returns true if and only if character
+      strings #s1# is lexicographically greater than string #s2#
+      (as with #strcmp#.)
+   */
+  bool operator> (const GBaseString &s2) const;
+  bool operator> (const char *s2) const;
+  bool operator> (const char s2) const;
+  friend bool operator> (const char    *s1, const GBaseString &s2);
+  friend bool operator> (const char s1, const GBaseString &s2);
+
+  /** String comparison. Returns true if and only if character
+      strings #s1# is lexicographically less than or equal to string
+      #s2# (as with #strcmp#.)
+   */
+  bool operator<=(const GBaseString &s2) const;
+  bool operator<=(const char *s2) const;
+  bool operator<=(const char s2) const;
+  friend bool operator<=(const char    *s1, const GBaseString &s2);
+  friend bool operator<=(const char    s1, const GBaseString &s2);
+
+   /** Returns an integer.  Implements a functional i18n atoi. Note
+       that if you pass a GBaseString that is not in Native format
+       the results may be disparaging. */
+
+  /** Returns a hash code for the string.  This hashing function
+      helps when creating associative maps with string keys (see
+      \Ref{GMap}).  This hash code may be reduced to an arbitrary
+      range by computing its remainder modulo the upper bound of
+      the range. */
+  friend DJVUAPI unsigned int hash(const GBaseString &ref);
+  // -- HELPERS
+  friend class GStringRep;
+
+  /// Returns next non space position.
+  int nextNonSpace( const int from=0, const int len=(-1) ) const;
+
+  /// Returns next character position.
+  int nextChar( const int from=0 ) const;
+
+  /// Returns next non space position.
+  int nextSpace( const int from=0, const int len=(-1) ) const;
+
+  /// return the position after the last non-whitespace character.
+  int firstEndSpace( const int from=0,const int len=(-1) ) const;
+
+  /// Tests if the string is legally encoded in the current codepage.
+  bool is_valid(void) const;
+
+  /// copy to a wchar_t buffer
+#if HAS_WCHAR
+  int ncopy(wchar_t * const buf, const int buflen) const;
+#endif
+protected:
+  const char *gstr;
+  static void throw_illegal_subscript() no_return;
+  static const char *nullstr;
+public:
+  GNativeString UTF8ToNative(
+    const bool currentlocale=false,
+    const EscapeMode escape=UNKNOWN_ESCAPED) const;
+  GUTF8String NativeToUTF8(void) const;
+protected:
+  inline int CheckSubscript(int n) const;
+};
+
+/** General purpose character string.
+    Each instance of class #GUTF8String# represents a character
+    string.  Overloaded operators provide a value semantic to
+    #GUTF8String# objects.  Conversion operators and constructors
+    transparently convert between #GUTF8String# objects and
+    #const char*# pointers.
+
+    Functions taking strings as arguments should declare their
+    arguments as "#const char*#".  Such functions will work equally
+    well with #GUTF8String# objects since there is a fast conversion
+    operator from #GUTF8String# to "#const char*#".  Functions
+    returning strings should return #GUTF8String# or #GNativeString#
+    objects because the class will automatically manage the necessary
+    memory.
+
+    Characters in the string can be identified by their position.  The
+    first character of a string is numbered zero. Negative positions
+    represent characters relative to the end of the string (i.e.
+    position #-1# accesses the last character of the string,
+    position #-2# represents the second last character, etc.)  */
+
+class DJVUAPI GUTF8String : public GBaseString
+{
+public:
+  ~GUTF8String();
+  inline void init(void);
+
+  inline GUTF8String &init(const GP<GStringRep> &rep);
+
+  // -- CONSTRUCTORS
+  /** Null constructor. Constructs an empty string. */
+  GUTF8String(void);
+  /// Constructs a string from a character.
+  GUTF8String(const char dat);
+  /// Constructs a string from a null terminated character array.
+  GUTF8String(const char *str);
+  /// Constructs a string from a null terminated character array.
+  GUTF8String(const unsigned char *str);
+  GUTF8String(const uint16_t *dat);
+  GUTF8String(const uint32_t *dat);
+  /** Constructs a string from a character array.  Elements of the
+      character array #dat# are added into the string until the
+      string length reaches #len# or until encountering a null
+      character (whichever comes first). */
+  GUTF8String(const char *dat, unsigned int len);
+  GUTF8String(const uint16_t *dat, unsigned int len);
+  GUTF8String(const uint32_t *dat, unsigned int len);
+
+  /// Construct from base class.
+  GUTF8String(const GP<GStringRep> &str);
+  GUTF8String(const GBaseString &str);
+  GUTF8String(const GUTF8String &str);
+  GUTF8String(const GNativeString &str);
+  /** Constructs a string from a character array.  Elements of the
+      character array #dat# are added into the string until the
+      string length reaches #len# or until encountering a null
+      character (whichever comes first). */
+  GUTF8String(const GBaseString &gs, int from, int len);
+
+  /** Copy a null terminated character array. Resets this string
+      with the character string contained in the null terminated
+      character array #str#. */
+  GUTF8String& operator= (const char str);
+  GUTF8String& operator= (const char *str);
+  inline GUTF8String& operator= (const GP<GStringRep> &str);
+  inline GUTF8String& operator= (const GBaseString &str);
+  inline GUTF8String& operator= (const GUTF8String &str);
+  inline GUTF8String& operator= (const GNativeString &str);
+
+  /** Constructs a string with a formatted string (as in #vprintf#).
+      The string is re-initialized with the characters generated
+      according to the specified format #fmt# and using the optional
+      arguments.  See the ANSI-C function #vprintf()# for more
+      information. The current implementation will cause a
+      segmentation violation if the resulting string is longer
+      than 32768 characters. */
+  GUTF8String(const GUTF8String &fmt, va_list &args);
+
+  /// Constructs a string from a character.
+  /** Constructs a string with a human-readable representation of
+      integer #number#.  The format is similar to format #"%d"# in
+      function #printf#. */
+  GUTF8String(const int number);
+
+  /** Constructs a string with a human-readable representation of
+      floating point number #number#. The format is similar to
+      format #"%f"# in function #printf#.  */
+  GUTF8String(const double number);
+
+
+  /** Initializes a string with a formatted string (as in #printf#).
+      The string is re-initialized with the characters generated
+      according to the specified format #fmt# and using the optional
+      arguments.  See the ANSI-C function #printf()# for more
+      information. The current implementation will cause a
+      segmentation violation if the resulting string is longer
+      than 32768 characters. */
+  GUTF8String &format(const char *fmt, ... );
+  /** Initializes a string with a formatted string (as in #vprintf#).
+      The string is re-initialized with the characters generated
+      according to the specified format #fmt# and using the optional
+      arguments.  See the ANSI-C function #vprintf()# for more
+      information. The current implementation will cause a
+      segmentation violation if the resulting string is longer
+      than 32768 characters. */
+  GUTF8String &vformat(const GUTF8String &fmt, va_list &args);
+
+  /** Returns a copy of this string with characters used in XML with
+      '<'  to "&lt;", '>'  to "&gt;",  '&' to "&amp;" '\'' to
+      "&apos;", and  '\"' to  "&quot;".   Characters 0x01 through
+      0x1f are also escaped. */
+  GUTF8String toEscaped( const bool tosevenbit=false ) const;
+
+  /** Converts strings containing HTML/XML escaped characters into
+      their unescaped forms. Numeric representations of characters
+      (e.g., "&#38;" or "&#x26;" for "*") are the only forms
+      converted by this function. */
+  GUTF8String fromEscaped( void ) const;
+
+  /** Converts strings containing HTML/XML escaped characters
+      (e.g., "&lt;" for "<") into their unescaped forms. The
+      conversion is partially defined by the ConvMap argument which
+      specifies the conversion strings to be recognized. Numeric
+      representations of characters (e.g., "&#38;" or "&#x26;"
+      for "*") are always converted. */
+  GUTF8String fromEscaped(
+    const GMap<GUTF8String,GUTF8String> ConvMap ) const;
+
+
+  // -- CONCATENATION
+  /// Appends character #ch# to the string.
+  GUTF8String& operator+= (char ch);
+
+  /// Appends the null terminated character array #str# to the string.
+  GUTF8String& operator+= (const char *str);
+  /// Appends the specified GBaseString to the string.
+  GUTF8String& operator+= (const GBaseString &str);
+
+  /** Returns a sub-string.  The sub-string is composed by copying
+      #len# characters starting at position #from# in this string.
+      The length of the resulting string may be smaller than #len#
+      if the specified range is too large. */
+  GUTF8String substr(int from, int len/*=(-1)*/) const;
+
+  /** Returns an upper case copy of this string.  The returned string
+      contains a copy of the current string with all letters turned
+      into upper case letters. */
+  GUTF8String upcase( void ) const;
+  /** Returns an lower case copy of this string.  The returned string
+      contains a copy of the current string with all letters turned
+      into lower case letters. */
+  GUTF8String downcase( void ) const;
+
+  /** Concatenates strings. Returns a string composed by concatenating
+      the characters of strings #s1# and #s2#.
+  */
+  GUTF8String operator+(const GBaseString &s2) const;
+  GUTF8String operator+(const GUTF8String &s2) const;
+  GUTF8String operator+(const GNativeString &s2) const;
+  GUTF8String operator+(const char *s2) const;
+  friend DJVUAPI GUTF8String operator+(const char *s1, const GUTF8String &s2);
+
+  /** Provides a direct access to the string buffer.  Returns a
+      pointer for directly accessing the string buffer.  This pointer
+      valid remains valid as long as the string is not modified by
+      other means.  Positive values for argument #n# represent the
+      length of the returned buffer.  The returned string buffer will
+      be large enough to hold at least #n# characters plus a null
+      character.  If #n# is positive but smaller than the string
+      length, the string will be truncated to #n# characters. */
+  char *getbuf(int n = -1);
+  /** Set the character at position #n# to value #ch#.  An exception
+      \Ref{GException} is thrown if number #n# is not in range #-len#
+      to #len#, where #len# is the length of the string.  If character
+      #ch# is zero, the string is truncated at position #n#.  The
+      first character of a string is numbered zero. Negative
+      positions represent characters relative to the end of the
+      string. If position #n# is equal to the length of the string,
+      this function appends character #ch# to the end of the string. */
+  void setat(const int n, const char ch);
+public:
+  typedef enum GStringRep::EncodeType EncodeType;
+  static GUTF8String create(void const * const buf,
+    const unsigned int size,
+    const EncodeType encodetype, const GUTF8String &encoding);
+  static GUTF8String create( void const * const buf,
+    unsigned int size, const EncodeType encodetype );
+  static GUTF8String create( void const * const buf,
+    const unsigned int size, const GUTF8String &encoding );
+  static GUTF8String create( void const * const buf,
+    const unsigned int size, const GP<GStringRep::Unicode> &remainder);
+  GP<GStringRep::Unicode> get_remainder(void) const;
+  static GUTF8String create( const char *buf, const unsigned int bufsize );
+  static GUTF8String create( const uint16_t *buf, const unsigned int bufsize );
+  static GUTF8String create( const uint32_t *buf, const unsigned int bufsize );
+};
+
+
+#if !HAS_WCHAR
+#define GBaseString GUTF8String
+#endif
+
+/** General purpose character string.
+    Each instance of class #GNativeString# represents a character
+    string.  Overloaded operators provide a value semantic to
+    #GNativeString# objects.  Conversion operators and constructors
+    transparently convert between #GNativeString# objects and
+    #const char*# pointers.
+
+    Functions taking strings as arguments should declare their
+    arguments as "#const char*#".  Such functions will work equally
+    well with #GNativeString# objects since there is a fast conversion
+    operator from #GNativeString# to "#const char*#".  Functions
+    returning strings should return #GUTF8String# or #GNativeString#
+    objects because the class will automatically manage the necessary
+    memory.
+
+    Characters in the string can be identified by their position.  The
+    first character of a string is numbered zero. Negative positions
+    represent characters relative to the end of the string (i.e.
+    position #-1# accesses the last character of the string,
+    position #-2# represents the second last character, etc.)  */
+
+class DJVUAPI GNativeString : public GBaseString
+{
+public:
+  ~GNativeString();
+  // -- CONSTRUCTORS
+  /** Null constructor. Constructs an empty string. */
+  GNativeString(void);
+  /// Constructs a string from a character.
+  GNativeString(const char dat);
+  /// Constructs a string from a null terminated character array.
+  GNativeString(const char *str);
+  /// Constructs a string from a null terminated character array.
+  GNativeString(const unsigned char *str);
+  GNativeString(const uint16_t *str);
+  GNativeString(const uint32_t *str);
+  /** Constructs a string from a character array.  Elements of the
+      character array #dat# are added into the string until the
+      string length reaches #len# or until encountering a null
+      character (whichever comes first). */
+  GNativeString(const char *dat, unsigned int len);
+  GNativeString(const uint16_t *dat, unsigned int len);
+  GNativeString(const uint32_t *dat, unsigned int len);
+  /// Construct from base class.
+  GNativeString(const GP<GStringRep> &str);
+  GNativeString(const GBaseString &str);
+#if HAS_WCHAR
+  GNativeString(const GUTF8String &str);
+#endif
+  GNativeString(const GNativeString &str);
+  /** Constructs a string from a character array.  Elements of the
+      character array #dat# are added into the string until the
+      string length reaches #len# or until encountering a null
+      character (whichever comes first). */
+  GNativeString(const GBaseString &gs, int from, int len);
+
+  /** Constructs a string with a formatted string (as in #vprintf#).
+      The string is re-initialized with the characters generated
+      according to the specified format #fmt# and using the optional
+      arguments.  See the ANSI-C function #vprintf()# for more
+      information. The current implementation will cause a
+      segmentation violation if the resulting string is longer than
+      32768 characters. */
+  GNativeString(const GNativeString &fmt, va_list &args);
+
+  /** Constructs a string with a human-readable representation of
+      integer #number#.  The format is similar to format #"%d"# in
+      function #printf#. */
+  GNativeString(const int number);
+
+  /** Constructs a string with a human-readable representation of
+      floating point number #number#. The format is similar to
+      format #"%f"# in function #printf#.  */
+  GNativeString(const double number);
+
+#if !HAS_WCHAR
+#undef GBaseString
+#else
+  /// Initialize this string class
+  void init(void);
+
+  /// Initialize this string class
+  GNativeString &init(const GP<GStringRep> &rep);
+
+  /** Copy a null terminated character array. Resets this string with
+      the character string contained in the null terminated character
+      array #str#. */
+  GNativeString& operator= (const char str);
+  GNativeString& operator= (const char *str);
+  inline GNativeString& operator= (const GP<GStringRep> &str);
+  inline GNativeString& operator= (const GBaseString &str);
+  inline GNativeString& operator= (const GUTF8String &str);
+  inline GNativeString& operator= (const GNativeString &str);
+  // -- CONCATENATION
+  /// Appends character #ch# to the string.
+  GNativeString& operator+= (char ch);
+  /// Appends the null terminated character array #str# to the string.
+  GNativeString& operator+= (const char *str);
+  /// Appends the specified GBaseString to the string.
+  GNativeString& operator+= (const GBaseString &str);
+
+  /** Returns a sub-string.  The sub-string is composed by copying
+      #len# characters starting at position #from# in this string.
+      The length of the resulting string may be smaller than #len#
+      if the specified range is too large. */
+  GNativeString substr(int from, int len/*=(-1)*/) const;
+
+  /** Returns an upper case copy of this string.  The returned
+      string contains a copy of the current string with all letters
+      turned into upper case letters. */
+  GNativeString upcase( void ) const;
+  /** Returns an lower case copy of this string.  The returned
+      string contains a copy of the current string with all letters
+      turned into lower case letters. */
+  GNativeString downcase( void ) const;
+
+
+  GNativeString operator+(const GBaseString &s2) const;
+  GNativeString operator+(const GNativeString &s2) const;
+  GUTF8String operator+(const GUTF8String &s2) const;
+  GNativeString operator+(const char *s2) const;
+  friend DJVUAPI GNativeString operator+(const char *s1, const GNativeString &s2);
+
+  /** Initializes a string with a formatted string (as in #printf#).
+      The string is re-initialized with the characters generated
+      according to the specified format #fmt# and using the optional
+      arguments.  See the ANSI-C function #printf()# for more
+      information. The current implementation will cause a
+      segmentation violation if the resulting string is longer than
+      32768 characters. */
+  GNativeString &format(const char *fmt, ... );
+  /** Initializes a string with a formatted string (as in #vprintf#).
+      The string is re-initialized with the characters generated
+      according to the specified format #fmt# and using the optional
+      arguments.  See the ANSI-C function #vprintf()# for more
+      information. The current implementation will cause a
+      segmentation violation if the resulting string is longer than
+      32768 characters. */
+  GNativeString &vformat(const GNativeString &fmt, va_list &args);
+
+  /** Returns a copy of this string with characters used in XML with
+      '<'  to "&lt;", '>'  to "&gt;",  '&' to "&amp;" '\'' to
+      "&apos;", and  '\"' to  "&quot;".   Characters 0x01 through
+      0x1f are also escaped. */
+  GNativeString toEscaped( const bool tosevenbit=false ) const;
+
+
+  /** Provides a direct access to the string buffer.  Returns a
+      pointer for directly accessing the string buffer.  This
+      pointer valid remains valid as long as the string is not
+      modified by other means.  Positive values for argument #n#
+      represent the length of the returned buffer.  The returned
+      string buffer will be large enough to hold at least #n#
+      characters plus a null character.  If #n# is positive but
+      smaller than the string length, the string will be truncated
+      to #n# characters. */
+  char *getbuf(int n = -1);
+  /** Set the character at position #n# to value #ch#.  An exception
+      \Ref{GException} is thrown if number #n# is not in range #-len#
+      to #len#, where #len# is the length of the string.  If
+      character #ch# is zero, the string is truncated at position
+      #n#.  The first character of a string is numbered zero.
+      Negative positions represent characters relative to the end of
+      the string. If position #n# is equal to the length of the
+      string, this function appends character #ch# to the end of the
+      string. */
+  void setat(const int n, const char ch);
+
+  static GNativeString create( const char *buf, const unsigned int bufsize );
+  static GNativeString create( const uint16_t *buf, const unsigned int bufsize );
+  static GNativeString create( const uint32_t *buf, const unsigned int bufsize );
+#endif // WinCE
+};
+
+//@}
+
+inline
+GBaseString::operator const char* ( void ) const
+{
+  return ptr?(*this)->data:nullstr;
+}
+
+inline unsigned int
+GBaseString::length( void ) const
+{
+  return ptr ? (*this)->size : 0;
+}
+
+inline bool
+GBaseString::operator! ( void ) const
+{
+  return !ptr;
+}
+
+inline GUTF8String
+GUTF8String::upcase( void ) const
+{
+  if (ptr) return (*this)->upcase();
+  return *this;
+}
+
+inline GUTF8String
+GUTF8String::downcase( void ) const
+{
+  if (ptr) return (*this)->downcase();
+  return *this;
+}
+
+inline void
+GUTF8String::init(void)
+{ GBaseString::init(); }
+
+inline GUTF8String &
+GUTF8String::init(const GP<GStringRep> &rep)
+{ GP<GStringRep>::operator=(rep?rep->toUTF8(true):rep); init(); return *this; }
+
+inline GUTF8String &
+GUTF8String::vformat(const GUTF8String &fmt, va_list &args)
+{ return (*this = (fmt.ptr?GUTF8String(fmt,args):fmt)); }
+
+inline GUTF8String
+GUTF8String::toEscaped( const bool tosevenbit ) const
+{ return ptr?GUTF8String((*this)->toEscaped(tosevenbit)):(*this); }
+
+inline GP<GStringRep::Unicode> 
+GUTF8String::get_remainder(void) const
+{
+  GP<GStringRep::Unicode> retval;
+  if(ptr)
+    retval=((*this)->get_remainder());
+  return retval;
+}
+
+inline
+GUTF8String::GUTF8String(const GNativeString &str)
+{ init(str.length()?(str->toUTF8(true)):(GP<GStringRep>)str); }
+
+inline
+GUTF8String::GUTF8String(const GP<GStringRep> &str)
+{ init(str?(str->toUTF8(true)):str); }
+
+inline
+GUTF8String::GUTF8String(const GBaseString &str)
+{ init(str.length()?(str->toUTF8(true)):(GP<GStringRep>)str); }
+
+inline void
+GBaseString::init(void)
+{
+  gstr=ptr?((*this)->data):nullstr;
+}
+/** Returns an integer.  Implements i18n atoi.  */
+inline int
+GBaseString::toInt(void) const
+{ return ptr?(*this)->toInt():0; }
+
+/** Returns a long intenger.  Implments i18n strtol.  */
+inline long
+GBaseString::toLong(const int pos, int &endpos, const int base) const
+{
+  long int retval=0;
+  if(ptr)
+  {
+    retval=(*this)->toLong(pos, endpos, base);
+  }else
+  {
+    endpos=(-1);
+  }
+  return retval;
+}
+
+inline long
+GBaseString::toLong(
+  const GUTF8String& src, const int pos, int &endpos, const int base)
+{
+  return src.toLong(pos,endpos,base);
+}
+
+inline long
+GBaseString::toLong(
+  const GNativeString& src, const int pos, int &endpos, const int base)
+{
+  return src.toLong(pos,endpos,base);
+}
+
+/** Returns a unsigned long integer.  Implements i18n strtoul. */
+inline unsigned long
+GBaseString::toULong(const int pos, int &endpos, const int base) const
+{
+  unsigned long retval=0;
+  if(ptr)
+  {
+    retval=(*this)->toULong(pos, endpos, base);
+  }else
+  {
+    endpos=(-1);
+  }
+  return retval;
+}
+
+inline unsigned long
+GBaseString::toULong(
+  const GUTF8String& src, const int pos, int &endpos, const int base)
+{
+  return src.toULong(pos,endpos,base);
+}
+
+inline unsigned long
+GBaseString::toULong(
+  const GNativeString& src, const int pos, int &endpos, const int base)
+{
+  return src.toULong(pos,endpos,base);
+}
+
+/** Returns a double.  Implements the i18n strtod.  */
+inline double
+GBaseString::toDouble(
+  const int pos, int &endpos ) const
+{
+  double retval=(double)0;
+  if(ptr)
+  {
+    retval=(*this)->toDouble(pos, endpos);
+  }else
+  {
+    endpos=(-1);
+  }
+  return retval;
+}
+
+inline double
+GBaseString::toDouble(
+  const GUTF8String& src, const int pos, int &endpos)
+{
+  return src.toDouble(pos,endpos);
+}
+
+inline double
+GBaseString::toDouble(
+  const GNativeString& src, const int pos, int &endpos)
+{
+  return src.toDouble(pos,endpos);
+}
+
+inline GBaseString &
+GBaseString::init(const GP<GStringRep> &rep)
+{ GP<GStringRep>::operator=(rep); init(); return *this;}
+
+inline char
+GBaseString::operator[] (int n) const
+{ return ((n||ptr)?((*this)->data[CheckSubscript(n)]):0); }
+
+inline int
+GBaseString::search(char c, int from) const
+{ return ptr?((*this)->search(c,from)):(-1); }
+
+inline int
+GBaseString::search(const char *str, int from) const
+{ return ptr?((*this)->search(str,from)):(-1); }
+
+inline int
+GBaseString::rsearch(char c, const int from) const
+{ return ptr?((*this)->rsearch(c,from)):(-1); }
+
+inline int
+GBaseString::rsearch(const char *str, const int from) const
+{ return ptr?((*this)->rsearch(str,from)):(-1); }
+
+inline int
+GBaseString::contains(const char accept[], const int from) const
+{ return ptr?((*this)->contains(accept,from)):(-1); }
+
+inline int
+GBaseString::rcontains(const char accept[], const int from) const
+{ return ptr?((*this)->rcontains(accept,from)):(-1); }
+
+inline int
+GBaseString::cmp(const GBaseString &s2, const int len) const
+{ return GStringRep::cmp(*this,s2,len); }
+
+inline int
+GBaseString::cmp(const char *s2, const int len) const
+{ return GStringRep::cmp(*this,s2,len); }
+
+inline int
+GBaseString::cmp(const char s2) const
+{ return GStringRep::cmp(*this,&s2,1); }
+
+inline int
+GBaseString::cmp(const char *s1, const char *s2, const int len)
+{ return GStringRep::cmp(s1,s2,len); }
+
+inline bool
+GBaseString::operator==(const GBaseString &s2) const
+{ return !cmp(s2); }
+
+inline bool
+GBaseString::operator==(const char *s2) const
+{ return !cmp(s2); }
+
+inline bool
+GBaseString::operator!=(const GBaseString &s2) const
+{ return !!cmp(s2); }
+
+inline bool
+GBaseString::operator!=(const char *s2) const
+{ return !!cmp(s2); }
+
+inline bool
+GBaseString::operator>=(const GBaseString &s2) const
+{ return (cmp(s2)>=0); }
+
+inline bool
+GBaseString::operator>=(const char *s2) const
+{ return (cmp(s2)>=0); }
+
+inline bool
+GBaseString::operator>=(const char s2) const
+{ return (cmp(s2)>=0); }
+
+inline bool
+GBaseString::operator<(const GBaseString &s2) const
+{ return (cmp(s2)<0); }
+
+inline bool
+GBaseString::operator<(const char *s2) const
+{ return (cmp(s2)<0); }
+
+inline bool
+GBaseString::operator<(const char s2) const
+{ return (cmp(s2)<0); }
+
+inline bool
+GBaseString::operator> (const GBaseString &s2) const
+{ return (cmp(s2)>0); }
+
+inline bool
+GBaseString::operator> (const char *s2) const
+{ return (cmp(s2)>0); }
+
+inline bool
+GBaseString::operator> (const char s2) const
+{ return (cmp(s2)>0); }
+
+inline bool
+GBaseString::operator<=(const GBaseString &s2) const
+{ return (cmp(s2)<=0); }
+
+inline bool
+GBaseString::operator<=(const char *s2) const
+{ return (cmp(s2)<=0); }
+
+inline bool
+GBaseString::operator<=(const char s2) const
+{ return (cmp(s2)<=0); }
+
+inline int
+GBaseString::nextNonSpace( const int from, const int len ) const
+{ return ptr?(*this)->nextNonSpace(from,len):0; }
+
+inline int
+GBaseString::nextChar( const int from ) const
+{ return ptr?(*this)->nextChar(from):0; }
+
+inline int
+GBaseString::nextSpace( const int from, const int len ) const
+{ return ptr?(*this)->nextSpace(from,len):0; }
+
+inline int
+GBaseString::firstEndSpace( const int from,const int len ) const
+{ return ptr?(*this)->firstEndSpace(from,len):0; }
+
+inline bool
+GBaseString::is_valid(void) const
+{ return ptr?((*this)->is_valid()):true; }
+
+#if HAS_WCHAR
+inline int
+GBaseString::ncopy(wchar_t * const buf, const int buflen) const
+{if(buf&&buflen)buf[0]=0;return ptr?((*this)->ncopy(buf,buflen)):0;}
+#endif
+
+inline int
+GBaseString::CheckSubscript(int n) const
+{
+  if(n)
+  {
+    if (n<0 && ptr)
+      n += (*this)->size;
+    if (n<0 || !ptr || n > (int)(*this)->size)
+      throw_illegal_subscript();
+  }
+  return n;
+}
+
+inline GBaseString::GBaseString(void) { init(); }
+
+inline GUTF8String::GUTF8String(void) { }
+
+inline GUTF8String::GUTF8String(const GUTF8String &str)
+{ init(str); }
+
+inline GUTF8String& GUTF8String::operator= (const GP<GStringRep> &str)
+{ return init(str); }
+
+inline GUTF8String& GUTF8String::operator= (const GBaseString &str)
+{ return init(str); }
+
+inline GUTF8String& GUTF8String::operator= (const GUTF8String &str)
+{ return init(str); }
+
+inline GUTF8String& GUTF8String::operator= (const GNativeString &str)
+{ return init(str); }
+
+inline GUTF8String
+GUTF8String::create( const char *buf, const unsigned int bufsize )
+{
+#if HAS_WCHAR
+  return GNativeString(buf,bufsize);
+#else
+  return GUTF8String(buf,bufsize);
+#endif
+}
+
+inline GUTF8String
+GUTF8String::create( const uint16_t *buf, const unsigned int bufsize )
+{
+  return GUTF8String(buf,bufsize);
+}
+
+inline GUTF8String
+GUTF8String::create( const uint32_t *buf, const unsigned int bufsize )
+{
+  return GUTF8String(buf,bufsize);
+}
+
+inline GNativeString::GNativeString(void) {}
+
+#if !HAS_WCHAR
+// For Windows CE, GNativeString is essentially GUTF8String
+
+inline
+GNativeString::GNativeString(const GUTF8String &str)
+: GUTF8String(str) {}
+
+inline
+GNativeString::GNativeString(const GP<GStringRep> &str)
+: GUTF8String(str) {}
+
+inline
+GNativeString::GNativeString(const char dat)
+: GUTF8String(dat) {}
+
+inline
+GNativeString::GNativeString(const char *str)
+: GUTF8String(str) {}
+
+inline
+GNativeString::GNativeString(const unsigned char *str)
+: GUTF8String(str) {}
+
+inline
+GNativeString::GNativeString(const uint16_t *str)
+: GUTF8String(str) {}
+
+inline
+GNativeString::GNativeString(const uint32_t *str)
+: GUTF8String(str) {}
+
+inline
+GNativeString::GNativeString(const char *dat, unsigned int len)
+: GUTF8String(dat,len) {}
+
+inline
+GNativeString::GNativeString(const uint16_t *dat, unsigned int len)
+: GUTF8String(dat,len) {}
+
+inline
+GNativeString::GNativeString(const uint32_t *dat, unsigned int len)
+: GUTF8String(dat,len) {}
+
+inline
+GNativeString::GNativeString(const GNativeString &str)
+: GUTF8String(str) {}
+
+inline
+GNativeString::GNativeString(const int number)
+: GUTF8String(number) {}
+
+inline
+GNativeString::GNativeString(const double number)
+: GUTF8String(number) {}
+
+inline
+GNativeString::GNativeString(const GNativeString &fmt, va_list &args)
+: GUTF8String(fmt,args) {}
+
+#else // HAS_WCHAR
+
+/// Initialize this string class
+inline void
+GNativeString::init(void)
+{ GBaseString::init(); }
+
+/// Initialize this string class
+inline GNativeString &
+GNativeString::init(const GP<GStringRep> &rep)
+{
+  GP<GStringRep>::operator=(rep?rep->toNative(GStringRep::NOT_ESCAPED):rep);
+  init();
+  return *this;
+}
+
+inline GNativeString 
+GNativeString::substr(int from, int len) const
+{ return GNativeString(*this, from, len); }
+
+inline GNativeString &
+GNativeString::vformat(const GNativeString &fmt, va_list &args)
+{ return (*this = (fmt.ptr?GNativeString(fmt,args):fmt)); }
+
+inline GNativeString
+GNativeString::toEscaped( const bool tosevenbit ) const
+{ return ptr?GNativeString((*this)->toEscaped(tosevenbit)):(*this); }
+
+inline
+GNativeString::GNativeString(const GUTF8String &str)
+{
+  if (str.length())
+    init(str->toNative(GStringRep::NOT_ESCAPED));
+  else
+    init((GP<GStringRep>)str);
+}
+
+inline
+GNativeString::GNativeString(const GP<GStringRep> &str)
+{
+  if (str)
+    init(str->toNative(GStringRep::NOT_ESCAPED));
+  else
+    init(str);
+}
+
+inline
+GNativeString::GNativeString(const GBaseString &str)
+{
+  if (str.length())
+    init(str->toNative(GStringRep::NOT_ESCAPED));
+  else
+    init((GP<GStringRep>)str);
+}
+
+
+inline
+GNativeString::GNativeString(const GNativeString &fmt, va_list &args)
+{
+  if (fmt.ptr)
+    init(fmt->vformat(args));
+  else
+    init(fmt);
+}
+
+inline GNativeString
+GNativeString::create( const char *buf, const unsigned int bufsize )
+{
+  return GNativeString(buf,bufsize);
+}
+
+inline GNativeString
+GNativeString::create( const uint16_t *buf, const unsigned int bufsize )
+{
+  return GNativeString(buf,bufsize);
+}
+
+inline GNativeString
+GNativeString::create( const uint32_t *buf, const unsigned int bufsize )
+{
+  return GNativeString(buf,bufsize);
+}
+
+inline GNativeString&
+GNativeString::operator= (const GP<GStringRep> &str)
+{ return init(str); }
+
+inline GNativeString&
+GNativeString::operator= (const GBaseString &str)
+{ return init(str); }
+
+inline GNativeString&
+GNativeString::operator= (const GUTF8String &str)
+{ return init(str); }
+
+inline GNativeString&
+GNativeString::operator= (const GNativeString &str)
+{ return init(str); }
+
+inline GNativeString
+GNativeString::upcase( void ) const
+{
+  if (ptr) return (*this)->upcase();
+  return *this;
+}
+
+inline GNativeString
+GNativeString::downcase( void ) const
+{
+  if (ptr) return (*this)->downcase();
+  return *this;
+}
+
+#endif // HAS_WCHAR
+
+inline bool
+operator==(const char *s1, const GBaseString &s2)
+{ return !s2.cmp(s1); }
+
+inline bool
+operator!=(const char *s1, const GBaseString &s2)
+{ return !!s2.cmp(s1); }
+
+inline bool
+operator>=(const char    *s1, const GBaseString &s2)
+{ return (s2.cmp(s1)<=0); }
+
+inline bool
+operator>=(const char s1, const GBaseString &s2)
+{ return (s2.cmp(s1)<=0); }
+
+inline bool
+operator<(const char *s1, const GBaseString &s2)
+{ return (s2.cmp(s1)>0); }
+
+inline bool
+operator<(const char s1, const GBaseString &s2)
+{ return (s2.cmp(s1)>0); }
+
+inline bool
+operator> (const char    *s1, const GBaseString &s2)
+{ return (s2.cmp(s1)<0); }
+
+inline bool
+operator> (const char s1, const GBaseString &s2)
+{ return (s2.cmp(s1)<0); }
+
+inline bool
+operator<=(const char    *s1, const GBaseString &s2)
+{ return !(s1>s2); }
+
+inline bool
+operator<=(const char    s1, const GBaseString &s2)
+{ return !(s1>s2); }
+
+// ------------------- The end
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp
new file mode 100644
index 0000000..0b0fe0a
--- /dev/null
+++ b/libdjvu/GThreads.cpp
@@ -0,0 +1,693 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// This file defines machine independent classes
+// for running and synchronizing threads.
+// - Author: Leon Bottou, 01/1998
+
+// From: Leon Bottou, 1/31/2002
+// Almost unchanged by Lizardtech.
+// GSafeFlags should go because it not as safe as it claims.
+
+#include "GThreads.h"
+#include "GException.h"
+#include "DjVuMessageLite.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+// ----------------------------------------
+// Consistency check
+
+#ifdef USE_EXCEPTION_EMULATION
+# if defined(WINTHREADS) || defined(POSIXTHREADS)
+#  warning "Compiler must support thread safe exceptions"
+# endif
+#endif
+
+#ifndef _DEBUG
+# if defined(DEBUG) 
+#  define _DEBUG /* */
+# elif DEBUGLVL >= 1
+#  define _DEBUG /* */
+# endif
+#endif
+
+#if WINTHREADS
+# include <process.h>
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// ----------------------------------------
+// WIN32 IMPLEMENTATION
+// ----------------------------------------
+
+#if WINTHREADS
+
+static unsigned __stdcall 
+start(void *arg)
+{
+  GThread *gt = (GThread*)arg;
+  try 
+    {
+      G_TRY
+        {
+          gt->xentry( gt->xarg );
+        }
+      G_CATCH(ex)
+        {
+          ex.perror();
+          DjVuMessageLite::perror( ERR_MSG("GThreads.uncaught") );
+          abort();
+        }
+      G_ENDCATCH;
+    }
+  catch(...)
+    {
+      DjVuMessageLite::perror( ERR_MSG("GThreads.unrecognized") );
+      abort();
+    }
+  return 0;
+}
+
+GThread::GThread(int stacksize)
+  : hthr(0), thrid(0), xentry(0), xarg(0)
+{
+}
+
+GThread::~GThread()
+{
+  if (hthr)
+    CloseHandle(hthr);
+  hthr = 0;
+  thrid = 0;
+}
+
+int  
+GThread::create(void (*entry)(void*), void *arg)
+{
+  if (hthr)
+    return -1;
+  xentry = entry;
+  xarg = arg;
+  unsigned uthread = 0;
+  hthr = (HANDLE)_beginthreadex(NULL, 0, start, (void*)this, 0, &uthread);
+  thrid = (DWORD) uthread;
+  if (hthr)
+    return 0;
+  return -1;
+}
+
+void 
+GThread::terminate()
+{
+  OutputDebugString("Terminating thread.\n");
+  if (hthr)
+    TerminateThread(hthr,0);
+}
+
+int
+GThread::yield()
+{
+  Sleep(0);
+  return 0;
+}
+
+void *
+GThread::current()
+{
+  return (void*) GetCurrentThreadId();
+}
+
+struct thr_waiting {
+  struct thr_waiting *next;
+  struct thr_waiting *prev;
+  BOOL   waiting;
+  HANDLE gwait;
+};
+
+GMonitor::GMonitor()
+  : ok(0), count(1), head(0), tail(0)
+{
+  InitializeCriticalSection(&cs);
+  locker = GetCurrentThreadId();
+  ok = 1;
+}
+
+GMonitor::~GMonitor()
+{
+  ok = 0;
+  EnterCriticalSection(&cs);
+  for (struct thr_waiting *w=head; w; w=w->next)
+    SetEvent(w->gwait);
+  LeaveCriticalSection(&cs);
+  DeleteCriticalSection(&cs); 
+}
+
+void 
+GMonitor::enter()
+{
+  DWORD self = GetCurrentThreadId();
+  if (count>0 || self!=locker)
+    {
+      if (ok)
+        EnterCriticalSection(&cs);
+      locker = self;
+      count = 1;
+    }
+  count -= 1;
+}
+
+void 
+GMonitor::leave()
+{
+  DWORD self = GetCurrentThreadId();
+  if (ok && (count>0 || self!=locker))
+    G_THROW( ERR_MSG("GThreads.not_acq_broad") );
+  count += 1;
+  if (count > 0)
+    {
+      count = 1;
+      if (ok)
+        LeaveCriticalSection(&cs);
+    }
+}
+
+void
+GMonitor::signal()
+{
+  if (ok)
+    {
+      DWORD self = GetCurrentThreadId();
+      if (count>0 || self!=locker)
+        G_THROW( ERR_MSG("GThreads.not_acq_signal") );
+      for (struct thr_waiting *w=head; w; w=w->next)
+        if (w->waiting) 
+          {
+            SetEvent(w->gwait);
+            w->waiting = FALSE;
+            break; // Only one thread is allowed to run!
+          }
+    }
+}
+
+void
+GMonitor::broadcast()
+{
+  if (ok)
+    {
+      DWORD self = GetCurrentThreadId();
+      if (count>0 || self!=locker)
+        G_THROW( ERR_MSG("GThreads.not_acq_broad") );
+      for (struct thr_waiting *w=head; w; w=w->next)
+        if (w->waiting)
+            {
+              SetEvent(w->gwait);
+              w->waiting = FALSE;
+            }
+    }
+}
+
+void
+GMonitor::wait()
+{
+  // Check state
+  DWORD self = GetCurrentThreadId();
+  if (count>0 || self!=locker)
+    G_THROW( ERR_MSG("GThreads.not_acq_wait") );
+  // Wait
+  if (ok)
+    {
+      // Prepare wait record
+      struct thr_waiting waitrec;
+      waitrec.waiting = TRUE;
+      waitrec.gwait = CreateEvent(NULL,FALSE,FALSE,NULL);
+      waitrec.next = 0;
+      waitrec.prev = tail;
+      // Link wait record (protected by critical section)
+      *(waitrec.next ? &waitrec.next->prev : &tail) = &waitrec; 
+      *(waitrec.prev ? &waitrec.prev->next : &head) = &waitrec;
+      // Start wait
+      int sav_count = count;
+      count = 1;
+      LeaveCriticalSection(&cs);
+      WaitForSingleObject(waitrec.gwait,INFINITE);
+      // Re-acquire
+      EnterCriticalSection(&cs);
+      count = sav_count;
+      locker = self;
+      // Unlink wait record
+      *(waitrec.next ? &waitrec.next->prev : &tail) = waitrec.prev;
+      *(waitrec.prev ? &waitrec.prev->next : &head) = waitrec.next;
+      CloseHandle(waitrec.gwait);
+    }
+}
+
+void
+GMonitor::wait(unsigned long timeout) 
+{
+  // Check state
+  DWORD self = GetCurrentThreadId();
+  if (count>0 || self!=locker)
+    G_THROW( ERR_MSG("GThreads.not_acq_wait") );
+  // Wait
+  if (ok)
+    {
+      // Prepare wait record
+      struct thr_waiting waitrec;
+      waitrec.waiting = TRUE;
+      waitrec.gwait = CreateEvent(NULL,FALSE,FALSE,NULL);
+      waitrec.next = 0;
+      waitrec.prev = tail;
+      // Link wait record (protected by critical section)
+      *(waitrec.prev ? &waitrec.prev->next : &head) = &waitrec;
+      *(waitrec.next ? &waitrec.next->prev : &tail) = &waitrec; 
+      // Start wait
+      int sav_count = count;
+      count = 1;
+      LeaveCriticalSection(&cs);
+      WaitForSingleObject(waitrec.gwait,timeout);
+      // Re-acquire
+      EnterCriticalSection(&cs);
+      count = sav_count;
+      locker = self;
+      // Unlink wait record
+      *(waitrec.next ? &waitrec.next->prev : &tail) = waitrec.prev;
+      *(waitrec.prev ? &waitrec.prev->next : &head) = waitrec.next;
+      CloseHandle(waitrec.gwait);
+    }
+}
+
+#endif
+
+
+// ----------------------------------------
+// POSIXTHREADS IMPLEMENTATION
+// ----------------------------------------
+
+#if POSIXTHREADS
+
+#if defined(CMA_INCLUDE)
+# define DCETHREADS 1
+# define pthread_key_create pthread_keycreate
+#else
+# define pthread_mutexattr_default  NULL
+# define pthread_condattr_default   NULL
+#endif
+
+static pthread_t pthread_null; // portable zero initialization!
+
+void *
+GThread::start(void *arg)
+{
+  GThread *gt = (GThread*)arg;
+#if DCETHREADS
+# ifdef CANCEL_ON
+  pthread_setcancel(CANCEL_ON);
+  pthread_setasynccancel(CANCEL_ON);
+# endif
+#else // !DCETHREADS
+# ifdef PTHREAD_CANCEL_ENABLE
+  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0);
+# endif
+# ifdef PTHREAD_CANCEL_ASYNCHRONOUS
+  pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
+# endif
+#endif
+  // Catch exceptions
+#ifdef __EXCEPTIONS
+  try 
+    {
+#endif 
+      G_TRY
+        {
+          (gt->xentry)(gt->xarg);
+        }
+      G_CATCH(ex)
+        {
+          ex.perror();
+          DjVuMessageLite::perror( ERR_MSG("GThreads.uncaught") );
+          abort();
+        }
+      G_ENDCATCH;
+#ifdef __EXCEPTIONS
+    }
+  catch(...)
+    {
+      DjVuMessageLite::perror( ERR_MSG("GThreads.unrecognized") );
+      abort();
+    }
+#endif
+  return 0;
+}
+
+
+// GThread
+
+GThread::GThread(int stacksize) : 
+  hthr(pthread_null), xentry(0), xarg(0)
+{
+}
+
+GThread::~GThread()
+{
+  hthr = pthread_null;
+}
+
+int  
+GThread::create(void (*entry)(void*), void *arg)
+{
+  if (xentry || xarg)
+    return -1;
+  xentry = entry;
+  xarg = arg;
+#if DCETHREADS
+  int ret = pthread_create(&hthr, pthread_attr_default, GThread::start, (void*)this);
+  if (ret >= 0)
+    pthread_detach(hthr);
+#else
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+  int ret = pthread_create(&hthr, &attr, start, (void*)this);
+  pthread_attr_destroy(&attr);
+#endif
+  return ret;
+}
+
+void 
+GThread::terminate()
+{
+  if (xentry || xarg)
+    pthread_cancel(hthr);
+}
+
+int
+GThread::yield()
+{
+#if DCETHREADS
+  pthread_yield();
+#else
+  // should use sched_yield() when available.
+  static struct timeval timeout = { 0, 0 };
+  ::select(0, 0,0,0, &timeout);
+#endif
+  return 0;
+}
+
+void*
+GThread::current()
+{
+  pthread_t self = pthread_self();
+#if defined(pthread_getunique_np)
+  return (void*) pthread_getunique_np( & self );
+#elif defined(cma_thread_get_unique)
+  return (void*) cma_thread_get_unique( & self );  
+#else
+  return (void*) self;
+#endif
+}
+
+// -- GMonitor
+
+GMonitor::GMonitor()
+  : ok(0), count(1), locker(pthread_null)
+{
+  // none of this should be necessary ... in theory.
+#ifdef PTHREAD_MUTEX_INITIALIZER
+  static pthread_mutex_t tmutex=PTHREAD_MUTEX_INITIALIZER;
+  memcpy(&mutex,&tmutex,sizeof(mutex));
+#endif
+#ifdef PTHREAD_COND_INITIALIZER
+  static pthread_cond_t tcond=PTHREAD_COND_INITIALIZER;
+  memcpy(&cond,&tcond,sizeof(cond));
+#endif
+  // standard
+  pthread_mutex_init(&mutex, pthread_mutexattr_default);
+  pthread_cond_init(&cond, pthread_condattr_default); 
+  locker = pthread_self();
+  ok = 1;
+}
+
+GMonitor::~GMonitor()
+{
+  ok = 0;
+  pthread_cond_destroy(&cond);
+  pthread_mutex_destroy(&mutex); 
+}
+
+
+void 
+GMonitor::enter()
+{
+  pthread_t self = pthread_self();
+  if (count>0 || !pthread_equal(locker, self))
+    {
+      if (ok)
+        pthread_mutex_lock(&mutex);
+      locker = self;
+      count = 1;
+    }
+  count -= 1;
+}
+
+void 
+GMonitor::leave()
+{
+  pthread_t self = pthread_self();
+  if (ok && (count>0 || !pthread_equal(locker, self)))
+    G_THROW( ERR_MSG("GThreads.not_acq_broad") );
+  count += 1;
+  if (count > 0)
+    {
+      count = 1;
+      locker = pthread_null;
+      if (ok)
+        pthread_mutex_unlock(&mutex);
+    }
+}
+
+void
+GMonitor::signal()
+{
+  if (ok)
+    {
+      pthread_t self = pthread_self();
+      if (count>0 || !pthread_equal(locker, self))
+        G_THROW( ERR_MSG("GThreads.not_acq_signal") );
+      pthread_cond_signal(&cond);
+    }
+}
+
+void
+GMonitor::broadcast()
+{
+  if (ok)
+    {
+      pthread_t self = pthread_self();
+      if (count>0 || !pthread_equal(locker, self))
+        G_THROW( ERR_MSG("GThreads.not_acq_broad") );
+      pthread_cond_broadcast(&cond);
+    }
+}
+
+void
+GMonitor::wait()
+{
+  // Check
+  pthread_t self = pthread_self();
+  if (count>0 || !pthread_equal(locker, self))
+    G_THROW( ERR_MSG("GThreads.not_acq_wait") );
+  // Wait
+  if (ok)
+    {
+      // Release
+      int sav_count = count;
+      count = 1;
+      // Wait
+      pthread_cond_wait(&cond, &mutex);
+      // Re-acquire
+      count = sav_count;
+      locker = self;
+    }      
+}
+
+void
+GMonitor::wait(unsigned long timeout) 
+{
+  // Check
+  pthread_t self = pthread_self();
+  if (count>0 || !pthread_equal(locker, self))
+    G_THROW( ERR_MSG("GThreads.not_acq_wait") );
+  // Wait
+  if (ok)
+    {
+      // Release
+      int sav_count = count;
+      count = 1;
+      // Wait
+      struct timeval  abstv;
+      struct timespec absts;
+      gettimeofday(&abstv, NULL); // grrr
+      absts.tv_sec = abstv.tv_sec + timeout/1000;
+      absts.tv_nsec = abstv.tv_usec*1000  + (timeout%1000)*1000000;
+      if (absts.tv_nsec > 1000000000) {
+        absts.tv_nsec -= 1000000000;
+        absts.tv_sec += 1;
+      }
+      pthread_cond_timedwait(&cond, &mutex, &absts);
+      // Re-acquire
+      count = sav_count;
+      locker = self;
+    }      
+}
+
+#endif
+
+
+
+// ----------------------------------------
+// GSAFEFLAGS 
+// ----------------------------------------
+
+
+
+GSafeFlags &
+GSafeFlags::operator=(long xflags)
+{
+   enter();
+   if (flags!=xflags)
+   {
+      flags=xflags;
+      broadcast();
+   }
+   leave();
+   return *this;
+}
+
+GSafeFlags::operator long(void) const
+{
+   long f;
+   ((GSafeFlags *) this)->enter();
+   f=flags;
+   ((GSafeFlags *) this)->leave();
+   return f;
+}
+
+bool
+GSafeFlags::test_and_modify(long set_mask, long clr_mask,
+			    long set_mask1, long clr_mask1)
+{
+   enter();
+   if ((flags & set_mask)==set_mask &&
+       (~flags & clr_mask)==clr_mask)
+   {
+      long new_flags=flags;
+      new_flags|=set_mask1;
+      new_flags&=~clr_mask1;
+      if (new_flags!=flags)
+      {
+	 flags=new_flags;
+	 broadcast();
+      }
+      leave();
+      return true;
+   }
+   leave();
+   return false;
+}
+
+void
+GSafeFlags::wait_and_modify(long set_mask, long clr_mask,
+			    long set_mask1, long clr_mask1)
+{
+   enter();
+   while((flags & set_mask)!=set_mask ||
+	 (~flags & clr_mask)!=clr_mask) wait();
+   long new_flags=flags;
+   new_flags|=set_mask1;
+   new_flags&=~clr_mask1;
+   if (flags!=new_flags)
+   {
+      flags=new_flags;
+      broadcast();
+   }
+   leave();
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/GThreads.h b/libdjvu/GThreads.h
new file mode 100644
index 0000000..9d60e62
--- /dev/null
+++ b/libdjvu/GThreads.h
@@ -0,0 +1,477 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GTHREADS_H_
+#define _GTHREADS_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name GThreads.h
+
+    Files #"GThreads.h"# and #"GThreads.cpp"# implement common entry points
+    for multithreading on multiple platforms.  Each execution thread is
+    represented by an instance of class \Ref{GThread}.  Synchronization is
+    provided by class \Ref{GMonitor} which implements a monitor (C.A.R Hoare,
+    Communications of the ACM, 17(10), 1974).
+
+    @memo
+    Portable threads
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation.\\
+    Praveen Guduru <praveen@sanskrit.lz.att.com> -- mac implementation.
+
+// From: Leon Bottou, 1/31/2002
+// Almost unchanged by Lizardtech.
+// GSafeFlags should go because it not as safe as it claims.
+// Reduced to only WINTHREADS and POSIXTHREADS around djvulibre-3.5.25
+
+*/
+//@{
+
+
+#include "DjVuGlobal.h"
+#include "GException.h"
+
+// Known platforms
+# ifdef _WIN32
+#  define WINTHREADS 1
+# elif HAVE_PTHREAD
+#  define POSIXTHREADS 1
+# else
+#  error "Libdjvu requires thread support"
+# endif
+
+
+// ----------------------------------------
+// INCLUDES
+
+#if WINTHREADS
+#ifndef _WINDOWS_
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
+#endif
+#endif
+
+#if POSIXTHREADS
+#include <sys/types.h>
+#include <sys/time.h>
+#include <unistd.h>
+#undef TRY
+#undef CATCH
+#define _CMA_NOWRAPPERS_
+#include <pthread.h>
+#endif
+
+
+// ----------------------------------------
+// PORTABLE CLASSES
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+/** Thread class.  A multithreaded process is composed of a main execution
+    thread and of several secondary threads.  Each secondary thread is
+    represented by a #GThread# object.  The amount of memory required for the
+    stack of a secondary thread is defined when the #GThread# object is
+    constructed.  The execution thread is started when function
+    \Ref{GThread::create} is called.  The destructor of class GThread waits
+    until the thread terminanes.  Note that the execution can be terminated at
+    any time (with possible prejudice) by calling \Ref{GThread::terminate}.
+
+    Several static member functions control the thread scheduler.  Function
+    \Ref{GThread::yield} relinquishes the processor to another thread.
+    Function \Ref{GThread::select} (#COTHREADS# only) provides a thread-aware
+    replacement for the well-known unix system call #select#.  
+
+    {\bf Note} --- Both the copy constructor and the copy operator are declared
+    as private members. It is therefore not possible to make multiple copies
+    of instances of this class, as implied by the class semantic. */
+
+class GThread {
+public:
+  /** Constructs a new thread object.  Memory is allocated for the
+      thread, but the thread is not started. 
+      Argument #stacksize# is used by the #COTHREADS# model only for
+      specifying the amount of memory needed for the processor stack. A
+      negative value will be replaced by a suitable default value of 128Kb.
+      A minimum value of 32Kb is silently enforced. */
+  GThread(int stacksize = -1);
+  /** Destructor.  Destroying the thread object while the thread is running is
+      perfectly ok since it only destroys the thread identifier.  Execution
+      will continue without interference. */
+  ~GThread();
+  /** Starts the thread. The new thread executes function #entry# with
+      argument #arg#.  The thread terminates when the function returns.  A
+      thread cannot be restarted after its termination. You must create a new
+      #GThread# object. */
+  int  create(void (*entry)(void*), void *arg);
+  /** Terminates a thread with extreme prejudice. The thread is removed from
+      the scheduling list.  Execution terminates regardless of the execution
+      status of the thread function. Automatic variables may or may not be
+      destroyed. This function must be considered as a last resort since
+      memory may be lost. */
+  void terminate();
+  /** Causes the current thread to relinquish the processor.  The scheduler
+      selects a thread ready to run and transfers control to that thread.  The
+      actual effect of #yield# heavily depends on the selected implementation.
+      Function #yield# usually returns zero when the execution of the current
+      thread is resumed.  It may return a positive number when it can
+      determine that the current thread will remain the only runnable thread
+      for some time.  You may then call function \Ref{get_select} to
+      obtain more information. */
+  static int yield();
+  /** Returns a value which uniquely identifies the current thread. */
+  static void *current();
+#if WINTHREADS
+private:
+  HANDLE hthr;
+  DWORD  thrid;
+#elif POSIXTHREADS
+private:
+  pthread_t hthr;
+  static void *start(void *arg);
+#endif
+public:
+  // Should be considered as private
+  void (*xentry)(void*);
+  void  *xarg;
+private:
+  // Disable default members
+  GThread(const GThread&);
+  GThread& operator=(const GThread&);
+};
+
+
+/** Monitor class.  Monitors have been first described in (C.A.R Hoare,
+    Communications of the ACM, 17(10), 1974).  This mechanism provides the
+    basic mutual exclusion (mutex) and thread notification facilities
+    (condition variables).
+    
+    Only one thread can own the monitor at a given time.  Functions
+    \Ref{enter} and \Ref{leave} can be used to acquire and release the
+    monitor. This mutual exclusion provides an efficient way to protect
+    segment of codes ({\em critical sections}) which should not be
+    simultaneously executed by two threads. Class \Ref{GMonitorLock} provides
+    a convenient way to do this effectively.
+    
+    When the thread owning the monitor calls function \Ref{wait}, the monitor
+    is released and the thread starts waiting until another thread calls
+    function \Ref{signal} or \Ref{broadcast}.  When the thread wakes-up, it
+    re-acquires the monitor and function #wait# returns.  Since the signaling
+    thread must acquire the monitor before calling functions #signal# and
+    #broadcast#, the signaled thread will not be able to re-acquire the
+    monitor until the signaling thread(s) releases the monitor.
+    
+    {\bf Note} --- Both the copy constructor and the copy operator are declared
+    as private members. It is therefore not possible to make multiple copies
+    of instances of this class, as implied by the class semantic. */
+
+class GMonitor
+{
+public:
+  GMonitor();
+  ~GMonitor();
+  /** Enters the monitor.  If the monitor is acquired by another thread this
+      function waits until the monitor is released.  The current thread then
+      acquires the monitor.  Calls to #enter# and #leave# may be nested. */
+  void enter();
+  /** Leaves the monitor.  The monitor counts how many times the current
+      thread has entered the monitor.  Function #leave# decrement this count.
+      The monitor is released when this count reaches zero.  An exception is
+      thrown if this function is called by a thread which does not own the
+      monitor. */
+  void leave();
+  /** Waits until the monitor is signaled.  The current thread atomically
+      releases the monitor and waits until another thread calls function
+      #signal# or #broadcast#.  Function #wait# then re-acquires the monitor
+      and returns.  An exception is thrown if this function is called by a
+      thread which does not own the monitor. */
+  void wait();
+  /** Waits until the monitor is signaled or a timeout is reached.  The
+      current thread atomically releases the monitor and waits until another
+      thread calls function #signal# or #broadcast# or a maximum of #timeout#
+      milliseconds.  Function #wait# then re-acquires the monitor and returns.
+      An exception is thrown if this function is called by a thread which does
+      not own the monitor. */
+  void wait(unsigned long timeout);
+  /** Signals one waiting thread.  Function #signal# wakes up at most one of
+      the waiting threads for this monitor.  An exception is thrown if this
+      function is called by a thread which does not own the monitor. */
+  void signal();
+  /** Signals all waiting threads. Function #broadcast# wakes up all the
+      waiting threads for this monitor.  An exception is thrown if this
+      function is called by a thread which does not own the monitor. */
+  void broadcast();
+private:
+#if WINTHREADS
+  int ok;
+  int count;
+  DWORD locker;
+  CRITICAL_SECTION cs;
+  struct thr_waiting *head;
+  struct thr_waiting *tail;
+#elif POSIXTHREADS
+  int ok;
+  int count;
+  pthread_t locker;
+  pthread_mutex_t mutex;
+  pthread_cond_t cond;
+#endif  
+private:
+  // Disable default members
+  GMonitor(const GMonitor&);
+  GMonitor& operator=(const GMonitor&);
+};
+
+
+
+
+
+// ----------------------------------------
+// SCOPE LOCK
+
+
+/** Wrapper for mutually exclusive code.
+    This class locks a specified critical section (see \Ref{GCriticalSection})
+    at construction time and unlocks it at destruction time. It provides a
+    convenient way to take advantage of the C++ implicit destruction of
+    automatic variables in order to make sure that the monitor is
+    released when exiting the protected code.  The following code will release
+    the monitor when the execution thread leaves the protected scope, either
+    because the protected code has executed successfully, or because an
+    exception was thrown.
+    \begin{verbatim}
+      {      -- protected scope
+         static GMonitor theMonitor;
+         GMonitorLock lock(&theMonitor)
+         ... -- protected code
+      }
+    \end{verbatim} 
+    This construct will do nothing when passed a null pointer.
+*/
+class GMonitorLock 
+{
+private:
+  GMonitor *gsec;
+public:
+  /** Constructor. Enters the monitor #gsec#. */
+  GMonitorLock(GMonitor *gsec) : gsec(gsec) 
+    { if (gsec) gsec->enter(); };
+  /** Destructor. Leaves the associated monitor. */
+  ~GMonitorLock() 
+    { if (gsec) gsec->leave(); };
+};
+
+
+
+// ----------------------------------------
+// GSAFEFLAGS (LB: this is not foolproof-safe but can be used savely!)
+
+/** A thread safe class representing a set of flags. The flags are protected
+    by \Ref{GMonitor}, which is attempted to be locked whenever somebody
+    accesses the flags. One can modify the class contents using one of
+    two functions: \Ref{test_and_modify}() and \Ref{wait_and_modify}().
+    Both of them provide atomic operation of testing (first) and modification
+    (second). The flags remain locked between the moment of testing and
+    modification, which guarantees, that their state cannot be changed in
+    between of these operations. */
+
+class GSafeFlags : public GMonitor
+{
+private:
+   volatile long flags;
+public:
+      /// Constructs #GSafeFlags# object.
+   GSafeFlags(long flags=0);
+
+      /** Assignment operator. Will also wake up threads waiting for the
+	  flags to change. */
+   GSafeFlags & operator=(long flags);
+
+      /** Returns the value of the flags */
+   operator long(void) const;
+      /** Modifies the flags by ORing them with the provided mask. A broadcast
+	  will be sent after the modification is done. */
+   GSafeFlags &	operator|=(long mask);
+      /** Modifies the flags by ANDing them with the provided mask. A broadcast
+	  will be sent after the modification is done. */
+   GSafeFlags &	operator&=(long mask);
+
+      /** If all bits mentioned in #set_mask# are set in the flags and all
+	  bits mentioned in #clr_mask# are cleared in the flags, it sets all
+	  bits from #set_mask1# in the flags, clears all flags from
+	  #clr_mask1# in the flags and returns #TRUE#. Otherwise returns
+	  #FALSE#. */
+   bool	test_and_modify(long set_mask, long clr_mask,
+			long set_mask1, long clr_mask1);
+
+      /** Waits until all bits mentioned in #set_mask# are set in the flags
+	  and all bits mentioned in #clr_flags# are cleared in the flags.
+	  After that it sets bits from #set_mask1# and clears bits from
+	  #clr_mask1# in the flags. */
+   void	wait_and_modify(long set_mask, long clr_mask,
+			long set_mask1, long clr_mask1);
+
+      /** Waits until all bits set in #set_mask# are set in the flags and
+	  all bits mentioned in #clr_mask# are cleared in the flags. */
+   void	wait_for_flags(long set_mask, long clr_mask=0) const;
+
+      /** Modifies the flags by setting all bits mentioned in #set_mask#
+	  and clearing all bits mentioned in #clr_mask#. If the flags have
+	  actually been modified, a broadcast will be sent. */
+   void	modify(long set_mask, long clr_mask);
+};
+
+inline
+GSafeFlags::GSafeFlags(long xflags) 
+  : flags(xflags) 
+{
+}
+
+inline void
+GSafeFlags::wait_for_flags(long set_mask, long clr_mask) const
+{
+   ((GSafeFlags *) this)->wait_and_modify(set_mask, clr_mask, 0, 0);
+}
+
+inline void
+GSafeFlags::modify(long set_mask, long clr_mask)
+{
+   test_and_modify(0, 0, set_mask, clr_mask);
+}
+
+inline GSafeFlags &
+GSafeFlags::operator|=(long mask)
+{
+   test_and_modify(0, 0, mask, 0);
+   return *this;
+}
+
+inline GSafeFlags &
+GSafeFlags::operator&=(long mask)
+{
+   test_and_modify(0, 0, 0, ~mask);
+   return *this;
+}
+
+//@}
+
+
+
+
+// ----------------------------------------
+// COMPATIBILITY CLASSES
+
+
+// -- these classes are no longer documented.
+
+class GCriticalSection : protected GMonitor 
+{
+public:
+  void lock() 
+    { GMonitor::enter(); };
+  void unlock() 
+    { GMonitor::leave(); };
+};
+
+class GEvent : protected GMonitor 
+{
+private:
+  int status;
+public:
+  GEvent() 
+    : status(0) { };
+  void set() 
+    { if (!status) { enter(); status=1; signal(); leave(); } };
+  void wait() 
+    { enter(); if (!status) GMonitor::wait(); status=0; leave(); };
+  void wait(int timeout) 
+    { enter(); if (!status) GMonitor::wait(timeout); status=0; leave(); };
+};
+
+class GCriticalSectionLock
+{
+private:
+  GCriticalSection *gsec;
+public:
+  GCriticalSectionLock(GCriticalSection *gsec) : gsec(gsec) 
+    { if (gsec) gsec->lock(); };
+  ~GCriticalSectionLock() 
+    { if (gsec) gsec->unlock(); };
+};
+
+
+// ----------------------------------------
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif //_GTHREADS_H_
+
diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp
new file mode 100644
index 0000000..0e8c0fc
--- /dev/null
+++ b/libdjvu/GURL.cpp
@@ -0,0 +1,1888 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// This has been heavily changed by Lizardtech.
+// They decided to use URLs for everyting, including
+// the most basic file access.  The URL class now is a unholy 
+// mixture of code for syntactically parsing the urls (which it was)
+// and file status code (only for local file: urls).
+
+#include "GException.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "debug.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+#include <string.h>
+
+#ifdef _WIN32
+# include <tchar.h>
+# include <windows.h>
+# include <direct.h>
+#endif /* WIN32 */
+
+// -- MAXPATHLEN
+#ifndef MAXPATHLEN
+# ifdef _MAX_PATH
+#  define MAXPATHLEN _MAX_PATH
+# else
+#  define MAXPATHLEN 1024
+# endif
+#else
+# if ( MAXPATHLEN < 1024 )
+#  undef MAXPATHLEN
+#  define MAXPATHLEN 1024
+# endif
+#endif
+
+#if defined(UNIX) || defined(OS2)
+# include <unistd.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <errno.h>
+# include <fcntl.h>
+# include <pwd.h>
+# include <stdio.h>
+# ifdef AUTOCONF
+#  ifdef TIME_WITH_SYS_TIME
+#   include <sys/time.h>
+#   include <time.h>
+#  else
+#   ifdef HAVE_SYS_TIME_H
+#    include <sys/time.h>
+#   else
+#    include <time.h>
+#   endif
+#  endif
+#  ifdef HAVE_DIRENT_H
+#   include <dirent.h>
+#   define NAMLEN(dirent) strlen((dirent)->d_name)
+#  else
+#   define dirent direct
+#   define NAMLEN(dirent) (dirent)->d_namlen
+#   ifdef HAVE_SYS_NDIR_H
+#    include <sys/ndir.h>
+#   endif
+#   ifdef HAVE_SYS_DIR_H
+#    include <sys/dir.h>
+#   endif
+#   ifdef HAVE_NDIR_H
+#    include <ndir.h>
+#   endif
+#  endif
+# else /* !AUTOCONF */ 
+#  include <sys/time.h>
+#  if defined(XENIX)
+#   define USE_DIRECT
+#   include <sys/ndir.h>
+#  elif defined(OLDBSD)
+#   define USE_DIRECT
+#   include <sys/dir.h>
+#  endif
+#  ifdef USE_DIRECT
+#   define dirent direct
+#   define NAMLEN(dirent) (dirent)->d_namlen
+#  else
+#   include <dirent.h>
+#   define NAMLEN(dirent) strlen((dirent)->d_name)
+#  endif 
+# endif /* !AUTOCONF */
+#endif /* UNIX */
+
+#ifdef macintosh
+#include <unix.h>
+#include <errno.h>
+#include <unistd.h>
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+static const char djvuopts[]="DJVUOPTS";
+static const char localhost[]="file://localhost/";
+static const char backslash='\\';  
+static const char colon=':';
+static const char dot='.';
+static const char filespecslashes[] = "file://";
+static const char filespec[] = "file:";
+static const char slash='/';
+static const char percent='%';
+static const char localhostspec1[] = "//localhost/";
+static const char localhostspec2[] = "///";
+static const char nillchar=0;
+#if defined(UNIX)
+  static const char tilde='~';
+  static const char root[] = "/";
+#elif defined(_WIN32) || defined(OS2)
+  static const char root[] = "\\";
+#elif defined(macintosh)
+  static char const * const root = &nillchar; 
+#else
+#error "Define something here for your operating system"
+#endif
+
+
+static const int
+pathname_start(const GUTF8String &url, const int protolength);
+
+// hexval --
+// -- Returns the hexvalue of a character.
+//    Returns -1 if illegal;
+
+static int 
+hexval(char c)
+{
+  return ((c>='0' && c<='9')
+    ?(c-'0')
+    :((c>='A' && c<='F')
+      ?(c-'A'+10)
+      :((c>='a' && c<='f')
+        ?(c-'a'+10):(-1))));
+}
+
+
+static bool
+is_argument(const char * start)
+      // Returns TRUE if 'start' points to the beginning of an argument
+      // (either hash or CGI)
+{
+   // return (*start=='#' || *start=='?' || *start=='&' || *start==';');
+   return (*start=='#' || *start=='?' );
+}
+
+static bool
+is_argument_sep(const char * start)
+      // Returns TRUE if 'start' points to the beginning of an argument
+      // (either hash or CGI)
+{
+   return (*start=='&')||(*start == ';');
+}
+
+void
+GURL::convert_slashes(void)
+{
+   GUTF8String xurl(get_string());
+#if defined(_WIN32)
+   const int protocol_length=protocol(xurl).length();
+   for(char *ptr=(xurl.getbuf()+protocol_length);*ptr;ptr++)
+     if(*ptr == backslash)
+       *ptr=slash;
+   url=xurl;
+#endif
+}
+
+static void
+collapse(char * ptr, const int chars)
+      // Will remove the first 'chars' chars from the string and
+      // move the rest toward the beginning. Will take into account
+      // string length
+{
+   const int length=strlen(ptr);
+   const char *srcptr=ptr+((chars>length)?length:chars);
+   while((*(ptr++) = *(srcptr++)))
+     EMPTY_LOOP;
+}
+
+GUTF8String
+GURL::beautify_path(GUTF8String xurl)
+{
+
+  const int protocol_length=GURL::protocol(xurl).length();
+   
+  // Eats parts like ./ or ../ or ///
+  char * buffer;
+  GPBuffer<char> gbuffer(buffer,xurl.length()+1);
+  strcpy(buffer, (const char *)xurl);
+   
+  // Find start point
+  char * start=buffer+pathname_start(xurl,protocol_length);
+
+  // Find end of the url (don't touch arguments)
+  char * ptr;
+  GUTF8String args;
+  for(ptr=start;*ptr;ptr++)
+  {
+    if (is_argument(ptr))
+    {
+      args=ptr;
+      *ptr=0;
+      break;
+    }
+  }
+
+  // Eat multiple slashes
+  for(;(ptr=strstr(start, "////"));collapse(ptr, 3))
+    EMPTY_LOOP;
+  for(;(ptr=strstr(start, "//"));collapse(ptr, 1))
+    EMPTY_LOOP;
+  // Convert /./ stuff into plain /
+  for(;(ptr=strstr(start, "/./"));collapse(ptr, 2))
+    EMPTY_LOOP;
+#if defined(_WIN32) || defined(OS2)
+  if(!xurl.cmp(filespec,sizeof(filespec)-1))
+  {
+	int offset=1;
+	if(start&&(start[0] == '/')&& 
+           !xurl.cmp("file:////",sizeof("file:////")-1))
+	{
+	  collapse(start, 1);
+	  offset=0;
+	}
+    for(ptr=start+offset;(ptr=strchr(ptr, '/'));)
+	{
+	  if(isalpha((++ptr)[0]))
+	  {
+	    if((ptr[1] == ':')&&(ptr[2]=='/'))
+		{
+		  char *buffer2;
+                  GPBuffer<char> gbuffer2(buffer2,strlen(ptr)+1);
+		  strcpy(buffer2,ptr);
+		  gbuffer.resize(strlen(ptr)+sizeof(localhost));
+		  strcpy(buffer,localhost);
+		  strcat(buffer,buffer2);
+		  ptr=(start=buffer+sizeof(localhost))+1;
+		}
+	  }
+	}
+  }
+#endif
+  // Process /../
+  while((ptr=strstr(start, "/../")))
+  {
+    for(char * ptr1=ptr-1;(ptr1>=start);ptr1--)
+    {
+      if (*ptr1==slash)
+      {
+        collapse(ptr1, ptr-ptr1+3);
+        break;
+      }
+    }
+  }
+
+  // Remove trailing /.
+  ptr=start+strlen(start)-2;
+  if((ptr>=start)&& (ptr == GUTF8String("/.")))
+  {
+    ptr[1]=0;
+  }
+  // Eat trailing /..
+  ptr=start+strlen(start)-3;
+  if((ptr >= start) && (ptr == GUTF8String("/..")))
+  {
+    for(char * ptr1=ptr-1;(ptr1>=start);ptr1--)
+    {
+      if (*ptr1==slash)
+      {
+        ptr1[1]=0;
+        break;
+      }
+    }
+  }
+
+  // Done. Copy the buffer back into the URL and add arguments.
+  xurl=buffer;
+  return (xurl+args);
+}
+
+
+void
+GURL::beautify_path(void)
+{
+  url=beautify_path(get_string());
+}
+
+void
+GURL::init(const bool nothrow)
+{
+   GCriticalSectionLock lock(&class_lock);
+   validurl=true;
+   
+   if (url.length())
+   {
+      GUTF8String proto=protocol();
+      if (proto.length()<2)
+      {
+        validurl=false;
+        if(!nothrow)
+          G_THROW( ERR_MSG("GURL.no_protocol") "\t"+url);
+        return;
+      }
+
+         // Below we have to make this complex test to detect URLs really
+         // referring to *local* files. Surprisingly, file://hostname/dir/file
+         // is also valid, but shouldn't be treated thru local FS.
+      if (proto=="file" && url[5]==slash &&
+          (url[6]!=slash || !url.cmp(localhost, sizeof(localhost))))
+      {
+            // Separate the arguments
+         GUTF8String arg;
+         {
+           const char * const url_ptr=url;
+           const char * ptr;
+           for(ptr=url_ptr;*ptr&&!is_argument(ptr);ptr++)
+           		EMPTY_LOOP;
+           arg=ptr;
+           url=url.substr(0,(size_t)(ptr-url_ptr));
+         }
+
+            // Do double conversion
+         GUTF8String tmp=UTF8Filename();
+         if (!tmp.length())
+         {
+           validurl=false;
+           if(!nothrow)
+             G_THROW( ERR_MSG("GURL.fail_to_file") );
+           return;
+         }
+         url=GURL::Filename::UTF8(tmp).get_string();
+         if (!url.length())
+         {
+           validurl=false;
+           if(!nothrow)
+             G_THROW( ERR_MSG("GURL.fail_to_URL") );
+           return;
+         }
+            // Return the argument back
+         url+=arg;
+      }
+      convert_slashes();
+      beautify_path();
+      parse_cgi_args();
+   }
+}
+
+GURL::GURL(void) 
+  : validurl(false) 
+{
+}
+
+GURL::GURL(const char * url_in) 
+  : url(url_in ? url_in : ""), validurl(false)
+{
+}
+
+GURL::GURL(const GUTF8String & url_in)
+  : url(url_in), validurl(false)
+{
+}
+
+GURL::GURL(const GNativeString & url_in)
+  : url(url_in.getNative2UTF8()), validurl(false)
+{
+#if defined(_WIN32) || defined(OS2)
+  if(is_valid() && is_local_file_url())
+  {
+    GURL::Filename::UTF8 xurl(UTF8Filename());
+    url=xurl.get_string(true);
+    validurl=false;
+  }
+#endif
+}
+
+GURL::GURL(const GURL & url_in)
+  : validurl(false)
+{
+  if(url_in.is_valid())
+  {
+    url=url_in.get_string();
+    init();
+  }else
+  {
+    url=url_in.url;
+  }
+}
+
+GURL &
+GURL::operator=(const GURL & url_in)
+{
+   GCriticalSectionLock lock(&class_lock);
+   if(url_in.is_valid())
+   {
+     url=url_in.get_string();
+     init(true);
+   }else
+   {
+     url=url_in.url;
+     validurl=false;
+   }
+   return *this;
+}
+
+GUTF8String
+GURL::protocol(const GUTF8String& url)
+{
+  const char * const url_ptr=url;
+  const char * ptr=url_ptr;
+  for(char c=*ptr;
+      c && isascii(c) && (isalnum(c) || c == '+' || c == '-' || c == '.');
+      c=*(++ptr)) EMPTY_LOOP;
+  if (ptr[0]==colon && ptr[1]=='/' && ptr[2]=='/')
+    return GUTF8String(url_ptr, ptr-url_ptr);
+  return GUTF8String();
+}
+
+GUTF8String
+GURL::hash_argument(void) const
+      // Returns the HASH argument (anything after '#' and before '?')
+{
+   const GUTF8String xurl(get_string());
+
+   bool found=false;
+   GUTF8String arg;
+
+         // Break if CGI argument is found
+   for(const char * start=xurl;*start&&(*start!='?');start++)
+   {
+      if (found)
+      {
+         arg+=*start;
+      }else
+      {
+         found=(*start=='#');
+      }
+   }
+   return decode_reserved(arg);
+}
+
+void
+GURL::set_hash_argument(const GUTF8String &arg)
+{
+   const GUTF8String xurl(get_string());
+
+   GUTF8String new_url;
+   bool found=false;
+   const char * ptr;
+   for(ptr=xurl;*ptr;ptr++)
+   {
+      if (is_argument(ptr))
+      {
+         if (*ptr!='#')
+         {
+           break;
+         }
+         found=true;
+      } else if (!found)
+      {
+         new_url+=*ptr;
+      }
+   }
+
+   url=new_url+"#"+GURL::encode_reserved(arg)+ptr;
+}
+
+void
+GURL::parse_cgi_args(void)
+      // Will read CGI arguments from the URL into
+      // cgi_name_arr and cgi_value_arr
+{
+   if(!validurl)
+     init();
+   GCriticalSectionLock lock1(&class_lock);
+   cgi_name_arr.empty();
+   cgi_value_arr.empty();
+
+      // Search for the beginning of CGI arguments
+   const char * start=url;
+   while(*start)
+   {
+     if(*(start++)=='?')
+     {
+       break;
+     }
+   }
+
+      // Now loop until we see all of them
+   while(*start)
+   {
+      GUTF8String arg;        // Storage for another argument
+      while(*start)        // Seek for the end of it
+      {
+         if (is_argument_sep(start))
+         {
+            start++;
+            break;
+         } else
+         {
+           arg+=*start++;
+         }
+      }
+      if (arg.length())
+      {
+            // Got argument in 'arg'. Split it into 'name' and 'value'
+         const char * ptr;
+         const char * const arg_ptr=arg;
+	 for(ptr=arg_ptr;*ptr&&(*ptr != '=');ptr++)
+	   EMPTY_LOOP;
+
+         GUTF8String name, value;
+         if (*ptr)
+         {
+            name=GUTF8String(arg_ptr, (int)((ptr++)-arg_ptr));
+            value=GUTF8String(ptr, arg.length()-name.length()-1);
+         } else
+         {
+           name=arg;
+         }
+            
+         int args=cgi_name_arr.size();
+         cgi_name_arr.resize(args);
+         cgi_value_arr.resize(args);
+         cgi_name_arr[args]=decode_reserved(name);
+         cgi_value_arr[args]=decode_reserved(value);
+      }
+   }
+}
+
+void
+GURL::store_cgi_args(void)
+      // Will store CGI arguments from the cgi_name_arr and cgi_value_arr
+      // back into the URL
+{
+   if(!validurl)
+     init();
+   GCriticalSectionLock lock1(&class_lock);
+
+   const char * const url_ptr=url;
+   const char * ptr;
+   for(ptr=url_ptr;*ptr&&(*ptr!='?');ptr++)
+   		EMPTY_LOOP;
+   
+   GUTF8String new_url(url_ptr, ptr-url_ptr);
+   
+   for(int i=0;i<cgi_name_arr.size();i++)
+   {
+      GUTF8String name=GURL::encode_reserved(cgi_name_arr[i]);
+      GUTF8String value=GURL::encode_reserved(cgi_value_arr[i]);
+      new_url+=(i?"&":"?")+name;
+      if (value.length())
+         new_url+="="+value;
+   }
+
+   url=new_url;
+}
+
+int
+GURL::cgi_arguments(void) const
+{
+   if(!validurl)
+      const_cast<GURL *>(this)->init();
+   return cgi_name_arr.size();
+}
+
+int
+GURL::djvu_cgi_arguments(void) const
+{
+   if(!validurl)
+     const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   int args=0;
+   for(int i=0;i<cgi_name_arr.size();i++)
+   {
+      if (cgi_name_arr[i].upcase()==djvuopts)
+      {
+         args=cgi_name_arr.size()-(i+1);
+         break;
+      }
+   } 
+   return args;
+}
+
+GUTF8String
+GURL::cgi_name(int num) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   return (num<cgi_name_arr.size())?cgi_name_arr[num]:GUTF8String();
+}
+
+GUTF8String
+GURL::djvu_cgi_name(int num) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   GUTF8String arg;
+   for(int i=0;i<cgi_name_arr.size();i++)
+      if (cgi_name_arr[i].upcase()==djvuopts)
+      {
+         for(i++;i<cgi_name_arr.size();i++)
+            if (! num--)
+            {
+               arg=cgi_name_arr[i];
+               break;
+            }
+         break;
+      }
+   return arg;
+}
+
+GUTF8String
+GURL::cgi_value(int num) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   return (num<cgi_value_arr.size())?cgi_value_arr[num]:GUTF8String();
+}
+
+GUTF8String
+GURL::djvu_cgi_value(int num) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   GUTF8String arg;
+   for(int i=0;i<cgi_name_arr.size();i++)
+   {
+      if (cgi_name_arr[i].upcase()==djvuopts)
+      {
+         for(i++;i<cgi_name_arr.size();i++)
+         {
+            if (! num--)
+            {
+               arg=cgi_value_arr[i];
+               break;
+            }
+         }
+         break;
+      }
+   }
+   return arg;
+}
+
+DArray<GUTF8String>
+GURL::cgi_names(void) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   return cgi_name_arr;
+}
+
+DArray<GUTF8String>
+GURL::cgi_values(void) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   return cgi_value_arr;
+}
+
+DArray<GUTF8String>
+GURL::djvu_cgi_names(void) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   int i;
+   DArray<GUTF8String> arr;
+   for(i=0;(i<cgi_name_arr.size())&&
+     (cgi_name_arr[i].upcase()!=djvuopts)
+     ;i++)
+     	EMPTY_LOOP;
+
+   int size=cgi_name_arr.size()-(i+1);
+   if (size>0)
+   {
+      arr.resize(size-1);
+      for(i=0;i<arr.size();i++)
+         arr[i]=cgi_name_arr[cgi_name_arr.size()-arr.size()+i];
+   }
+
+   return arr;
+}
+
+DArray<GUTF8String>
+GURL::djvu_cgi_values(void) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+
+   int i;
+   DArray<GUTF8String> arr;
+   for(i=0;i<cgi_name_arr.size()&&(cgi_name_arr[i].upcase()!=djvuopts);i++)
+   		EMPTY_LOOP;
+
+   int size=cgi_name_arr.size()-(i+1);
+   if (size>0)
+   {
+      arr.resize(size-1);
+      for(i=0;i<arr.size();i++)
+         arr[i]=cgi_value_arr[cgi_value_arr.size()-arr.size()+i];
+   }
+
+   return arr;
+}
+
+void
+GURL::clear_all_arguments(void)
+{
+   clear_hash_argument();
+   clear_cgi_arguments();
+}
+
+void
+GURL::clear_hash_argument(void)
+      // Clear anything after first '#' and before the following '?'
+{
+   if(!validurl) init();
+   GCriticalSectionLock lock(&class_lock);
+   bool found=false;
+   GUTF8String new_url;
+   for(const char * start=url;*start;start++)
+   {
+         // Break on first CGI arg.
+      if (*start=='?')
+      {
+         new_url+=start;
+         break;
+      }
+
+      if (!found)
+      { 
+        if (*start=='#')
+          found=true;
+        else
+          new_url+=*start;
+      }
+   }
+   url=new_url;
+}
+
+void
+GURL::clear_cgi_arguments(void)
+{
+   if(!validurl)
+     init();
+   GCriticalSectionLock lock1(&class_lock);
+
+      // Clear the arrays
+   cgi_name_arr.empty();
+   cgi_value_arr.empty();
+
+      // And clear everything past the '?' sign in the URL
+   const char * ptrurl = url;
+   for(const char *ptr = ptrurl; *ptr; ptr++)
+     if (*ptr=='?')
+       {
+         url.setat(ptr-ptrurl, 0);
+         break;
+       }
+}
+
+void
+GURL::clear_djvu_cgi_arguments(void)
+{
+   if(!validurl) init();
+      // First - modify the arrays
+   GCriticalSectionLock lock(&class_lock);
+   for(int i=0;i<cgi_name_arr.size();i++)
+   {
+      if (cgi_name_arr[i].upcase()==djvuopts)
+      {
+         cgi_name_arr.resize(i-1);
+         cgi_value_arr.resize(i-1);
+         break;
+      }
+   }
+
+      // And store them back into the URL
+   store_cgi_args();
+}
+
+void
+GURL::add_djvu_cgi_argument(const GUTF8String &name, const char * value)
+{
+   if(!validurl)
+     init();
+   GCriticalSectionLock lock1(&class_lock);
+
+      // Check if we already have the "DJVUOPTS" argument
+   bool have_djvuopts=false;
+   for(int i=0;i<cgi_name_arr.size();i++)
+   {
+      if (cgi_name_arr[i].upcase()==djvuopts)
+      {
+         have_djvuopts=true;
+         break;
+      }
+   }
+
+      // If there is no DJVUOPTS, insert it
+   if (!have_djvuopts)
+   {
+      int pos=cgi_name_arr.size();
+      cgi_name_arr.resize(pos);
+      cgi_value_arr.resize(pos);
+      cgi_name_arr[pos]=djvuopts;
+   }
+
+      // Add new argument to the array
+   int pos=cgi_name_arr.size();
+   cgi_name_arr.resize(pos);
+   cgi_value_arr.resize(pos);
+   cgi_name_arr[pos]=name;
+   cgi_value_arr[pos]=value;
+
+      // And update the URL
+   store_cgi_args();
+}
+
+bool
+GURL::is_local_file_url(void) const
+{
+   if(!validurl) const_cast<GURL *>(this)->init();
+   GCriticalSectionLock lock((GCriticalSection *) &class_lock);
+   return (protocol()=="file" && url[5]==slash);
+}
+
+static const int
+pathname_start(const GUTF8String &url, const int protolength)
+{
+  const int length=url.length();
+  int retval=0;
+  if(protolength+1<length)
+  {
+    retval=url.search(slash,((url[protolength+1] == '/')
+      ?((url[protolength+2] == '/')?(protolength+3):(protolength+2))
+      :(protolength+1)));
+  }
+  return (retval>0)?retval:length;
+}
+
+GUTF8String
+GURL::pathname(void) const
+{
+  return (is_local_file_url())
+    ?GURL::encode_reserved(UTF8Filename()) 
+    :url.substr(pathname_start(url,protocol().length()),(unsigned int)(-1));
+}
+
+GURL
+GURL::base(void) const
+{
+   const GUTF8String xurl(get_string());
+   const int protocol_length=protocol(xurl).length();
+   const char * const url_ptr=xurl;
+   const char * ptr, * xslash;
+   ptr=xslash=url_ptr+protocol_length+1;
+   if(xslash[0] == '/')
+   {
+     xslash++;
+     if(xslash[0] == '/')
+       xslash++;
+     for(ptr=xslash;ptr[0] && !is_argument(ptr);ptr++)
+     {
+       if ((ptr[0]==slash)&&ptr[1]&&!is_argument(ptr+1))
+        xslash=ptr;
+     }
+     if(xslash[0] != '/')
+     {
+       xslash=ptr;
+     }
+   }
+   return GURL::UTF8(GUTF8String(xurl,(int)(xslash-url_ptr))+"/"+ptr);
+}
+
+bool
+GURL::operator==(const GURL & gurl2) const
+{
+  const GUTF8String g1(get_string());
+  const GUTF8String g2(gurl2.get_string());
+  const char *s1 = (const char*)g1;
+  const char *s2 = (const char*)g2;
+  int n1=0;
+  int n2=0;
+  while (s1[n1] && !is_argument(s1+n1))
+    n1 += 1;
+  while (s2[n2] && !is_argument(s2+n2))
+    n2 += 1;
+  if (n1 == n2)
+    return !strcmp(s1+n1,s2+n2) && !strncmp(s1,s2,n1);
+  if (n1 == n2+1 && s1[n2]=='/')
+    return !strcmp(s1+n1,s2+n2) && !strncmp(s1,s2,n2);
+  if (n2 == n1+1 && s2[n1]=='/')
+    return !strcmp(s1+n1,s2+n2) && !strncmp(s1,s2,n1);    
+  return false;
+}
+
+GUTF8String
+GURL::name(void) const
+{
+   if(!validurl)
+     const_cast<GURL *>(this)->init();
+   GUTF8String retval;
+   if(!is_empty())
+   {
+     const GUTF8String xurl(url);
+     const int protocol_length=protocol(xurl).length();
+     const char * ptr, * xslash=(const char *)xurl+protocol_length-1;
+     for(ptr=(const char *)xurl+protocol_length;
+       *ptr && !is_argument(ptr);ptr++)
+	 {
+       if (*ptr==slash)
+          xslash=ptr;
+	 }
+     retval=GUTF8String(xslash+1, ptr-xslash-1);
+   }
+   return retval;
+}
+
+GUTF8String
+GURL::fname(void) const
+{
+   if(!validurl)
+     const_cast<GURL *>(this)->init();
+   return decode_reserved(name());
+}
+
+GUTF8String
+GURL::extension(void) const
+{
+   if(!validurl)
+     const_cast<GURL *>(this)->init();
+   GUTF8String xfilename=name();
+   GUTF8String retval;
+
+   for(int i=xfilename.length()-1;i>=0;i--)
+   {
+      if (xfilename[i]=='.')
+      {
+         retval=(const char*)xfilename+i+1;
+         break;
+      }
+   } 
+   return retval;
+}
+
+GUTF8String
+GURL::decode_reserved(const GUTF8String &gurl)
+{
+  const char *url=gurl;
+  char *res;
+  GPBuffer<char> gres(res,gurl.length()+1);
+  char *r=res;
+  for(const char * ptr=url;*ptr;++ptr,++r)
+  {
+    if (*ptr!=percent)
+    {
+      r[0]=*ptr;
+    }else
+    {
+      int c1,c2;
+      if ( ((c1=hexval(ptr[1]))>=0)
+        && ((c2=hexval(ptr[2]))>=0) )
+      {
+        r[0]=(c1<<4)|c2;
+        ptr+=2;
+      } else
+      {
+        r[0]=*ptr;
+      }
+    }
+  }
+  r[0]=0;
+  GUTF8String retval(res);
+  if(!retval.is_valid())
+  {
+    retval=GNativeString(res);
+  }
+  return retval;
+}
+
+GUTF8String
+GURL::encode_reserved(const GUTF8String &gs)
+{
+  const char *s=(const char *)gs;
+  // Potentially unsafe characters (cf. RFC1738 and RFC1808)
+  static const char hex[] = "0123456789ABCDEF";
+  
+  unsigned char *retval;
+  GPBuffer<unsigned char> gd(retval,strlen(s)*3+1);
+  unsigned char *d=retval;
+  for (; *s; s++,d++)
+  {
+    // Convert directory separator to slashes
+#if defined(_WIN32) || defined(OS2)
+    if (*s == backslash || *s== slash)
+#else
+#ifdef macintosh
+    if (*s == colon )
+#else
+#ifdef UNIX
+    if (*s == slash )
+#else
+#error "Define something here for your operating system"
+#endif  
+#endif
+#endif
+    {
+      *d = slash; 
+      continue;
+    }
+    unsigned char const ss=(unsigned char const)(*s);
+    // WARNING: Whenever you modify this conversion code,
+    // make sure, that the following functions are in sync:
+    //   encode_reserved()
+    //   decode_reserved()
+    //   url_to_filename()
+    //   filename_to_url()
+    // unreserved characters
+    if ( (ss>='a' && ss<='z') ||
+         (ss>='A' && ss<='Z') ||
+         (ss>='0' && ss<='9') ||
+         (strchr("$-_.+!*'(),~:=", ss)) ) 
+    {
+      *d = ss;
+      continue;
+    }
+    // escape sequence
+    d[0] = percent;
+    d[1] = hex[ (ss >> 4) & 0xf ];
+    d[2] = hex[ (ss) & 0xf ];
+    d+=2;
+  }
+  *d = 0;
+  return retval;
+}
+
+// -------------------------------------------
+// Functions for converting filenames and urls
+// -------------------------------------------
+
+static GUTF8String
+url_from_UTF8filename(const GUTF8String &gfilename)
+{
+  if(GURL::UTF8(gfilename).is_valid())
+  {
+    DEBUG_MSG("Debug: URL as Filename: " << gfilename << "\n");
+  } 
+  const char *filename=gfilename;
+  if(filename && (unsigned char)filename[0] == (unsigned char)0xEF
+     && (unsigned char)filename[1] == (unsigned char)0xBB 
+     && (unsigned char)filename[2] == (unsigned char)0xBF)
+  {
+    filename+=3;
+  }
+
+  // Special case for blank pages
+  if(!filename || !filename[0])
+  {
+    return GUTF8String();
+  } 
+
+  // Normalize file name to url slash-and-escape syntax
+  GUTF8String oname=GURL::expand_name(filename);
+  GUTF8String nname=GURL::encode_reserved(oname);
+
+  // Preprend "file://" to file name. If file is on the local
+  // machine, include "localhost".
+  GUTF8String url=filespecslashes;
+  const char *cnname=nname;
+  if (cnname[0] == slash)
+  {
+    if (cnname[1] == slash)
+    {
+      url += cnname+2;
+    }else
+    {
+      url = localhost + nname;
+    }
+  }else
+  {
+    url += (localhostspec1+2) + nname;
+  }
+  return url;
+}
+
+GUTF8String 
+GURL::get_string(const bool nothrow) const
+{
+  if(!validurl)
+    const_cast<GURL *>(this)->init(nothrow);
+  return url;
+}
+
+// -- Returns a url for accessing a given file.
+//    If useragent is not provided, standard url will be created,
+//    but will not be understood by some versions if IE.
+GUTF8String 
+GURL::get_string(const GUTF8String &useragent) const
+{
+  if(!validurl)
+    const_cast<GURL *>(this)->init();
+  GUTF8String retval(url);
+  if(is_local_file_url()&&useragent.length())
+  {
+    if(useragent.search("MSIE") >= 0 || useragent.search("Microsoft")>=0)
+    {
+      retval=filespecslashes + expand_name(UTF8Filename());
+    }
+  }
+  return retval;
+}
+
+GURL::UTF8::UTF8(const GUTF8String &xurl)
+: GURL(xurl) {}
+
+GURL::UTF8::UTF8(const GUTF8String &xurl,const GURL &codebase)
+: GURL(xurl,codebase) {}
+
+GURL::GURL(const GUTF8String &xurl,const GURL &codebase)
+  : validurl(false)
+{
+  if(GURL::UTF8(xurl).is_valid())
+    {
+      url=xurl;
+    }
+  else
+    {
+      // split codebase
+      const char *buffer = codebase;
+      GUTF8String all(buffer);
+      GUTF8String suffix;
+      GUTF8String path;
+      GUTF8String prefix;
+      const int protocol_length=GURL::protocol(all).length();
+      const char *start = buffer + pathname_start(all,protocol_length);
+      if (start > buffer)
+        prefix = GUTF8String(buffer, start-buffer);
+      const char *ptr = start;
+      while (*ptr && !is_argument(ptr))
+        ptr++;
+      if (*ptr)
+        suffix = GUTF8String(ptr);
+      if (ptr > start)
+        path = GUTF8String(start, ptr-start);
+      // append xurl to path
+      const char *c = xurl;
+      if(c[0] == slash)
+        path = GURL::encode_reserved(xurl);
+      else
+        path = path + GUTF8String(slash)+GURL::encode_reserved(xurl);
+      // construct url
+      url = beautify_path(prefix + path + suffix);
+    }
+}
+
+GURL::Native::Native(const GNativeString &xurl)
+: GURL(xurl) {}
+
+GURL::Native::Native(const GNativeString &xurl,const GURL &codebase)
+: GURL(xurl,codebase) {}
+
+GURL::GURL(const GNativeString &xurl,const GURL &codebase)
+  : validurl(false)
+{
+  GURL retval(xurl.getNative2UTF8(),codebase);
+  if(retval.is_valid())
+  {
+#if defined(_WIN32)
+    // Hack for IE to change \\ to /
+    if(retval.is_local_file_url())
+    {
+      GURL::Filename::UTF8 retval2(retval.UTF8Filename());
+      url=retval2.get_string(true);
+      validurl=false;
+    }else
+#endif // WIN32
+    {
+      url=retval.get_string(true);
+      validurl=false;
+    }
+  }
+}
+
+GURL::Filename::Filename(const GNativeString &gfilename)
+{
+  url=url_from_UTF8filename(gfilename.getNative2UTF8());
+}
+
+GURL::Filename::Native::Native(const GNativeString &gfilename)
+: GURL::Filename(gfilename) {}
+
+GURL::Filename::Filename(const GUTF8String &gfilename)
+{
+  url=url_from_UTF8filename(gfilename);
+}
+
+GURL::Filename::UTF8::UTF8(const GUTF8String &gfilename)
+: GURL::Filename(gfilename) {}
+
+// filename --
+// -- Applies heuristic rules to convert a url into a valid file name.  
+//    Returns a simple basename in case of failure.
+GUTF8String 
+GURL::UTF8Filename(void) const
+{
+  GUTF8String retval;
+  if(! is_empty())
+  {
+    const char *url_ptr=url;
+  
+    // WARNING: Whenever you modify this conversion code,
+    // make sure, that the following functions are in sync:
+    //   encode_reserved()
+    //   decode_reserved()
+    //   url_to_filename()
+    //   filename_to_url()
+
+    GUTF8String urlcopy=decode_reserved(url);
+    url_ptr = urlcopy;
+
+    // All file urls are expected to start with filespec which is "file:"
+    if (GStringRep::cmp(filespec, url_ptr, sizeof(filespec)-1))  //if not
+      return GOS::basename(url_ptr);
+    url_ptr += sizeof(filespec)-1;
+  
+#if defined(macintosh)
+    //remove all leading slashes
+    for(;*url_ptr==slash;url_ptr++)
+      EMPTY_LOOP;
+    // Remove possible localhost spec
+    if ( !GStringRep::cmp(localhost, url_ptr, sizeof(localhost)-1) )
+      url_ptr += sizeof(localhost)-1;
+    //remove all leading slashes
+    while(*url_ptr==slash)
+      url_ptr++;
+#else
+    // Remove possible localhost spec
+    if ( !GStringRep::cmp(localhostspec1, url_ptr, sizeof(localhostspec1)-1) )
+      // RFC 1738 local host form
+      url_ptr += sizeof(localhostspec1)-1;
+    else if ( !GStringRep::cmp(localhostspec2, url_ptr, sizeof(localhostspec2)-1 ) )
+      // RFC 1738 local host form
+      url_ptr += sizeof(localhostspec2)-1;
+    else if ( (strlen(url_ptr) > 4)   // "file://<letter>:/<path>"
+        && (url_ptr[0] == slash)      // "file://<letter>|/<path>"
+        && (url_ptr[1] == slash)
+        && isalpha(url_ptr[2])
+        && ( url_ptr[3] == colon || url_ptr[3] == '|' )
+        && (url_ptr[4] == slash) )
+      url_ptr += 2;
+    else if ( (strlen(url_ptr)) > 2 // "file:/<path>"
+        && (url_ptr[0] == slash)
+        && (url_ptr[1] != slash) )
+      url_ptr++;
+#endif
+
+    // Check if we are finished
+#if defined(macintosh)
+    {
+      char *l_url;
+      GPBuffer<char> gl_url(l_url,strlen(url_ptr)+1);
+      const char *s;
+      char *r;
+      for ( s=url_ptr,r=l_url; *s; s++,r++)
+      {
+        *r=(*s == slash)?colon:*s;
+      }
+      *r=0;
+      retval = expand_name(l_url,root);
+    }
+#else  
+    retval = expand_name(url_ptr,root);
+#endif
+    
+#if defined(_WIN32) || defined(OS2)
+    if (url_ptr[0] && url_ptr[1]=='|' && url_ptr[2]== slash)
+    {
+      if ((url_ptr[0]>='a' && url_ptr[0]<='z') 
+          || (url_ptr[0]>='A' && url_ptr[0]<='Z'))
+      {
+	GUTF8String drive;
+	drive.format("%c%c%c", url_ptr[0],colon,backslash);
+	retval = expand_name(url_ptr+3, drive);
+      }
+    }
+#endif
+  }
+  // Return what we have
+  return retval;
+}
+
+GNativeString 
+GURL::NativeFilename(void) const
+{
+  return UTF8Filename().getUTF82Native();
+}
+
+#if defined(UNIX) || defined(macintosh) || defined(OS2)
+static int
+urlstat(const GURL &url,struct stat &buf)
+{
+  return ::stat(url.NativeFilename(),&buf);
+}
+#endif
+
+// is_file(url) --
+// -- returns true if filename denotes a regular file.
+bool
+GURL::is_file(void) const
+{
+  bool retval=false;
+  if(is_local_file_url())
+  {
+#if defined(UNIX) || defined(macintosh) || defined(OS2)
+    struct stat buf;
+    if (!urlstat(*this,buf))
+    {
+      retval=!(buf.st_mode & S_IFDIR);
+    }
+#elif defined(_WIN32)
+    GUTF8String filename(UTF8Filename());
+    if(filename.length() >= MAX_PATH)
+      {
+        if(!filename.cmp("\\\\",2))
+          filename="\\\\?\\UNC"+filename.substr(1,-1);
+        else
+          filename="\\\\?\\"+filename;
+      }
+    wchar_t *wfilename;
+    const size_t wfilename_size=filename.length()+1;
+    GPBuffer<wchar_t> gwfilename(wfilename,wfilename_size);
+    filename.ncopy(wfilename,wfilename_size);
+    DWORD dwAttrib;
+    dwAttrib = GetFileAttributesW(wfilename);
+    if((dwAttrib|1) == 0xFFFFFFFF)
+        dwAttrib = GetFileAttributesA(NativeFilename());
+    retval=!( dwAttrib & FILE_ATTRIBUTE_DIRECTORY );
+#else
+# error "Define something here for your operating system"
+#endif
+  }
+  return retval;
+}
+
+bool
+GURL::is_local_path(void) const
+{
+  bool retval=false;
+  if(is_local_file_url())
+  {
+#if defined(UNIX) || defined(macintosh) || defined(OS2)
+    struct stat buf;
+    retval=!urlstat(*this,buf);
+#else
+    GUTF8String filename(UTF8Filename());
+    if(filename.length() >= MAX_PATH)
+      {
+        if(!filename.cmp("\\\\",2))
+          filename="\\\\?\\UNC"+filename.substr(1,-1);
+        else
+          filename="\\\\?\\"+filename;
+      }
+    wchar_t *wfilename;
+    const size_t wfilename_size=filename.length()+1;
+    GPBuffer<wchar_t> gwfilename(wfilename,wfilename_size);
+    filename.ncopy(wfilename,wfilename_size);
+    DWORD dwAttrib;
+    dwAttrib = GetFileAttributesW(wfilename);
+    if((dwAttrib|1) == 0xFFFFFFFF)
+        dwAttrib = GetFileAttributesA(NativeFilename());
+    retval=( (dwAttrib|1) != 0xFFFFFFFF);
+#endif
+  }
+  return retval;
+}
+
+// is_dir(url) --
+// -- returns true if url denotes a directory.
+bool 
+GURL::is_dir(void) const
+{
+  bool retval=false;
+  if(is_local_file_url())
+  {
+    // UNIX implementation
+#if defined(UNIX) || defined(macintosh) || defined(OS2)
+    struct stat buf;
+    if (!urlstat(*this,buf))
+    {
+      retval=(buf.st_mode & S_IFDIR);
+    }
+#elif defined(_WIN32)   // (either Windows or WCE)
+    GUTF8String filename(UTF8Filename());
+    if(filename.length() >= MAX_PATH)
+      {
+        if(!filename.cmp("\\\\",2))
+          filename="\\\\?\\UNC"+filename.substr(1,-1);
+        else
+          filename="\\\\?\\"+filename;
+      }
+    wchar_t *wfilename;
+    const size_t wfilename_size=filename.length()+1;
+    GPBuffer<wchar_t> gwfilename(wfilename,wfilename_size);
+    filename.ncopy(wfilename,wfilename_size);
+    DWORD dwAttrib;
+    dwAttrib = GetFileAttributesW(wfilename);
+    if((dwAttrib|1) == 0xFFFFFFFF)
+        dwAttrib = GetFileAttributesA(NativeFilename());
+    retval=((dwAttrib != 0xFFFFFFFF)&&( dwAttrib & FILE_ATTRIBUTE_DIRECTORY ));
+#else
+# error "Define something here for your operating system"
+#endif
+  }
+  return retval;
+}
+
+// Follows symbolic links.
+GURL 
+GURL::follow_symlinks(void) const
+{
+  GURL ret = *this;
+#if defined(S_IFLNK)
+#if defined(UNIX) || defined(macintosh)
+  int lnklen;
+  char lnkbuf[MAXPATHLEN+1];
+  struct stat buf;
+  while ( (urlstat(ret, buf) >= 0) &&
+          (buf.st_mode & S_IFLNK) &&
+          ((lnklen = readlink(ret.NativeFilename(),lnkbuf,sizeof(lnkbuf))) > 0) )
+    {
+      lnkbuf[lnklen] = 0;
+      GNativeString lnk(lnkbuf);
+      ret = GURL(lnk, ret.base());
+    }
+#endif
+#endif
+  return ret;
+}
+
+int
+GURL::mkdir() const
+{
+  if(! is_local_file_url())
+    return -1;
+  int retval=0;
+  const GURL baseURL=base();
+  if (baseURL.get_string() != url && !baseURL.is_dir())
+    retval = baseURL.mkdir();
+  if(!retval)
+    {
+#if defined(UNIX)
+      if (is_dir())
+        retval = 0;
+      else 
+        retval = ::mkdir(NativeFilename(), 0755);
+#elif defined(_WIN32)
+      if (is_dir())
+        retval = 0;
+      else 
+        retval = CreateDirectoryA(NativeFilename(), NULL);
+#else
+# error "Define something here for your operating system"
+#endif
+    }
+  return retval;
+}
+
+// deletefile
+// -- deletes a file or directory
+  
+int
+GURL::deletefile(void) const
+{
+  int retval = -1;
+  if(is_local_file_url())
+    {
+#if defined(UNIX)
+      if (is_dir())
+        retval = ::rmdir(NativeFilename());
+      else
+        retval = ::unlink(NativeFilename());
+#elif defined(_WIN32)
+      if (is_dir())
+        retval = ::RemoveDirectoryA(NativeFilename());
+      else
+        retval = ::DeleteFile(NativeFilename());
+#else
+# error "Define something here for your operating system"
+#endif
+  }
+  return retval;
+}
+
+GList<GURL>
+GURL::listdir(void) const
+{
+  GList<GURL> retval;
+  if(is_dir())
+  {
+#if defined(UNIX) || defined(OS2)
+    DIR * dir=opendir(NativeFilename());//MBCS cvt
+    for(dirent *de=readdir(dir);de;de=readdir(dir))
+    {
+      const int len = NAMLEN(de);
+      if (de->d_name[0]== dot  && len==1)
+        continue;
+      if (de->d_name[0]== dot  && de->d_name[1]== dot  && len==2)
+        continue;
+      retval.append(GURL::Native(de->d_name,*this));
+    }
+    closedir(dir);
+#elif defined(_WIN32)
+    GURL::UTF8 wildcard("*.*",*this);
+    WIN32_FIND_DATA finddata;
+    HANDLE handle = FindFirstFile(wildcard.NativeFilename(), &finddata);//MBCS cvt
+    const GUTF8String gpathname=pathname();
+    const GUTF8String gbase=base().pathname();
+    if( handle != INVALID_HANDLE_VALUE)
+    {
+      do
+      {
+        GURL::UTF8 Entry(finddata.cFileName,*this);
+        const GUTF8String gentry=Entry.pathname();
+        if((gentry != gpathname) && (gentry != gbase))
+          retval.append(Entry);
+      } while( FindNextFile(handle, &finddata) );
+
+      FindClose(handle);
+    }
+#else
+# error "Define something here for your operating system"
+#endif
+  }
+  return retval;
+}
+
+int
+GURL::cleardir(const int timeout) const
+{
+  int retval=(-1);
+  if(is_dir())
+  {
+    GList<GURL> dirlist=listdir();
+    retval=0;
+    for(GPosition pos=dirlist;pos&&!retval;++pos)
+    {
+      const GURL &Entry=dirlist[pos];
+      if(Entry.is_dir())
+      {
+        if((retval=Entry.cleardir(timeout)) < 0)
+        {
+          break;
+        }
+      }
+      if(((retval=Entry.deletefile())<0) && (timeout>0))
+      {
+        GOS::sleep(timeout);
+        retval=Entry.deletefile();
+      }
+    }
+  }
+  return retval;
+}
+
+int
+GURL::renameto(const GURL &newurl) const
+{
+  if (is_local_file_url() && newurl.is_local_file_url())
+    return rename(NativeFilename(),newurl.NativeFilename());
+  return -1;
+}
+
+// expand_name(filename[, fromdirname])
+// -- returns the full path name of filename interpreted
+//    relative to fromdirname.  Use current working dir when
+//    fromdirname is null.
+GUTF8String 
+GURL::expand_name(const GUTF8String &xfname, const char *from)
+{
+  const char *fname=xfname;
+  GUTF8String retval;
+  const size_t maxlen=xfname.length()*9+MAXPATHLEN+10;
+  char * const string_buffer = retval.getbuf(maxlen);
+  // UNIX implementation
+#if defined(UNIX)
+  // Perform tilde expansion
+  GUTF8String senv;
+  if (fname && fname[0]==tilde)
+  {
+    int n;
+    for(n=1;fname[n] && fname[n]!= slash;n++) 
+      EMPTY_LOOP;
+    struct passwd *pw=0;
+    if (n!=1)
+    {
+      GUTF8String user(fname+1, n-1);
+      pw=getpwnam(user);
+    }else if ((senv=GOS::getenv("HOME")).length())
+    {
+      from=(const char *)senv;
+      fname = fname + n;
+    }else if ((senv=GOS::getenv("LOGNAME")).length())
+    {
+      pw = getpwnam((const char *)senv.getUTF82Native());
+    }else
+    {
+      pw=getpwuid(getuid());
+    }
+    if (pw)
+    {
+      senv=GNativeString(pw->pw_dir).getNative2UTF8();
+      from = (const char *)senv;
+      fname = fname + n;
+    }
+    for(;fname[0] == slash; fname++)
+      EMPTY_LOOP;
+  }
+  // Process absolute vs. relative path
+  if (fname && fname[0]== slash)
+  {
+    string_buffer[0]=slash;
+    string_buffer[1]=0;
+  }else if (from)
+  {
+    strcpy(string_buffer, expand_name(from));
+  }else
+  {
+    strcpy(string_buffer, GOS::cwd());
+  }
+  char *s = string_buffer + strlen(string_buffer);
+  if(fname)
+  {
+    for(;fname[0]== slash;fname++)
+      EMPTY_LOOP;
+    // Process path components
+    while(fname[0])
+    {
+      if (fname[0] == dot )
+      {
+        if (!fname[1] || fname[1]== slash)
+        {
+          fname++;
+          continue;
+        }else if (fname[1]== dot && (fname[2]== slash || !fname[2]))
+        {
+          fname +=2;
+          for(;s>string_buffer+1 && *(s-1)== slash; s--)
+            EMPTY_LOOP;
+          for(;s>string_buffer+1 && *(s-1)!= slash; s--)
+            EMPTY_LOOP;
+          continue;
+        }
+      }
+      if ((s==string_buffer)||(*(s-1)!= slash))
+      {
+        *s = slash;
+        s++;
+      }
+      while (*fname &&(*fname!= slash))
+      {
+        *s = *fname++;
+        if ((size_t)((++s)-string_buffer) > maxlen)
+        {
+          G_THROW( ERR_MSG("GURL.big_name") );
+        }
+      }
+      *s = 0;
+      for(;fname[0]== slash;fname++)
+        EMPTY_LOOP;
+    }
+  }
+  if (!fname || !fname[0])
+  {
+    for(;s>string_buffer+1 && *(s-1) == slash; s--)
+      EMPTY_LOOP;
+    *s = 0;
+  }
+#elif defined(_WIN32) // WIN32 implementation
+  // Handle base
+  strcpy(string_buffer, (char const *)(from ? expand_name(from) : GOS::cwd()));
+  //  GNativeString native;
+  if (fname)
+  {
+    char *s = string_buffer;
+    char  drv[4];
+    // Handle absolute part of fname
+    //      Put absolute part of the file name in string_buffer, and
+    //      the relative part pointed to by fname.
+    if (fname[0]== slash || fname[0]== backslash)
+    {
+      if (fname[1]== slash || fname[1]== backslash)
+      {       // Case "//abcd"
+        s[0]=s[1]= backslash; s[2]=0;
+      }
+      else
+      {       // Case "/abcd" or "/"
+              //    File is at the root of the current drive. Delete the
+              //    slash at the beginning of the filename and leave
+              //    an explicit identification of the root of the drive in
+              //    string_buffer.
+        fname++;
+        s[3] = '\0';
+      }
+    }
+    else if (fname[0] && fname[1]==colon)
+    {
+      if (fname[2]!= slash && fname[2]!= backslash)
+      {       // Case "x:abcd"
+        if ( toupper((unsigned char)s[0]) != toupper((unsigned char)fname[0])
+          || s[1]!=colon)
+        {
+          drv[0]=fname[0];
+          drv[1]=colon;
+          drv[2]= dot ;
+          drv[3]=0;
+          GetFullPathName(drv, maxlen, string_buffer, &s);
+          strcpy(string_buffer,(const char *)GUTF8String(string_buffer).getNative2UTF8());
+          s = string_buffer;
+        }
+        fname += 2;
+      }
+      else if (fname[3]!= slash && fname[3]!= backslash)
+      {       // Case "x:/abcd"
+        s[0]=toupper((unsigned char)fname[0]);
+        s[1]=colon;
+        s[2]=backslash;
+        s[3]=0;
+        fname += 3;
+      }
+      else
+      {       // Case "x://abcd"
+        s[0]=s[1]=backslash;
+        s[2]=0;
+        fname += 4;
+      }
+    }
+    // Process path components
+    while(*fname)
+    {
+      for(;*fname== slash || *fname==backslash;fname++)
+        EMPTY_LOOP;
+      if (fname[0]== dot )
+      {
+        if (fname[1]== slash || fname[1]==backslash || !fname[1])
+        {
+          fname++;
+          continue;
+        }
+		else if ((fname[1] == dot)
+                 && (fname[2]== slash || fname[2]==backslash || !fname[2]))
+        {
+          fname += 2;
+          char *back=_tcsrchr(string_buffer,backslash);
+          char *forward=_tcsrchr(string_buffer,slash);
+          if(back>forward)
+          {
+            *back=0;
+          }else if(forward)
+          {
+            *forward=0;
+          }
+          s = string_buffer;
+          continue;
+        }
+      }
+      char* s2=s;//MBCS DBCS
+      for(;*s;s++) 
+        EMPTY_LOOP;
+	  if (s > string_buffer && s[-1] != slash && s[-1] != backslash)
+        *s++ = backslash;
+      while (*fname && (*fname!= slash) && (*fname!=backslash))
+      {
+        if (s > string_buffer + maxlen)
+          G_THROW( ERR_MSG("GURL.big_name") );
+        *s++ = *fname++;
+      }
+      *s = 0;
+    }
+  }
+#else
+# error "Define something here for your operating system"
+#endif  
+  return retval;
+}
+
+unsigned int
+hash(const GURL & gurl)
+{
+  unsigned int retval;
+  const GUTF8String s(gurl.get_string());
+  const int len=s.length();
+  if(len && (s[len-1] == '/')) // Don't include the trailing slash as part of the hash.
+  {
+	retval=hash(s.substr(0,len-1));
+  }else
+  {
+    retval=hash(s);
+  }
+  return retval;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/GURL.h b/libdjvu/GURL.h
new file mode 100644
index 0000000..d1ac3c9
--- /dev/null
+++ b/libdjvu/GURL.h
@@ -0,0 +1,444 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _GURL_H_
+#define _GURL_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GString.h"
+#include "Arrays.h"
+#include "GThreads.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+/** @name GURL.h
+    Files #"GURL.h"# and #"GURL.cpp"# contain the implementation of the
+    \Ref{GURL} class used to store URLs in a system independent format.
+    @memo System independent URL representation.
+    @author Andrei Erofeev <eaf@geocities.com>
+
+// From: Leon Bottou, 1/31/2002
+// This has been heavily changed by Lizardtech.
+// They decided to use URLs for everyting, including
+// the most basic file access.  The URL class now is a unholy 
+// mixture of code for syntactically parsing the urls (which is was)
+// and file status code (only for local file: urls).
+
+*/
+
+//@{
+
+/** System independent URL representation.
+
+    This class is used in the library to store URLs in a system independent
+    format. The idea to use a general class to hold URL arose after we
+    realized, that DjVu had to be able to access files both from the WEB
+    and from the local disk. While it is strange to talk about system
+    independence of HTTP URLs, file names formats obviously differ from
+    platform to platform. They may contain forward slashes, backward slashes,
+    colons as separators, etc. There maybe more than one URL corresponding
+    to the same file name. Compare #file:/dir/file.djvu# and
+    #file://localhost/dir/file.djvu#.
+
+    To simplify a developer's life we have created this class, which contains
+    inside a canonical representation of URLs.
+
+    File URLs are converted to internal format with the help of \Ref{GOS} class.
+
+    All other URLs are modified to contain only forward slashes.
+*/
+
+class DJVUAPI GURL
+{
+public:
+  class Filename;
+  class UTF8;
+  class Native;
+protected:
+      /** @name Constructors
+	  Accept the string URL, check that it starts from #file:/#
+	  or #http:/# and convert to internal system independent
+	  representation.
+      */
+      //@{
+      ///
+   GURL(const char * url_string);
+      //@}
+
+public:
+   GURL(void);
+
+   GURL(const GUTF8String & url_string);
+
+   GURL(const GNativeString & url_string);
+
+   GURL(const GUTF8String &xurl, const GURL &codebase);
+
+   GURL(const GNativeString &xurl, const GURL &codebase);
+
+      /// Copy constructor
+   GURL(const GURL & gurl);
+
+      /// The destructor
+   virtual ~GURL(void) {}
+
+private:
+      // The 'class_lock' should be locked whenever you're accessing
+      // url, or cgi_name_arr, or cgi_value_arr.
+   GCriticalSection	class_lock;
+protected:
+   GUTF8String	url;
+   DArray<GUTF8String>	cgi_name_arr, cgi_value_arr;
+   bool validurl;
+
+   void		init(const bool nothrow=false);
+   void		convert_slashes(void);
+   void		beautify_path(void);
+   static GUTF8String	beautify_path(GUTF8String url);
+
+   static GUTF8String	protocol(const GUTF8String& url);
+   void		parse_cgi_args(void);
+   void		store_cgi_args(void);
+public:
+   /// Test if the URL is valid. If invalid, reinitialize.
+   bool is_valid(void) const;     // const lies to the compiler because of dependency problems
+
+      /// Extracts the {\em protocol} part from the URL and returns it
+   GUTF8String	protocol(void) const;
+
+      /** Returns string after the first '\#' with decoded
+	  escape sequences. */
+   GUTF8String	hash_argument(void) const;
+
+      /** Inserts the #arg# after a separating hash into the URL.
+	  The function encodes any illegal character in #arg# using
+	  \Ref{GOS::encode_reserved}(). */
+   void		set_hash_argument(const GUTF8String &arg);
+
+      /** Returns the total number of CGI arguments in the URL.
+	  CGI arguments follow '#?#' sign and are separated by '#&#' signs */
+   int		cgi_arguments(void) const;
+
+      /** Returns the total number of DjVu-related CGI arguments (arguments
+	  following #DJVUOPTS# in the URL). */
+   int		djvu_cgi_arguments(void) const;
+
+      /** Returns that part of CGI argument number #num#, which is
+	  before the equal sign. */
+   GUTF8String	cgi_name(int num) const;
+
+      /** Returns that part of DjVu-related CGI argument number #num#,
+	  which is before the equal sign. */
+   GUTF8String	djvu_cgi_name(int num) const;
+
+      /** Returns that part of CGI argument number #num#, which is
+	  after the equal sign. */
+   GUTF8String	cgi_value(int num) const;
+   
+      /** Returns that part of DjVu-related CGI argument number #num#,
+	  which is after the equal sign. */
+   GUTF8String	djvu_cgi_value(int num) const;
+   
+      /** Returns array of all known CGI names (part of CGI argument before
+	  the equal sign) */
+   DArray<GUTF8String>cgi_names(void) const;
+
+      /** Returns array of names of DjVu-related CGI arguments (arguments
+	  following #DJVUOPTS# option. */
+   DArray<GUTF8String>djvu_cgi_names(void) const;
+   
+      /** Returns array of all known CGI names (part of CGI argument before
+	  the equal sign) */
+   DArray<GUTF8String>cgi_values(void) const;
+
+      /** Returns array of values of DjVu-related CGI arguments (arguments
+	  following #DJVUOPTS# option. */
+   DArray<GUTF8String>djvu_cgi_values(void) const;
+
+      /// Erases everything after the first '\#' or '?'
+   void		clear_all_arguments(void);
+
+      /// Erases everything after the first '\#'
+   void		clear_hash_argument(void);
+
+      /// Erases DjVu CGI arguments (following "#DJVUOPTS#")
+   void		clear_djvu_cgi_arguments(void);
+
+      /// Erases all CGI arguments (following the first '?')
+   void		clear_cgi_arguments(void);
+
+      /** Appends the specified CGI argument. Will insert "#DJVUOPTS#" if
+	  necessary */
+   void		add_djvu_cgi_argument(const GUTF8String &name, const char * value=0);
+   
+      /** Returns the URL corresponding to the directory containing
+	  the document with this URL. The function basically takes the
+	  URL and clears everything after the last slash. */
+   GURL		base(void) const;
+
+      /// Returns the aboslute URL without the host part.
+   GUTF8String pathname(void) const;
+
+      /** Returns the name part of this URL.
+	  For example, if the URL is #http://www.lizardtech.com/file%201.djvu# then
+          this function will return #file%201.djvu#. \Ref{fname}() will
+          return #file 1.djvu# at the same time. */
+   GUTF8String	name(void) const;
+
+      /** Returns the name part of this URL with escape sequences expanded.
+	  For example, if the URL is #http://www.lizardtech.com/file%201.djvu# then
+          this function will return #file 1.djvu#. \Ref{name}() will
+          return #file%201.djvu# at the same time. */
+   GUTF8String	fname(void) const;
+
+      /// Returns the extention part of name of document in this URL.
+   GUTF8String	extension(void) const;
+
+      /// Checks if this is an empty URL
+   bool		is_empty(void) const;
+
+      /// Checks if the URL is local (starts from #file:/#) or not
+   bool		is_local_file_url(void) const;
+
+      /** @name Concatenation operators
+	  Concatenate the GURL with the passed {\em name}. If the {\em name}
+	  is absolute (has non empty protocol prefix), we just return
+	  #GURL(name)#. Otherwise the #name# is appended to the GURL after a
+	  separating slash.
+      */
+      //@{
+      ///
+//   GURL		operator+(const GUTF8String &name) const;
+      //@}
+
+      /// Returns TRUE if #gurl1# and #gurl2# are the same
+   bool	operator==(const GURL & gurl2) const;
+
+      /// Returns TRUE if #gurl1# and #gurl2# are different
+   bool	operator!=(const GURL & gurl2) const;
+
+      /// Assignment operator
+   GURL &	operator=(const GURL & url);
+
+      /// Returns Internal URL representation
+   operator	const char*(void) const { return url; };
+
+  /** Returns a string representing the URL.  This function normally
+      returns a standard file URL as described in RFC 1738.  
+      Some versions of MSIE do not support this standard syntax.
+      A brain damaged MSIE compatible syntax is generated
+      when the optional argument #useragent# contains string #"MSIE"# or
+      #"Microsoft"#. */
+   GUTF8String get_string(const GUTF8String &useragent) const;
+
+   GUTF8String get_string(const bool nothrow=false) const;
+
+      /// Escape special characters
+   static GUTF8String encode_reserved(const GUTF8String &gs);
+
+   /** Decodes reserved characters from the URL.
+      See also: \Ref{encode_reserved}(). */
+   static GUTF8String decode_reserved(const GUTF8String &url);
+
+  /// Test if this url is an existing file, directory, or device.
+  bool is_local_path(void) const;
+
+  /// Test if this url is an existing file.
+  bool is_file(void) const;
+
+  /// Test if this url is an existing directory.
+  bool is_dir(void) const;
+
+  /// Follows symbolic links.
+  GURL follow_symlinks(void) const;
+
+  /// Creates the specified directory.
+  int mkdir(void) const;
+
+  /** Deletes file or directory.
+      Directories are not deleted unless the directory is empty.
+      Returns a negative number if an error occurs. */
+  int deletefile(void) const;
+
+  /** Recursively erases contents of directory. The directory
+      itself will not be removed. */
+  int cleardir(const int timeout=0) const;
+
+  /// Rename a file or directory.
+  int renameto(const GURL &newurl) const;
+
+  /// List the contents of a directory. 
+  GList<GURL> listdir(void) const;
+
+  /** Returns a filename for a URL. Argument #url# must be a legal file URL.
+      This function applies heuristic rules to convert the URL into a valid
+      file name. It is guaranteed that this function can properly parse all
+      URLs generated by #filename_to_url#. The heuristics also work better when
+      the file actually exists.  The empty string is returned when this
+      function cannot parse the URL or when the URL is not a file URL.
+        URL formats are as described in RFC 1738 plus the following alternative
+      formats for files on the local host:
+
+                file://<letter>:/<path>
+                file://<letter>|/<path>
+                file:/<path>
+
+      which are accepted because various browsers recognize them.*/
+   GUTF8String UTF8Filename(void) const;
+   /// Same but returns a native string.
+   GNativeString NativeFilename(void) const;
+
+      /** Hashing function.
+	  @return hash suitable for usage in \Ref{GMap} */
+   friend unsigned int	hash(const GURL & gurl);
+
+  /** Returns fully qualified file names.  This functions constructs the fully
+      qualified name of file or directory #filename#. When provided, the
+      optional argument #fromdirname# is used as the current directory when
+      interpreting relative specifications in #filename#.  Function
+      #expand_name# is very useful for logically concatenating file names.  It
+      knows which separators should be used for each operating system and it
+      knows which syntactical rules apply. */
+  static GUTF8String expand_name(const GUTF8String &filename, const char *fromdirname=0);
+};
+
+class DJVUAPI GURL::UTF8 : public GURL
+{
+public:
+  UTF8(const GUTF8String &xurl);
+  UTF8(const GUTF8String &xurl, const GURL &codebase);
+};
+
+class DJVUAPI GURL::Native : public GURL
+{
+public:
+  Native(const GNativeString &xurl);
+  Native(const GNativeString &xurl, const GURL &codebase);
+};
+
+class DJVUAPI GURL::Filename : public GURL
+{
+public:
+  Filename(const GUTF8String &filename);
+  Filename(const GNativeString &filename);
+  class UTF8;
+  class Native;
+};
+
+class DJVUAPI GURL::Filename::UTF8 : public GURL::Filename
+{
+public:
+  UTF8(const GUTF8String &filename);
+};
+
+class DJVUAPI GURL::Filename::Native : public GURL::Filename
+{
+public:
+  Native(const GNativeString &filename);
+};
+
+
+inline bool
+GURL::operator!=(const GURL & gurl2) const
+{
+  return !(*this == gurl2);
+}
+
+inline GUTF8String
+GURL::protocol(void) const
+{
+   return protocol(get_string());
+}
+
+inline bool
+GURL::is_empty(void) const
+{
+   return !url.length()||!get_string().length();
+}
+
+// Test if the URL is valid.
+// If invalid, reinitialize and return the result.
+inline bool
+GURL::is_valid(void) const
+{
+  if(!validurl)
+    const_cast<GURL *>(this)->init(true);
+  return validurl;
+}
+
+
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp
new file mode 100644
index 0000000..d305483
--- /dev/null
+++ b/libdjvu/GUnicode.cpp
@@ -0,0 +1,803 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "GString.h"
+
+#include <stddef.h>
+
+#if HAS_ICONV
+#include <iconv.h>
+#endif
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+static unsigned char nill=0;
+
+static void const * 
+checkmarks(void const * const xbuf,
+           unsigned int &bufsize,
+           GStringRep::EncodeType &rep)
+{
+  unsigned char const *buf=(unsigned char const *)xbuf;
+  if(bufsize >= 2 || (xbuf && !bufsize && rep != GStringRep::XOTHER))
+  {
+    const unsigned int s=(((unsigned int)buf[0])<<8)+(unsigned int)buf[1];
+    switch(s)
+    {
+      case 0:
+        if((bufsize>=4)||(!bufsize && rep == GStringRep::XUCS4BE)
+          ||(!bufsize && rep == GStringRep::XUCS4_2143))
+        {
+          const unsigned int s=(((unsigned int)buf[2])<<8)+(unsigned int)buf[3];
+          if(s == 0xfeff)
+          { 
+            rep=GStringRep::XUCS4BE;
+            buf+=4;
+          }else if(s == 0xfffe)
+          {
+            rep=GStringRep::XUCS4_2143;
+            buf+=4;
+          }
+        }
+        break;
+      case 0xfffe:
+        if(((bufsize>=4)||(!bufsize && rep == GStringRep::XUCS4LE)) 
+           && !((unsigned char *)buf)[2] && !((unsigned char *)buf)[3])
+        {
+          rep=GStringRep::XUCS4LE;
+          buf+=4;
+        }else
+        {
+          rep=GStringRep::XUTF16LE;
+          buf+=2;
+        }
+        break;
+      case 0xfeff:
+        if(((bufsize>=4)||(!bufsize && rep == GStringRep::XUCS4_3412)) 
+           && !((unsigned char *)buf)[2] && !((unsigned char *)buf)[3])
+        {
+          rep=GStringRep::XUCS4_3412;
+          buf+=4;
+        }else
+        {
+          rep=GStringRep::XUTF16LE;
+          buf+=2;
+        }
+        break;
+      case 0xefbb:
+        if(((bufsize>=3)||(!bufsize && GStringRep::XUTF8 == rep))&&(buf[2] == 0xbf))
+        {
+          rep=GStringRep::XUTF8;
+          buf+=3;
+        }
+        break;
+      default:
+        break;
+    }
+  }
+  if(buf != xbuf)
+  {
+    if(bufsize)
+    {
+      const size_t s=(size_t)xbuf-(size_t)buf;
+      if(bufsize> s)
+      {
+        bufsize-=s;
+      }else
+      {
+        bufsize=0;
+        buf=(const unsigned char *)&nill;
+      }
+    }
+  }
+  return buf;
+}
+
+class GStringRep::Unicode : public GStringRep::UTF8
+{
+public:
+  GP<GStringRep> encoding;
+  EncodeType encodetype;
+  void *remainder;
+  GPBufferBase gremainder;
+public:
+  Unicode(void);
+  /// virtual destructor.
+  virtual ~Unicode();
+
+  static GP<GStringRep> create(const unsigned int sz);
+  static GP<GStringRep> create(void const * const buf, unsigned int bufsize,
+                               const EncodeType, const GP<GStringRep> &encoding);
+  static GP<GStringRep> create( void const * const buf,
+    unsigned int size, const EncodeType encodetype );
+  static GP<GStringRep> create( void const * const buf,
+    const unsigned int size, GP<GStringRep> encoding );
+  static GP<GStringRep> create( void const * const buf,
+    const unsigned int size, const GP<Unicode> &remainder );
+
+protected:
+  virtual void set_remainder( void const * const buf, const unsigned int size,
+    const EncodeType encodetype );
+  virtual void set_remainder( void const * const buf, const unsigned int size,
+    const GP<GStringRep> &encoding );
+  virtual void set_remainder( const GP<Unicode> &remainder );
+  virtual GP<Unicode> get_remainder(void) const;
+};
+// static uint32_t UTF8toUCS4(unsigned char const *&,void const * const);
+static uint32_t xUTF16toUCS4(uint16_t const *&s,void const * const);
+static uint32_t UTF16BEtoUCS4(unsigned char const *&s,void const * const);
+static uint32_t UTF16LEtoUCS4(unsigned char const *&s,void const * const);
+static uint32_t UCS4BEtoUCS4(unsigned char const *&s,void const * const);
+static uint32_t UCS4LEtoUCS4(unsigned char const *&s,void const * const);
+static uint32_t UCS4_3412toUCS4(unsigned char const *&s,void const * const);
+static uint32_t UCS4_2143toUCS4(unsigned char const *&s,void const * const);
+
+GP<GStringRep>
+GStringRep::Unicode::create(const unsigned int sz)
+{
+  GP<GStringRep> gaddr;
+  if (sz > 0)
+  {
+    GStringRep *addr;
+    gaddr=(addr=new GStringRep::Unicode);
+    addr->data=(char *)(::operator new(sz+1));
+    addr->size = sz;
+    addr->data[sz] = 0;
+  }
+  return gaddr;
+}
+
+GStringRep::Unicode::Unicode(void)
+: encodetype(XUTF8), gremainder(remainder,0,1) {}
+
+GStringRep::Unicode::~Unicode() {}
+
+GP<GStringRep>
+GStringRep::Unicode::create(
+  void const * const xbuf,
+  unsigned int bufsize,
+  const EncodeType t,
+  const GP<GStringRep> &encoding)
+{
+  return (encoding->size)
+    ?create(xbuf,bufsize,encoding)
+    :create(xbuf,bufsize,t);
+}
+
+GP<GStringRep>
+GStringRep::Unicode::create(
+  void const * const xbuf,
+  const unsigned int bufsize,
+  const GP<Unicode> &xremainder )
+{
+  Unicode *r=xremainder;
+  GP<GStringRep> retval;
+  if(r)
+  {
+    const int s=r->gremainder;
+    if(xbuf && bufsize)
+    {
+      if(s)
+      {
+        void *buf;
+        GPBufferBase gbuf(buf,s+bufsize,1);
+        memcpy(buf,r->remainder,s);
+        memcpy((void *)((size_t)buf+s),xbuf,bufsize);
+        retval=((r->encoding)
+          ?create(buf,s+bufsize,r->encoding)
+          :create(buf,s+bufsize,r->encodetype));
+      }else
+      {
+        retval=((r->encoding)
+          ?create(xbuf,bufsize,r->encoding)
+          :create(xbuf,bufsize,r->encodetype));
+      }
+    }else if(s)
+	{
+      void *buf;
+      GPBufferBase gbuf(buf,s,1);
+      memcpy(buf,r->remainder,s);
+      retval=((r->encoding)
+        ?create(buf,s,r->encoding)
+        :create(buf,s,r->encodetype));
+	}else
+    {
+      retval=((r->encoding)
+        ?create(0,0,r->encoding)
+        :create(0,0,r->encodetype));
+    }
+  }else
+  {
+    retval=create(xbuf,bufsize,XUTF8);
+  }
+  return retval;
+}
+
+#if HAS_ICONV
+/* This template works around incompatible iconv protoypes */
+template<typename _T> inline size_t 
+iconv_adaptor(size_t(*iconv_func)(iconv_t, _T, size_t *, char**, size_t*),
+              iconv_t cd, char **inbuf, size_t *inbytesleft,
+              char **outbuf, size_t *outbytesleft)
+{
+  return iconv_func (cd, (_T)inbuf, inbytesleft, outbuf, outbytesleft);
+}
+#endif
+
+GP<GStringRep>
+GStringRep::Unicode::create(
+  void const * const xbuf,
+  unsigned int bufsize,
+  GP<GStringRep> encoding)
+{
+  GP<GStringRep> retval;
+  GStringRep *e=encoding;
+  if(e)
+  {
+    e=(encoding=e->upcase());
+  }
+  if(!e || !e->size)
+  {
+    retval=create(xbuf,bufsize,XOTHER);
+  }else if(!e->cmp("UTF8") || !e->cmp("UTF-8"))
+  {
+    retval=create(xbuf,bufsize,XUTF8);
+  }else if(!e->cmp("UTF16")|| !e->cmp("UTF-16")
+        || !e->cmp("UCS2") || !e->cmp("UCS-2"))
+  {
+    retval=create(xbuf,bufsize,XUTF16);
+  }else if(!e->cmp("UCS4") || !e->cmp("UCS-4"))
+  {
+    retval=create(xbuf,bufsize,XUCS4);
+  }else
+  {
+#if HAS_ICONV
+    EncodeType t=XOTHER;
+    void const * const buf=checkmarks(xbuf,bufsize,t); 
+    if(t != XOTHER)
+    {
+      retval=create(xbuf,bufsize,t);
+    }else if(buf && bufsize)
+    {
+      unsigned char const *eptr=(unsigned char *)buf;
+      unsigned int j=0;
+      for(j=0;(j<bufsize)&&*eptr;j++,eptr++)
+        EMPTY_LOOP;
+      if (j)
+      {
+        unsigned char const *ptr=(unsigned char *)buf;
+        if(e)
+        {
+          iconv_t cv=iconv_open("UTF-8",(const char *)e);
+          if(cv == (iconv_t)(-1))
+          { 
+            const int i=e->search('-');
+            if(i>=0)
+            {
+              cv=iconv_open("UTF-8",e->data+i+1);
+            }
+          }
+          if(cv == (iconv_t)(-1))
+          { 
+            retval=create(0,0,XOTHER);
+          }else
+          {
+            size_t ptrleft=(eptr-ptr); 
+            char *utf8buf;
+            size_t pleft=6*ptrleft+1;
+            GPBuffer<char> gutf8buf(utf8buf,pleft);
+            char *p=utf8buf;
+            char *nptr = (char*)ptr;
+            while(iconv_adaptor(iconv, cv, &nptr, &ptrleft, &p, &pleft)) 
+              ptr = (unsigned char*)nptr;
+            iconv_close(cv);
+            retval=create(utf8buf,(size_t)ptr-(size_t)buf,t);
+            retval->set_remainder(ptr,(size_t)eptr-(size_t)ptr,e);
+          }
+        }
+      }else
+      {
+        retval=create(0,0,XOTHER);
+        retval->set_remainder(0,0,e);
+      }
+    }
+#else
+    retval=create(xbuf,bufsize,XOTHER);
+#endif
+  }
+  return retval;
+}
+
+GP<GStringRep>
+GStringRep::Unicode::create(
+  void const * const xbuf,
+  unsigned int bufsize,
+  EncodeType t)
+{
+  GP<GStringRep> gretval;
+  GStringRep *retval=0;
+  void const * const buf=checkmarks(xbuf,bufsize,t); 
+  if(buf && bufsize)
+  {
+    unsigned char const *eptr=(unsigned char *)buf;
+    unsigned int maxutf8size=0;
+    void const* const xeptr=(void const *)((size_t)eptr+bufsize);
+    switch(t)
+    {
+      case XUCS4:
+      case XUCS4BE:
+      case XUCS4LE:
+      case XUCS4_2143:
+      case XUCS4_3412:
+      {
+        for(uint32_t w;
+          (eptr<xeptr)&&(w=*(uint32_t const *)eptr);
+          eptr+=sizeof(uint32_t))
+        {
+          maxutf8size+=(w>0x7f)?6:1;
+        }
+        break;
+      }
+      case XUTF16:
+      case XUTF16BE:
+      case XUTF16LE:
+      {
+        for(uint16_t w;
+          (eptr<xeptr)&&(w=*(uint16_t const *)eptr);
+          eptr+=sizeof(uint16_t))
+        {
+          maxutf8size+=3;
+        }
+        break;
+      }
+      case XUTF8:
+        for(;(eptr<xeptr)&&*eptr;maxutf8size++,eptr++)
+          EMPTY_LOOP;
+        break;
+      case XEBCDIC:
+        for(;(eptr<xeptr)&&*eptr;eptr++)
+        {
+          maxutf8size+=(*eptr>0x7f)?2:1;
+        }
+        break;
+      default:
+        break;
+    }
+    unsigned char *utf8buf=0;
+    GPBuffer<unsigned char> gutf8buf(utf8buf,maxutf8size+1);
+    utf8buf[0]=0;
+    if (maxutf8size)
+    {
+      unsigned char *optr=utf8buf;
+      int len=0;
+      unsigned char const *iptr=(unsigned char *)buf;
+      uint16_t const *sptr=(uint16_t *)buf;
+      uint32_t w;
+      switch(t)
+      {
+        case XUCS4:
+          for(;
+            (iptr<eptr)&&(w=*(uint32_t const *)iptr);
+            len++,iptr+=sizeof(uint32_t const))
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUCS4BE:
+          for(;(w=UCS4BEtoUCS4(iptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUCS4LE:
+          for(;(w=UCS4LEtoUCS4(iptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUCS4_2143:
+          for(;(w=UCS4_2143toUCS4(iptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUCS4_3412:
+          for(;(w=UCS4_3412toUCS4(iptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUTF16:
+          for(;(w=xUTF16toUCS4(sptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUTF16BE:
+          for(;(w=UTF16BEtoUCS4(iptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUTF16LE:
+          for(;(w=UTF16LEtoUCS4(iptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XUTF8:
+          for(;(w=UTF8toUCS4(iptr,eptr));len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        case XEBCDIC:
+          for(;(iptr<eptr)&&(w=*iptr++);len++)
+          {
+            optr=UCS4toUTF8(w,optr);
+          }
+          break;
+        default:
+          break;
+      }
+      const unsigned int size=(size_t)optr-(size_t)utf8buf;
+      if(size)
+      {
+        retval=(gretval=GStringRep::Unicode::create(size));
+        memcpy(retval->data,utf8buf,size);
+      }
+      else
+      {
+        retval=(gretval=GStringRep::Unicode::create(1));
+        retval->size=size;
+      }
+      retval->data[size]=0;
+      gutf8buf.resize(0);
+      const size_t s=(size_t)eptr-(size_t)iptr;
+      retval->set_remainder(iptr,s,t);
+    }
+  }
+  if(!retval)
+    {
+      retval=(gretval=GStringRep::Unicode::create(1));
+      retval->data[0]=0;
+      retval->size=0;
+      retval->set_remainder(0,0,t);
+    }
+  return gretval;
+}
+
+static uint32_t
+xUTF16toUCS4(uint16_t const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  uint16_t const * const r=s+1;
+  if(r <= eptr)
+  {
+    uint32_t const W1=s[0];
+    if((W1<0xD800)||(W1>0xDFFF))
+    {
+      if((U=W1))
+        {
+          s=r;
+        }
+    }
+    else if(W1<=0xDBFF)
+      {
+        uint16_t const * const rr=r+1;
+        if(rr <= eptr)
+          {
+            uint32_t const W2=s[1];
+            if(((W2>=0xDC00)||(W2<=0xDFFF))
+               &&((U=(0x1000+((W1&0x3ff)<<10))|(W2&0x3ff))))
+              {
+                s=rr;
+              }
+            else
+              {
+                U=(unsigned int)(-1)-W1;
+                s=r;
+              }
+          }
+      }
+  }
+  return U;
+}
+
+static uint32_t
+UTF16BEtoUCS4(unsigned char const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  unsigned char const * const r=s+2;
+  if(r <= eptr)
+    {
+      uint32_t const C1MSB=s[0];
+      if((C1MSB<0xD8)||(C1MSB>0xDF))
+        {
+          if((U=((C1MSB<<8)|((uint32_t)s[1]))))
+            {
+              s=r;
+            }
+        }
+      else if(C1MSB<=0xDB)
+        {
+          unsigned char const * const rr=r+2;
+          if(rr <= eptr)
+            {
+              uint32_t const C2MSB=s[2];
+              if((C2MSB>=0xDC)||(C2MSB<=0xDF))
+                {
+                  U=0x10000+((uint32_t)s[1]<<10)+(uint32_t)s[3]
+                    +(((C1MSB<<18)|(C2MSB<<8))&0xc0300);
+                  s=rr;
+                }
+              else
+                {
+                  U=(unsigned int)(-1)-((C1MSB<<8)|((uint32_t)s[1]));
+                  s=r;
+                }
+            }
+        }
+    }
+  return U;
+}
+
+static uint32_t
+UTF16LEtoUCS4(unsigned char const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  unsigned char const * const r=s+2;
+  if(r <= eptr)
+    {
+      uint32_t const C1MSB=s[1];
+      if((C1MSB<0xD8)||(C1MSB>0xDF))
+        {
+          if((U=((C1MSB<<8)|((uint32_t)s[0]))))
+            {
+              s=r;
+            }
+        }
+      else if(C1MSB<=0xDB)
+        {
+          unsigned char const * const rr=r+2;
+          if(rr <= eptr)
+            {
+              uint32_t const C2MSB=s[3];
+              if((C2MSB>=0xDC)||(C2MSB<=0xDF))
+                {
+                  U=0x10000+((uint32_t)s[0]<<10)+(uint32_t)s[2]
+                    +(((C1MSB<<18)|(C2MSB<<8))&0xc0300);
+                  s=rr;
+                }
+              else
+                {
+                  U=(unsigned int)(-1)-((C1MSB<<8)|((uint32_t)s[1]));
+                  s=r;
+                }
+            }
+        }
+    }
+  return U;
+}
+
+static uint32_t
+UCS4BEtoUCS4(unsigned char const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  unsigned char const * const r=s+4;
+  if(r<=eptr)
+    {
+      U=(((((((uint32_t)s[0]<<8)|(uint32_t)s[1])<<8)
+           |(uint32_t)s[2])<<8)|(uint32_t)s[3]);
+      if(U)
+        {
+          s=r;
+        } 
+    }
+  return U;
+}
+
+static uint32_t
+UCS4LEtoUCS4(unsigned char const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  unsigned char const * const r=s+4;
+  if(r<=eptr)
+    {
+      U=(((((((uint32_t)s[3]<<8)|(uint32_t)s[2])<<8)|
+           (uint32_t)s[1])<<8)|(uint32_t)s[0]);
+      if(U)
+        {
+          s=r;
+        }
+    }
+  return U;
+}
+
+static uint32_t
+UCS4_2143toUCS4(unsigned char const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  unsigned char const * const r=s+4;
+  if(r<=eptr)
+    {
+      U=(((((((uint32_t)s[1]<<8)|(uint32_t)s[0])<<8)
+           |(uint32_t)s[3])<<8)|(uint32_t)s[2]);
+      if(U)
+        {
+          s=r;
+        }
+    }
+  return U;
+}
+
+static uint32_t
+UCS4_3412toUCS4(unsigned char const *&s,void const * const eptr)
+{
+  uint32_t U=0;
+  unsigned char const * const r=s+4;
+  if(r<=eptr)
+    {
+      U=(((((((uint32_t)s[2]<<8)|(uint32_t)s[3])<<8)
+           |(uint32_t)s[0])<<8)|(uint32_t)s[1]);
+      if(U)
+        {
+          s=r;
+        }
+    }
+  return U;
+}
+
+void
+GStringRep::Unicode::set_remainder( void const * const buf,
+   const unsigned int size, const EncodeType xencodetype )
+{
+  gremainder.resize(size,1);
+  if(size)
+    memcpy(remainder,buf,size);
+  encodetype=xencodetype;
+  encoding=0;
+}
+
+void
+GStringRep::Unicode::set_remainder( void const * const buf,
+   const unsigned int size, const GP<GStringRep> &xencoding )
+{
+  gremainder.resize(size,1);
+  if(size)
+    memcpy(remainder,buf,size);
+  encoding=xencoding;
+  encodetype=XOTHER;
+}
+
+void
+GStringRep::Unicode::set_remainder( const GP<GStringRep::Unicode> &xremainder )
+{
+  if(xremainder)
+  {
+    const int size=xremainder->gremainder;
+    gremainder.resize(size,1);
+    if(size)
+      memcpy(remainder,xremainder->remainder,size);
+    encodetype=xremainder->encodetype;
+  }
+  else
+  {
+    gremainder.resize(0,1);
+    encodetype=XUTF8;
+  }
+}
+
+GP<GStringRep::Unicode>
+GStringRep::Unicode::get_remainder( void ) const
+{
+  return const_cast<GStringRep::Unicode *>(this);
+}
+
+GUTF8String 
+GUTF8String::create(void const * const buf,const unsigned int size,
+    const EncodeType encodetype, const GUTF8String &encoding)
+{
+  return encoding.length()
+    ?create(buf,size,encodetype)
+    :create(buf,size,encoding);
+}
+
+GUTF8String 
+GUTF8String::create( void const * const buf,
+  unsigned int size, const EncodeType encodetype )
+{
+  GUTF8String retval;
+  retval.init(GStringRep::Unicode::create(buf,size,encodetype));
+  return retval;
+}
+
+GUTF8String 
+GUTF8String::create( void const * const buf,
+  const unsigned int size, const GP<GStringRep::Unicode> &remainder)
+{
+  GUTF8String retval;
+  retval.init(GStringRep::Unicode::create(buf,size,remainder));
+  return retval;
+}
+
+GUTF8String 
+GUTF8String::create( void const * const buf,
+  const unsigned int size, const GUTF8String &encoding )
+{
+  GUTF8String retval;
+  retval.init(GStringRep::Unicode::create(buf,size,encoding ));
+  return retval;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/IFFByteStream.cpp b/libdjvu/IFFByteStream.cpp
new file mode 100644
index 0000000..67f319d
--- /dev/null
+++ b/libdjvu/IFFByteStream.cpp
@@ -0,0 +1,569 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// -- Implementation of IFFByteStream
+// - Author: Leon Bottou, 06/1998
+
+// From: Leon Bottou, 1/31/2002
+// This has been changed by Lizardtech to fit better 
+// with their re-implementation of ByteStreams.
+
+#include <assert.h>
+#include "IFFByteStream.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// Constructor
+IFFByteStream::IFFByteStream(const GP<ByteStream> &xbs,const int xpos)
+  : ByteStream::Wrapper(xbs), ctx(0), dir(0)
+{
+  offset = seekto = xpos;
+  has_magic_att = false;
+  has_magic_sdjv = false;
+}
+
+// Destructor
+IFFByteStream::~IFFByteStream()
+{
+  while (ctx)
+    close_chunk();
+}
+
+GP<IFFByteStream>
+IFFByteStream::create(const GP<ByteStream> &bs)
+{
+  const int pos=bs->tell();
+  return new IFFByteStream(bs,pos);
+}
+
+
+// IFFByteStream::ready
+// -- indicates if bytestream is ready for reading
+//    returns number of bytes available
+
+int 
+IFFByteStream::ready()
+{
+  if (ctx && dir < 0)
+    return ctx->offEnd - offset;
+  else if (ctx)
+    return 1;
+  else
+    return 0;
+}
+
+
+// IFFByteStream::composite
+// -- indicates if bytestream is ready for putting or getting chunks
+
+int 
+IFFByteStream::composite()
+{
+  if (ctx && !ctx->bComposite)
+    return 0;
+  else
+    return 1;
+}
+
+
+
+
+// IFFByteStream::check_id
+// -- checks if an id is legal
+
+int 
+IFFByteStream::check_id(const char *id)
+{
+  int i;
+  // check absence of null bytes
+  for (i=0; i<4; i++)
+    if (id[i]<0x20 || id[i]>0x7e)
+      return -1;
+  // check composite chunks
+  static const char *szComposite[] = { "FORM", "LIST", "PROP", "CAT ", 0 };
+  for (i=0; szComposite[i]; i++) 
+    if (!memcmp(id, szComposite[i], 4))
+      return 1;
+  // check reserved chunks
+  static const char *szReserved[] = { "FOR", "LIS", "CAT", 0 };
+  for (i=0; szReserved[i]; i++) 
+    if (!memcmp(id, szReserved[i], 3) && id[3]>='1' && id[3]<='9')
+      return -1;
+  // regular chunk
+  return 0;
+}
+
+
+
+// IFFByteStream::get_chunk
+// -- get next chunk header
+
+int  
+IFFByteStream::get_chunk(GUTF8String &chkid, int *rawoffsetptr, int *rawsizeptr)
+{
+  int bytes;
+  char buffer[8];
+  
+  // Check that we are allowed to read a chunk
+  if (dir > 0)
+    G_THROW( ERR_MSG("IFFByteStream.read_write") );
+  if (ctx && !ctx->bComposite)
+    G_THROW( ERR_MSG("IFFByteStream.not_ready") );
+  dir = -1;
+
+  // Seek to end of previous chunk if necessary
+  if (seekto > offset)
+    {
+      bs->seek(seekto);
+      offset = seekto;
+    }
+
+  // Skip padding byte
+  if (ctx && offset == ctx->offEnd)
+    return 0;
+  if (offset & 1)
+    {
+      bytes = bs->read( (void*)buffer, 1);
+      if (bytes==0 && !ctx)
+        return 0;
+      offset += bytes;
+    }
+  
+  // Record raw offset
+  int rawoffset = offset;
+  
+  // Read chunk id (skipping magic sequences inserted here to make
+  // DjVu files recognizable.)
+  for(;;)
+  {
+    if (ctx && offset == ctx->offEnd)
+      return 0;
+    if (ctx && offset+4 > ctx->offEnd)
+      G_THROW( ERR_MSG("IFFByteStream.corrupt_end") );
+    bytes = bs->readall( (void*)&buffer[0], 4);
+    offset = seekto = offset + bytes;
+    if (bytes==0 && !ctx)
+      return 0;
+    if (bytes != 4)
+      G_THROW(ByteStream::EndOfFile);
+    if (buffer[0] == 'S' && buffer[1] == 'D' &&
+        buffer[2] == 'J' && buffer[3] == 'V' )
+      {
+        has_magic_sdjv = true;
+        continue;
+      }
+    else if (buffer[0] == 'A' && buffer[1] == 'T' &&
+             buffer[2] == '&' && buffer[3] == 'T' )
+      {
+        has_magic_att=true;
+        continue;
+      }
+    else
+      break;
+  }
+  
+  // Read chunk size
+  if (ctx && offset+4 > ctx->offEnd)
+    G_THROW( ERR_MSG("IFFByteStream.corrupt_end2") );
+  bytes = bs->readall( (void*)&buffer[4], 4);
+  offset = seekto = offset + bytes;
+  if (bytes != 4)
+    G_THROW( ByteStream::EndOfFile );
+  long size = ((unsigned char)buffer[4]<<24) |
+              ((unsigned char)buffer[5]<<16) |
+              ((unsigned char)buffer[6]<<8)  |
+              ((unsigned char)buffer[7]);
+  if (ctx && offset+size > ctx->offEnd)
+    G_THROW( ERR_MSG("IFFByteStream.corrupt_mangled") );
+  
+  // Check if composite 
+  int composite = check_id(buffer);
+  if (composite < 0)
+    G_THROW( ERR_MSG("IFFByteStream.corrupt_id") );
+  
+  // Read secondary id of composite chunk
+  if (composite)
+  {
+    if (ctx && ctx->offEnd<offset+4)
+      G_THROW( ERR_MSG("IFFByteStream.corrupt_header") );
+    bytes = bs->readall( (void*)&buffer[4], 4);
+    offset += bytes;
+    if (bytes != 4)
+      G_THROW( ByteStream::EndOfFile );
+    if (check_id(&buffer[4]))
+      G_THROW( ERR_MSG("IFFByteStream.corrupt_2nd_id") );
+  }
+
+  // Create context record
+  IFFContext *nctx = new IFFContext;
+  G_TRY
+  {
+    nctx->next = ctx;
+    nctx->offStart = seekto;
+    nctx->offEnd = seekto + size;
+    if (composite)
+    {
+      memcpy( (void*)(nctx->idOne), (void*)&buffer[0], 4);
+      memcpy( (void*)(nctx->idTwo), (void*)&buffer[4], 4);
+      nctx->bComposite = 1;
+    }
+    else
+    {
+      memcpy( (void*)(nctx->idOne), (void*)&buffer[0], 4);
+      memset( (void*)(nctx->idTwo), 0, 4);
+      nctx->bComposite = 0;
+    }
+  }
+  G_CATCH_ALL
+  {
+    delete nctx;
+    G_RETHROW;
+  }
+  G_ENDCATCH;
+  
+  // Install context record
+  ctx = nctx;
+  chkid = GUTF8String(ctx->idOne, 4);
+  if (composite)
+    chkid = chkid + ":" + GUTF8String(ctx->idTwo, 4);
+
+  // Return
+  if (rawoffsetptr)
+    *rawoffsetptr = rawoffset;
+  if (rawsizeptr)
+    *rawsizeptr = ( ctx->offEnd - rawoffset + 1) & ~0x1;
+  return size;
+}
+
+
+
+// IFFByteStream::put_chunk
+// -- write new chunk header
+
+void  
+IFFByteStream::put_chunk(const char *chkid, int insert_magic)
+{
+  int bytes;
+  char buffer[8];
+
+  // Check that we are allowed to write a chunk
+  if (dir < 0)
+    G_THROW( ERR_MSG("IFFByteStream.read_write") );
+  if (ctx && !ctx->bComposite)
+    G_THROW( ERR_MSG("IFFByteStream.not_ready2") );
+  dir = +1;
+
+  // Check primary id
+  int composite = check_id(chkid);
+  if ((composite<0) || (composite==0 && chkid[4])
+      || (composite && (chkid[4]!=':' || check_id(&chkid[5]) || chkid[9])) )
+    G_THROW( ERR_MSG("IFFByteStream.bad_chunk") );
+
+  // Write padding byte
+  assert(seekto <= offset);
+  memset((void*)buffer, 0, 8);
+  if (offset & 1)
+    offset += bs->write((void*)&buffer[4], 1);
+
+  // Insert magic to make this file recognizable as DjVu
+  if (insert_magic)
+  {
+    // Don't change the way you do the file magic!
+    // I rely on these bytes letters in some places
+    // (like DjVmFile.cpp and djvm.cpp) -- eaf
+    buffer[0]=0x41;
+    buffer[1]=0x54;
+    buffer[2]=0x26;
+    buffer[3]=0x54;
+    offset += bs->writall((void*)&buffer[0], 4);
+  }
+
+  // Write chunk header
+  memcpy((void*)&buffer[0], (void*)&chkid[0], 4);
+  bytes = bs->writall((void*)&buffer[0], 8);
+  offset = seekto = offset + bytes;
+  if (composite)
+  {
+    memcpy((void*)&buffer[4], (void*)&chkid[5], 4);
+    bytes = bs->writall((void*)&buffer[4], 4);
+    offset = offset + bytes;    
+  }
+
+  // Create new context record
+  IFFContext *nctx = new IFFContext;
+  G_TRY
+  {
+    nctx->next = ctx;
+    nctx->offStart = seekto;
+    nctx->offEnd = 0;
+    if (composite)
+    {
+      memcpy( (void*)(nctx->idOne), (void*)&buffer[0], 4);
+      memcpy( (void*)(nctx->idTwo), (void*)&buffer[4], 4);
+      nctx->bComposite = 1;
+    }
+    else
+    {
+      memcpy( (void*)(nctx->idOne), (void*)&buffer[0], 4);
+      memset( (void*)(nctx->idTwo), 0, 4);
+      nctx->bComposite = 0;
+    }
+  }
+  G_CATCH_ALL
+  {
+    delete nctx;
+    G_RETHROW;
+  }
+  G_ENDCATCH; 
+  // Install context record and leave
+  ctx = nctx;
+}
+
+
+
+void 
+IFFByteStream::close_chunk()
+{
+  // Check that this is ok
+  if (!ctx)
+    G_THROW( ERR_MSG("IFFByteStream.cant_close") );
+  // Patch size field in new chunk
+  if (dir > 0)
+    {
+      ctx->offEnd = offset;
+      long size = ctx->offEnd - ctx->offStart;
+      char buffer[4];
+      buffer[0] = (unsigned char)(size>>24);
+      buffer[1] = (unsigned char)(size>>16);
+      buffer[2] = (unsigned char)(size>>8);
+      buffer[3] = (unsigned char)(size);
+      bs->seek(ctx->offStart - 4);
+      bs->writall((void*)buffer, 4);
+      bs->seek(offset);
+    }
+  // Arrange for reader to seek at next chunk
+  seekto = ctx->offEnd;
+  // Remove ctx record
+  IFFContext *octx = ctx;
+  ctx = octx->next;
+  assert(ctx==0 || ctx->bComposite);
+  delete octx;
+}
+
+// This is the same as above, but adds a seek to the close
+// Otherwise an EOF in this chunk won't be reported until we
+// try to open the next chunk, which makes error recovery
+// very difficult.
+void  
+IFFByteStream::seek_close_chunk(void)
+{
+  close_chunk();
+  if ((dir <= 0)&&((!ctx)||(ctx->bComposite))&&(seekto > offset))
+  {
+    bs->seek(seekto);
+    offset = seekto;
+  }
+}
+
+// IFFByteStream::short_id
+// Returns the id of the current chunk
+
+void 
+IFFByteStream::short_id(GUTF8String &chkid)
+{
+  if (!ctx)
+    G_THROW( ERR_MSG("IFFByteStream.no_chunk_id") );
+  if (ctx->bComposite)
+    chkid = GUTF8String(ctx->idOne, 4) + ":" + GUTF8String(ctx->idTwo, 4);
+  else
+    chkid = GUTF8String(ctx->idOne, 4);
+}
+
+
+// IFFByteStream::full_id
+// Returns the full chunk id of the current chunk
+
+void 
+IFFByteStream::full_id(GUTF8String &chkid)
+{
+  short_id(chkid);
+  if (ctx->bComposite)
+    return;
+  // Search parent FORM or PROP chunk.
+  for (IFFContext *ct = ctx->next; ct; ct=ct->next)
+    if (memcmp(ct->idOne, "FOR", 3)==0 || 
+        memcmp(ct->idOne, "PRO", 3)==0  )
+      {
+        chkid = GUTF8String(ct->idTwo, 4) + "." + chkid;
+        break;
+      }
+}
+
+
+
+// IFFByteStream::read
+// -- read bytes from IFF file chunk
+
+size_t 
+IFFByteStream::read(void *buffer, size_t size)
+{
+  if (! (ctx && dir < 0))
+    G_THROW( ERR_MSG("IFFByteStream.not_ready3") );
+  // Seek if necessary
+  if (seekto > offset) {
+    bs->seek(seekto);
+    offset = seekto;
+  }
+  // Ensure that read does not extend beyond chunk
+  if (offset > ctx->offEnd)
+    G_THROW( ERR_MSG("IFFByteStream.bad_offset") );
+  if (offset + (long)size >  ctx->offEnd)
+    size = (size_t) (ctx->offEnd - offset);
+  // Read bytes
+  size_t bytes = bs->read(buffer, size);
+  offset += bytes;
+  return bytes;
+}
+
+
+// IFFByteStream::write
+// -- write bytes to IFF file chunk
+
+size_t 
+IFFByteStream::write(const void *buffer, size_t size)
+{
+  if (! (ctx && dir > 0))
+    G_THROW( ERR_MSG("IFFByteStream.not_ready4") );
+  if (seekto > offset)
+    G_THROW( ERR_MSG("IFFByteStream.cant_write") );
+  size_t bytes = bs->write(buffer, size);
+  offset += bytes;
+  return bytes;
+}
+
+// IFFByteStream::tell
+// -- tell position
+
+long 
+IFFByteStream::tell() const
+{
+  return (seekto>offset)?seekto:offset;
+}
+
+bool
+IFFByteStream::compare(IFFByteStream &iff)
+{
+  bool retval=(&iff == this);
+  if(!retval)
+  {
+    GUTF8String chkid1, chkid2;
+    int size;
+    while((size=get_chunk(chkid1)) == iff.get_chunk(chkid2))
+    {
+      if(chkid1 != chkid2)
+      {
+        break;
+      }
+      if(!size)
+      {
+        retval=true;
+        break;
+      }
+      char buf[4096];
+      int len;
+      while((len=read(buf,sizeof(buf))))
+      {
+        int s=0;
+        char buf2[sizeof(buf)];
+        while(s<len)
+        {
+          const int i=iff.read(buf2+s,len-s);
+          if(!i)
+            break;
+          s+=i;
+        }
+        if((s != len)||memcmp(buf,buf2,len))
+          break;
+      }
+      if(len)
+        break;
+      iff.close_chunk();
+      close_chunk();
+    }
+  }
+  return retval;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h
new file mode 100644
index 0000000..e31b216
--- /dev/null
+++ b/libdjvu/IFFByteStream.h
@@ -0,0 +1,314 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _IFFBYTESTREAM_H_
+#define _IFFBYTESTREAM_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name IFFByteStream.h
+
+    Files #"IFFByteStream.h"# and #"IFFByteStream.cpp"# implement a parser for
+    files structured according the Electronic Arts ``EA IFF 85 Interchange
+    File Format''.  IFF files are composed of a sequence of data {\em chunks}.
+    Each chunk is identified by a four character {\em chunk identifier}
+    describing the type of the data stored in the chunk.  A few special chunk
+    identifiers, for instance #"FORM"#, are reserved for {\em composite
+    chunks} which themselves contain a sequence of data chunks.  This
+    conventions effectively provides IFF files with a convenient hierarchical
+    structure.  Composite chunks are further identified by a secondary chunk
+    identifier.
+    
+    We found convenient to define a {\em extended chunk identifier}.  In the
+    case of a regular chunk, the extended chunk identifier is simply the
+    chunk identifier, as in #"PM44"#. In the case of a composite chunk, the
+    extended chunk identifier is composed by concatenating the main chunk
+    identifier, a colon, and the secondary chunk identifier, as in
+    #"FORM:DJVU"#.
+
+    Class \Ref{IFFByteStream} provides a way to read or write IFF structured
+    files.  Member functions provide an easy mean to position the underlying
+    \Ref{ByteStream} at the beginning of each chunk and to read or write the
+    data until reaching the end of the chunk.  The utility program
+    \Ref{djvuinfo} demonstrates how to use class #IFFByteStream#.
+
+    {\bf IFF Files and ZP-Coder} ---
+    Class #IFFByteStream# repositions the underlying ByteStream whenever a new
+    chunk is accessed.  It is possible to code chunk data with the ZP-Coder
+    without worrying about the final file position. See class \Ref{ZPCodec}
+    for more details.
+    
+    {\bf DjVu IFF Files} --- We had initially planned to exactly follow the
+    IFF specifications.  Then we realized that certain versions of MSIE
+    recognize any IFF file as a Microsoft AIFF sound file and pop a message
+    box "Cannot play that sound".  It appears that the structure of AIFF files
+    is entirely modeled after the IFF standard, with small variations
+    regarding the endianness of numbers and the padding rules.  We eliminate
+    this problem by casting the octet protection spell.  Our IFF files always
+    start with the four octets #0x41,0x54,0x26,0x54# followed by the fully
+    conformant IFF byte stream.  Class #IFFByteStream# silently skips these
+    four octets when it encounters them.
+
+    {\bf References} --- EA IFF 85 Interchange File Format specification:\\
+    \URL{http://www.cica.indiana.edu/graphics/image_specs/ilbm.format.txt} or
+    \URL{http://www.tnt.uni-hannover.de/soft/compgraph/fileformats/docs/iff.pre}
+
+    @memo 
+    IFF file parser.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+
+// From: Leon Bottou, 1/31/2002
+// This has been changed by Lizardtech to fit better 
+// with their re-implementation of ByteStreams.
+
+*/
+//@{
+
+
+#include "DjVuGlobal.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "GException.h"
+#include "GString.h"
+#include "ByteStream.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+/** ByteStream interface for an IFF file. 
+
+    Class #IFFByteStream# augments the #ByteStream# interface with
+    functions for navigating from chunk to chunk.  It works in relation
+    with a ByteStream specified at construction time. 
+
+    {\bf Reading an IFF file} --- You can read an IFF file by constructing an
+    #IFFByteStream# object attached to the ByteStream containing the IFF file.
+    Calling function \Ref{get_chunk} positions the file pointer at the
+    beginning of the first chunk.  You can then use \Ref{ByteStream::read} to
+    access the chunk data.  Function #read# will return #0# if you attempt to
+    read past the end of the chunk, just as if you were trying to read past
+    the end of a file. You can at any time call function \Ref{close_chunk} to
+    terminate reading data in this chunk.  The following chunks can be
+    accessed by calling #get_chunk# and #close_chunk# repeatedly until you
+    reach the end of the file.  Function #read# is not very useful when
+    accessing a composite chunk.  You can instead make nested calls to
+    functions #get_chunk# and #close_chunk# in order to access the chunks
+    located inside the composite chunk.
+    
+    {\bf Writing an IFF file} --- You can write an IFF file by constructing an
+    #IFFByteStream# object attached to the seekable ByteStream object that
+    will contain the IFF file.  Calling function \Ref{put_chunk} creates a
+    first chunk header and positions the file pointer at the beginning of the
+    chunk.  You can then use \Ref{ByteStream::write} to store the chunk data.
+    Calling function \Ref{close_chunk} terminates the current chunk.  You can
+    append more chunks by calling #put_chunk# and #close_chunk# repeatedly.
+    Function #write# is not very useful for writing a composite chunk.  You
+    can instead make nested calls to function #put_chunk# and #close_chunk# in
+    order to create chunks located inside the composite chunk.
+
+    Writing an IFF file requires a seekable ByteStream (see
+    \Ref{ByteStream::is_seekable}).  This is not much of a problem because you
+    can always create the IFF file into a \Ref{MemoryByteStream} and then use
+    \Ref{ByteStream::copy} to transfer the IFF file into a non seekable
+    ByteStream.  */
+
+class DJVUAPI IFFByteStream : protected ByteStream::Wrapper
+{
+protected: 
+  IFFByteStream(const GP<ByteStream> &bs, const int pos);
+public:
+  /** Constructs an IFFByteStream object attached to ByteStream #bs#.
+      Any ByteStream can be used when reading an IFF file.  Writing
+      an IFF file however requires a seekable ByteStream. */
+  static GP<IFFByteStream> create(const GP<ByteStream> &bs);
+  // --- BYTESTREAM INTERFACE
+  ~IFFByteStream();
+  virtual size_t read(void *buffer, size_t size);
+  virtual size_t write(const void *buffer, size_t size);
+  virtual long tell(void) const;
+  // -- NAVIGATING CHUNKS
+  /** Enters a chunk for reading.  Function #get_chunk# returns zero when the
+      last chunk has already been accessed.  Otherwise it parses a chunk
+      header, positions the IFFByteStream at the beginning of the chunk data,
+      stores the extended chunk identifier into string #chkid#, and returns
+      the non zero chunk size.  The file offset of the chunk data may be
+      retrieved using function #tell#.  The chunk data can then be read using
+      function #read# until reaching the end of the chunk.  Advanced users may
+      supply two pointers to integer variables using arguments #rawoffsetptr#
+      and #rawsizeptr#. These variables will be overwritten with the offset
+      and the length of the file segment containing both the chunk header and
+      the chunk data. */
+  int get_chunk(GUTF8String &chkid, int *rawoffsetptr=0, int *rawsizeptr=0);
+  /** Enters a chunk for writing.  Function #put_chunk# prepares a chunk
+      header and positions the IFFByteStream at the beginning of the chunk
+      data.  Argument #chkid# defines a extended chunk identifier for this
+      chunk.  The chunk data can then be written using function #write#.  The
+      chunk is terminated by a matching call to function #close_chunk#.  When
+      #insertmagic# is non zero, function #put_chunk# inserts the bytes:
+      0x41, 0x54, 0x26, 0x54 before the chunk header, as discussed in
+      \Ref{IFFByteStream.h}. */
+  void put_chunk(const char *chkid, int insertmagic=0);
+  /** Leaves the current chunk.  This function leaves the chunk previously
+      entered by a matching call to #get_chunk# and #put_chunk#.  The
+      IFFByteStream is then ready to process the next chunk at the same
+      hierarchical level. */
+  void close_chunk();
+  /** This is identical to the above, plus it adds a seek to the start of
+      the next chunk.  This way we catch EOF errors with the current chunk.*/
+  void seek_close_chunk();
+  /** Returns true when it is legal to call #read# or #write#. */
+  int ready();
+  /** Returns true when the current chunk is a composite chunk. */
+  int composite();
+  /** Returns the current chunk identifier of the current chunk.  String
+      #chkid# is overwritten with the {\em extended chunk identifier} of the
+      current chunk.  The extended chunk identifier of a regular chunk is
+      simply the chunk identifier, as in #"PM44"#.  The extended chunk
+      identifier of a composite chunk is the concatenation of the chunk
+      identifier, of a semicolon #":"#, and of the secondary chunk identifier,
+      as in #"FORM:DJVU"#. */
+  void short_id(GUTF8String &chkid);
+  /** Returns the qualified chunk identifier of the current chunk.  String
+      #chkid# is overwritten with the {\em qualified chunk identifier} of the
+      current chunk.  The qualified chunk identifier of a composite chunk is
+      equal to the extended chunk identifier.  The qualified chunk identifier
+      of a regular chunk is composed by concatenating the secondary chunk
+      identifier of the closest #"FORM"# or #"PROP"# composite chunk
+      containing the current chunk, a dot #"."#, and the current chunk
+      identifier, as in #"DJVU.INFO"#.  According to the EA IFF 85 identifier
+      scoping rules, the qualified chunk identifier uniquely defines how the
+      chunk data should be interpreted. */
+  void full_id(GUTF8String &chkid);
+  /** Checks a potential chunk identifier.  This function categorizes the
+      chunk identifier formed by the first four characters of string #chkid#.
+      It returns #0# if this is a legal identifier for a regular chunk.  It
+      returns #+1# if this is a reserved composite chunk identifier.  It
+      returns #-1# if this is an illegal or otherwise reserved identifier
+      which should not be used.  */
+  static int check_id(const char *id);
+  GP<ByteStream> get_bytestream(void) {return this;}
+  /** Copy data from another ByteStream.  A maximum of #size# bytes are read
+      from the ByteStream #bsfrom# and are written to the ByteStream #*this#
+      at the current position.  Less than #size# bytes may be written if an
+      end-of-file mark is reached on #bsfrom#.  This function returns the
+      total number of bytes copied.  Setting argument #size# to zero (the
+      default value) has a special meaning: the copying process will continue
+      until reaching the end-of-file mark on ByteStream #bsfrom#, regardless
+      of the number of bytes transferred.  */
+  size_t copy(ByteStream &bsfrom, size_t size=0)
+  { return get_bytestream()->copy(bsfrom,size); }
+  /** Flushes all buffers in the ByteStream.  Calling this function
+      guarantees that pending data have been actually written (i.e. passed to
+      the operating system). Class #ByteStream# provides a default
+      implementation which does nothing. */
+  virtual void flush(void)
+  { ByteStream::Wrapper::flush(); }
+  /** This is a simple compare method.  The IFFByteStream may be read for
+      the sake of the comparison.  Since IFFByteStreams are non-seekable,
+      the stream is not valid for use after comparing, regardless of the
+      result. */
+  bool compare(IFFByteStream &iff);
+  /** #has_magic_att# is true if the stream has 
+      the DjVu magic 'AT&T' marker. */
+  bool has_magic_att;
+  /** #has_magic_sdjv# is true if the stream has 
+      the Celartem magic 'SDJV' marker. */
+  bool has_magic_sdjv;
+private:
+  // private datatype
+  struct IFFContext
+  {
+    IFFContext *next;
+    long offStart;
+    long offEnd;
+    char idOne[4];
+    char idTwo[4];
+    char bComposite;
+  };
+  // Implementation
+  IFFContext *ctx;
+  long offset;
+  long seekto;
+  int dir;
+  // Cancel C++ default stuff
+  IFFByteStream(const IFFByteStream &);
+  IFFByteStream & operator=(const IFFByteStream &);
+  static GP<IFFByteStream> create(ByteStream *bs);
+};
+
+//@}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
new file mode 100644
index 0000000..d45bce9
--- /dev/null
+++ b/libdjvu/IW44EncodeCodec.cpp
@@ -0,0 +1,1797 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// - Author: Leon Bottou, 08/1998
+// From: Leon Bottou, 1/31/2002
+// Lizardtech has split this file into a decoder and an encoder.
+// Only superficial changes.  The meat is mine.
+
+#define IW44IMAGE_IMPLIMENTATION /* */
+
+
+
+#include "IW44Image.h"
+#include "ZPCodec.h"
+#include "GBitmap.h"
+#include "GPixmap.h"
+#include "IFFByteStream.h"
+#include "GRect.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "MMX.h"
+#undef IWTRANSFORM_TIMER
+#ifdef IWTRANSFORM_TIMER
+#include "GOS.h"
+#endif
+
+#include <assert.h>
+#include <string.h>
+#include <math.h>
+
+#ifndef NEED_DECODER_ONLY
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+#define IWALLOCSIZE    4080
+#define IWCODEC_MAJOR     1
+#define IWCODEC_MINOR     2
+#define DECIBEL_PRUNE   5.0
+
+
+//////////////////////////////////////////////////////
+// WAVELET DECOMPOSITION CONSTANTS
+//////////////////////////////////////////////////////
+
+// Parameters for IW44 wavelet.
+// - iw_norm: norm of all wavelets (for db estimation)
+// - iw_shift: scale applied before decomposition
+
+
+static const float iw_norm[16] = {
+  2.627989e+03F,
+  1.832893e+02F, 1.832959e+02F, 5.114690e+01F,
+  4.583344e+01F, 4.583462e+01F, 1.279225e+01F,
+  1.149671e+01F, 1.149712e+01F, 3.218888e+00F,
+  2.999281e+00F, 2.999476e+00F, 8.733161e-01F,
+  1.074451e+00F, 1.074511e+00F, 4.289318e-01F
+};
+
+static const int iw_shift  = 6;
+static const int iw_round  = (1<<(iw_shift-1));
+
+static const struct { int start; int size; }  
+bandbuckets[] = 
+{
+  // Code first bucket and number of buckets in each band
+  { 0, 1 }, // -- band zero contains all lores info
+  { 1, 1 }, { 2, 1 }, { 3, 1 }, 
+  { 4, 4 }, { 8, 4 }, { 12,4 }, 
+  { 16,16 }, { 32,16 }, { 48,16 }, 
+};
+
+
+/** IW44 encoded gray-level image.  This class provided functions for managing
+    a gray level image represented as a collection of IW44 wavelet
+    coefficients.  The coefficients are stored in a memory efficient data
+    structure.  Member function \Ref{get_bitmap} renders an arbitrary segment
+    of the image into a \Ref{GBitmap}.  Member functions \Ref{decode_iff} and
+    \Ref{encode_iff} read and write DjVu IW44 files (see \Ref{IW44Image.h}).
+    Both the copy constructor and the copy operator are declared as private
+    members. It is therefore not possible to make multiple copies of instances
+    of this class. */
+
+class IWBitmap::Encode : public IWBitmap
+{
+public:
+  /// Destructor
+  virtual ~Encode(void);
+  /** Null constructor.  Constructs an empty IWBitmap object. This object does
+      not contain anything meaningful. You must call function \Ref{init},
+      \Ref{decode_iff} or \Ref{decode_chunk} to populate the wavelet
+      coefficient data structure. */
+  Encode(void);
+  /** Initializes an IWBitmap with image #bm#.  This constructor
+      performs the wavelet decomposition of image #bm# and records the
+      corresponding wavelet coefficient.  Argument #mask# is an optional
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */
+  void init(const GBitmap &bm, const GP<GBitmap> mask=0);
+  // CODER
+  /** Encodes one data chunk into ByteStream #bs#.  Parameter #parms# controls
+      how much data is generated.  The chunk data is written to ByteStream
+      #bs# with no IFF header.  Successive calls to #encode_chunk# encode
+      successive chunks.  You must call #close_codec# after encoding the last
+      chunk of a file. */
+  virtual int  encode_chunk(GP<ByteStream> gbs, const IWEncoderParms &parms);
+  /** Writes a gray level image into DjVu IW44 file.  This function creates a
+      composite chunk (identifier #FORM:BM44#) composed of #nchunks# chunks
+      (identifier #BM44#).  Data for each chunk is generated with
+      #encode_chunk# using the corresponding parameters in array #parms#. */
+  virtual void encode_iff(IFFByteStream &iff, int nchunks, const IWEncoderParms *parms);
+  /** Resets the encoder/decoder state.  The first call to #decode_chunk# or
+      #encode_chunk# initializes the coder for encoding or decoding.  Function
+      #close_codec# must be called after processing the last chunk in order to
+      reset the coder and release the associated memory. */
+  virtual void close_codec(void);
+protected:
+  Codec::Encode *ycodec_enc;
+};
+
+/** IW44 encoded color image. This class provided functions for managing a
+    color image represented as a collection of IW44 wavelet coefficients.  The
+    coefficients are stored in a memory efficient data structure.  Member
+    function \Ref{get_pixmap} renders an arbitrary segment of the image into a
+    \Ref{GPixmap}.  Member functions \Ref{decode_iff} and \Ref{encode_iff}
+    read and write DjVu IW44 files (see \Ref{IW44Image.h}).  Both the copy
+    constructor and the copy operator are declared as private members. It is
+    therefore not possible to make multiple copies of instances of this
+    class. */
+
+class IWPixmap::Encode : public IWPixmap
+{
+public:
+  enum CRCBMode { 
+    CRCBnone=IW44Image::CRCBnone, 
+    CRCBhalf=IW44Image::CRCBhalf, 
+    CRCBnormal=IW44Image::CRCBnormal, 
+    CRCBfull=IW44Image::CRCBfull };
+  /// Destructor
+  virtual ~Encode(void);
+  /** Null constructor.  Constructs an empty IWPixmap object. This object does
+      not contain anything meaningful. You must call function \Ref{init},
+      \Ref{decode_iff} or \Ref{decode_chunk} to populate the wavelet
+      coefficient data structure. */
+  Encode(void);
+  /** Initializes an IWPixmap with color image #bm#.  This constructor
+      performs the wavelet decomposition of image #bm# and records the
+      corresponding wavelet coefficient.  Argument #mask# is an optional
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}).
+      Argument #crcbmode# specifies how the chrominance information should be
+      encoded (see \Ref{CRCBMode}). */
+  void init(const GPixmap &bm, const GP<GBitmap> mask=0, CRCBMode crcbmode=CRCBnormal);
+  // CODER
+  /** Encodes one data chunk into ByteStream #bs#.  Parameter #parms# controls
+      how much data is generated.  The chunk data is written to ByteStream
+      #bs# with no IFF header.  Successive calls to #encode_chunk# encode
+      successive chunks.  You must call #close_codec# after encoding the last
+      chunk of a file. */
+  virtual int  encode_chunk(GP<ByteStream> gbs, const IWEncoderParms &parms);
+  /** Writes a color image into a DjVu IW44 file.  This function creates a
+      composite chunk (identifier #FORM:PM44#) composed of #nchunks# chunks
+      (identifier #PM44#).  Data for each chunk is generated with
+      #encode_chunk# using the corresponding parameters in array #parms#. */
+  virtual void encode_iff(IFFByteStream &iff, int nchunks, const IWEncoderParms *parms);
+  /** Resets the encoder/decoder state.  The first call to #decode_chunk# or
+      #encode_chunk# initializes the coder for encoding or decoding.  Function
+      #close_codec# must be called after processing the last chunk in order to
+      reset the coder and release the associated memory. */
+  virtual void close_codec(void);
+protected:
+  Codec::Encode *ycodec_enc, *cbcodec_enc, *crcodec_enc;
+};
+
+class IW44Image::Map::Encode : public IW44Image::Map // DJVU_CLASS
+{
+public:
+  Encode(const int w, const int h) : Map(w,h) {}
+  // creation (from image)
+  void create(const signed char *img8, int imgrowsize, 
+              const signed char *msk8=0, int mskrowsize=0);
+  // slash resolution
+  void slashres(int res);
+};
+
+class IW44Image::Codec::Encode : public IW44Image::Codec
+{
+public:
+  Encode(IW44Image::Map &map);
+  // Coding
+  virtual int code_slice(ZPCodec &zp);
+  float estimate_decibel(float frac);
+  // Data
+  void encode_buckets(ZPCodec &zp, int bit, int band,
+    IW44Image::Block &blk, IW44Image::Block &eblk, int fbucket, int nbucket);
+  int encode_prepare(int band, int fbucket, int nbucket, IW44Image::Block &blk, IW44Image::Block &eblk);
+  IW44Image::Map emap;
+};
+
+IW44Image::Codec::Encode::Encode(IW44Image::Map &map)
+: Codec(map), emap(map.iw,map.ih) {}
+
+//////////////////////////////////////////////////////
+/** IW44Image::Transform::Encode
+*/
+
+class IW44Image::Transform::Encode : IW44Image::Transform
+{
+ public:
+ // WAVELET TRANSFORM
+  /** Forward transform. */
+  static void forward(short *p, int w, int h, int rowsize, int begin, int end);
+  
+  // COLOR TRANSFORM
+  /** Extracts Y */
+  static void RGB_to_Y(const GPixel *p, int w, int h, int rowsize, 
+                       signed char *out, int outrowsize);
+  /** Extracts Cb */
+  static void RGB_to_Cb(const GPixel *p, int w, int h, int rowsize, 
+                        signed char *out, int outrowsize);
+  /** Extracts Cr */
+  static void RGB_to_Cr(const GPixel *p, int w, int h, int rowsize, 
+                        signed char *out, int outrowsize);
+};
+
+
+//////////////////////////////////////////////////////
+// MMX IMPLEMENTATION HELPERS
+//////////////////////////////////////////////////////
+
+
+// Note:
+// MMX implementation for vertical transforms only.
+// Speedup is basically related to faster memory transfer
+// The IW44 transform is not CPU bound, it is memory bound.
+
+#ifdef MMX
+
+static const short w9[]  = {9,9,9,9};
+static const short w1[]  = {1,1,1,1};
+static const int   d8[]  = {8,8};
+static const int   d16[] = {16,16};
+
+
+static inline void
+mmx_fv_1 ( short* &q, short* e, int s, int s3 )
+{
+  while (q<e && (((size_t)q)&0x7))
+    {
+      int a = (int)q[-s] + (int)q[s];
+      int b = (int)q[-s3] + (int)q[s3];
+      *q -= (((a<<3)+a-b+8)>>4);
+      q++;
+    }
+  while (q+3<e)
+    {
+      MMXar( movq,       q-s,mm0);  // MM0=[ b3, b2, b1, b0 ]
+      MMXar( movq,       q+s,mm2);  // MM2=[ c3, c2, c1, c0 ]
+      MMXrr( movq,       mm0,mm1);  
+      MMXrr( punpcklwd,  mm2,mm0);  // MM0=[ c1, b1, c0, b0 ]
+      MMXrr( punpckhwd,  mm2,mm1);  // MM1=[ c3, b3, c2, b2 ]
+      MMXar( pmaddwd,    w9,mm0);   // MM0=[ (c1+b1)*9, (c0+b0)*9 ]
+      MMXar( pmaddwd,    w9,mm1);   // MM1=[ (c3+b3)*9, (c2+b2)*9 ]
+      MMXar( movq,       q-s3,mm2);
+      MMXar( movq,       q+s3,mm4);
+      MMXrr( movq,       mm2,mm3);
+      MMXrr( punpcklwd,  mm4,mm2);  // MM2=[ d1, a1, d0, a0 ]
+      MMXrr( punpckhwd,  mm4,mm3);  // MM3=[ d3, a3, d2, a2 ]
+      MMXar( pmaddwd,    w1,mm2);   // MM2=[ (a1+d1)*1, (a0+d0)*1 ]
+      MMXar( pmaddwd,    w1,mm3);   // MM3=[ (a3+d3)*1, (a2+d2)*1 ]
+      MMXar( paddd,      d8,mm0);
+      MMXar( paddd,      d8,mm1);
+      MMXrr( psubd,      mm2,mm0);  // MM0=[ (c1+b1)*9-a1-d1+8, ...
+      MMXrr( psubd,      mm3,mm1);  // MM1=[ (c3+b3)*9-a3-d3+8, ...
+      MMXir( psrad,      4,mm0);
+      MMXar( movq,       q,mm7);    // MM7=[ p3,p2,p1,p0 ]
+      MMXir( psrad,      4,mm1);
+      MMXrr( packssdw,   mm1,mm0);  // MM0=[ x3,x2,x1,x0 ]
+      MMXrr( psubw,      mm0,mm7);  // MM7=[ p3-x3, p2-x2, ... ]
+      MMXra( movq,       mm7,q);
+#if defined(_MSC_VER) && defined(_DEBUG)
+      MMXemms;
+#endif
+      q += 4;
+    }
+}
+
+static inline void
+mmx_fv_2 ( short* &q, short* e, int s, int s3 )
+{
+  while (q<e && (((size_t)q)&0x7))
+    {
+      int a = (int)q[-s] + (int)q[s];
+      int b = (int)q[-s3] + (int)q[s3];
+      *q += (((a<<3)+a-b+16)>>5);
+      q ++;
+    }
+  while (q+3<e)
+    {
+      MMXar( movq,       q-s,mm0);  // MM0=[ b3, b2, b1, b0 ]
+      MMXar( movq,       q+s,mm2);  // MM2=[ c3, c2, c1, c0 ]
+      MMXrr( movq,       mm0,mm1);  
+      MMXrr( punpcklwd,  mm2,mm0);  // MM0=[ c1, b1, c0, b0 ]
+      MMXrr( punpckhwd,  mm2,mm1);  // MM1=[ c3, b3, c2, b2 ]
+      MMXar( pmaddwd,    w9,mm0);   // MM0=[ (c1+b1)*9, (c0+b0)*9 ]
+      MMXar( pmaddwd,    w9,mm1);   // MM1=[ (c3+b3)*9, (c2+b2)*9 ]
+      MMXar( movq,       q-s3,mm2);
+      MMXar( movq,       q+s3,mm4);
+      MMXrr( movq,       mm2,mm3);
+      MMXrr( punpcklwd,  mm4,mm2);  // MM2=[ d1, a1, d0, a0 ]
+      MMXrr( punpckhwd,  mm4,mm3);  // MM3=[ d3, a3, d2, a2 ]
+      MMXar( pmaddwd,    w1,mm2);   // MM2=[ (a1+d1)*1, (a0+d0)*1 ]
+      MMXar( pmaddwd,    w1,mm3);   // MM3=[ (a3+d3)*1, (a2+d2)*1 ]
+      MMXar( paddd,      d16,mm0);
+      MMXar( paddd,      d16,mm1);
+      MMXrr( psubd,      mm2,mm0);  // MM0=[ (c1+b1)*9-a1-d1+8, ...
+      MMXrr( psubd,      mm3,mm1);  // MM1=[ (c3+b3)*9-a3-d3+8, ...
+      MMXir( psrad,      5,mm0);
+      MMXar( movq,       q,mm7);    // MM7=[ p3,p2,p1,p0 ]
+      MMXir( psrad,      5,mm1);
+      MMXrr( packssdw,   mm1,mm0);  // MM0=[ x3,x2,x1,x0 ]
+      MMXrr( paddw,      mm0,mm7);  // MM7=[ p3+x3, p2+x2, ... ]
+      MMXra( movq,       mm7,q);
+#if defined(_MSC_VER) && defined(_DEBUG)
+      MMXemms;
+#endif
+      q += 4;
+    }
+}
+
+#endif /* MMX */
+
+//////////////////////////////////////////////////////
+// NEW FILTERS
+//////////////////////////////////////////////////////
+
+static void 
+filter_fv(short *p, int w, int h, int rowsize, int scale)
+{
+  int y = 0;
+  int s = scale*rowsize;
+  int s3 = s+s+s;
+  h = ((h-1)/scale)+1;
+  y += 1;
+  p += s;
+  while (y-3 < h)
+    {
+      // 1-Delta
+      {
+        short *q = p;
+        short *e = q+w;
+        if (y>=3 && y+3<h)
+          {
+            // Generic case
+#ifdef MMX
+            if (scale==1 && MMXControl::mmxflag>0)
+              mmx_fv_1(q, e, s, s3);
+#endif
+            while (q<e)
+              {
+                int a = (int)q[-s] + (int)q[s];
+                int b = (int)q[-s3] + (int)q[s3];
+                *q -= (((a<<3)+a-b+8)>>4);
+                q += scale;
+              }
+          }
+        else if (y<h)
+          {
+            // Special cases
+            short *q1 = (y+1<h ? q+s : q-s);
+            while (q<e)
+              {
+                int a = (int)q[-s] + (int)(*q1);
+                *q -= ((a+1)>>1);
+                q += scale;
+                q1 += scale;
+              }
+          }
+      }
+      // 2-Update
+      {
+        short *q = p-s3;
+        short *e = q+w;
+        if (y>=6 && y<h)
+          {
+            // Generic case
+#ifdef MMX
+            if (scale==1 && MMXControl::mmxflag>0)
+              mmx_fv_2(q, e, s, s3);
+#endif
+            while (q<e)
+              {
+                int a = (int)q[-s] + (int)q[s];
+                int b = (int)q[-s3] + (int)q[s3];
+                *q += (((a<<3)+a-b+16)>>5);
+                q += scale;
+              }
+          }
+        else if (y>=3)
+          {
+            // Special cases
+            short *q1 = (y-2<h ? q+s : 0);
+            short *q3 = (y<h ? q+s3 : 0);
+            if (y>=6)
+              {
+                while (q<e)
+                  {
+                    int a = (int)q[-s] + (q1 ? (int)(*q1) : 0);
+                    int b = (int)q[-s3] + (q3 ? (int)(*q3) : 0);
+                    *q += (((a<<3)+a-b+16)>>5);
+                    q += scale;
+                    if (q1) q1 += scale;
+                    if (q3) q3 += scale;
+                  }
+              }
+            else if (y>=4)
+              {
+                while (q<e)
+                  {
+                    int a = (int)q[-s] + (q1 ? (int)(*q1) : 0);
+                    int b = (q3 ? (int)(*q3) : 0);
+                    *q += (((a<<3)+a-b+16)>>5);
+                    q += scale;
+                    if (q1) q1 += scale;
+                    if (q3) q3 += scale;
+                  }
+              }
+            else
+              {
+                while (q<e)
+                  {
+                    int a = (q1 ? (int)(*q1) : 0);
+                    int b = (q3 ? (int)(*q3) : 0);
+                    *q += (((a<<3)+a-b+16)>>5);
+                    q += scale;
+                    if (q1) q1 += scale;
+                    if (q3) q3 += scale;
+                  }
+              }
+          }
+      }
+      y += 2;
+      p += s+s;
+    }
+}
+
+static void 
+filter_fh(short *p, int w, int h, int rowsize, int scale)
+{
+  int y = 0;
+  int s = scale;
+  int s3 = s+s+s;
+  rowsize *= scale;
+  while (y<h)
+    {
+      short *q = p+s;
+      short *e = p+w;
+      int a0=0, a1=0, a2=0, a3=0;
+      int b0=0, b1=0, b2=0, b3=0;
+      if (q < e)
+        {
+          // Special case: x=1
+          a1 = a2 = a3 = q[-s];
+          if (q+s<e)
+            a2 = q[s];
+          if (q+s3<e)
+            a3 = q[s3];
+          b3 = q[0] - ((a1+a2+1)>>1);
+          q[0] = b3;
+          q += s+s;
+        }
+      while (q+s3 < e)
+        {
+          // Generic case
+          a0=a1; 
+          a1=a2; 
+          a2=a3;
+          a3=q[s3];
+          b0=b1; 
+          b1=b2; 
+          b2=b3;
+          b3 = q[0] - ((((a1+a2)<<3)+(a1+a2)-a0-a3+8) >> 4);
+          q[0] = b3;
+          q[-s3] = q[-s3] + ((((b1+b2)<<3)+(b1+b2)-b0-b3+16) >> 5);
+          q += s+s;
+        }
+      while (q < e)
+        {
+          // Special case: w-3 <= x < w
+          a1=a2; 
+          a2=a3;
+          b0=b1; 
+          b1=b2; 
+          b2=b3;
+          b3 = q[0] - ((a1+a2+1)>>1);
+          q[0] = b3;
+          q[-s3] = q[-s3] + ((((b1+b2)<<3)+(b1+b2)-b0-b3+16) >> 5);
+          q += s+s;
+        }
+      while (q-s3 < e)
+        {
+          // Special case  w <= x < w+3
+          b0=b1; 
+          b1=b2; 
+          b2=b3;
+          b3=0;
+          if (q-s3 >= p)
+            q[-s3] = q[-s3] + ((((b1+b2)<<3)+(b1+b2)-b0-b3+16) >> 5);
+          q += s+s;
+        }
+      y += scale;
+      p += rowsize;
+    }
+}
+
+
+//////////////////////////////////////////////////////
+// WAVELET TRANSFORM 
+//////////////////////////////////////////////////////
+
+
+//----------------------------------------------------
+// Function for applying bidimensional IW44 between 
+// scale intervals begin(inclusive) and end(exclusive)
+
+void
+IW44Image::Transform::Encode::forward(short *p, int w, int h, int rowsize, int begin, int end)
+{ 
+
+  // PREPARATION
+  filter_begin(w,h);
+  // LOOP ON SCALES
+  for (int scale=begin; scale<end; scale<<=1)
+    {
+#ifdef IWTRANSFORM_TIMER
+      int tv,th;
+      th = tv = GOS::ticks();
+#endif
+      filter_fh(p, w, h, rowsize, scale);
+#ifdef IWTRANSFORM_TIMER
+      th = GOS::ticks();
+      tv = th - tv;
+#endif
+      filter_fv(p, w, h, rowsize, scale);
+#ifdef IWTRANSFORM_TIMER
+      th = GOS::ticks()-th;
+      DjVuPrintErrorUTF8("forw%d\tv=%dms h=%dms\n", scale,th,tv);
+#endif
+    }
+  // TERMINATE
+  filter_end();
+}
+
+//////////////////////////////////////////////////////
+// COLOR TRANSFORM 
+//////////////////////////////////////////////////////
+
+static const float 
+rgb_to_ycc[3][3] = 
+{ { 0.304348F,  0.608696F,  0.086956F },      
+  { 0.463768F, -0.405797F, -0.057971F },
+  {-0.173913F, -0.347826F,  0.521739F } };
+
+
+/* Extracts Y */
+void 
+IW44Image::Transform::Encode::RGB_to_Y(const GPixel *p, int w, int h, int rowsize, 
+                      signed char *out, int outrowsize)
+{
+  int rmul[256], gmul[256], bmul[256];
+  for (int k=0; k<256; k++)
+    {
+      rmul[k] = (int)(k*0x10000*rgb_to_ycc[0][0]);
+      gmul[k] = (int)(k*0x10000*rgb_to_ycc[0][1]);
+      bmul[k] = (int)(k*0x10000*rgb_to_ycc[0][2]);
+    }
+  for (int i=0; i<h; i++, p+=rowsize, out+=outrowsize)
+    {
+      const GPixel *p2 = p;
+      signed char *out2 = out;
+      for (int j=0; j<w; j++,p2++,out2++)
+        {
+          int y = rmul[p2->r] + gmul[p2->g] + bmul[p2->b] + 32768;
+          *out2 = (y>>16) - 128;
+        }
+    }
+}
+
+#ifdef min
+#undef min
+#endif
+static inline int min(const int x,const int y) {return (x<y)?x:y;}
+#ifdef max
+#undef max
+#endif
+static inline int max(const int x,const int y) {return (x>y)?x:y;}
+
+/* Extracts Cb */
+void 
+IW44Image::Transform::Encode::RGB_to_Cb(const GPixel *p, int w, int h, int rowsize, 
+                       signed char *out, int outrowsize)
+{
+  int rmul[256], gmul[256], bmul[256];
+  for (int k=0; k<256; k++)
+    {
+      rmul[k] = (int)(k*0x10000*rgb_to_ycc[2][0]);
+      gmul[k] = (int)(k*0x10000*rgb_to_ycc[2][1]);
+      bmul[k] = (int)(k*0x10000*rgb_to_ycc[2][2]);
+    }
+  for (int i=0; i<h; i++, p+=rowsize, out+=outrowsize)
+    {
+      const GPixel *p2 = p;
+      signed char *out2 = out;
+      for (int j=0; j<w; j++,p2++,out2++)
+        {
+          int c = rmul[p2->r] + gmul[p2->g] + bmul[p2->b] + 32768;
+          *out2 = max(-128, min(127, c>>16));
+        }
+    }
+}
+
+/* Extracts Cr */
+void 
+IW44Image::Transform::Encode::RGB_to_Cr(const GPixel *p, int w, int h, int rowsize, 
+                       signed char *out, int outrowsize)
+{
+  int rmul[256], gmul[256], bmul[256];
+  for (int k=0; k<256; k++)
+    {
+      rmul[k] = (int)((k*0x10000)*rgb_to_ycc[1][0]);
+      gmul[k] = (int)((k*0x10000)*rgb_to_ycc[1][1]);
+      bmul[k] = (int)((k*0x10000)*rgb_to_ycc[1][2]);
+    }
+  for (int i=0; i<h; i++, p+=rowsize, out+=outrowsize)
+    {
+      const GPixel *p2 = p;
+      signed char *out2 = out;
+      for (int j=0; j<w; j++,p2++,out2++)
+        {
+          int c = rmul[p2->r] + gmul[p2->g] + bmul[p2->b] + 32768;
+          *out2 = max(-128, min(127, c>>16));
+        }
+    }
+}
+
+
+//////////////////////////////////////////////////////
+// MASKING DECOMPOSITION
+//////////////////////////////////////////////////////
+
+//----------------------------------------------------
+// Function for applying bidimensional IW44 between 
+// scale intervals begin(inclusive) and end(exclusive)
+// with a MASK bitmap
+
+
+static void
+interpolate_mask(short *data16, int w, int h, int rowsize,
+                 const signed char *mask8, int mskrowsize)
+{
+  int i,j;
+  // count masked bits
+  short *count;
+  GPBuffer<short> gcount(count,w*h);
+  short *cp = count;
+  for (i=0; i<h; i++, cp+=w, mask8+=mskrowsize)
+    for (j=0; j<w; j++)
+      cp[j] = (mask8[j] ? 0 : 0x1000);
+  // copy image
+  short *sdata;
+  GPBuffer<short> gsdata(sdata,w*h);
+  short *p = sdata;
+  short *q = data16;
+  for (i=0; i<h; i++, p+=w, q+=rowsize)
+    for (j=0; j<w; j++)
+      p[j] = q[j];
+  // iterate over resolutions
+  int split = 1;
+  int scale = 2;
+  int again = 1;
+  while (again && scale<w && scale<h)
+    {
+      again = 0;
+      p = data16;
+      q = sdata;
+      cp = count;
+      // iterate over block
+      for (i=0; i<h; i+=scale, cp+=w*scale, q+=w*scale, p+=rowsize*scale)
+        for (j=0; j<w; j+=scale)
+          {
+            int ii, jj;
+            int gotz = 0;
+            int gray = 0;
+            int npix = 0;
+            short *cpp = cp;
+            short *qq = q;
+            // look around when square goes beyond border
+            int istart = i;
+            if (istart+split>h)
+              {
+                istart -= scale;
+                cpp -= w*scale;
+                qq -= w*scale;
+              }
+            int jstart = j;
+            if (jstart+split>w)
+              jstart -= scale;
+            // compute gray level
+            for (ii=istart; ii<i+scale && ii<h; ii+=split, cpp+=w*split, qq+=w*split)
+              for (jj=jstart; jj<j+scale && jj<w; jj+=split)
+                {
+                  if (cpp[jj]>0) 
+                    {
+                      npix += cpp[jj];
+                      gray += cpp[jj] * qq[jj];
+                    } 
+                  else if (ii>=i && jj>=j)
+                    {
+                      gotz = 1;
+                    }
+                }
+            // process result
+            if (npix == 0)
+              {
+                // continue to next resolution
+                again = 1;
+                cp[j] = 0;
+              }
+            else
+              {
+                gray = gray / npix;
+                // check whether initial image require fix
+                if (gotz)
+                  {
+                    cpp = cp;
+                    qq = p;
+                    for (ii=i; ii<i+scale && ii<h; ii+=1, cpp+=w, qq+=rowsize)
+                      for (jj=j; jj<j+scale && jj<w; jj+=1)
+                        if (cpp[jj] == 0)
+                          {
+                            qq[jj] = gray;
+                            cpp[jj] = 1;
+                          }
+                  }
+                // store average for next iteration
+                cp[j] = npix>>2;
+                q[j] = gray;
+              }
+          }
+      // double resolution
+      split = scale;
+      scale = scale+scale;
+    }
+}
+
+
+static void
+forward_mask(short *data16, int w, int h, int rowsize, int begin, int end,
+             const signed char *mask8, int mskrowsize )
+{
+  int i,j;
+  signed char *m;
+  short *p;
+  short *d;
+  // Allocate buffers
+  short *sdata;
+  GPBuffer<short> gsdata(sdata,w*h);
+  signed char *smask;
+  GPBuffer<signed char> gsmask(smask,w*h);
+  // Copy mask
+  m = smask;
+  for (i=0; i<h; i+=1, m+=w, mask8+=mskrowsize)
+    memcpy((void*)m, (void*)mask8, w);
+  // Loop over scale
+  for (int scale=begin; scale<end; scale<<=1)
+    {
+      // Copy data into sdata buffer
+      p = data16;
+      d = sdata;
+      for (i=0; i<h; i+=scale)
+        {
+          for (j=0; j<w; j+=scale)
+            d[j] = p[j];
+          p += rowsize * scale;
+          d += w * scale;
+        }
+      // Decompose
+      IW44Image::Transform::Encode::forward(sdata, w, h, w, scale, scale+scale);
+      // Cancel masked coefficients
+      d = sdata;
+      m = smask;
+      for (i=0; i<h; i+=scale+scale)
+        {
+          for (j=scale; j<w; j+=scale+scale)
+            if (m[j])
+              d[j] = 0;
+          d += w * scale;
+          m += w * scale;
+          if (i+scale < h)
+            {
+              for (j=0; j<w; j+=scale)
+                if (m[j])
+                  d[j] = 0;
+              d += w * scale;
+              m += w * scale;
+            }
+        }
+      // Reconstruct
+      IW44Image::Transform::Decode::backward(sdata, w, h, w, scale+scale, scale);
+      // Correct visible pixels
+      p = data16;
+      d = sdata;
+      m = smask;
+      for (i=0; i<h; i+=scale)
+        {
+          for (j=0; j<w; j+=scale)
+            if (! m[j])
+              d[j] = p[j];
+          p += rowsize*scale;
+          m += w*scale;
+          d += w*scale;
+        }
+      // Decompose again (no need to iterate actually!)
+      IW44Image::Transform::Encode::forward(sdata, w, h, w, scale, scale+scale);
+      // Copy coefficients from sdata buffer
+      p = data16;
+      d = sdata;
+      for (i=0; i<h; i+=scale)
+        {
+          for (j=0; j<w; j+=scale)
+            p[j] = d[j];
+          p += rowsize * scale;
+          d += w * scale;
+        }
+      // Compute new mask for next scale
+      m = smask;
+      signed char *m0 = m;
+      signed char *m1 = m;
+      for (i=0; i<h; i+=scale+scale)
+        {
+          m0 = m1;
+          if (i+scale < h)
+            m1 = m + w*scale;
+          for (j=0; j<w; j+=scale+scale)
+            if (m[j] && m0[j] && m1[j] && (j<=0 || m[j-scale]) && (j+scale>=w || m[j+scale]))
+              m[j] = 1;
+            else
+              m[j] = 0;
+          m = m1 + w*scale;
+        }
+    }
+  // Free buffers
+}
+
+void 
+IW44Image::Map::Encode::create(const signed char *img8, int imgrowsize, 
+               const signed char *msk8, int mskrowsize )
+{
+  int i, j;
+  // Progress
+  DJVU_PROGRESS_TASK(transf,"create iw44 map",3);
+  // Allocate decomposition buffer
+  short *data16;
+  GPBuffer<short> gdata16(data16,bw*bh);
+  // Copy pixels
+  short *p = data16;
+  const signed char *row = img8;
+  for (i=0; i<ih; i++)
+    {
+      for (j=0; j<iw; j++)
+        *p++ = (int)(row[j]) << iw_shift;
+      row += imgrowsize;
+      for (j=iw; j<bw; j++)
+        *p++ = 0;
+    }
+  for (i=ih; i<bh; i++)
+    for (j=0; j<bw; j++)
+      *p++ = 0;
+  // Handle bitmask
+  if (msk8)
+    {
+      // Interpolate pixels below mask
+      DJVU_PROGRESS_RUN(transf, 1);
+      interpolate_mask(data16, iw, ih, bw, msk8, mskrowsize);
+      // Multiscale iterative masked decomposition
+      DJVU_PROGRESS_RUN(transf, 3);
+      forward_mask(data16, iw, ih, bw, 1, 32, msk8, mskrowsize);
+    }
+  else
+    {
+      // Perform traditional decomposition
+      DJVU_PROGRESS_RUN(transf, 3);
+      IW44Image::Transform::Encode::forward(data16, iw, ih, bw, 1, 32);
+    }
+  // Copy coefficient into blocks
+  p = data16;
+  IW44Image::Block *block = blocks;
+  for (i=0; i<bh; i+=32)
+    {
+      for (j=0; j<bw; j+=32)
+        {
+          short liftblock[1024];
+          // transfer coefficients at (p+j) into aligned block
+          short *pp = p + j;
+          short *pl = liftblock;
+          for (int ii=0; ii<32; ii++, pp+=bw)
+            for (int jj=0; jj<32; jj++) 
+              *pl++ = pp[jj];
+          // transfer into IW44Image::Block (apply zigzag and scaling)
+          block->read_liftblock(liftblock, this);
+          block++;
+        }
+      // next row of blocks
+      p += 32*bw;
+    }
+}
+
+void 
+IW44Image::Map::Encode::slashres(int res)
+{
+  int minbucket = 1;
+  if (res < 2)
+    return;
+  else if (res < 4)
+    minbucket=16;
+  else if (res < 8)
+    minbucket=4;
+  for (int blockno=0; blockno<nb; blockno++)
+    for (int buckno=minbucket; buckno<64; buckno++)
+      blocks[blockno].zero(buckno);
+}
+
+// encode_prepare
+// -- compute the states prior to encoding the buckets
+int
+IW44Image::Codec::Encode::encode_prepare(int band, int fbucket, int nbucket, IW44Image::Block &blk, IW44Image::Block &eblk)
+{
+  int bbstate = 0;
+  // compute state of all coefficients in all buckets
+  if (band) 
+    {
+      // Band other than zero
+      int thres = quant_hi[band];
+      char *cstate = coeffstate;
+      for (int buckno=0; buckno<nbucket; buckno++, cstate+=16)
+        {
+          const short *pcoeff = blk.data(fbucket+buckno);
+          const short *epcoeff = eblk.data(fbucket+buckno);
+          int bstatetmp = 0;
+          if (! pcoeff)
+            {
+              bstatetmp = UNK;
+              // cstate[i] is not used and does not need initialization
+            }
+          else if (! epcoeff)
+            {
+              for (int i=0; i<16; i++)
+                {
+                  int cstatetmp = UNK;
+                  if  ((int)(pcoeff[i])>=thres || (int)(pcoeff[i])<=-thres)
+                    cstatetmp = NEW|UNK;
+                  cstate[i] = cstatetmp;
+                  bstatetmp |= cstatetmp;
+                }
+            }
+          else
+            {
+              for (int i=0; i<16; i++)
+                {
+                  int cstatetmp = UNK;
+                  if (epcoeff[i])
+                    cstatetmp = ACTIVE;
+                  else if  ((int)(pcoeff[i])>=thres || (int)(pcoeff[i])<=-thres)
+                    cstatetmp = NEW|UNK;
+                  cstate[i] = cstatetmp;
+                  bstatetmp |= cstatetmp;
+                }
+            }
+          bucketstate[buckno] = bstatetmp;
+          bbstate |= bstatetmp;
+        }
+    }
+  else
+    {
+      // Band zero ( fbucket==0 implies band==zero and nbucket==1 )
+      const short *pcoeff = blk.data(0, &map);
+      const short *epcoeff = eblk.data(0, &emap);
+      char *cstate = coeffstate;
+      for (int i=0; i<16; i++)
+        {
+          int thres = quant_lo[i];
+          int cstatetmp = cstate[i];
+          if (cstatetmp != ZERO)
+            {
+              cstatetmp = UNK;
+              if (epcoeff[i])
+                cstatetmp = ACTIVE;
+              else if ((int)(pcoeff[i])>=thres || (int)(pcoeff[i])<=-thres)
+                cstatetmp = NEW|UNK;
+            }
+          cstate[i] = cstatetmp;
+          bbstate |= cstatetmp;
+        }
+      bucketstate[0] = bbstate;
+    }
+  return bbstate;
+}
+
+// encode_buckets
+// -- code a sequence of buckets in a given block
+void
+IW44Image::Codec::Encode::encode_buckets(ZPCodec &zp, int bit, int band, 
+                         IW44Image::Block &blk, IW44Image::Block &eblk,
+                         int fbucket, int nbucket)
+{
+  // compute state of all coefficients in all buckets
+  int bbstate = encode_prepare(band, fbucket, nbucket, blk, eblk);
+
+  // code root bit
+  if ((nbucket<16) || (bbstate&ACTIVE))
+    {
+      bbstate |= NEW;
+    }
+  else if (bbstate & UNK)
+    {
+      zp.encoder( (bbstate&NEW) ? 1 : 0 , ctxRoot);
+#ifdef TRACE
+      DjVuPrintMessage("bbstate[bit=%d,band=%d] = %d\n", bit, band, bbstate);
+#endif
+    }
+  
+  // code bucket bits
+  if (bbstate & NEW)
+    for (int buckno=0; buckno<nbucket; buckno++)
+      {
+        // Code bucket bit
+        if (bucketstate[buckno] & UNK)
+          {
+            // Context
+            int ctx = 0;
+#ifndef NOCTX_BUCKET_UPPER
+            if (band>0)
+              {
+                int k = (fbucket+buckno)<<2;
+                const short *b = eblk.data(k>>4);
+                if (b)
+                  {
+                    k = k & 0xf;
+                    if (b[k])
+                      ctx += 1;
+                    if (b[k+1])
+                      ctx += 1;
+                    if (b[k+2])
+                      ctx += 1;
+                    if (ctx<3 && b[k+3])
+                      ctx += 1;
+                  }
+              }
+#endif
+#ifndef NOCTX_BUCKET_ACTIVE
+            if (bbstate & ACTIVE)
+              ctx |= 4; 
+#endif
+            // Code
+            zp.encoder( (bucketstate[buckno]&NEW) ? 1 : 0, ctxBucket[band][ctx] );
+#ifdef TRACE
+            DjVuPrintMessage("  bucketstate[bit=%d,band=%d,buck=%d] = %d\n", 
+                   bit, band, buckno, bucketstate[buckno] & ~ZERO);
+#endif
+          }
+      }
+  
+  // code new active coefficient (with their sign)
+  if (bbstate & NEW)
+    {
+      int thres = quant_hi[band];
+      char *cstate = coeffstate;
+      for (int buckno=0; buckno<nbucket; buckno++, cstate+=16)
+        if (bucketstate[buckno] & NEW)
+          {
+            int i;
+#ifndef NOCTX_EXPECT
+            int gotcha = 0;
+            const int maxgotcha = 7;
+            for (i=0; i<16; i++)
+              if (cstate[i] & UNK)
+                gotcha += 1;
+#endif
+            const short *pcoeff = blk.data(fbucket+buckno);
+            short *epcoeff = eblk.data(fbucket+buckno, &emap);
+            // iterate within bucket
+            for (i=0; i<16; i++)
+              {
+                if (cstate[i] & UNK)
+                  {
+                    // Prepare context
+                    int ctx = 0;
+#ifndef NOCTX_EXPECT
+                    if (gotcha>=maxgotcha)
+                      ctx = maxgotcha;
+                    else
+                      ctx = gotcha;
+#endif
+#ifndef NOCTX_ACTIVE
+                    if (bucketstate[buckno] & ACTIVE)
+                      ctx |= 8;
+#endif
+                    // Code
+                    zp.encoder( (cstate[i]&NEW) ? 1 : 0, ctxStart[ctx] );
+                    if (cstate[i] & NEW)
+                      {
+                        // Code sign
+                        zp.IWencoder( (pcoeff[i]<0) ? 1 : 0 );
+                        // Set encoder state
+                        if (band==0)
+                          thres = quant_lo[i];
+                        epcoeff[i] = thres + (thres>>1);
+                      }
+#ifndef NOCTX_EXPECT
+                    if (cstate[i] & NEW)
+                      gotcha = 0;
+                    else if (gotcha > 0)
+                      gotcha -= 1;
+#endif
+#ifdef TRACE
+                    DjVuPrintMessage("    coeffstate[bit=%d,band=%d,buck=%d,c=%d] = %d\n", 
+                           bit, band, buckno, i, cstate[i]);
+#endif
+                  }
+              }
+          }
+    }
+
+  // code mantissa bits
+  if (bbstate & ACTIVE)
+    {
+      int thres = quant_hi[band];
+      char *cstate = coeffstate;
+      for (int buckno=0; buckno<nbucket; buckno++, cstate+=16)
+        if (bucketstate[buckno] & ACTIVE)
+          {
+            const short *pcoeff = blk.data(fbucket+buckno);
+            short *epcoeff = eblk.data(fbucket+buckno, &emap);
+            for (int i=0; i<16; i++)
+              if (cstate[i] & ACTIVE)
+                {
+                  // get coefficient
+                  int coeff = pcoeff[i];
+                  int ecoeff = epcoeff[i];
+                  if (coeff < 0)
+                    coeff = -coeff;
+                  // get band zero thresholds
+                  if (band == 0)
+                    thres = quant_lo[i];
+                  // compute mantissa bit
+                  int pix = 0;
+                  if (coeff >= ecoeff)
+                    pix = 1;
+                  // encode second or lesser mantissa bit
+                  if (ecoeff <= 3*thres)
+                    zp.encoder(pix, ctxMant);                      
+                  else
+					  zp.IWencoder(!!pix);
+                  // adjust epcoeff
+                  epcoeff[i] = ecoeff - (pix ? 0 : thres) + (thres>>1);
+                }
+          }
+    }
+}
+
+// IW44Image::Codec::estimate_decibel
+// -- estimate encoding error (after code_slice) in decibels.
+float
+IW44Image::Codec::Encode::estimate_decibel(float frac)
+{
+  int i,j;
+  const float *q;
+  // Fill norm arrays
+  float norm_lo[16];
+  float norm_hi[10];
+  // -- lo coefficients
+  q = iw_norm;
+  for (i=j=0; i<4; j++)
+    norm_lo[i++] = *q++;
+  for (j=0; j<4; j++)
+    norm_lo[i++] = *q;
+  q += 1;
+  for (j=0; j<4; j++)
+    norm_lo[i++] = *q;
+  q += 1;
+  for (j=0; j<4; j++)
+    norm_lo[i++] = *q;
+  q += 1;
+  // -- hi coefficients
+  norm_hi[0] = 0;
+  for (j=1; j<10; j++)
+    norm_hi[j] = *q++;
+  // Initialize mse array
+  float *xmse;
+  GPBuffer<float> gxmse(xmse,map.nb);
+  // Compute mse in each block
+  for (int blockno=0; blockno<map.nb; blockno++)
+    {
+      float mse = 0;
+      // Iterate over bands
+      for (int bandno=0; bandno<10; bandno++)
+        {
+          int fbucket = bandbuckets[bandno].start;
+          int nbucket = bandbuckets[bandno].size;
+          IW44Image::Block &blk = map.blocks[blockno];
+          IW44Image::Block &eblk = emap.blocks[blockno];
+          float norm = norm_hi[bandno];
+          for (int buckno=0; buckno<nbucket; buckno++)
+            {
+              const short *pcoeff = blk.data(fbucket+buckno);
+              const short *epcoeff = eblk.data(fbucket+buckno);
+              if (pcoeff)
+                {
+                  if (epcoeff)
+                    {
+                      for (i=0; i<16; i++)
+                        {
+                          if (bandno == 0)
+                            norm = norm_lo[i];
+                          float delta = (float)(pcoeff[i]<0 ? -pcoeff[i] : pcoeff[i]);
+                          delta = delta - epcoeff[i];
+                          mse = mse + norm * delta * delta;
+                        }
+                    }
+                  else
+                    {
+                      for (i=0; i<16; i++)
+                        {
+                          if (bandno == 0)
+                            norm = norm_lo[i];
+                          float delta = (float)(pcoeff[i]);
+                          mse = mse + norm * delta * delta;
+                        }
+                    }
+                }
+            }
+        }
+      xmse[blockno] = mse / 1024;
+    }
+  // Compute partition point
+  int n = 0;
+  int m = map.nb - 1;
+  int p = (int)floor(m*(1.0-frac)+0.5);
+  p = (p>m ? m : (p<0 ? 0 : p));
+  float pivot = 0;
+  // Partition array
+  while (n < p)
+    {
+      int l = n;
+      int h = m;
+      if (xmse[l] > xmse[h]) { float tmp=xmse[l]; xmse[l]=xmse[h]; xmse[h]=tmp; }
+      pivot = xmse[(l+h)/2];
+      if (pivot < xmse[l]) { float tmp=pivot; pivot=xmse[l]; xmse[l]=tmp; }
+      if (pivot > xmse[h]) { float tmp=pivot; pivot=xmse[h]; xmse[h]=tmp; }
+      while (l < h)
+        {
+          if (xmse[l] > xmse[h]) { float tmp=xmse[l]; xmse[l]=xmse[h]; xmse[h]=tmp; }
+          while (xmse[l]<pivot || (xmse[l]==pivot && l<h)) l++;
+          while (xmse[h]>pivot) h--;
+        }
+      if (p>=l) 
+        n = l;
+      else 
+        m = l-1;
+    }
+  // Compute average mse
+  float mse = 0;
+  for (i=p; i<map.nb; i++)
+    mse = mse + xmse[i];
+  mse = mse / (map.nb - p);
+  // Return
+  float factor = 255 << iw_shift;
+  float decibel = (float)(10.0 * log ( factor * factor / mse ) / 2.302585125);
+  return decibel;
+}
+
+
+
+
+//////////////////////////////////////////////////////
+// IW44IMAGE ENCODING ROUTINES
+//////////////////////////////////////////////////////
+
+
+void 
+IW44Image::PrimaryHeader::encode(GP<ByteStream> gbs)
+{
+  gbs->write8(serial);
+  gbs->write8(slices);
+}
+
+void 
+IW44Image::SecondaryHeader::encode(GP<ByteStream> gbs)
+{
+  gbs->write8(major);
+  gbs->write8(minor);
+}
+
+void 
+IW44Image::TertiaryHeader::encode(GP<ByteStream> gbs)
+{
+  gbs->write8(xhi);
+  gbs->write8(xlo);
+  gbs->write8(yhi);
+  gbs->write8(ylo);
+  gbs->write8(crcbdelay);
+}
+
+
+
+GP<IW44Image>
+IW44Image::create_encode(const ImageType itype)
+{
+  switch(itype)
+  {
+  case COLOR:
+    return new IWPixmap::Encode();
+  case GRAY:
+    return new IWBitmap::Encode();
+  default:
+    return 0;
+  }
+}
+
+GP<IW44Image>
+IW44Image::create_encode(const GBitmap &bm, const GP<GBitmap> mask)
+{
+  IWBitmap::Encode *bit=new IWBitmap::Encode();
+  GP<IW44Image> retval=bit;
+  bit->init(bm, mask);
+  return retval;
+}
+
+
+IWBitmap::Encode::Encode(void)
+: IWBitmap(), ycodec_enc(0)
+{}
+
+IWBitmap::Encode::~Encode()
+{
+  close_codec();
+}
+
+void
+IWBitmap::Encode::init(const GBitmap &bm, const GP<GBitmap> gmask)
+{
+  // Free
+  close_codec();
+  delete ymap;
+  ymap = 0;
+  // Init
+  int i, j;
+  int w = bm.columns();
+  int h = bm.rows();
+  int g = bm.get_grays()-1;
+  signed char *buffer;
+  GPBuffer<signed char> gbuffer(buffer,w*h);
+  // Prepare gray level conversion table
+  signed char  bconv[256];
+  for (i=0; i<256; i++)
+    bconv[i] = max(0,min(255,i*255/g)) - 128;
+  // Perform decomposition
+  // Prepare mask information
+  const signed char *msk8 = 0;
+  int mskrowsize = 0;
+  GBitmap *mask=gmask;
+  if (gmask)
+  {
+    msk8 = (const signed char*)((*mask)[0]);
+    mskrowsize = mask->rowsize();
+  }
+  // Prepare a buffer of signed bytes
+  for (i=0; i<h; i++)
+    {
+      signed char *bufrow = buffer + i*w;
+      const unsigned char *bmrow = bm[i];
+      for (j=0; j<w; j++)
+        bufrow[j] = bconv[bmrow[j]];
+    }
+  // Create map
+  Map::Encode *eymap=new Map::Encode(w,h);
+  ymap = eymap;
+  eymap->create(buffer, w, msk8, mskrowsize);
+}
+
+void 
+IWBitmap::Encode::close_codec(void)
+{
+  delete ycodec_enc;
+  ycodec_enc = 0;
+  IWBitmap::close_codec();
+}
+
+int  
+IWBitmap::Encode::encode_chunk(GP<ByteStream> gbs, const IWEncoderParms &parm)
+{
+  // Check
+  if (parm.slices==0 && parm.bytes==0 && parm.decibels==0)
+    G_THROW( ERR_MSG("IW44Image.need_stop") );
+  if (! ymap)
+    G_THROW( ERR_MSG("IW44Image.empty_object") );
+  // Open codec
+  if (!ycodec_enc)
+  {
+    cslice = cserial = cbytes = 0;
+    ycodec_enc = new Codec::Encode(*ymap);
+  }
+  // Adjust cbytes
+  cbytes += sizeof(struct IW44Image::PrimaryHeader);
+  if (cserial == 0)
+    cbytes += sizeof(struct IW44Image::SecondaryHeader) + sizeof(struct IW44Image::TertiaryHeader);
+  // Prepare zcoded slices
+  int flag = 1;
+  int nslices = 0;
+  GP<ByteStream> gmbs=ByteStream::create();
+  ByteStream &mbs=*gmbs;
+  DJVU_PROGRESS_TASK(chunk,"encode chunk",parm.slices-cslice);
+  {
+    float estdb = -1.0;
+    GP<ZPCodec> gzp=ZPCodec::create(gmbs, true, true);
+    ZPCodec &zp=*gzp;
+    while (flag)
+      {
+        if (parm.decibels>0  && estdb>=parm.decibels)
+          break;
+        if (parm.bytes>0  && mbs.tell()+cbytes>=parm.bytes)
+          break;
+        if (parm.slices>0 && nslices+cslice>=parm.slices)
+          break;
+        DJVU_PROGRESS_RUN(chunk, (1+nslices-cslice)|0xf);
+        flag = ycodec_enc->code_slice(zp);
+        if (flag && parm.decibels>0.0)
+          if (ycodec_enc->curband==0 || estdb>=parm.decibels-DECIBEL_PRUNE)
+            estdb = ycodec_enc->estimate_decibel(db_frac);
+        nslices++;
+      }
+  }
+  // Write primary header
+  struct IW44Image::PrimaryHeader primary;
+  primary.serial = cserial;
+  primary.slices = nslices;
+  primary.encode(gbs);
+  // Write auxilliary headers
+  if (cserial == 0)
+    {
+      struct IW44Image::SecondaryHeader secondary;
+      secondary.major = IWCODEC_MAJOR + 0x80;
+      secondary.minor = IWCODEC_MINOR;
+      secondary.encode(gbs);
+      struct IW44Image::TertiaryHeader tertiary;
+      tertiary.xhi = (ymap->iw >> 8) & 0xff;
+      tertiary.xlo = (ymap->iw >> 0) & 0xff;
+      tertiary.yhi = (ymap->ih >> 8) & 0xff;
+      tertiary.ylo = (ymap->ih >> 0) & 0xff;
+      tertiary.crcbdelay = 0;
+      tertiary.encode(gbs);
+    }
+  // Write slices
+  mbs.seek(0);
+  gbs->copy(mbs);
+  // Return
+  cbytes  += mbs.tell();
+  cslice  += nslices;
+  cserial += 1;
+  return flag;
+}
+
+void 
+IWBitmap::Encode::encode_iff(IFFByteStream &iff, int nchunks, const IWEncoderParms *parms)
+{
+  if (ycodec_enc)
+    G_THROW( ERR_MSG("IW44Image.left_open1") );
+  int flag = 1;
+  iff.put_chunk("FORM:BM44", 1);
+  DJVU_PROGRESS_TASK(iff,"encode iff chunk",nchunks);
+  for (int i=0; flag && i<nchunks; i++)
+    {
+      DJVU_PROGRESS_RUN(iff,i+1);
+      iff.put_chunk("BM44");
+      flag = encode_chunk(iff.get_bytestream(),parms[i]);
+      iff.close_chunk();
+    }
+  iff.close_chunk();
+  close_codec();
+}
+
+GP<IW44Image>
+IW44Image::create_encode(
+  const GPixmap &pm, const GP<GBitmap> gmask, CRCBMode crcbmode)
+{
+  IWPixmap::Encode *pix=new IWPixmap::Encode();
+  GP<IW44Image> retval=pix;
+  pix->init(pm, gmask,(IWPixmap::Encode::CRCBMode)crcbmode);
+  return retval;
+}
+
+IWPixmap::Encode::Encode(void)
+: IWPixmap(), ycodec_enc(0), cbcodec_enc(0), crcodec_enc(0)
+{}
+
+IWPixmap::Encode::~Encode()
+{
+  close_codec();
+}
+
+void
+IWPixmap::Encode::init(const GPixmap &pm, const GP<GBitmap> gmask, CRCBMode crcbmode)
+{
+  /* Free */
+  close_codec();
+  delete ymap;
+  delete cbmap;
+  delete crmap;
+  ymap = cbmap = crmap = 0;
+  /* Create */
+  int w = pm.columns();
+  int h = pm.rows();
+  signed char *buffer;
+  GPBuffer<signed char> gbuffer(buffer,w*h);
+  // Create maps
+  Map::Encode *eymap = new Map::Encode(w,h);
+  ymap = eymap;
+  // Handle CRCB mode
+  switch (crcbmode) 
+    {
+    case CRCBnone:   crcb_half=1; crcb_delay=-1; break;
+    case CRCBhalf:   crcb_half=1; crcb_delay=10; break;        
+    case CRCBnormal: crcb_half=0; crcb_delay=10; break;
+    case CRCBfull:   crcb_half=0; crcb_delay= 0; break;
+    }
+  // Prepare mask information
+  const signed char *msk8 = 0;
+  int mskrowsize = 0;
+  GBitmap *mask=gmask;
+  if (mask)
+  {
+    msk8 = (signed char const *)((*mask)[0]);
+    mskrowsize = mask->rowsize();
+  }
+  // Fill buffer with luminance information
+  DJVU_PROGRESS_TASK(create,"initialize pixmap",3);
+  DJVU_PROGRESS_RUN(create,(crcb_delay>=0 ? 1 : 3));
+  Transform::Encode::RGB_to_Y(pm[0], w, h, pm.rowsize(), buffer, w);
+  if (crcb_delay < 0)
+    {
+      // Stupid inversion for gray images
+      signed char *e = buffer + w*h;
+      for (signed char *b=buffer; b<e; b++)
+        *b = 255 - *b;
+    }
+  // Create YMAP
+  eymap->create(buffer, w, msk8, mskrowsize);
+  // Create chrominance maps
+  if (crcb_delay >= 0)
+    {
+      Map::Encode *ecbmap = new Map::Encode(w,h);
+      cbmap = ecbmap;
+      Map::Encode *ecrmap = new Map::Encode(w,h);
+      crmap = ecrmap;
+      // Process CB information
+      DJVU_PROGRESS_RUN(create,2);
+      Transform::Encode::RGB_to_Cb(pm[0], w, h, pm.rowsize(), buffer, w);
+      ecbmap->create(buffer, w, msk8, mskrowsize);
+      // Process CR information
+      DJVU_PROGRESS_RUN(create,3);
+      Transform::Encode::RGB_to_Cr(pm[0], w, h, pm.rowsize(), buffer, w); 
+      ecrmap->create(buffer, w, msk8, mskrowsize);
+      // Perform chrominance reduction (CRCBhalf)
+      if (crcb_half)
+        {
+          ecbmap->slashres(2);
+          ecrmap->slashres(2);
+        }
+    }
+}
+
+void 
+IWPixmap::Encode::encode_iff(IFFByteStream &iff, int nchunks, const IWEncoderParms *parms)
+{
+  if (ycodec_enc)
+    G_THROW( ERR_MSG("IW44Image.left_open3") );
+  int flag = 1;
+  iff.put_chunk("FORM:PM44", 1);
+  DJVU_PROGRESS_TASK(iff,"encode pixmap chunk", nchunks);
+  for (int i=0; flag && i<nchunks; i++)
+    {
+      DJVU_PROGRESS_RUN(iff,i+1);
+      iff.put_chunk("PM44");
+      flag = encode_chunk(iff.get_bytestream(), parms[i]);
+      iff.close_chunk();
+    }
+  iff.close_chunk();
+  close_codec();
+}
+
+void 
+IWPixmap::Encode::close_codec(void)
+{
+  delete ycodec_enc;
+  delete cbcodec_enc;
+  delete crcodec_enc;
+  ycodec_enc = crcodec_enc = cbcodec_enc = 0;
+  IWPixmap::close_codec();
+}
+
+int  
+IWPixmap::Encode::encode_chunk(GP<ByteStream> gbs, const IWEncoderParms &parm)
+{
+  // Check
+  if (parm.slices==0 && parm.bytes==0 && parm.decibels==0)
+    G_THROW( ERR_MSG("IW44Image.need_stop2") );
+  if (!ymap)
+    G_THROW( ERR_MSG("IW44Image.empty_object2") );
+  // Open
+  if (!ycodec_enc)
+  {
+    cslice = cserial = cbytes = 0;
+    ycodec_enc = new Codec::Encode(*ymap);
+    if (crmap && cbmap)
+    {
+      cbcodec_enc = new Codec::Encode(*cbmap);
+      crcodec_enc = new Codec::Encode(*crmap);
+    }
+  }
+
+  // Adjust cbytes
+  cbytes += sizeof(struct IW44Image::PrimaryHeader);
+  if (cserial == 0)
+    cbytes += sizeof(struct IW44Image::SecondaryHeader) + sizeof(struct IW44Image::TertiaryHeader);
+  // Prepare zcodec slices
+  int flag = 1;
+  int nslices = 0;
+  GP<ByteStream> gmbs=ByteStream::create();
+  ByteStream &mbs=*gmbs;
+  DJVU_PROGRESS_TASK(chunk, "encode pixmap chunk", parm.slices-cslice);
+  {
+    float estdb = -1.0;
+    GP<ZPCodec> gzp=ZPCodec::create(gmbs, true, true);
+    ZPCodec &zp=*gzp;
+    while (flag)
+      {
+        if (parm.decibels>0  && estdb>=parm.decibels)
+          break;
+        if (parm.bytes>0  && mbs.tell()+cbytes>=parm.bytes)
+          break;
+        if (parm.slices>0 && nslices+cslice>=parm.slices)
+          break;
+        DJVU_PROGRESS_RUN(chunk,(1+nslices-cslice)|0xf);
+        flag = ycodec_enc->code_slice(zp);
+        if (flag && parm.decibels>0)
+          if (ycodec_enc->curband==0 || estdb>=parm.decibels-DECIBEL_PRUNE)
+            estdb = ycodec_enc->estimate_decibel(db_frac);
+        if (crcodec_enc && cbcodec_enc && cslice+nslices>=crcb_delay)
+          {
+            flag |= cbcodec_enc->code_slice(zp);
+            flag |= crcodec_enc->code_slice(zp);
+          }
+        nslices++;
+      }
+  }
+  // Write primary header
+  struct IW44Image::PrimaryHeader primary;
+  primary.serial = cserial;
+  primary.slices = nslices;
+  primary.encode(gbs);
+  // Write secondary header
+  if (cserial == 0)
+    {
+      struct IW44Image::SecondaryHeader secondary;
+      secondary.major = IWCODEC_MAJOR;
+      secondary.minor = IWCODEC_MINOR;
+      if (! (crmap && cbmap))
+        secondary.major |= 0x80;
+      secondary.encode(gbs);
+      struct IW44Image::TertiaryHeader tertiary;
+      tertiary.xhi = (ymap->iw >> 8) & 0xff;
+      tertiary.xlo = (ymap->iw >> 0) & 0xff;
+      tertiary.yhi = (ymap->ih >> 8) & 0xff;
+      tertiary.ylo = (ymap->ih >> 0) & 0xff;
+      tertiary.crcbdelay = (crcb_half ? 0x00 : 0x80);
+      tertiary.crcbdelay |= (crcb_delay>=0 ? crcb_delay : 0x00);
+      tertiary.encode(gbs);
+    }
+  // Write slices
+  mbs.seek(0);
+  gbs->copy(mbs);
+  // Return
+  cbytes  += mbs.tell();
+  cslice  += nslices;
+  cserial += 1;
+  return flag;
+}
+
+// code_slice
+// -- read/write a slice of datafile
+
+int
+IW44Image::Codec::Encode::code_slice(ZPCodec &zp)
+{
+  // Check that code_slice can still run
+  if (curbit < 0)
+    return 0;
+  // Perform coding
+  if (! is_null_slice(curbit, curband))
+    {
+      for (int blockno=0; blockno<map.nb; blockno++)
+        {
+          const int fbucket = bandbuckets[curband].start;
+          const int nbucket = bandbuckets[curband].size;
+          encode_buckets(zp, curbit, curband, 
+                         map.blocks[blockno], emap.blocks[blockno], 
+                         fbucket, nbucket);
+        }
+    }
+  return finish_code_slice(zp);
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif // NEED_DECODER_ONLY
+
diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp
new file mode 100644
index 0000000..bd7d859
--- /dev/null
+++ b/libdjvu/IW44Image.cpp
@@ -0,0 +1,1946 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// - Author: Leon Bottou, 08/1998
+
+// From: Leon Bottou, 1/31/2002
+// Lizardtech has split this file into a decoder and an encoder.
+// Only superficial changes.  The meat is mine.
+
+#define IW44IMAGE_IMPLIMENTATION /* */
+// -------------------^  not my spelling mistake (Leon Bottou)
+
+#include "IW44Image.h"
+#include "ZPCodec.h"
+#include "GBitmap.h"
+#include "GPixmap.h"
+#include "IFFByteStream.h"
+#include "GRect.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "MMX.h"
+#undef IWTRANSFORM_TIMER
+#ifdef IWTRANSFORM_TIMER
+#include "GOS.h"
+#endif
+
+#include <assert.h>
+#include <string.h>
+#include <math.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+#define IWALLOCSIZE    4080
+#define IWCODEC_MAJOR     1
+#define IWCODEC_MINOR     2
+#define DECIBEL_PRUNE   5.0
+
+
+//////////////////////////////////////////////////////
+// WAVELET DECOMPOSITION CONSTANTS
+//////////////////////////////////////////////////////
+
+// Parameters for IW44 wavelet.
+// - iw_quant: quantization for all 16 sub-bands
+// - iw_norm: norm of all wavelets (for db estimation)
+// - iw_border: pixel border required to run filters
+// - iw_shift: scale applied before decomposition
+
+
+static const int iw_quant[16] = {
+  0x004000, 
+  0x008000, 0x008000, 0x010000,
+  0x010000, 0x010000, 0x020000,
+  0x020000, 0x020000, 0x040000,
+  0x040000, 0x040000, 0x080000, 
+  0x040000, 0x040000, 0x080000
+};
+
+static const float iw_norm[16] = {
+  2.627989e+03F,
+  1.832893e+02F, 1.832959e+02F, 5.114690e+01F,
+  4.583344e+01F, 4.583462e+01F, 1.279225e+01F,
+  1.149671e+01F, 1.149712e+01F, 3.218888e+00F,
+  2.999281e+00F, 2.999476e+00F, 8.733161e-01F,
+  1.074451e+00F, 1.074511e+00F, 4.289318e-01F
+};
+
+static const int iw_border = 3;
+static const int iw_shift  = 6;
+static const int iw_round  = (1<<(iw_shift-1));
+
+class IW44Image::Codec::Decode : public IW44Image::Codec 
+{
+public:
+  // Construction
+  Decode(IW44Image::Map &map) : Codec(map) {}
+  // Coding
+  virtual int code_slice(ZPCodec &zp);
+};
+
+//////////////////////////////////////////////////////
+// MMX IMPLEMENTATION HELPERS
+//////////////////////////////////////////////////////
+
+
+// Note:
+// MMX implementation for vertical transforms only.
+// Speedup is basically related to faster memory transfer
+// The IW44 transform is not CPU bound, it is memory bound.
+
+#ifdef MMX
+
+static const short w9[]  = {9,9,9,9};
+static const short w1[]  = {1,1,1,1};
+static const int   d8[]  = {8,8};
+static const int   d16[] = {16,16};
+
+static void
+mmx_bv_1 ( short* &q, short* e, int s, int s3 )
+{
+  while (q<e && (((size_t)q)&0x7))
+    {
+      int a = (int)q[-s] + (int)q[s];
+      int b = (int)q[-s3] + (int)q[s3];
+      *q -= (((a<<3)+a-b+16)>>5);
+      q ++;
+  }
+  while (q+3 < e)
+    {
+      MMXar( movq,       q-s,mm0);  // MM0=[ b3, b2, b1, b0 ]
+      MMXar( movq,       q+s,mm2);  // MM2=[ c3, c2, c1, c0 ]
+      MMXrr( movq,       mm0,mm1);  
+      MMXrr( punpcklwd,  mm2,mm0);  // MM0=[ c1, b1, c0, b0 ]
+      MMXrr( punpckhwd,  mm2,mm1);  // MM1=[ c3, b3, c2, b2 ]
+      MMXar( pmaddwd,    w9,mm0);   // MM0=[ (c1+b1)*9, (c0+b0)*9 ]
+      MMXar( pmaddwd,    w9,mm1);   // MM1=[ (c3+b3)*9, (c2+b2)*9 ]
+      MMXar( movq,       q-s3,mm2);
+      MMXar( movq,       q+s3,mm4);
+      MMXrr( movq,       mm2,mm3);
+      MMXrr( punpcklwd,  mm4,mm2);  // MM2=[ d1, a1, d0, a0 ]
+      MMXrr( punpckhwd,  mm4,mm3);  // MM3=[ d3, a3, d2, a2 ]
+      MMXar( pmaddwd,    w1,mm2);   // MM2=[ (a1+d1)*1, (a0+d0)*1 ]
+      MMXar( pmaddwd,    w1,mm3);   // MM3=[ (a3+d3)*1, (a2+d2)*1 ]
+      MMXar( paddd,      d16,mm0);
+      MMXar( paddd,      d16,mm1);
+      MMXrr( psubd,      mm2,mm0);  // MM0=[ (c1+b1)*9-a1-d1+8, ...
+      MMXrr( psubd,      mm3,mm1);  // MM1=[ (c3+b3)*9-a3-d3+8, ...
+      MMXir( psrad,      5,mm0);
+      MMXar( movq,       q,mm7);    // MM7=[ p3,p2,p1,p0 ]
+      MMXir( psrad,      5,mm1);
+      MMXrr( packssdw,   mm1,mm0);  // MM0=[ x3,x2,x1,x0 ]
+      MMXrr( psubw,      mm0,mm7);  // MM7=[ p3-x3, p2-x2, ... ]
+      MMXra( movq,       mm7,q);
+#if defined(_MSC_VER) && defined(_DEBUG)
+      MMXemms;
+#endif
+      q += 4;
+    }
+}
+
+
+static void
+mmx_bv_2 ( short* &q, short* e, int s, int s3 )
+{
+  while (q<e && (((size_t)q)&0x7))
+    {
+      int a = (int)q[-s] + (int)q[s];
+      int b = (int)q[-s3] + (int)q[s3];
+      *q += (((a<<3)+a-b+8)>>4);
+      q ++;
+    }
+  while (q+3 < e)
+    {
+      MMXar( movq,       q-s,mm0);  // MM0=[ b3, b2, b1, b0 ]
+      MMXar( movq,       q+s,mm2);  // MM2=[ c3, c2, c1, c0 ]
+      MMXrr( movq,       mm0,mm1);  
+      MMXrr( punpcklwd,  mm2,mm0);  // MM0=[ c1, b1, c0, b0 ]
+      MMXrr( punpckhwd,  mm2,mm1);  // MM1=[ c3, b3, c2, b2 ]
+      MMXar( pmaddwd,    w9,mm0);   // MM0=[ (c1+b1)*9, (c0+b0)*9 ]
+      MMXar( pmaddwd,    w9,mm1);   // MM1=[ (c3+b3)*9, (c2+b2)*9 ]
+      MMXar( movq,       q-s3,mm2);
+      MMXar( movq,       q+s3,mm4);
+      MMXrr( movq,       mm2,mm3);
+      MMXrr( punpcklwd,  mm4,mm2);  // MM2=[ d1, a1, d0, a0 ]
+      MMXrr( punpckhwd,  mm4,mm3);  // MM3=[ d3, a3, d2, a2 ]
+      MMXar( pmaddwd,    w1,mm2);   // MM2=[ (a1+d1)*1, (a0+d0)*1 ]
+      MMXar( pmaddwd,    w1,mm3);   // MM3=[ (a3+d3)*1, (a2+d2)*1 ]
+      MMXar( paddd,      d8,mm0);
+      MMXar( paddd,      d8,mm1);
+      MMXrr( psubd,      mm2,mm0);  // MM0=[ (c1+b1)*9-a1-d1+8, ...
+      MMXrr( psubd,      mm3,mm1);  // MM1=[ (c3+b3)*9-a3-d3+8, ...
+      MMXir( psrad,      4,mm0);
+      MMXar( movq,       q,mm7);    // MM7=[ p3,p2,p1,p0 ]
+      MMXir( psrad,      4,mm1);
+      MMXrr( packssdw,   mm1,mm0);  // MM0=[ x3,x2,x1,x0 ]
+      MMXrr( paddw,      mm0,mm7);  // MM7=[ p3+x3, p2+x2, ... ]
+      MMXra( movq,       mm7,q);
+#if defined(_MSC_VER) && defined(_DEBUG)
+      MMXemms;
+#endif
+      q += 4;
+    }
+}
+#endif /* MMX */
+
+static void 
+filter_bv(short *p, int w, int h, int rowsize, int scale)
+{
+  int y = 0;
+  int s = scale*rowsize;
+  int s3 = s+s+s;
+  h = ((h-1)/scale)+1;
+  while (y-3 < h)
+    {
+      // 1-Lifting
+      {
+        short *q = p;
+        short *e = q+w;
+        if (y>=3 && y+3<h)
+          {
+            // Generic case
+#ifdef MMX
+            if (scale==1 && MMXControl::mmxflag>0)
+              mmx_bv_1(q, e, s, s3);
+#endif
+            while (q<e)
+              {
+                int a = (int)q[-s] + (int)q[s];
+                int b = (int)q[-s3] + (int)q[s3];
+                *q -= (((a<<3)+a-b+16)>>5);
+                q += scale;
+              }
+          }
+        else if (y<h)
+          {
+            // Special cases
+            short *q1 = (y+1<h ? q+s : 0);
+            short *q3 = (y+3<h ? q+s3 : 0);
+            if (y>=3)
+              {
+                while (q<e)
+                  {
+                    int a = (int)q[-s] + (q1 ? (int)(*q1) : 0);
+                    int b = (int)q[-s3] + (q3 ? (int)(*q3) : 0);
+                    *q -= (((a<<3)+a-b+16)>>5);
+                    q += scale;
+                    if (q1) q1 += scale;
+                    if (q3) q3 += scale;
+                  }
+              }
+            else if (y>=1)
+              {
+                while (q<e)
+                  {
+                    int a = (int)q[-s] + (q1 ? (int)(*q1) : 0);
+                    int b = (q3 ? (int)(*q3) : 0);
+                    *q -= (((a<<3)+a-b+16)>>5);
+                    q += scale;
+                    if (q1) q1 += scale;
+                    if (q3) q3 += scale;
+                  }
+              }
+            else
+              {
+                while (q<e)
+                  {
+                    int a = (q1 ? (int)(*q1) : 0);
+                    int b = (q3 ? (int)(*q3) : 0);
+                    *q -= (((a<<3)+a-b+16)>>5);
+                    q += scale;
+                    if (q1) q1 += scale;
+                    if (q3) q3 += scale;
+                  }
+              }
+          }
+      }
+      // 2-Interpolation
+      {
+        short *q = p-s3;
+        short *e = q+w;
+        if (y>=6 && y<h)
+          {
+            // Generic case
+#ifdef MMX
+            if (scale==1 && MMXControl::mmxflag>0)
+              mmx_bv_2(q, e, s, s3);
+#endif
+            while (q<e)
+              {
+                int a = (int)q[-s] + (int)q[s];
+                int b = (int)q[-s3] + (int)q[s3];
+                *q += (((a<<3)+a-b+8)>>4);
+                q += scale;
+              }
+          }
+        else if (y>=3)
+          {
+            // Special cases
+            short *q1 = (y-2<h ? q+s : q-s);
+            while (q<e)
+              {
+                int a = (int)q[-s] + (int)(*q1);
+                *q += ((a+1)>>1);
+                q += scale;
+                q1 += scale;
+              }
+          }
+      }
+      y += 2;
+      p += s+s;
+    }
+}
+
+static void 
+filter_bh(short *p, int w, int h, int rowsize, int scale)
+{
+  int y = 0;
+  int s = scale;
+  int s3 = s+s+s;
+  rowsize *= scale;
+  while (y<h)
+    {
+      short *q = p;
+      short *e = p+w;
+      int a0=0, a1=0, a2=0, a3=0;
+      int b0=0, b1=0, b2=0, b3=0;
+      if (q<e)
+        {
+          // Special case:  x=0
+          if (q+s < e)
+            a2 = q[s];
+          if (q+s3 < e)
+            a3 = q[s3];
+          b2 = b3 = q[0] - ((((a1+a2)<<3)+(a1+a2)-a0-a3+16) >> 5);
+          q[0] = b3;
+          q += s+s;
+        }
+      if (q<e)
+        {
+          // Special case:  x=2
+          a0 = a1;
+          a1 = a2;
+          a2 = a3;
+          if (q+s3 < e)
+            a3 = q[s3];
+          b3 = q[0] - ((((a1+a2)<<3)+(a1+a2)-a0-a3+16) >> 5);
+          q[0] = b3;
+          q += s+s;
+        }
+      if (q<e)
+        {
+          // Special case:  x=4
+          b1 = b2;
+          b2 = b3;
+          a0 = a1;
+          a1 = a2;
+          a2 = a3;
+          if (q+s3 < e)
+            a3 = q[s3];
+          b3 = q[0] - ((((a1+a2)<<3)+(a1+a2)-a0-a3+16) >> 5);
+          q[0] = b3;
+          q[-s3] = q[-s3] + ((b1+b2+1)>>1);
+          q += s+s;
+        }
+      while (q+s3 < e)
+        {
+          // Generic case
+          a0=a1; 
+          a1=a2; 
+          a2=a3;
+          a3=q[s3];
+          b0=b1; 
+          b1=b2; 
+          b2=b3;
+          b3 = q[0] - ((((a1+a2)<<3)+(a1+a2)-a0-a3+16) >> 5);
+          q[0] = b3;
+          q[-s3] = q[-s3] + ((((b1+b2)<<3)+(b1+b2)-b0-b3+8) >> 4);
+          q += s+s;
+        }
+      while (q < e)
+        {
+          // Special case:  w-3 <= x < w
+          a0=a1;
+          a1=a2; 
+          a2=a3;
+          a3=0;
+          b0=b1; 
+          b1=b2; 
+          b2=b3;
+          b3 = q[0] - ((((a1+a2)<<3)+(a1+a2)-a0-a3+16) >> 5);
+          q[0] = b3;
+          q[-s3] = q[-s3] + ((((b1+b2)<<3)+(b1+b2)-b0-b3+8) >> 4);
+          q += s+s;
+        }
+      while (q-s3 < e)
+        {
+          // Special case  w <= x < w+3
+          b0=b1; 
+          b1=b2; 
+          b2=b3;
+          if (q-s3 >= p)
+            q[-s3] = q[-s3] + ((b1+b2+1)>>1);
+          q += s+s;
+        }
+      y += scale;
+      p += rowsize;
+    }
+}
+
+
+//////////////////////////////////////////////////////
+// REPRESENTATION OF WAVELET DECOMPOSED IMAGES
+//////////////////////////////////////////////////////
+
+
+
+//---------------------------------------------------------------
+// Zig zag location in a 1024 liftblock.
+// These numbers have been generated with the following program:
+//
+// int x=0, y=0;
+// for (int i=0; i<5; i++) {
+//   x = (x<<1) | (n&1);  n >>= 1;
+//   y = (y<<1) | (n&1);  n >>= 1;
+// }
+
+
+static int zigzagloc[1024] = {
+   0,  16, 512, 528,   8,  24, 520, 536, 256, 272, 768, 784, 264, 280, 776, 792,
+   4,  20, 516, 532,  12,  28, 524, 540, 260, 276, 772, 788, 268, 284, 780, 796,
+ 128, 144, 640, 656, 136, 152, 648, 664, 384, 400, 896, 912, 392, 408, 904, 920,
+ 132, 148, 644, 660, 140, 156, 652, 668, 388, 404, 900, 916, 396, 412, 908, 924,
+   2,  18, 514, 530,  10,  26, 522, 538, 258, 274, 770, 786, 266, 282, 778, 794,
+   6,  22, 518, 534,  14,  30, 526, 542, 262, 278, 774, 790, 270, 286, 782, 798,
+ 130, 146, 642, 658, 138, 154, 650, 666, 386, 402, 898, 914, 394, 410, 906, 922,
+ 134, 150, 646, 662, 142, 158, 654, 670, 390, 406, 902, 918, 398, 414, 910, 926,
+  64,  80, 576, 592,  72,  88, 584, 600, 320, 336, 832, 848, 328, 344, 840, 856,
+  68,  84, 580, 596,  76,  92, 588, 604, 324, 340, 836, 852, 332, 348, 844, 860,
+ 192, 208, 704, 720, 200, 216, 712, 728, 448, 464, 960, 976, 456, 472, 968, 984,
+ 196, 212, 708, 724, 204, 220, 716, 732, 452, 468, 964, 980, 460, 476, 972, 988,
+  66,  82, 578, 594,  74,  90, 586, 602, 322, 338, 834, 850, 330, 346, 842, 858,
+  70,  86, 582, 598,  78,  94, 590, 606, 326, 342, 838, 854, 334, 350, 846, 862,
+ 194, 210, 706, 722, 202, 218, 714, 730, 450, 466, 962, 978, 458, 474, 970, 986,
+ 198, 214, 710, 726, 206, 222, 718, 734, 454, 470, 966, 982, 462, 478, 974, 990, // 255
+   1,  17, 513, 529,   9,  25, 521, 537, 257, 273, 769, 785, 265, 281, 777, 793,
+   5,  21, 517, 533,  13,  29, 525, 541, 261, 277, 773, 789, 269, 285, 781, 797,
+ 129, 145, 641, 657, 137, 153, 649, 665, 385, 401, 897, 913, 393, 409, 905, 921,
+ 133, 149, 645, 661, 141, 157, 653, 669, 389, 405, 901, 917, 397, 413, 909, 925,
+   3,  19, 515, 531,  11,  27, 523, 539, 259, 275, 771, 787, 267, 283, 779, 795,
+   7,  23, 519, 535,  15,  31, 527, 543, 263, 279, 775, 791, 271, 287, 783, 799,
+ 131, 147, 643, 659, 139, 155, 651, 667, 387, 403, 899, 915, 395, 411, 907, 923,
+ 135, 151, 647, 663, 143, 159, 655, 671, 391, 407, 903, 919, 399, 415, 911, 927,
+  65,  81, 577, 593,  73,  89, 585, 601, 321, 337, 833, 849, 329, 345, 841, 857,
+  69,  85, 581, 597,  77,  93, 589, 605, 325, 341, 837, 853, 333, 349, 845, 861,
+ 193, 209, 705, 721, 201, 217, 713, 729, 449, 465, 961, 977, 457, 473, 969, 985,
+ 197, 213, 709, 725, 205, 221, 717, 733, 453, 469, 965, 981, 461, 477, 973, 989,
+  67,  83, 579, 595,  75,  91, 587, 603, 323, 339, 835, 851, 331, 347, 843, 859,
+  71,  87, 583, 599,  79,  95, 591, 607, 327, 343, 839, 855, 335, 351, 847, 863,
+ 195, 211, 707, 723, 203, 219, 715, 731, 451, 467, 963, 979, 459, 475, 971, 987,
+ 199, 215, 711, 727, 207, 223, 719, 735, 455, 471, 967, 983, 463, 479, 975, 991, // 511
+  32,  48, 544, 560,  40,  56, 552, 568, 288, 304, 800, 816, 296, 312, 808, 824,
+  36,  52, 548, 564,  44,  60, 556, 572, 292, 308, 804, 820, 300, 316, 812, 828,
+ 160, 176, 672, 688, 168, 184, 680, 696, 416, 432, 928, 944, 424, 440, 936, 952,
+ 164, 180, 676, 692, 172, 188, 684, 700, 420, 436, 932, 948, 428, 444, 940, 956,
+  34,  50, 546, 562,  42,  58, 554, 570, 290, 306, 802, 818, 298, 314, 810, 826,
+  38,  54, 550, 566,  46,  62, 558, 574, 294, 310, 806, 822, 302, 318, 814, 830,
+ 162, 178, 674, 690, 170, 186, 682, 698, 418, 434, 930, 946, 426, 442, 938, 954,
+ 166, 182, 678, 694, 174, 190, 686, 702, 422, 438, 934, 950, 430, 446, 942, 958,
+  96, 112, 608, 624, 104, 120, 616, 632, 352, 368, 864, 880, 360, 376, 872, 888,
+ 100, 116, 612, 628, 108, 124, 620, 636, 356, 372, 868, 884, 364, 380, 876, 892,
+ 224, 240, 736, 752, 232, 248, 744, 760, 480, 496, 992,1008, 488, 504,1000,1016,
+ 228, 244, 740, 756, 236, 252, 748, 764, 484, 500, 996,1012, 492, 508,1004,1020,
+  98, 114, 610, 626, 106, 122, 618, 634, 354, 370, 866, 882, 362, 378, 874, 890,
+ 102, 118, 614, 630, 110, 126, 622, 638, 358, 374, 870, 886, 366, 382, 878, 894,
+ 226, 242, 738, 754, 234, 250, 746, 762, 482, 498, 994,1010, 490, 506,1002,1018,
+ 230, 246, 742, 758, 238, 254, 750, 766, 486, 502, 998,1014, 494, 510,1006,1022, // 767
+  33,  49, 545, 561,  41,  57, 553, 569, 289, 305, 801, 817, 297, 313, 809, 825,
+  37,  53, 549, 565,  45,  61, 557, 573, 293, 309, 805, 821, 301, 317, 813, 829,
+ 161, 177, 673, 689, 169, 185, 681, 697, 417, 433, 929, 945, 425, 441, 937, 953,
+ 165, 181, 677, 693, 173, 189, 685, 701, 421, 437, 933, 949, 429, 445, 941, 957,
+  35,  51, 547, 563,  43,  59, 555, 571, 291, 307, 803, 819, 299, 315, 811, 827,
+  39,  55, 551, 567,  47,  63, 559, 575, 295, 311, 807, 823, 303, 319, 815, 831,
+ 163, 179, 675, 691, 171, 187, 683, 699, 419, 435, 931, 947, 427, 443, 939, 955,
+ 167, 183, 679, 695, 175, 191, 687, 703, 423, 439, 935, 951, 431, 447, 943, 959,
+  97, 113, 609, 625, 105, 121, 617, 633, 353, 369, 865, 881, 361, 377, 873, 889,
+ 101, 117, 613, 629, 109, 125, 621, 637, 357, 373, 869, 885, 365, 381, 877, 893,
+ 225, 241, 737, 753, 233, 249, 745, 761, 481, 497, 993,1009, 489, 505,1001,1017,
+ 229, 245, 741, 757, 237, 253, 749, 765, 485, 501, 997,1013, 493, 509,1005,1021,
+  99, 115, 611, 627, 107, 123, 619, 635, 355, 371, 867, 883, 363, 379, 875, 891,
+ 103, 119, 615, 631, 111, 127, 623, 639, 359, 375, 871, 887, 367, 383, 879, 895,
+ 227, 243, 739, 755, 235, 251, 747, 763, 483, 499, 995,1011, 491, 507,1003,1019,
+ 231, 247, 743, 759, 239, 255, 751, 767, 487, 503, 999,1015, 495, 511,1007,1023, // 1023
+};
+
+//---------------------------------------------------------------
+// *** Class IW44Image::Alloc [declaration]
+
+struct IW44Image::Alloc // DJVU_CLASS
+{
+  Alloc *next;
+  short data[IWALLOCSIZE];
+  Alloc(Alloc *n);
+};
+
+//---------------------------------------------------------------
+// *** Class IW44Image::Block [implementation]
+
+
+IW44Image::Block::Block(void)
+{
+  pdata[0] = pdata[1] = pdata[2] = pdata[3] = 0;
+}
+
+void 
+IW44Image::Block::zero(int n)
+{
+  if (pdata[n>>4])
+    pdata[n>>4][n&15] = 0;
+}
+
+void  
+IW44Image::Block::read_liftblock(const short *coeff, IW44Image::Map *map)
+{
+  int n=0;
+  for (int n1=0; n1<64; n1++)
+    {
+      short *d = data(n1,map);
+      for (int n2=0; n2<16; n2++,n++)
+        d[n2] = coeff[zigzagloc[n]];
+    }
+}
+
+void  
+IW44Image::Block::write_liftblock(short *coeff, int bmin, int bmax) const
+{
+  int n = bmin<<4;
+  memset(coeff, 0, 1024*sizeof(short));
+  for (int n1=bmin; n1<bmax; n1++)
+    {
+      const short *d = data(n1);
+      if (d == 0)
+        n += 16;
+      else
+        for (int n2=0; n2<16; n2++,n++)
+          coeff[zigzagloc[n]] = d[n2];
+    }
+}
+
+//---------------------------------------------------------------
+// *** Class IW44Image::Map [implementation]
+
+
+IW44Image::Map::Map(int w, int h)
+  :  blocks(0), iw(w), ih(h), chain(0)
+{
+  bw = (w+0x20-1) & ~0x1f;
+  bh = (h+0x20-1) & ~0x1f;
+  nb = (bw * bh) / (32 * 32);
+  blocks = new IW44Image::Block[nb];
+  top = IWALLOCSIZE;
+}
+
+IW44Image::Map::~Map()
+{
+  while (chain)
+    {
+      IW44Image::Alloc *next = chain->next;
+      delete chain;
+      chain = next;
+    }
+  delete [] blocks;
+}
+
+
+IW44Image::Alloc::Alloc(Alloc *n)
+  : next(n) 
+{ 
+  // see note in IW44Image::Map::alloc
+  memset(data, 0, sizeof(data)); 
+}
+
+short *
+IW44Image::Map::alloc(int n)
+{
+  if (top+n > IWALLOCSIZE)
+    {
+      // note: everything is cleared long before we use it
+      // in order to avoid the need for a memory fence.
+      chain = new IW44Image::Alloc(chain);
+      top = 0;
+    }
+  short *ans = chain->data + top;
+  top += n;
+  return ans;
+}
+
+short **
+IW44Image::Map::allocp(int n)
+{
+  // Allocate enough room for pointers plus alignment
+  short *p = alloc( (n+1) * sizeof(short*) / sizeof(short) );
+  // Align on pointer size
+  while ( ((size_t)p) & (sizeof(short*)-1) )
+    p += 1;
+  // Cast and return
+  return (short**)p;
+}
+
+int 
+IW44Image::Map::get_bucket_count(void) const
+{
+  int buckets = 0;
+  for (int blockno=0; blockno<nb; blockno++)
+    for (int buckno=0; buckno<64; buckno++)
+      if (blocks[blockno].data(buckno))
+        buckets += 1;
+  return buckets;
+}
+
+unsigned int 
+IW44Image::Map::get_memory_usage(void) const
+{
+  unsigned int usage = sizeof(Map);
+  usage += sizeof(IW44Image::Block) * nb;
+  for (IW44Image::Alloc *n = chain; n; n=n->next)
+    usage += sizeof(IW44Image::Alloc);
+  return usage;
+}
+
+
+
+
+void 
+IW44Image::Map::image(signed char *img8, int rowsize, int pixsep, int fast)
+{
+  // Allocate reconstruction buffer
+  short *data16;
+  size_t sz = bw * bh;
+  if (sz / (size_t)bw != (size_t)bh) // multiplication overflow
+    G_THROW("IW44Image: image size exceeds maximum (corrupted file?)");
+  GPBuffer<short> gdata16(data16,sz);
+  // Copy coefficients
+  int i;
+  short *p = data16;
+  const IW44Image::Block *block = blocks;
+  for (i=0; i<bh; i+=32)
+    {
+      for (int j=0; j<bw; j+=32)
+        {
+          short liftblock[1024];
+          // transfer into IW44Image::Block (apply zigzag and scaling)
+          block->write_liftblock(liftblock);
+          block++;
+          // transfer into coefficient matrix at (p+j)
+          short *pp = p + j;
+          short *pl = liftblock;
+          for (int ii=0; ii<32; ii++, pp+=bw,pl+=32)
+            memcpy((void*)pp, (void*)pl, 32*sizeof(short));
+        }
+      // next row of blocks
+      p += 32*bw;
+    }
+  // Reconstruction
+  if (fast)
+    {
+      IW44Image::Transform::Decode::backward(data16, iw, ih, bw, 32, 2);  
+      p = data16;
+      for (i=0; i<bh; i+=2,p+=bw)
+        for (int jj=0; jj<bw; jj+=2,p+=2)
+          p[bw] = p[bw+1] = p[1] = p[0];
+    }
+  else
+    {
+      IW44Image::Transform::Decode::backward(data16, iw, ih, bw, 32, 1);  
+    }
+  // Copy result into image
+  p = data16;
+  signed char *row = img8;  
+  for (i=0; i<ih; i++)
+    {
+      signed char *pix = row;
+      for (int j=0; j<iw; j+=1,pix+=pixsep)
+        {
+          int x = (p[j] + iw_round) >> iw_shift;
+          if (x < -128)
+            x = -128;
+          else if (x > 127)
+            x = 127;
+          *pix = x;
+        }
+      row += rowsize;
+      p += bw;
+    }
+}
+
+void 
+IW44Image::Map::image(int subsample, const GRect &rect, 
+              signed char *img8, int rowsize, int pixsep, int fast)
+{
+  int i;
+  // Compute number of decomposition levels
+  int nlevel = 0;
+  while (nlevel<5 && (32>>nlevel)>subsample)
+    nlevel += 1;
+  int boxsize = 1<<nlevel;
+  // Parameter check
+  if (subsample!=(32>>nlevel))
+    G_THROW( ERR_MSG("IW44Image.sample_factor") );
+  if (rect.isempty())
+    G_THROW( ERR_MSG("IW44Image.empty_rect") );    
+  GRect irect(0,0,(iw+subsample-1)/subsample,(ih+subsample-1)/subsample);
+  if (rect.xmin<0 || rect.ymin<0 || rect.xmax>irect.xmax || rect.ymax>irect.ymax)
+    G_THROW( ERR_MSG("IW44Image.bad_rect") );
+  // Multiresolution rectangles 
+  // -- needed[i] tells which coeffs are required for the next step
+  // -- recomp[i] tells which coeffs need to be computed at this level
+  GRect needed[8];
+  GRect recomp[8];
+  int r = 1;
+  needed[nlevel] = rect;
+  recomp[nlevel] = rect;
+  for (i=nlevel-1; i>=0; i--)
+    {
+      needed[i] = recomp[i+1];
+      needed[i].inflate(iw_border*r, iw_border*r);
+      needed[i].intersect(needed[i], irect);
+      r += r;
+      recomp[i].xmin = (needed[i].xmin + r-1) & ~(r-1);
+      recomp[i].xmax = (needed[i].xmax) & ~(r-1);
+      recomp[i].ymin = (needed[i].ymin + r-1) & ~(r-1);
+      recomp[i].ymax = (needed[i].ymax) & ~(r-1);
+    }
+  // Working rectangle
+  // -- a rectangle large enough to hold all the data
+  GRect work;
+  work.xmin = (needed[0].xmin) & ~(boxsize-1);
+  work.ymin = (needed[0].ymin) & ~(boxsize-1);
+  work.xmax = ((needed[0].xmax-1) & ~(boxsize-1) ) + boxsize;
+  work.ymax = ((needed[0].ymax-1) & ~(boxsize-1) ) + boxsize;
+  // -- allocate work buffer
+  int dataw = work.xmax - work.xmin;     // Note: cannot use inline width() or height()
+  int datah = work.ymax - work.ymin;     // because Intel C++ compiler optimizes it wrong !
+  short *data;
+  GPBuffer<short> gdata(data,dataw*datah);
+  // Fill working rectangle
+  // -- loop over liftblocks rows
+  short *ldata = data;
+  int blkw = (bw>>5);
+  const IW44Image::Block *lblock = blocks + (work.ymin>>nlevel)*blkw + (work.xmin>>nlevel);
+  for (int by=work.ymin; by<work.ymax; by+=boxsize)
+    {
+      // -- loop over liftblocks in row
+      const IW44Image::Block *block = lblock;
+      short *rdata = ldata;
+      for (int bx=work.xmin; bx<work.xmax; bx+=boxsize)        
+        {
+          // -- decide how much to load
+          int mlevel = nlevel;
+          if (nlevel>2)
+            if (bx+31<needed[2].xmin || bx>needed[2].xmax ||
+                by+31<needed[2].ymin || by>needed[2].ymax )
+              mlevel = 2;
+          int bmax   = ((1<<(mlevel+mlevel))+15)>>4;
+          int ppinc  = (1<<(nlevel-mlevel));
+          int ppmod1 = (dataw<<(nlevel-mlevel));
+          int ttmod0 = (32 >> mlevel);
+          int ttmod1 = (ttmod0 << 5);
+          // -- get current block
+          short liftblock[1024];
+          block->write_liftblock(liftblock, 0, bmax );
+          // -- copy liftblock into image
+          short *tt = liftblock;
+          short *pp = rdata;
+          for (int ii=0; ii<boxsize; ii+=ppinc,pp+=ppmod1,tt+=ttmod1-32)
+            for (int jj=0; jj<boxsize; jj+=ppinc,tt+=ttmod0)
+              pp[jj] = *tt;
+          // -- next block in row
+          rdata += boxsize;
+          block += 1;
+        }
+      // -- next row of blocks
+      ldata += dataw << nlevel;
+      lblock += blkw;
+    }
+  // Perform reconstruction
+  r = boxsize;
+  for (i=0; i<nlevel; i++)
+    {
+      GRect comp = needed[i];
+      comp.xmin = comp.xmin & ~(r-1);
+      comp.ymin = comp.ymin & ~(r-1);
+      comp.translate(-work.xmin, -work.ymin);
+      // Fast mode shortcuts finer resolution
+      if (fast && i>=4) 
+        {
+          short *pp = data + comp.ymin*dataw;
+          for (int ii=comp.ymin; ii<comp.ymax; ii+=2, pp+=dataw+dataw)
+            for (int jj=comp.xmin; jj<comp.xmax; jj+=2)
+              pp[jj+dataw] = pp[jj+dataw+1] = pp[jj+1] = pp[jj];
+          break;
+        }
+      else
+        {
+          short *pp = data + comp.ymin*dataw + comp.xmin;
+          IW44Image::Transform::Decode::backward(pp, comp.width(), comp.height(), dataw, r, r>>1);
+        }
+      r = r>>1;
+    }
+  // Copy result into image
+  GRect nrect = rect;
+  nrect.translate(-work.xmin, -work.ymin);
+  short *p = data + nrect.ymin*dataw;
+  signed char *row = img8;  
+  for (i=nrect.ymin; i<nrect.ymax; i++)
+    {
+      int j;
+      signed char *pix = row;
+      for (j=nrect.xmin; j<nrect.xmax; j+=1,pix+=pixsep)
+        {
+          int x = (p[j] + iw_round) >> iw_shift;
+          if (x < -128)
+            x = -128;
+          else if (x > 127)
+            x = 127;
+          *pix = x;
+        }
+      row += rowsize;
+      p += dataw;
+    }
+}
+
+
+
+
+//////////////////////////////////////////////////////
+// ENCODING/DECODING WAVELET COEFFICIENTS 
+//    USING HIERARCHICAL SET DIFFERENCE
+//////////////////////////////////////////////////////
+
+
+//-----------------------------------------------
+// Class IW44Image::Codec [implementation]
+// Maintains information shared while encoding or decoding
+
+
+// Constant
+
+static const struct { int start; int size; }  
+bandbuckets[] = 
+{
+  // Code first bucket and number of buckets in each band
+  { 0, 1 }, // -- band zero contains all lores info
+  { 1, 1 }, { 2, 1 }, { 3, 1 }, 
+  { 4, 4 }, { 8, 4 }, { 12,4 }, 
+  { 16,16 }, { 32,16 }, { 48,16 }, 
+};
+
+
+// IW44Image::Codec constructor
+
+IW44Image::Codec::Codec(IW44Image::Map &xmap)
+  : map(xmap), 
+    curband(0),
+    curbit(1)
+{
+  // Initialize quantification
+  int  j;
+  int  i = 0;
+  const int *q = iw_quant;
+  // -- lo coefficients
+  for (j=0; i<4; j++)
+    quant_lo[i++] = *q++;
+  for (j=0; j<4; j++)
+    quant_lo[i++] = *q;
+  q += 1;
+  for (j=0; j<4; j++)
+    quant_lo[i++] = *q;
+  q += 1;
+  for (j=0; j<4; j++)
+    quant_lo[i++] = *q;
+  q += 1;
+  // -- hi coefficients
+  quant_hi[0] = 0;
+  for (j=1; j<10; j++)
+    quant_hi[j] = *q++;
+  // Initialize coding contexts
+  memset((void*)ctxStart, 0, sizeof(ctxStart));
+  memset((void*)ctxBucket, 0, sizeof(ctxBucket));
+  ctxMant = 0;
+  ctxRoot = 0;
+}
+
+
+// IW44Image::Codec destructor
+
+IW44Image::Codec::~Codec() {}
+
+// is_null_slice
+// -- check if data can be produced for this band/mask
+// -- also fills the sure_zero array
+
+int 
+IW44Image::Codec::is_null_slice(int bit, int band)
+{
+  if (band == 0)
+    {
+      int is_null = 1;
+      for (int i=0; i<16; i++) 
+        {
+          int threshold = quant_lo[i];
+          coeffstate[i] = ZERO;
+          if (threshold>0 && threshold<0x8000)
+            {
+              coeffstate[i] = UNK;
+              is_null = 0;
+            }
+        }
+      return is_null;
+    }
+  else
+    {
+      int threshold = quant_hi[band];
+      return (! (threshold>0 && threshold<0x8000));
+    }
+}
+
+
+// code_slice
+// -- read/write a slice of datafile
+
+int
+IW44Image::Codec::Decode::code_slice(ZPCodec &zp)
+{
+  // Check that code_slice can still run
+  if (curbit < 0)
+    return 0;
+  // Perform coding
+  if (! is_null_slice(curbit, curband))
+    {
+      for (int blockno=0; blockno<map.nb; blockno++)
+        {
+          int fbucket = bandbuckets[curband].start;
+          int nbucket = bandbuckets[curband].size;
+          decode_buckets(zp, curbit, curband, 
+                           map.blocks[blockno], 
+                           fbucket, nbucket);
+        }
+    }
+  return finish_code_slice(zp);
+}
+
+// code_slice
+// -- read/write a slice of datafile
+
+int
+IW44Image::Codec::finish_code_slice(ZPCodec &zp)
+{
+  // Reduce quantization threshold
+  quant_hi[curband] = quant_hi[curband] >> 1;
+  if (curband == 0)
+    for (int i=0; i<16; i++) 
+      quant_lo[i] = quant_lo[i] >> 1;
+  // Proceed to the next slice
+  if (++curband >= (int)(sizeof(bandbuckets)/sizeof(bandbuckets[0])))
+    {
+      curband = 0;
+      curbit += 1;
+      if (quant_hi[(sizeof(bandbuckets)/sizeof(bandbuckets[0]))-1] == 0)
+        {
+          // All quantization thresholds are null
+          curbit = -1;
+          return 0;
+        }
+    }
+  return 1;
+}
+
+// decode_prepare
+// -- prepare the states before decoding buckets
+
+int
+IW44Image::Codec::decode_prepare(int fbucket, int nbucket, IW44Image::Block &blk)
+{  
+  int bbstate = 0;
+  char *cstate = coeffstate;
+  if (fbucket)
+    {
+      // Band other than zero
+      for (int buckno=0; buckno<nbucket; buckno++, cstate+=16)
+        {
+          int bstatetmp = 0;
+          const short *pcoeff = blk.data(fbucket+buckno);
+          if (! pcoeff)
+            {
+              // cstate[0..15] will be filled later
+              bstatetmp = UNK;
+            }
+          else
+            {
+              for (int i=0; i<16; i++)
+                {
+                  int cstatetmp = UNK;
+                  if (pcoeff[i])
+                    cstatetmp = ACTIVE;
+                  cstate[i] = cstatetmp;
+                  bstatetmp |= cstatetmp;
+                }
+            }
+          bucketstate[buckno] = bstatetmp;
+          bbstate |= bstatetmp;
+        }
+    }
+  else
+    {
+      // Band zero ( fbucket==0 implies band==zero and nbucket==1 )
+      const short *pcoeff = blk.data(0);
+      if (! pcoeff)
+        {
+          // cstate[0..15] will be filled later
+          bbstate = UNK;      
+        }
+      else
+        {
+          for (int i=0; i<16; i++)
+            {
+              int cstatetmp = cstate[i];
+              if (cstatetmp != ZERO)
+                {
+                  cstatetmp = UNK;
+                  if (pcoeff[i])
+                    cstatetmp = ACTIVE;
+                }
+              cstate[i] = cstatetmp;
+              bbstate |= cstatetmp;
+            }
+        }
+      bucketstate[0] = bbstate;
+    }
+  return bbstate;
+}
+
+
+// decode_buckets
+// -- code a sequence of buckets in a given block
+
+void
+IW44Image::Codec::decode_buckets(ZPCodec &zp, int bit, int band, 
+                         IW44Image::Block &blk,
+                         int fbucket, int nbucket)
+{
+  // compute state of all coefficients in all buckets
+  int bbstate = decode_prepare(fbucket, nbucket, blk);
+  // code root bit
+  if ((nbucket<16) || (bbstate&ACTIVE))
+    {
+      bbstate |= NEW;
+    }
+  else if (bbstate & UNK)
+    {
+      if (zp.decoder(ctxRoot))
+        bbstate |= NEW;
+#ifdef TRACE
+      DjVuPrintMessage("bbstate[bit=%d,band=%d] = %d\n", bit, band, bbstate);
+#endif
+    }
+  
+  // code bucket bits
+  if (bbstate & NEW)
+    for (int buckno=0; buckno<nbucket; buckno++)
+      {
+        // Code bucket bit
+        if (bucketstate[buckno] & UNK)
+          {
+            // Context
+            int ctx = 0;
+#ifndef NOCTX_BUCKET_UPPER
+            if (band>0)
+              {
+                int k = (fbucket+buckno)<<2;
+                const short *b = blk.data(k>>4);
+                if (b)
+                  {
+                    k = k & 0xf;
+                    if (b[k])
+                      ctx += 1;
+                    if (b[k+1])
+                      ctx += 1;
+                    if (b[k+2])
+                      ctx += 1;
+                    if (ctx<3 && b[k+3])
+                      ctx += 1;
+                  }
+              }
+#endif // NOCTX_BUCKET_UPPER
+#ifndef NOCTX_BUCKET_ACTIVE
+            if (bbstate & ACTIVE)
+              ctx |= 4; 
+#endif
+            // Code
+            if (zp.decoder( ctxBucket[band][ctx] ))
+              bucketstate[buckno] |= NEW;
+#ifdef TRACE
+            DjVuPrintMessage("  bucketstate[bit=%d,band=%d,buck=%d] = %d\n", 
+                   bit, band, buckno, bucketstate[buckno]);
+#endif
+          }
+      }
+
+  // code new active coefficient (with their sign)
+  if (bbstate & NEW)
+    {
+      int thres = quant_hi[band];
+      char *cstate = coeffstate;
+      for (int buckno=0; buckno<nbucket; buckno++, cstate+=16)
+        if (bucketstate[buckno] & NEW)
+          {
+            int i;
+            short *pcoeff = (short*)blk.data(fbucket+buckno);
+            if (!pcoeff)
+              {
+                pcoeff = blk.data(fbucket+buckno, &map);
+                // time to fill cstate[0..15]
+                if (fbucket == 0) // band zero
+                  {
+                    for (i=0; i<16; i++)
+                      if (cstate[i] != ZERO)
+                        cstate[i] = UNK;
+                  }
+                else
+                  {
+                    for (i=0; i<16; i++)
+                      cstate[i] = UNK;
+                  }
+              }
+#ifndef NOCTX_EXPECT
+            int gotcha = 0;
+            const int maxgotcha = 7;
+            for (i=0; i<16; i++)
+              if (cstate[i] & UNK)
+                gotcha += 1;
+#endif
+            for (i=0; i<16; i++)
+              {
+                if (cstate[i] & UNK)
+                  {
+                    // find lores threshold
+                    if (band == 0)
+                      thres = quant_lo[i];
+                    // prepare context
+                    int ctx = 0;
+#ifndef NOCTX_EXPECT
+                    if (gotcha>=maxgotcha)
+                      ctx = maxgotcha;
+                    else
+                      ctx = gotcha;
+#endif
+#ifndef NOCTX_ACTIVE
+                    if (bucketstate[buckno] & ACTIVE)
+                      ctx |= 8;
+#endif
+                    // code difference bit
+                    if (zp.decoder( ctxStart[ctx] ))
+                      {
+                        cstate[i] |= NEW;
+                        int halfthres = thres>>1;
+                        int coeff = thres+halfthres-(halfthres>>2);
+                        if (zp.IWdecoder())
+                          pcoeff[i] = -coeff;
+                        else
+                          pcoeff[i] = coeff;
+                      }
+#ifndef NOCTX_EXPECT
+                    if (cstate[i] & NEW)
+                      gotcha = 0;
+                    else if (gotcha > 0)
+                      gotcha -= 1;
+#endif
+#ifdef TRACE
+                    DjVuPrintMessage("    coeffstate[bit=%d,band=%d,buck=%d,c=%d] = %d\n", 
+                           bit, band, buckno, i, cstate[i]);
+#endif
+                  }
+              }
+          }
+    }
+  
+  // code mantissa bits
+  if (bbstate & ACTIVE)
+    {
+      int thres = quant_hi[band];
+      char *cstate = coeffstate;
+      for (int buckno=0; buckno<nbucket; buckno++, cstate+=16)
+        if (bucketstate[buckno] & ACTIVE)
+          {
+            short *pcoeff = (short*)blk.data(fbucket+buckno);
+            for (int i=0; i<16; i++)
+              if (cstate[i] & ACTIVE)
+                {
+                  int coeff = pcoeff[i];
+                  if (coeff < 0)
+                    coeff = -coeff;
+                  // find lores threshold
+                  if (band == 0)
+                    thres = quant_lo[i];
+                  // adjust coefficient
+                  if (coeff <= 3*thres)
+                    {
+                      // second mantissa bit
+                      coeff = coeff + (thres>>2);
+                      if (zp.decoder(ctxMant))
+                        coeff = coeff + (thres>>1);
+                      else
+                        coeff = coeff - thres + (thres>>1);
+                    }
+                  else
+                    {
+                      if (zp.IWdecoder())
+                        coeff = coeff + (thres>>1);
+                      else
+                        coeff = coeff - thres + (thres>>1);
+                    }
+                  // store coefficient
+                  if (pcoeff[i] > 0)
+                    pcoeff[i] = coeff;
+                  else
+                    pcoeff[i] = -coeff;
+                }
+          }
+    }
+}
+
+
+//////////////////////////////////////////////////////
+// UTILITIES
+//////////////////////////////////////////////////////
+
+
+#ifdef min
+#undef min
+#endif
+static inline int
+min(const int x, const int y)
+{
+  return (x <= y) ? x : y;
+}
+
+#ifdef max
+#undef max
+#endif
+static inline int
+max(const int x, const int y)
+{
+  return (y <= x) ? x : y;
+}
+
+
+void 
+IW44Image::PrimaryHeader::decode(GP<ByteStream> gbs)
+{
+  serial = gbs->read8();
+  slices = gbs->read8();
+}
+
+void 
+IW44Image::SecondaryHeader::decode(GP<ByteStream> gbs)
+{
+  major = gbs->read8();
+  minor = gbs->read8();
+}
+
+void 
+IW44Image::TertiaryHeader::decode(GP<ByteStream> gbs, int major, int minor)
+{
+  xhi = gbs->read8();
+  xlo = gbs->read8();
+  yhi = gbs->read8();
+  ylo = gbs->read8();
+  crcbdelay = 0;
+  if (major== 1 && minor>=2)
+    crcbdelay = gbs->read8();
+}
+
+
+
+//////////////////////////////////////////////////////
+// CLASS IW44Image
+//////////////////////////////////////////////////////
+
+IW44Image::IW44Image(void)
+  : db_frac(1.0),
+    ymap(0), cbmap(0), crmap(0),
+    cslice(0), cserial(0), cbytes(0)
+{}
+
+IW44Image::~IW44Image()
+{
+  delete ymap;
+  delete cbmap;
+  delete crmap;
+}
+
+GP<IW44Image>
+IW44Image::create_decode(const ImageType itype)
+{
+  switch(itype)
+  {
+  case COLOR:
+    return new IWPixmap();
+  case GRAY:
+    return new IWBitmap();
+  default:
+    return 0;
+  }
+}
+
+int
+IW44Image::encode_chunk(GP<ByteStream>, const IWEncoderParms &)
+{
+  G_THROW( ERR_MSG("IW44Image.codec_open2") );
+  return 0;
+}
+
+void 
+IW44Image::encode_iff(IFFByteStream &, int nchunks, const IWEncoderParms *)
+{
+  G_THROW( ERR_MSG("IW44Image.codec_open2") );
+}
+
+  
+void 
+IWBitmap::close_codec(void)
+{
+  delete ycodec;
+  ycodec = 0;
+  cslice = cbytes = cserial = 0;
+}
+
+void 
+IWPixmap::close_codec(void)
+{
+  delete ycodec;
+  delete cbcodec;
+  delete crcodec;
+  ycodec = crcodec = cbcodec = 0;
+  cslice = cbytes = cserial = 0;
+}
+
+int 
+IW44Image::get_width(void) const
+{
+  return (ymap)?(ymap->iw):0;
+}
+
+int 
+IW44Image::get_height(void) const
+{
+  return (ymap)?(ymap->ih):0;
+}
+
+
+//////////////////////////////////////////////////////
+// CLASS IWBITMAP
+//////////////////////////////////////////////////////
+
+IWBitmap::IWBitmap(void )
+: IW44Image(), ycodec(0)
+{}
+
+IWBitmap::~IWBitmap()
+{
+  close_codec();
+}
+
+int
+IWBitmap::get_percent_memory(void) const
+{
+  int buckets = 0;
+  int maximum = 0;
+  if (ymap) 
+    {
+      buckets += ymap->get_bucket_count();
+      maximum += 64 * ymap->nb;
+    }
+  return 100*buckets/ (maximum ? maximum : 1);
+}
+
+unsigned int
+IWBitmap::get_memory_usage(void) const
+{
+  unsigned int usage = sizeof(GBitmap);
+  if (ymap)
+    usage += ymap->get_memory_usage();
+  return usage;
+}
+
+
+GP<GBitmap> 
+IWBitmap::get_bitmap(void)
+{
+  // Check presence of data
+  if (ymap == 0)
+    return 0;
+  // Perform wavelet reconstruction
+  int w = ymap->iw;
+  int h = ymap->ih;
+  GP<GBitmap> pbm = GBitmap::create(h, w);
+  ymap->image((signed char*)(*pbm)[0],pbm->rowsize());
+  // Shift image data
+  for (int i=0; i<h; i++)
+    {
+      unsigned char *urow = (*pbm)[i];
+      signed char *srow = (signed char*)urow;
+      for (int j=0; j<w; j++)
+        urow[j] = (int)(srow[j]) + 128;
+    }
+  pbm->set_grays(256);
+  return pbm;
+}
+
+
+GP<GBitmap>
+IWBitmap::get_bitmap(int subsample, const GRect &rect)
+{
+  if (ymap == 0)
+    return 0;
+  // Allocate bitmap
+  int w = rect.width();
+  int h = rect.height();
+  GP<GBitmap> pbm = GBitmap::create(h,w);
+  ymap->image(subsample, rect, (signed char*)(*pbm)[0],pbm->rowsize());
+  // Shift image data
+  for (int i=0; i<h; i++)
+    {
+      unsigned char *urow = (*pbm)[i];
+      signed char *srow = (signed char*)urow;
+      for (int j=0; j<w; j++)
+        urow[j] = (int)(srow[j]) + 128;
+    }
+  pbm->set_grays(256);
+  return pbm;
+}
+
+
+int
+IWBitmap::decode_chunk(GP<ByteStream> gbs)
+{
+  // Open
+  if (! ycodec)
+  {
+    cslice = cserial = 0;
+    delete ymap;
+    ymap = 0;
+  }
+  // Read primary header
+  struct IW44Image::PrimaryHeader primary;
+  primary.decode(gbs);
+  if (primary.serial != cserial)
+    G_THROW( ERR_MSG("IW44Image.wrong_serial") );
+  int nslices = cslice + primary.slices;
+  // Read auxilliary headers
+  if (cserial == 0)
+    {
+      struct IW44Image::SecondaryHeader secondary;
+      secondary.decode(gbs);
+      if ((secondary.major & 0x7f) != IWCODEC_MAJOR)
+        G_THROW( ERR_MSG("IW44Image.incompat_codec") );
+      if (secondary.minor > IWCODEC_MINOR)
+        G_THROW( ERR_MSG("IW44Image.recent_codec") );
+      // Read tertiary header
+      struct IW44Image::TertiaryHeader tertiary;
+      tertiary.decode(gbs, secondary.major & 0x7f, secondary.minor);
+      if (! (secondary.major & 0x80))
+        G_THROW( ERR_MSG("IW44Image.has_color") );
+      // Create ymap and ycodec
+      int w = (tertiary.xhi << 8) | tertiary.xlo;
+      int h = (tertiary.yhi << 8) | tertiary.ylo;
+      assert(! ymap);
+      ymap = new Map(w, h);
+      assert(! ycodec);
+      ycodec = new Codec::Decode(*ymap);
+    }
+  // Read data
+  assert(ymap);
+  assert(ycodec);
+  GP<ZPCodec> gzp=ZPCodec::create(gbs, false, true);
+  ZPCodec &zp=*gzp;
+  int flag = 1;
+  while (flag && cslice<nslices)
+    {
+      flag = ycodec->code_slice(zp);
+      cslice++;
+    }
+  // Return
+  cserial += 1;
+  return nslices;
+}
+
+void 
+IWBitmap::parm_dbfrac(float frac)
+{
+  if (frac>0 && frac<=1)
+    db_frac = frac;
+  else
+    G_THROW( ERR_MSG("IW44Image.param_range") );
+}
+
+
+int 
+IWBitmap::get_serial(void)
+{
+  return cserial;
+}
+
+void 
+IWBitmap::decode_iff(IFFByteStream &iff, int maxchunks)
+{
+  if (ycodec)
+    G_THROW( ERR_MSG("IW44Image.left_open2") );
+  GUTF8String chkid;
+  iff.get_chunk(chkid);
+  if (chkid != "FORM:BM44")
+    G_THROW( ERR_MSG("IW44Image.corrupt_BM44") );
+  while (--maxchunks>=0 && iff.get_chunk(chkid))
+    {
+      if (chkid == "BM44")
+        decode_chunk(iff.get_bytestream());
+      iff.close_chunk();
+    }
+  iff.close_chunk();
+  close_codec();
+}
+
+
+
+
+//////////////////////////////////////////////////////
+// CLASS IWENCODERPARMS
+//////////////////////////////////////////////////////
+
+
+IWEncoderParms::IWEncoderParms(void)
+{
+  // Zero represent default values
+  memset((void*)this, 0, sizeof(IWEncoderParms));
+}
+
+
+
+
+
+//////////////////////////////////////////////////////
+// CLASS IWPIXMAP
+//////////////////////////////////////////////////////
+
+
+IWPixmap::IWPixmap(void)
+: IW44Image(), crcb_delay(10), crcb_half(0), ycodec(0), cbcodec(0), crcodec(0)
+{}
+
+IWPixmap::~IWPixmap()
+{
+  close_codec();
+}
+
+int
+IWPixmap::get_percent_memory(void) const
+{
+  int buckets = 0;
+  int maximum = 0;
+  if (ymap)
+    {
+      buckets += ymap->get_bucket_count();
+      maximum += 64*ymap->nb;
+    }
+  if (cbmap)
+    {
+      buckets += cbmap->get_bucket_count();
+      maximum += 64*cbmap->nb;
+    }
+  if (crmap)
+    {
+      buckets += crmap->get_bucket_count();
+      maximum += 64*crmap->nb;
+    }
+  return 100*buckets/ (maximum ? maximum : 1);
+}
+
+unsigned int
+IWPixmap::get_memory_usage(void) const
+{
+  unsigned int usage = sizeof(GPixmap);
+  if (ymap)
+    usage += ymap->get_memory_usage();
+  if (cbmap)
+    usage += cbmap->get_memory_usage();
+  if (crmap)
+    usage += crmap->get_memory_usage();
+  return usage;
+}
+
+
+GP<GPixmap> 
+IWPixmap::get_pixmap(void)
+{
+  // Check presence of data
+  if (ymap == 0)
+    return 0;
+  // Allocate pixmap
+  int w = ymap->iw;
+  int h = ymap->ih;
+  GP<GPixmap> ppm = GPixmap::create(h, w);
+  // Perform wavelet reconstruction
+  signed char *ptr = (signed char*) (*ppm)[0];
+  int rowsep = ppm->rowsize() * sizeof(GPixel);
+  int pixsep = sizeof(GPixel);
+  ymap->image(ptr, rowsep, pixsep);
+  if (crmap && cbmap && crcb_delay >= 0)
+  {
+    cbmap->image(ptr+1, rowsep, pixsep, crcb_half);
+    crmap->image(ptr+2, rowsep, pixsep, crcb_half);
+  }
+  // Convert image data to RGB
+  if (crmap && cbmap && crcb_delay >= 0)
+    {
+      Transform::Decode::YCbCr_to_RGB((*ppm)[0], w, h, ppm->rowsize());
+    }
+  else
+    {
+      for (int i=0; i<h; i++)
+        {
+          GPixel *pixrow = (*ppm)[i];
+          for (int j=0; j<w; j++, pixrow++)
+            pixrow->b = pixrow->g = pixrow->r 
+              = 127 - (int)(((signed char*)pixrow)[0]);
+        }
+    }
+  // Return
+  return ppm;
+}
+
+
+
+GP<GPixmap>
+IWPixmap::get_pixmap(int subsample, const GRect &rect)
+{
+  if (ymap == 0)
+    return 0;
+  // Allocate
+  int w = rect.width();
+  int h = rect.height();
+  GP<GPixmap> ppm = GPixmap::create(h,w);
+  // Perform wavelet reconstruction
+  signed char *ptr = (signed char*) (*ppm)[0];
+  int rowsep = ppm->rowsize() * sizeof(GPixel);
+  int pixsep = sizeof(GPixel);
+  ymap->image(subsample, rect, ptr, rowsep, pixsep);
+  if (crmap && cbmap && crcb_delay >= 0)
+  {
+    cbmap->image(subsample, rect, ptr+1, rowsep, pixsep, crcb_half);
+    crmap->image(subsample, rect, ptr+2, rowsep, pixsep, crcb_half);
+  }
+  // Convert image data to RGB
+  if (crmap && cbmap && crcb_delay >= 0)
+    {
+      Transform::Decode::YCbCr_to_RGB((*ppm)[0], w, h, ppm->rowsize());
+    }
+  else
+    {
+      for (int i=0; i<h; i++)
+        {
+          GPixel *pixrow = (*ppm)[i];
+          for (int j=0; j<w; j++, pixrow++)
+            pixrow->b = pixrow->g = pixrow->r 
+              = 127 - (int)(((signed char*)pixrow)[0]);
+        }
+    }
+  // Return
+  return ppm;
+}
+
+
+int
+IWPixmap::decode_chunk(GP<ByteStream> gbs)
+{
+  // Open
+  if (! ycodec)
+  {
+      cslice = cserial = 0;
+      delete ymap;
+      ymap = 0;
+  }
+
+  // Read primary header
+  struct IW44Image::PrimaryHeader primary;
+  primary.decode(gbs);
+  if (primary.serial != cserial)
+    G_THROW( ERR_MSG("IW44Image.wrong_serial2") );
+  int nslices = cslice + primary.slices;
+  // Read secondary header
+  if (cserial == 0)
+    {
+      struct IW44Image::SecondaryHeader secondary;
+      secondary.decode(gbs);
+      if ((secondary.major & 0x7f) != IWCODEC_MAJOR)
+        G_THROW( ERR_MSG("IW44Image.incompat_codec2") );
+      if (secondary.minor > IWCODEC_MINOR)
+        G_THROW( ERR_MSG("IW44Image.recent_codec2") );
+      // Read tertiary header
+      struct IW44Image::TertiaryHeader tertiary;
+      tertiary.decode(gbs, secondary.major & 0x7f, secondary.minor);
+      // Handle header information
+      int w = (tertiary.xhi << 8) | tertiary.xlo;
+      int h = (tertiary.yhi << 8) | tertiary.ylo;
+      crcb_delay = 0;
+      crcb_half = 0;
+      if (secondary.minor>=2)
+        crcb_delay = tertiary.crcbdelay & 0x7f;
+      if (secondary.minor>=2)
+        crcb_half = (tertiary.crcbdelay & 0x80 ? 0 : 1);
+      if (secondary.major & 0x80)
+        crcb_delay = -1;
+      // Create ymap and ycodec    
+      assert(! ymap);
+      assert(! ycodec);
+      ymap = new Map(w, h);
+      ycodec = new Codec::Decode(*ymap);
+      if (crcb_delay >= 0)
+        {
+          cbmap = new Map(w, h);
+          crmap = new Map(w, h);
+          cbcodec = new Codec::Decode(*cbmap);
+          crcodec = new Codec::Decode(*crmap);
+        }
+    }
+  // Read data
+  assert(ymap);
+  assert(ycodec);
+  GP<ZPCodec> gzp=ZPCodec::create(gbs, false, true);
+  ZPCodec &zp=*gzp;
+  int flag = 1;
+  while (flag && cslice<nslices)
+    {
+      flag = ycodec->code_slice(zp);
+      if (crcodec && cbcodec && crcb_delay<=cslice)
+        {
+          flag |= cbcodec->code_slice(zp);
+          flag |= crcodec->code_slice(zp);
+        }
+      cslice++;
+    }
+  // Return
+  cserial += 1;
+  return nslices;
+}
+
+
+int 
+IWPixmap::parm_crcbdelay(const int parm)
+{
+  if (parm >= 0)
+    crcb_delay = parm;
+  return crcb_delay;
+}
+
+void 
+IWPixmap::parm_dbfrac(float frac)
+{
+  if (frac>0 && frac<=1)
+    db_frac = frac;
+  else
+    G_THROW( ERR_MSG("IW44Image.param_range2") );
+}
+
+int 
+IWPixmap::get_serial(void)
+{
+  return cserial;
+}
+
+
+void 
+IWPixmap::decode_iff(IFFByteStream &iff, int maxchunks)
+{
+  if (ycodec)
+    G_THROW( ERR_MSG("IW44Image.left_open4") );
+  GUTF8String chkid;
+  iff.get_chunk(chkid);
+  if (chkid!="FORM:PM44" && chkid!="FORM:BM44")
+    G_THROW( ERR_MSG("IW44Image.corrupt_BM44_2") );
+  while (--maxchunks>=0 && iff.get_chunk(chkid))
+    {
+      if (chkid=="PM44" || chkid=="BM44")
+        decode_chunk(iff.get_bytestream());
+      iff.close_chunk();
+    }
+  iff.close_chunk();
+  close_codec();
+}
+
+//////////////////////////////////////////////////////
+// NEW FILTERS
+//////////////////////////////////////////////////////
+
+void
+IW44Image::Transform::filter_begin(int w, int h)
+{
+  if (MMXControl::mmxflag < 0)  
+    MMXControl::enable_mmx();
+}
+
+
+void
+IW44Image::Transform::filter_end(void)
+{
+#ifdef MMX
+  if (MMXControl::mmxflag > 0)
+    MMXemms;
+#endif
+}
+
+
+//////////////////////////////////////////////////////
+// WAVELET TRANSFORM 
+//////////////////////////////////////////////////////
+
+
+//----------------------------------------------------
+// Function for applying bidimensional IW44 between 
+// scale intervals begin(inclusive) and end(exclusive)
+
+void
+IW44Image::Transform::Decode::backward(short *p, int w, int h, int rowsize, int begin, int end)
+{ 
+  // PREPARATION
+  filter_begin(w,h);
+  // LOOP ON SCALES
+  for (int scale=begin>>1; scale>=end; scale>>=1)
+    {
+#ifdef IWTRANSFORM_TIMER
+      int tv,th;
+      th = tv = GOS::ticks();
+#endif
+      filter_bv(p, w, h, rowsize, scale);
+#ifdef IWTRANSFORM_TIMER
+      th = GOS::ticks();
+      tv = th - tv;
+#endif
+      filter_bh(p, w, h, rowsize, scale);
+#ifdef IWTRANSFORM_TIMER
+      th = GOS::ticks()-th;
+      DjVuPrintErrorUTF8("back%d\tv=%dms h=%dms\n", scale,tv,th);
+#endif
+    }
+  // TERMINATE
+  filter_end();
+}
+  
+
+
+
+//////////////////////////////////////////////////////
+// COLOR TRANSFORM 
+//////////////////////////////////////////////////////
+
+/* Converts YCbCr to RGB. */
+void 
+IW44Image::Transform::Decode::YCbCr_to_RGB(GPixel *p, int w, int h, int rowsize)
+{
+  for (int i=0; i<h; i++,p+=rowsize)
+    {
+      GPixel *q = p;
+      for (int j=0; j<w; j++,q++)
+        {
+          signed char y = ((signed char*)q)[0];
+          signed char b = ((signed char*)q)[1];
+          signed char r = ((signed char*)q)[2];
+          // This is the Pigeon transform
+          int t1 = b >> 2 ; 
+          int t2 = r + (r >> 1);
+          int t3 = y + 128 - t1;
+          int tr = y + 128 + t2;
+          int tg = t3 - (t2 >> 1);
+          int tb = t3 + (b << 1);
+          q->r = max(0,min(255,tr));
+          q->g = max(0,min(255,tg));
+          q->b = max(0,min(255,tb));
+        }
+    }
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/IW44Image.h b/libdjvu/IW44Image.h
new file mode 100644
index 0000000..7aac0d6
--- /dev/null
+++ b/libdjvu/IW44Image.h
@@ -0,0 +1,759 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef IW44IMAGE_H_
+#define IW44IMAGE_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name IW44Image.h
+
+    Files #"IW44Image.h"# and #"IW44Image.cpp"# implement the DjVu IW44 wavelet
+    scheme for the compression of gray-level images (see class \Ref{IWBitmap})
+    and color images (see class \Ref{IWPixmap}).  Programs \Ref{c44} and
+    \Ref{d44} demonstrate how to encode and decode IW44 files.
+
+    {\bf IW44 File Structure} --- The IW44 files are structured according to
+    the EA IFF85 specifications (see \Ref{IFFByteStream.h}).  Gray level IW44
+    Images consist of a single #"FORM:BM44"# chunk composed of an arbitrary
+    number of #"BM44"# data chunks.  Color IW44 Images consist of a single
+    #"FORM:PM44"# chunk composed of an arbitrary number of #"PM44"# data
+    chunks.  The successive #"PM44"# or #"BM44"# data chunks contain
+    successive refinements of the encoded image.  Each chunk contains a
+    certain number of ``data slices''.  The first chunk also contains a small
+    image header.  You can use program \Ref{djvuinfo} to display all this
+    structural information:
+    \begin{verbatim}
+    % djvuinfo lag.iw4
+    lag.iw4:
+      FORM:PM44 [62598] 
+        PM44 [10807]              #1 - 74 slices - v1.2 (color) - 684x510
+        PM44 [23583]              #2 - 13 slices 
+        PM44 [28178]              #3 - 10 slices 
+    \end{verbatim}
+
+    {\bf Embedded IW44 Images} --- These IW44 data chunks can also appear within
+    other contexts.  Files representing a DjVu page, for instance, consist of
+    a single #"FORM:DJVU"# composite chunk.  This composite chunk may contain
+    #"BG44"# chunks encoding the background layer and #"FG44"# chunks encoding
+    the foreground color layer.  These #"BG44"# and #"FG44"# chunks are
+    actually regular IW44 data chunks with a different chunk identifier.  This
+    information too can be displayed using program \Ref{djvuinfo}.
+    \begin{verbatim}
+    % djvuinfo graham1.djvu 
+    graham1.djvu:
+      FORM:DJVU [32553] 
+        INFO [5]            3156x2325, version 17
+        Sjbz [17692] 
+        BG44 [2570]         #1 - 74 slices - v1.2 (color) - 1052x775
+        FG44 [1035]         #1 - 100 slices - v1.2 (color) - 263x194
+        BG44 [3048]         #2 - 10 slices 
+        BG44 [894]          #3 - 4 slices 
+        BG44 [7247]         #4 - 9 slices 
+    \end{verbatim}
+
+    {\bf Performance} --- The main design objective for the DjVu wavelets
+    consisted of allowing progressive rendering and smooth scrolling of large
+    images with limited memory requirements.  Decoding functions process the
+    compressed data and update a memory efficient representation of the
+    wavelet coefficients.  Imaging function then can quickly render an
+    arbitrary segment of the image using the available data.  Both process can
+    be carried out in two threads of execution.  This design plays an
+    important role in the DjVu system.  We have investigated various
+    state-of-the-art wavelet compression schemes: although these schemes may
+    achieve slightly smaller file sizes, the decoding functions did not even
+    approach our requirements.  
+
+    The IW44 wavelets satisfy these requirements today. It performs very well
+    for quality settings resulting in high compression ratios.  It should not
+    be used for quasi-lossless compression because certain design choices
+    deliberately sacrifice the IW44 quasi-lossless performance in order to
+    improve the image quality at high compression ratios.
+
+    Little care however has been taken to make the IW44 encoder memory
+    efficient.  This code uses two copies of the wavelet coefficient data
+    structure (one for the raw coefficients, one for the quantized
+    coefficients).  A more sophisticated implementation should considerably
+    reduce the memory requirements.
+
+    {\bf Masking} --- When we create a DjVu image, we often know that certain
+    pixels of the background image are going to be covered by foreground
+    objects like text or drawings.  The DjVu IW44 wavelet decomposition
+    routine can use an optional bilevel image named the mask.  Every non zero
+    pixel in the mask means the value of the corresponding pixel in the
+    background image is irrelevant.  The wavelet decomposition code will
+    replace these masked pixels by a color value whose coding cost is minimal
+    (see \URL{http://www.research.att.com/~leonb/DJVU/mask}).
+
+    {\bf ToDo} --- There are many improvements to be made.  Besides better
+    quantization algorithms (such as trellis quantization and bitrate
+    allocation), we should allow for more wavelet transforms.  These
+    improvements may be implemented in future version, if (and only if) they
+    can meet our decoding constraints.  Future versions will probably split
+    file #"IW44Image.cpp"# which currently contains everything.
+ 
+    @memo
+    Wavelet encoded images.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+
+// From: Leon Bottou, 1/31/2002
+// Lizardtech has split the corresponding cpp file into a decoder and an encoder.
+// Only superficial changes.  The meat is mine.
+
+*/
+//@{
+
+
+#include "GSmartPointer.h"
+#include "ZPCodec.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class GRect;
+class IFFByteStream;
+class ByteStream;
+class GBitmap;
+class GPixmap;
+
+
+
+/** IW44 encoding parameters.  
+    This data structure gathers the quality specification parameters needed
+    for encoding each chunk of an IW44 file.  Chunk data is generated until
+    meeting either the slice target, the size target or the decibel target.  */
+
+struct DJVUAPI IWEncoderParms 
+{
+  /** Slice target.  Data generation for the current chunk stops if the total
+      number of slices (in this chunk and all the previous chunks) reaches
+      value #slice#.  The default value #0# has a special meaning: data will
+      be generated regardless of the number of slices in the file. */
+  int    slices;
+  /** Size target.  Data generation for the current chunk stops if the total
+      data size (in this chunk and all the previous chunks), expressed in
+      bytes, reaches value #size#.  The default value #0# has a special
+      meaning: data will be generated regardless of the file size. */
+  int    bytes;
+  /** Decibel target.  Data generation for the current chunk stops if the
+      estimated luminance error, expressed in decibels, reaches value
+      #decibel#.  The default value #0# has a special meaning: data will be
+      generated regardless of the estimated luminance error.  Specifying value
+      #0# in fact shortcuts the computation of the estimated luminance error
+      and sensibly speeds up the encoding process.  */
+  float  decibels;
+  /** Constructor. Initializes the structure with the default values. */
+  IWEncoderParms(void);
+};
+
+
+
+/** IW44 encoded gray-level and color images.  This class acts as a base for
+    images represented as a collection of IW44 wavelet coefficients.  The
+    coefficients are stored in a memory efficient data structure.  Member
+    function \Ref{get_bitmap} renders an arbitrary segment of the image into
+    a \Ref{GBitmap}.  Member functions \Ref{decode_iff} and \Ref{encode_iff}
+    read and write DjVu IW44 files (see \Ref{IW44Image.h}).  Both the copy
+    constructor and the copy operator are declared as private members. It is
+    therefore not possible to make multiple copies of instances of this
+    class. */
+
+class DJVUAPI IW44Image : public GPEnabled
+{
+public:
+  /** Chrominance processing selector.  The following constants may be used as
+      argument to the following \Ref{IWPixmap} constructor to indicate how the
+      chrominance information should be processed. There are four possible values:
+      \begin{description}
+      \item[CRCBnone:] The wavelet transform will discard the chrominance 
+           information and only keep the luminance. The image will show in shades of gray.
+      \item[CRCBhalf:] The wavelet transform will process the chrominance at only 
+           half the image resolution. This option creates smaller files but may create
+           artifacts in highly colored images.
+      \item[CRCBnormal:] The wavelet transform will process the chrominance at full 
+           resolution. This is the default.
+      \item[CRCBfull:] The wavelet transform will process the chrominance at full 
+           resolution. This option also disables the chrominance encoding delay
+           (see \Ref{parm_crcbdelay}) which usually reduces the bitrate associated with the
+           chrominance information.
+      \end{description} */
+  enum CRCBMode { 
+    CRCBnone, 
+    CRCBhalf, 
+    CRCBnormal, 
+    CRCBfull };
+  class Transform;
+  class Map;
+  class Block;
+  class Codec;
+  struct Alloc;
+  struct PrimaryHeader;
+  struct SecondaryHeader;
+  struct TertiaryHeader;
+  enum ImageType {
+    GRAY=false,
+    COLOR=true };
+protected:
+  IW44Image(void);
+public:
+  /** Null constructor.  Constructs an empty IW44Image object. This object does
+      not contain anything meaningful. You must call function \Ref{init},
+      \Ref{decode_iff} or \Ref{decode_chunk} to populate the wavelet
+      coefficient data structure. You may not use \Ref{encode_iff} or 
+      \Ref{encode_chunk}. */
+  static GP<IW44Image> create_decode(const ImageType itype=COLOR);
+  /** Null constructor.  Constructs an empty IW44Image object. This object does
+      not contain anything meaningful. You must call function \Ref{init},
+      \Ref{decode_iff} or \Ref{decode_chunk} to populate the wavelet
+      coefficient data structure.  You may then use \Ref{encode_iff}
+      and \Ref{encode_chunk}. */
+  static GP<IW44Image> create_encode(const ImageType itype=COLOR);
+  // virtual destructor
+  virtual ~IW44Image();
+  /** Initializes an IWBitmap with image #bm#.  This constructor
+      performs the wavelet decomposition of image #bm# and records the
+      corresponding wavelet coefficient.  Argument #mask# is an optional
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */
+  static GP<IW44Image> create_encode(const GBitmap &bm, const GP<GBitmap> mask=0);
+  /** Initializes an IWPixmap with color image #bm#.  This constructor
+      performs the wavelet decomposition of image #bm# and records the
+      corresponding wavelet coefficient.  Argument #mask# is an optional
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}).
+      Argument #crcbmode# specifies how the chrominance information should be
+      encoded (see \Ref{CRCBMode}). */
+  static GP<IW44Image> create_encode(const GPixmap &bm, const GP<GBitmap> mask=0, CRCBMode crcbmode=CRCBnormal);
+  // ACCESS
+  /** Returns the width of the IWBitmap image. */
+  int get_width(void) const;
+  /** Returns the height of the IWBitmap image. */
+  int get_height(void) const;
+  /** Reconstructs the complete image.  The reconstructed image
+      is then returned as a GBitmap object. */
+  virtual GP<GBitmap> get_bitmap(void) {return 0;}
+  /** Reconstructs a segment of the image at a given scale.  The subsampling
+      ratio #subsample# must be a power of two between #1# and #32#.  Argument
+      #rect# specifies which segment of the subsampled image should be
+      reconstructed.  The reconstructed image is returned as a GBitmap object
+      whose size is equal to the size of the rectangle #rect#. */
+  virtual GP<GBitmap> get_bitmap(int subsample, const GRect &rect) {return 0;}
+  /** Reconstructs the complete image.  The reconstructed image
+      is then returned as a GPixmap object. */
+  virtual GP<GPixmap> get_pixmap(void) {return 0;}
+  /** Reconstructs a segment of the image at a given scale.  The subsampling
+      ratio #subsample# must be a power of two between #1# and #32#.  Argument
+      #rect# specifies which segment of the subsampled image should be
+      reconstructed.  The reconstructed image is returned as a GPixmap object
+      whose size is equal to the size of the rectangle #rect#. */
+  virtual GP<GPixmap> get_pixmap(int subsample, const GRect &rect) {return 0;}
+  /** Returns the amount of memory used by the wavelet coefficients.  This
+      amount of memory is expressed in bytes. */
+  virtual unsigned int get_memory_usage(void) const = 0;
+  /** Returns the filling ratio of the internal data structure.  Wavelet
+      coefficients are stored in a sparse array.  This function tells what
+      percentage of bins have been effectively allocated. */
+  virtual int get_percent_memory(void) const = 0;
+  // CODER
+  /** Encodes one data chunk into ByteStream #bs#.  Parameter #parms# controls
+      how much data is generated.  The chunk data is written to ByteStream
+      #bs# with no IFF header.  Successive calls to #encode_chunk# encode
+      successive chunks.  You must call #close_codec# after encoding the last
+      chunk of a file. */
+  virtual int  encode_chunk(GP<ByteStream> gbs, const IWEncoderParms &parms);
+  /** Writes a gray level image into DjVu IW44 file.  This function creates a
+      composite chunk (identifier #FORM:BM44# or #FORM:PM44#) composed of
+      #nchunks# chunks (identifier #BM44# or #PM44#).  Data for each chunk is
+      generated with #encode_chunk# using the corresponding parameters in
+      array #parms#. */
+  virtual void encode_iff(IFFByteStream &iff, int nchunks, const IWEncoderParms *parms);
+  // DECODER
+  /** Decodes one data chunk from ByteStream #bs#.  Successive calls to
+      #decode_chunk# decode successive chunks.  You must call #close_codec#
+      after decoding the last chunk of a file.  Note that function
+      #get_bitmap# and #decode_chunk# may be called simultaneously from two
+      execution threads. */
+  virtual int  decode_chunk(GP<ByteStream> gbs) = 0;
+  /** This function enters a composite chunk (identifier #FORM:BM44#, or
+      #FORM:PM44#), and decodes a maximum of #maxchunks# data chunks
+      (identifier #BM44#).  Data for each chunk is processed using the
+      function #decode_chunk#. */
+  virtual void decode_iff(IFFByteStream &iff, int maxchunks=999) = 0;
+  // MISCELLANEOUS
+  /** Resets the encoder/decoder state.  The first call to #decode_chunk# or
+      #encode_chunk# initializes the coder for encoding or decoding.  Function
+      #close_codec# must be called after processing the last chunk in order to
+      reset the coder and release the associated memory. */
+  virtual void close_codec(void) = 0;
+  /** Returns the chunk serial number.  This function returns the serial
+      number of the last chunk encoded with #encode_chunk# or decoded with
+      #decode_chunk#. The first chunk always has serial number #1#. Successive
+      chunks have increasing serial numbers.  Value #0# is returned if this
+      function is called before calling #encode_chunk# or #decode_chunk# or
+      after calling #close_codec#. */
+  virtual int get_serial(void) = 0;
+  /** Sets the chrominance delay parameter.  This function can be called
+      before encoding the first color IW44 data chunk.  Parameter #parm# is an
+      encoding delay which reduces the bitrate associated with the
+      chrominance information. The default chrominance encoding delay is 10. */
+  virtual int  parm_crcbdelay(const int parm) {return parm;}
+  /** Sets the #dbfrac# parameter.  This function can be called before
+      encoding the first IW44 data chunk.  Parameter #frac# modifies the
+      decibel estimation algorithm in such a way that the decibel target only
+      pertains to the average error of the fraction #frac# of the most
+      misrepresented 32x32 pixel blocks.  Setting arguments #frac# to #1.0#
+      restores the normal behavior.  */
+  virtual void parm_dbfrac(float frac) = 0;
+protected:
+  // Parameter
+  float db_frac;
+  // Data
+  Map *ymap, *cbmap, *crmap;
+  int cslice;
+  int cserial;
+  int cbytes;
+private:
+  // Disable assignment semantic
+  IW44Image(const IW44Image &ref);
+  IW44Image& operator=(const IW44Image &ref);
+};
+
+#ifdef IW44IMAGE_IMPLIMENTATION
+
+/*x IW44 encoded gray-level image.  This class provided functions for managing
+    a gray level image represented as a collection of IW44 wavelet
+    coefficients.  The coefficients are stored in a memory efficient data
+    structure.  Member function \Ref{get_bitmap} renders an arbitrary segment
+    of the image into a \Ref{GBitmap}.  Member functions \Ref{decode_iff} and
+    \Ref{encode_iff} read and write DjVu IW44 files (see \Ref{IW44Image.h}).
+    Both the copy constructor and the copy operator are declared as private
+    members. It is therefore not possible to make multiple copies of instances
+    of this class. */
+
+class DJVUAPI IWBitmap : public IW44Image
+{
+public:
+  friend class IW44Image;
+  class Encode;
+protected:
+  /*x Null constructor.  Constructs an empty IWBitmap object. This object does
+      not contain anything meaningful. You must call function \Ref{init},
+      \Ref{decode_iff} or \Ref{decode_chunk} to populate the wavelet
+      coefficient data structure. */
+  IWBitmap(void);
+public:
+  //x virtual destructor
+  virtual ~IWBitmap();
+  //x ACCESS
+  /*x Reconstructs the complete image.  The reconstructed image
+      is then returned as a GBitmap object. */
+  virtual GP<GBitmap> get_bitmap(void);
+  /*x Reconstructs a segment of the image at a given scale.  The subsampling
+      ratio #subsample# must be a power of two between #1# and #32#.  Argument
+      #rect# specifies which segment of the subsampled image should be
+      reconstructed.  The reconstructed image is returned as a GBitmap object
+      whose size is equal to the size of the rectangle #rect#. */
+  virtual GP<GBitmap> get_bitmap(int subsample, const GRect &rect);
+  /*x Returns the amount of memory used by the wavelet coefficients.  This
+      amount of memory is expressed in bytes. */
+  virtual unsigned int get_memory_usage(void) const;
+  /*x Returns the filling ratio of the internal data structure.  Wavelet
+      coefficients are stored in a sparse array.  This function tells what
+      percentage of bins have been effectively allocated. */
+  virtual int get_percent_memory(void) const;
+  // DECODER
+  /*x Decodes one data chunk from ByteStream #bs#.  Successive calls to
+      #decode_chunk# decode successive chunks.  You must call #close_codec#
+      after decoding the last chunk of a file.  Note that function
+      #get_bitmap# and #decode_chunk# may be called simultaneously from two
+      execution threads. */
+  virtual int  decode_chunk(GP<ByteStream> gbs);
+  /*x Reads a DjVu IW44 file as a gray level image.  This function enters a
+      composite chunk (identifier #FORM:BM44#), and decodes a maximum of
+      #maxchunks# data chunks (identifier #BM44#).  Data for each chunk is
+      processed using the function #decode_chunk#. */
+  virtual void decode_iff(IFFByteStream &iff, int maxchunks=999);
+  // MISCELLANEOUS
+  /*x Resets the encoder/decoder state.  The first call to #decode_chunk# or
+      #encode_chunk# initializes the coder for encoding or decoding.  Function
+      #close_codec# must be called after processing the last chunk in order to
+      reset the coder and release the associated memory. */
+  virtual void close_codec(void);
+  /*x Returns the chunk serial number.  This function returns the serial
+      number of the last chunk encoded with #encode_chunk# or decoded with
+      #decode_chunk#. The first chunk always has serial number #1#. Successive
+      chunks have increasing serial numbers.  Value #0# is returned if this
+      function is called before calling #encode_chunk# or #decode_chunk# or
+      after calling #close_codec#. */
+  virtual int get_serial(void);
+  /*x Sets the #dbfrac# parameter.  This function can be called before
+      encoding the first IW44 data chunk.  Parameter #frac# modifies the
+      decibel estimation algorithm in such a way that the decibel target only
+      pertains to the average error of the fraction #frac# of the most
+      misrepresented 32x32 pixel blocks.  Setting arguments #frac# to #1.0#
+      restores the normal behavior.  */
+  virtual void parm_dbfrac(float frac);
+private:
+  Codec *ycodec;
+};
+
+
+/*x IW44 encoded color image. This class provided functions for managing a
+    color image represented as a collection of IW44 wavelet coefficients.  The
+    coefficients are stored in a memory efficient data structure.  Member
+    function \Ref{get_pixmap} renders an arbitrary segment of the image into a
+    \Ref{GPixmap}.  Member functions \Ref{decode_iff} and \Ref{encode_iff}
+    read and write DjVu IW44 files (see \Ref{IW44Image.h}).  Both the copy
+    constructor and the copy operator are declared as private members. It is
+    therefore not possible to make multiple copies of instances of this
+    class. */
+
+class DJVUAPI IWPixmap : public IW44Image
+{
+public:
+  friend class IW44Image;
+protected:
+  class Encode;
+  /*x Null constructor.  Constructs an empty IWPixmap object. This object does
+      not contain anything meaningful. You must call function \Ref{init},
+      \Ref{decode_iff} or \Ref{decode_chunk} to populate the wavelet
+      coefficient data structure. */
+  IWPixmap(void);
+public:
+  // virtual destructor
+  virtual ~IWPixmap();
+  // ACCESS
+  /*x Reconstructs the complete image.  The reconstructed image
+      is then returned as a GPixmap object. */
+  virtual GP<GPixmap> get_pixmap(void);
+  /*x Reconstructs a segment of the image at a given scale.  The subsampling
+      ratio #subsample# must be a power of two between #1# and #32#.  Argument
+      #rect# specifies which segment of the subsampled image should be
+      reconstructed.  The reconstructed image is returned as a GPixmap object
+      whose size is equal to the size of the rectangle #rect#. */
+  virtual GP<GPixmap> get_pixmap(int subsample, const GRect &rect);
+  /*x Returns the amount of memory used by the wavelet coefficients.  This
+      amount of memory is expressed in bytes. */
+  virtual unsigned int get_memory_usage(void) const;
+  /*x Returns the filling ratio of the internal data structure.  Wavelet
+      coefficients are stored in a sparse array.  This function tells what
+      percentage of bins have been effectively allocated. */
+  virtual int get_percent_memory(void) const;
+  // DECODER
+  /*x Decodes one data chunk from ByteStream #bs#.  Successive calls to
+      #decode_chunk# decode successive chunks.  You must call #close_codec#
+      after decoding the last chunk of a file.  Note that function
+      #get_bitmap# and #decode_chunk# may be called simultaneously from two
+      execution threads. */
+  virtual int  decode_chunk(GP<ByteStream> gbs);
+  /*x Reads a DjVu IW44 file as a color image.  This function enters a
+      composite chunk (identifier #FORM:PM44# or #FORM:BM44#), and decodes a
+      maximum of #maxchunks# data chunks (identifier #PM44# or #BM44#).  Data
+      for each chunk is processed using the function #decode_chunk#. */
+  virtual void decode_iff(IFFByteStream &iff, int maxchunks=999);
+  // MISCELLANEOUS
+  /*x Resets the encoder/decoder state.  The first call to #decode_chunk# or
+      #encode_chunk# initializes the coder for encoding or decoding.  Function
+      #close_codec# must be called after processing the last chunk in order to
+      reset the coder and release the associated memory. */
+  virtual void close_codec(void);
+  /*x Returns the chunk serial number.  This function returns the serial
+      number of the last chunk encoded with #encode_chunk# or decoded with
+      #decode_chunk#. The first chunk always has serial number #1#. Successive
+      chunks have increasing serial numbers.  Value #0# is returned if this
+      function is called before calling #encode_chunk# or #decode_chunk# or
+      after calling #close_codec#. */
+  virtual int  get_serial(void);
+  /*x Sets the chrominance delay parameter.  This function can be called
+      before encoding the first IW44 data chunk.  Parameter #parm# is an
+      encoding delay which reduces the bitrate associated with the
+      chrominance information. The default chrominance encoding delay is 10. */
+  virtual int  parm_crcbdelay(const int parm);
+  /*x Sets the #dbfrac# parameter.  This function can be called before
+      encoding the first IW44 data chunk.  Parameter #frac# modifies the
+      decibel estimation algorithm in such a way that the decibel target only
+      pertains to the average error of the fraction #frac# of the most
+      misrepresented 32x32 pixel blocks.  Setting arguments #frac# to #1.0#
+      restores the normal behavior.  */
+  virtual void parm_dbfrac(float frac);
+protected:
+  // Parameter
+  int   crcb_delay;
+  int   crcb_half;
+  // Data
+private:
+  Codec *ycodec, *cbcodec, *crcodec;
+};
+
+/*x IW44Transform.
+*/
+class IW44Image::Transform
+{
+public:
+  class Decode;
+  class Encode;
+protected:
+  static void filter_begin(int w, int h);
+  static void filter_end(void);
+};
+
+struct GPixel;
+class IW44Image::Transform::Decode : public IW44Image::Transform
+{
+public:
+ // WAVELET TRANSFORM
+  /*x Forward transform. */
+  static void backward(short *p, int w, int h, int rowsize, int begin, int end);
+  
+  // COLOR TRANSFORM
+  /*x Converts YCbCr to RGB. */
+  static void YCbCr_to_RGB(GPixel *p, int w, int h, int rowsize);
+};
+
+//---------------------------------------------------------------
+// *** Class IW44Image::Block [declaration]
+// Represents a block of 32x32 coefficients after zigzagging and scaling
+
+
+class IW44Image::Block // DJVU_CLASS
+{
+public:
+  // creating
+  Block(void);
+  // accessing scaled coefficients
+  short get(int n) const;
+  void  set(int n, int val, IW44Image::Map *map);
+  // converting from liftblock
+  void  read_liftblock(const short *coeff, IW44Image::Map *map);
+  void  write_liftblock(short *coeff, int bmin=0, int bmax=64) const;
+  // sparse array access
+  const short* data(int n) const;
+  short* data(int n, IW44Image::Map *map);
+  void   zero(int n);
+  // sparse representation
+private:
+  short **(pdata[4]);
+};
+
+//---------------------------------------------------------------
+// *** Class IW44Image::Map [declaration]
+// Represents all the blocks of an image
+
+class IW44Image::Map // DJVU_CLASS
+{
+public:
+  class Encode;
+
+  // construction
+  Map(int w, int h);
+  ~Map();
+  // image access
+  void image(signed char *img8, int rowsize, 
+             int pixsep=1, int fast=0);
+  void image(int subsample, const GRect &rect, 
+             signed char *img8, int rowsize, 
+             int pixsep=1, int fast=0);
+  // array of blocks
+  IW44Image::Block *blocks;
+  // geometry
+  int iw, ih;
+  int bw, bh;
+  int nb;
+  // coefficient allocation stuff
+  short *alloc(int n);
+  short **allocp(int n);
+  IW44Image::Alloc *chain;
+  int top;
+  // statistics
+  int get_bucket_count(void) const;
+  unsigned int get_memory_usage(void) const;
+};
+
+//////////////////////////////////////////////////////
+// ENCODING/DECODING WAVELET COEFFICIENTS 
+//    USING HIERARCHICAL SET DIFFERENCE
+//////////////////////////////////////////////////////
+
+
+//-----------------------------------------------
+// Class IW44Image::Codec [declaration+implementation]
+// Maintains information shared while encoding or decoding
+
+class IW44Image::Codec 
+{
+public:
+  class Decode;
+  class Encode;
+
+protected:
+  // Construction
+  Codec(IW44Image::Map &map);
+public:
+  virtual ~Codec();
+  // Coding
+  int finish_code_slice(ZPCodec &zp);
+  virtual int code_slice(ZPCodec &zp) = 0;
+  // Data
+  IW44Image::Map &map;                  // working map
+  // status
+  int curband;                  // current band
+  int curbit;                   // current bitplane
+  // quantization tables
+  int quant_hi[10];             // quantization for bands 1 to 9
+  int quant_lo[16];             // quantization for band 0.
+  // bucket state
+  char coeffstate[256];
+  char bucketstate[16];
+  enum { ZERO   = 1,            // this coeff never hits this bit
+         ACTIVE = 2,            // this coeff is already active
+         NEW    = 4,            // this coeff is becoming active
+         UNK    = 8 };          // this coeff may become active
+  // coding context
+  BitContext ctxStart [32];
+  BitContext ctxBucket[10][8];
+  BitContext ctxMant;
+  BitContext ctxRoot;
+  // helper
+  int is_null_slice(int bit, int band);
+  int decode_prepare(int fbucket, int nbucket, IW44Image::Block &blk);
+  void decode_buckets(ZPCodec &zp, int bit, int band,
+    IW44Image::Block &blk, int fbucket, int nbucket);
+};
+
+//////////////////////////////////////////////////////
+// DEFINITION OF CHUNK HEADERS
+//////////////////////////////////////////////////////
+
+
+struct IW44Image::PrimaryHeader {
+  unsigned char serial;
+  unsigned char slices;
+  void encode(GP<ByteStream> gbs);
+  void decode(GP<ByteStream> gbs);
+};  
+
+struct IW44Image::SecondaryHeader {
+  unsigned char major;
+  unsigned char minor;
+  void encode(GP<ByteStream> gbs);
+  void decode(GP<ByteStream> gbs);
+};
+
+struct IW44Image::TertiaryHeader {
+  unsigned char xhi, xlo;
+  unsigned char yhi, ylo;
+  unsigned char crcbdelay;
+  void encode(GP<ByteStream> gbs);
+  void decode(GP<ByteStream> gbs, int major=1, int minor=2);
+};
+
+inline const short* 
+IW44Image::Block::data(int n) const
+{
+  if (! pdata[n>>4])
+    return 0;
+  return pdata[n>>4][n&15];
+}
+
+inline short* 
+IW44Image::Block::data(int n, IW44Image::Map *map)
+{
+  if (! pdata[n>>4])
+    pdata[n>>4] = map->allocp(16);
+  if (! pdata[n>>4][n &15])
+    pdata[n>>4][n &15] = map->alloc(16);
+  return pdata[n>>4][n&15];
+}
+
+inline short 
+IW44Image::Block::get(int n) const
+{
+  int n1 = (n>>4);
+  const short *d = data(n1);
+  if (! d)
+    return 0;
+  return d[n&15];
+}
+
+inline void  
+IW44Image::Block::set(int n, int val, IW44Image::Map *map)
+{
+  int n1 = (n>>4);
+  short* d = data(n1, map);
+  d[n&15] = val;
+}
+
+#endif /* IW44IMAGE_IMPLIMENTATION */
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
diff --git a/libdjvu/JB2EncodeCodec.cpp b/libdjvu/JB2EncodeCodec.cpp
new file mode 100644
index 0000000..8b3671c
--- /dev/null
+++ b/libdjvu/JB2EncodeCodec.cpp
@@ -0,0 +1,562 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// Lizardtech has split the corresponding cpp file into a decoder and an encoder.
+// Only superficial changes.  The meat is mine.
+
+#ifndef NEED_DECODER_ONLY
+
+#include "JB2Image.h"
+#include "GBitmap.h"
+#include <string.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+////////////////////////////////////////
+//// CLASS JB2Codec::Encode:  DECLARATION
+////////////////////////////////////////
+
+// This class is accessed via the encode
+// functions of class JB2Image
+
+
+//**** Class JB2Codec
+// This class implements the JB2 coder.
+// Contains all contextual information for encoding a JB2Image.
+
+class JB2Dict::JB2Codec::Encode : public JB2Dict::JB2Codec
+{
+public:
+  Encode(void);
+  void init(const GP<ByteStream> &gbs);
+//virtual
+  void code(const GP<JB2Image> &jim);
+  void code(JB2Image *jim) { const GP<JB2Image> gjim(jim);code(gjim); }
+  void code(const GP<JB2Dict> &jim);
+  void code(JB2Dict *jim) { const GP<JB2Dict> gjim(jim);code(gjim); }
+
+protected:
+  void CodeNum(const int num, const int lo, const int hi, NumContext &ctx);
+  void encode_libonly_shape(const GP<JB2Image> &jim, int shapeno);
+// virtual
+  bool CodeBit(const bool bit, BitContext &ctx);
+  void code_comment(GUTF8String &comment);
+  void code_record_type(int &rectype);
+  int code_match_index(int &index, JB2Dict &jim);
+  void code_inherited_shape_count(JB2Dict &jim);
+  void code_image_size(JB2Dict &jim);
+  void code_image_size(JB2Image &jim);
+  void code_absolute_location(JB2Blit *jblt,  int rows, int columns);
+  void code_absolute_mark_size(GBitmap &bm, int border=0);
+  void code_relative_mark_size(GBitmap &bm, int cw, int ch, int border=0);
+  void code_bitmap_directly(GBitmap &bm,const int dw, int dy,
+    unsigned char *up2, unsigned char *up1, unsigned char *up0 );
+  int get_diff(const int x_diff,NumContext &rel_loc);
+  void code_bitmap_by_cross_coding (GBitmap &bm, GBitmap &cbm,
+    const int xd2c, const int dw, int dy, int cy,
+    unsigned char *up1, unsigned char *up0, unsigned char *xup1, 
+    unsigned char *xup0, unsigned char *xdn1 );
+
+private:
+  GP<ZPCodec> gzp;
+};
+
+
+////////////////////////////////////////
+//// CLASS JB2DICT: IMPLEMENTATION
+////////////////////////////////////////
+
+void 
+JB2Dict::encode(const GP<ByteStream> &gbs) const
+{
+  JB2Codec::Encode codec;
+  codec.init(gbs);
+  codec.code(const_cast<JB2Dict *>(this));
+}
+
+////////////////////////////////////////
+//// CLASS JB2IMAGE: IMPLEMENTATION
+////////////////////////////////////////
+
+void 
+JB2Image::encode(const GP<ByteStream> &gbs) const
+{
+  JB2Codec::Encode codec;
+  codec.init(gbs);
+  codec.code(const_cast<JB2Image *>(this));
+}
+
+////////////////////////////////////////
+//// CLASS JB2CODEC : IMPLEMENTATION
+////////////////////////////////////////
+
+#define START_OF_DATA                   (0)
+#define NEW_MARK                        (1)
+#define NEW_MARK_LIBRARY_ONLY           (2)
+#define NEW_MARK_IMAGE_ONLY             (3)
+#define MATCHED_REFINE                  (4)
+#define MATCHED_REFINE_LIBRARY_ONLY     (5)
+#define MATCHED_REFINE_IMAGE_ONLY       (6)
+#define MATCHED_COPY                    (7)
+#define NON_MARK_DATA                   (8)
+#define REQUIRED_DICT_OR_RESET          (9)
+#define PRESERVED_COMMENT               (10)
+#define END_OF_DATA                     (11)
+
+// STATIC DATA MEMBERS
+
+static const int BIGPOSITIVE = 262142;
+static const int BIGNEGATIVE = -262143;
+static const int CELLCHUNK = 20000;
+
+// CONSTRUCTOR
+
+JB2Dict::JB2Codec::Encode::Encode(void)
+: JB2Dict::JB2Codec(1) {}
+
+void
+JB2Dict::JB2Codec::Encode::init(const GP<ByteStream> &gbs)
+{
+  gzp=ZPCodec::create(gbs,true,true);
+}
+
+inline bool
+JB2Dict::JB2Codec::Encode::CodeBit(const bool bit, BitContext &ctx)
+{
+    gzp->encoder(bit?1:0, ctx);
+    return bit;
+}
+
+void
+JB2Dict::JB2Codec::Encode::CodeNum(int num, int low, int high, NumContext &ctx)
+{
+  if (num < low || num > high)
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  JB2Codec::CodeNum(low,high,&ctx,num);
+}
+
+// CODE COMMENTS
+
+void 
+JB2Dict::JB2Codec::Encode::code_comment(GUTF8String &comment)
+{
+  // Encode size
+      int size=comment.length();
+      CodeNum(size, 0, BIGPOSITIVE, dist_comment_length);
+      for (int i=0; i<size; i++) 
+        {
+          CodeNum(comment[i], 0, 255, dist_comment_byte);
+        }
+}
+
+// CODE SIMPLE VALUES
+
+inline void 
+JB2Dict::JB2Codec::Encode::code_record_type(int &rectype)
+{
+  CodeNum(rectype, START_OF_DATA, END_OF_DATA, dist_record_type);
+}
+
+int 
+JB2Dict::JB2Codec::Encode::code_match_index(int &index, JB2Dict &jim)
+{
+    int match=shape2lib[index];
+    CodeNum(match, 0, lib2shape.hbound(), dist_match_index);
+    return match;
+}
+
+// CODE PAIRS
+
+void
+JB2Dict::JB2Codec::Encode::code_inherited_shape_count(JB2Dict &jim)
+{
+  CodeNum(jim.get_inherited_shape_count(),
+    0, BIGPOSITIVE, inherited_shape_count_dist);
+}
+
+void 
+JB2Dict::JB2Codec::Encode::code_image_size(JB2Dict &jim)
+{
+  CodeNum(0, 0, BIGPOSITIVE, image_size_dist);
+  CodeNum(0, 0, BIGPOSITIVE, image_size_dist);
+  JB2Codec::code_image_size(jim);
+}
+
+void 
+JB2Dict::JB2Codec::Encode::code_image_size(JB2Image &jim)
+{
+  image_columns = jim.get_width();
+  CodeNum(image_columns, 0, BIGPOSITIVE, image_size_dist);
+  image_rows = jim.get_height();
+  CodeNum(image_rows, 0, BIGPOSITIVE, image_size_dist);
+  JB2Codec::code_image_size(jim);
+}
+
+inline int
+JB2Dict::JB2Codec::Encode::get_diff(int x_diff,NumContext &rel_loc)
+{
+   CodeNum(x_diff, BIGNEGATIVE, BIGPOSITIVE, rel_loc);
+   return x_diff;
+}
+
+void 
+JB2Dict::JB2Codec::Encode::code_absolute_location(JB2Blit *jblt, int rows, int columns)
+{
+  // Check start record
+  if (!gotstartrecordp)
+    G_THROW( ERR_MSG("JB2Image.no_start") );
+  // Code TOP and LEFT
+  CodeNum(jblt->left+1, 1, image_columns, abs_loc_x);
+  CodeNum(jblt->bottom+rows-1+1, 1, image_rows, abs_loc_y);
+}
+
+void 
+JB2Dict::JB2Codec::Encode::code_absolute_mark_size(GBitmap &bm, int border)
+{
+  CodeNum(bm.columns(), 0, BIGPOSITIVE, abs_size_x);
+  CodeNum(bm.rows(), 0, BIGPOSITIVE, abs_size_y);
+}
+
+void 
+JB2Dict::JB2Codec::Encode::code_relative_mark_size(GBitmap &bm, int cw, int ch, int border)
+{
+  CodeNum(bm.columns()-cw, BIGNEGATIVE, BIGPOSITIVE, rel_size_x);
+  CodeNum(bm.rows()-ch, BIGNEGATIVE, BIGPOSITIVE, rel_size_y);
+}
+
+// CODE BITMAP DIRECTLY
+
+void 
+JB2Dict::JB2Codec::Encode::code_bitmap_directly(
+  GBitmap &bm,const int dw, int dy,
+  unsigned char *up2, unsigned char *up1, unsigned char *up0 )
+{
+      ZPCodec &zp=*gzp;
+      // iterate on rows (encoding)
+      while (dy >= 0)
+        {
+          int context=get_direct_context(up2, up1, up0, 0);
+          for (int dx=0;dx < dw;)
+            {
+              int n = up0[dx++];
+              zp.encoder(n, bitdist[context]);
+              context=shift_direct_context(context, n, up2, up1, up0, dx);
+            }
+          // next row
+          dy -= 1;
+          up2 = up1;
+          up1 = up0;
+          up0 = bm[dy];
+        }
+}
+
+// CODE BITMAP BY CROSS CODING
+
+void 
+JB2Dict::JB2Codec::Encode::code_bitmap_by_cross_coding (GBitmap &bm, GBitmap &cbm,
+  const int xd2c, const int dw, int dy, int cy,
+  unsigned char *up1, unsigned char *up0, unsigned char *xup1, 
+  unsigned char *xup0, unsigned char *xdn1 )
+{
+      ZPCodec &zp=*gzp;
+      // iterate on rows (encoding)
+      while (dy >= 0)
+        {
+          int context=get_cross_context(up1, up0, xup1, xup0, xdn1, 0);
+          for(int dx=0;dx < dw;)
+            {
+              const int n = up0[dx++];
+              zp.encoder(n, cbitdist[context]);
+              context=shift_cross_context(context, n,  
+                                  up1, up0, xup1, xup0, xdn1, dx);
+            }
+          // next row
+          up1 = up0;
+          up0 = bm[--dy];
+          xup1 = xup0;
+          xup0 = xdn1;
+          xdn1 = cbm[(--cy)-1] + xd2c;
+        }
+}
+
+// CODE JB2DICT
+
+void 
+JB2Dict::JB2Codec::Encode::code(const GP<JB2Dict> &gjim)
+{
+  if(!gjim)
+  {
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  }
+  JB2Dict &jim=*gjim;
+      // -------------------------
+      // THIS IS THE ENCODING PART
+      // -------------------------
+      int firstshape = jim.get_inherited_shape_count();
+      int nshape = jim.get_shape_count();
+      init_library(jim);
+      // Code headers.
+      int rectype = REQUIRED_DICT_OR_RESET;
+      if (jim.get_inherited_shape_count() > 0)
+        code_record(rectype, gjim, 0);
+      rectype = START_OF_DATA;
+      code_record(rectype, gjim, 0);
+      // Code Comment.
+      rectype = PRESERVED_COMMENT;
+      if (!! jim.comment)
+        code_record(rectype, gjim, 0);
+      // Encode every shape
+      int shapeno;
+      DJVU_PROGRESS_TASK(jb2code,"jb2 encode", nshape-firstshape);
+      for (shapeno=firstshape; shapeno<nshape; shapeno++)
+        {
+          DJVU_PROGRESS_RUN(jb2code, (shapeno-firstshape)|0xff);
+          // Code shape
+          JB2Shape &jshp = jim.get_shape(shapeno);
+          rectype=(jshp.parent >= 0)
+            ?MATCHED_REFINE_LIBRARY_ONLY:NEW_MARK_LIBRARY_ONLY;
+          code_record(rectype, gjim, &jshp);
+          add_library(shapeno, jshp);
+	  // Check numcoder status
+	  if (cur_ncell > CELLCHUNK) 
+	    {
+	      rectype = REQUIRED_DICT_OR_RESET;
+	      code_record(rectype, 0, 0);	      
+	    }
+        }
+      // Code end of data record
+      rectype = END_OF_DATA;
+      code_record(rectype, gjim, 0); 
+      gzp=0;
+}
+
+// CODE JB2IMAGE
+
+void 
+JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
+{
+  if(!gjim)
+  {
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  }
+  JB2Image &jim=*gjim;
+      // -------------------------
+      // THIS IS THE ENCODING PART
+      // -------------------------
+      int i;
+      init_library(jim);
+      int firstshape = jim.get_inherited_shape_count();
+      int nshape = jim.get_shape_count();
+      int nblit = jim.get_blit_count();
+      // Initialize shape2lib 
+      shape2lib.resize(0,nshape-1);
+      for (i=firstshape; i<nshape; i++)
+        shape2lib[i] = -1;
+      // Determine shapes that go into library (shapeno>=firstshape)
+      //  shape2lib is -2 if used by one blit
+      //  shape2lib is -3 if used by more than one blit
+      //  shape2lib is -4 if used as a parent
+      for (i=0; i<nblit; i++)
+        {
+          JB2Blit *jblt = jim.get_blit(i);
+          int shapeno = jblt->shapeno;
+          if (shapeno < firstshape)
+            continue;
+          if (shape2lib[shapeno] >= -2) 
+            shape2lib[shapeno] -= 1;
+          shapeno = jim.get_shape(shapeno).parent;
+          while (shapeno>=firstshape && shape2lib[shapeno]>=-3)
+            {
+              shape2lib[shapeno] = -4;
+              shapeno = jim.get_shape(shapeno).parent;
+            }
+        }
+      // Code headers.
+      int rectype = REQUIRED_DICT_OR_RESET;
+      if (jim.get_inherited_shape_count() > 0)
+        code_record(rectype, gjim, 0, 0);
+      rectype = START_OF_DATA;
+      code_record(rectype, gjim, 0, 0);
+      // Code Comment.
+      rectype = PRESERVED_COMMENT;
+      if (!! jim.comment)
+        code_record(rectype, gjim, 0, 0);
+      // Encode every blit
+      int blitno;
+      DJVU_PROGRESS_TASK(jb2code,"jb2 encode", nblit);
+      for (blitno=0; blitno<nblit; blitno++)
+        {
+          DJVU_PROGRESS_RUN(jb2code, blitno|0xff);
+          JB2Blit *jblt = jim.get_blit(blitno);
+          int shapeno = jblt->shapeno;
+          JB2Shape &jshp = jim.get_shape(shapeno);
+          // Tests if shape exists in library
+          if (shape2lib[shapeno] >= 0)
+            {
+              int rectype = MATCHED_COPY;
+              code_record(rectype, gjim, 0, jblt);
+            }
+          // Avoid coding null shapes/blits
+          else if (jshp.bits) 
+            {
+              // Make sure all parents have been coded
+              if (jshp.parent>=0 && shape2lib[jshp.parent]<0)
+                encode_libonly_shape(gjim, jshp.parent);
+              // Allocate library entry when needed
+#define LIBRARY_CONTAINS_ALL
+              int libraryp = 0;
+#ifdef LIBRARY_CONTAINS_MARKS // baseline
+              if (jshp.parent >= -1)
+                libraryp = 1;
+#endif
+#ifdef LIBRARY_CONTAINS_SHARED // worse             
+              if (shape2lib[shapeno] <= -3)
+                libraryp = 1;
+#endif
+#ifdef LIBRARY_CONTAINS_ALL // better
+              libraryp = 1;
+#endif
+              // Test all blit cases
+              if (jshp.parent<-1 && !libraryp)
+                {
+                  int rectype = NON_MARK_DATA;
+                  code_record(rectype, gjim, &jshp, jblt);
+                }
+              else if (jshp.parent < 0)
+                {
+                  int rectype = (libraryp ? NEW_MARK : NEW_MARK_IMAGE_ONLY);
+                  code_record(rectype, gjim, &jshp, jblt);
+                }
+              else 
+                {
+                  int rectype = (libraryp ? MATCHED_REFINE : MATCHED_REFINE_IMAGE_ONLY);
+                  code_record(rectype, gjim, &jshp, jblt);
+                }
+              // Add shape to library
+              if (libraryp) 
+                add_library(shapeno, jshp);
+            }
+	  // Check numcoder status
+	  if (cur_ncell > CELLCHUNK) 
+	    {
+	      rectype = REQUIRED_DICT_OR_RESET;
+	      code_record(rectype, 0, 0);
+	    }
+        }
+      // Code end of data record
+      rectype = END_OF_DATA;
+      code_record(rectype, gjim, 0, 0); 
+      gzp=0;
+}
+
+////////////////////////////////////////
+//// HELPERS
+////////////////////////////////////////
+
+void 
+JB2Dict::JB2Codec::Encode::encode_libonly_shape(
+  const GP<JB2Image> &gjim, int shapeno )
+{
+  if(!gjim)
+  {
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  }
+  JB2Image &jim=*gjim;
+  // Recursively encode parent shape
+  JB2Shape &jshp = jim.get_shape(shapeno);
+  if (jshp.parent>=0 && shape2lib[jshp.parent]<0)
+    encode_libonly_shape(gjim, jshp.parent);
+  // Test that library shape must be encoded
+  if (shape2lib[shapeno] < 0)
+    {
+      // Code library entry
+      int rectype=(jshp.parent >= 0)
+            ?NEW_MARK_LIBRARY_ONLY:MATCHED_REFINE_LIBRARY_ONLY;
+      code_record(rectype, gjim, &jshp, 0);      
+      // Add shape to library
+      add_library(shapeno, jshp);
+      // Check numcoder status
+      if (cur_ncell > CELLCHUNK) 
+	{
+	  rectype = REQUIRED_DICT_OR_RESET;
+	  code_record(rectype, 0, 0);
+	}
+    }
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+#endif /* NEED_DECODER_ONLY */
+
diff --git a/libdjvu/JB2Image.cpp b/libdjvu/JB2Image.cpp
new file mode 100644
index 0000000..4dd7b89
--- /dev/null
+++ b/libdjvu/JB2Image.cpp
@@ -0,0 +1,1451 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// Lizardtech has split the corresponding cpp file into a decoder and an encoder.
+// Only superficial changes.  The meat is mine.
+
+#include "JB2Image.h"
+#include "GThreads.h"
+#include "GRect.h"
+#include "GBitmap.h"
+#include <string.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+////////////////////////////////////////
+//// CLASS JB2Codec::Decode:  DECLARATION
+////////////////////////////////////////
+
+// This class is accessed via the decode
+// functions of class JB2Image
+
+
+//**** Class JB2Codec
+// This class implements the JB2 decoder.
+// Contains all contextual information for decoding a JB2Image.
+
+class JB2Dict::JB2Codec::Decode : public JB2Dict::JB2Codec
+{
+public:
+  Decode(void);
+  void init(const GP<ByteStream> &gbs);
+// virtual
+  void code(const GP<JB2Image> &jim);
+  void code(JB2Image *jim) {const GP<JB2Image> gjim(jim);code(gjim);}
+  void code(const GP<JB2Dict> &jim);
+  void code(JB2Dict *jim) {const GP<JB2Dict> gjim(jim);code(gjim);}
+  void set_dict_callback(JB2DecoderCallback *cb, void *arg);
+protected:
+  int CodeNum(const int lo, const int hi, NumContext &ctx);
+
+// virtual
+  bool CodeBit(const bool bit, BitContext &ctx);
+  void code_comment(GUTF8String &comment);
+  void code_record_type(int &rectype);
+  int code_match_index(int &index, JB2Dict &jim);
+  void code_inherited_shape_count(JB2Dict &jim);
+  void code_image_size(JB2Dict &jim);
+  void code_image_size(JB2Image &jim);
+  void code_absolute_location(JB2Blit *jblt,  int rows, int columns);
+  void code_absolute_mark_size(GBitmap &bm, int border=0);
+  void code_relative_mark_size(GBitmap &bm, int cw, int ch, int border=0);
+  void code_bitmap_directly(GBitmap &bm,const int dw, int dy,
+    unsigned char *up2, unsigned char *up1, unsigned char *up0 );
+  void code_bitmap_by_cross_coding (GBitmap &bm, GBitmap &cbm,
+    const int xd2c, const int dw, int dy, int cy,
+    unsigned char *up1, unsigned char *up0, unsigned char *xup1, 
+    unsigned char *xup0, unsigned char *xdn1 );
+  int get_diff(const int x_diff,NumContext &rel_loc);
+
+private:
+  GP<ZPCodec> gzp;
+  JB2DecoderCallback *cbfunc;
+  void *cbarg;
+};
+
+////////////////////////////////////////
+//// CLASS JB2DICT: IMPLEMENTATION
+////////////////////////////////////////
+
+
+JB2Dict::JB2Dict()
+  : inherited_shapes(0)
+{
+}
+
+void
+JB2Dict::init()
+{
+  inherited_shapes = 0;
+  inherited_dict = 0;
+  shapes.empty();
+}
+
+JB2Shape &
+JB2Dict::get_shape(const int shapeno)
+{
+  JB2Shape *retval;
+  if(shapeno >= inherited_shapes)
+  {
+    retval=&shapes[shapeno - inherited_shapes];
+  }else if(inherited_dict)
+  {
+    retval=&(inherited_dict->get_shape(shapeno));
+  }else
+  {
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  }
+  return *retval;
+}
+
+const JB2Shape &
+JB2Dict::get_shape(const int shapeno) const
+{
+  const JB2Shape *retval;
+  if(shapeno >= inherited_shapes)
+  {
+    retval=&shapes[shapeno - inherited_shapes];
+  }else if(inherited_dict)
+  {
+    retval=&(inherited_dict->get_shape(shapeno));
+  }else
+  {
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  }
+  return *retval;
+}
+
+void 
+JB2Dict::set_inherited_dict(const GP<JB2Dict> &dict)
+{
+  if (shapes.size() > 0)
+    G_THROW( ERR_MSG("JB2Image.cant_set") );
+  if (inherited_dict)
+    G_THROW( ERR_MSG("JB2Image.cant_change") );
+  inherited_dict = dict; 
+  inherited_shapes = dict->get_shape_count();
+  // Make sure that inherited bitmaps are marked as shared
+  for (int i=0; i<inherited_shapes; i++)
+    {
+      JB2Shape &jshp = dict->get_shape(i);
+      if (jshp.bits) jshp.bits->share();
+    }
+}
+
+void
+JB2Dict::compress()
+{
+  for (int i=shapes.lbound(); i<=shapes.hbound(); i++)
+    shapes[i].bits->compress();
+}
+
+unsigned int
+JB2Dict::get_memory_usage() const
+{
+  unsigned int usage = sizeof(JB2Dict);
+  usage += sizeof(JB2Shape) * shapes.size();
+  for (int i=shapes.lbound(); i<=shapes.hbound(); i++)
+    if (shapes[i].bits)
+      usage += shapes[i].bits->get_memory_usage();
+  return usage;
+}
+
+int  
+JB2Dict::add_shape(const JB2Shape &shape)
+{
+  if (shape.parent >= get_shape_count())
+    G_THROW( ERR_MSG("JB2Image.bad_parent_shape") );
+  int index = shapes.size();
+  shapes.touch(index);
+  shapes[index] = shape;
+  return index + inherited_shapes;
+}
+
+void 
+JB2Dict::decode(const GP<ByteStream> &gbs, JB2DecoderCallback *cb, void *arg)
+{
+  init();
+  JB2Codec::Decode codec;
+  codec.init(gbs);
+  codec.set_dict_callback(cb,arg);
+  codec.code(this);
+}
+
+
+
+////////////////////////////////////////
+//// CLASS JB2IMAGE: IMPLEMENTATION
+////////////////////////////////////////
+
+
+JB2Image::JB2Image(void)
+  : width(0), height(0), reproduce_old_bug(false)
+{
+}
+
+void
+JB2Image::init(void)
+{
+  width = height = 0;
+  blits.empty();
+  JB2Dict::init();
+}
+
+unsigned int
+JB2Image::get_memory_usage() const
+{
+  unsigned int usage = JB2Dict::get_memory_usage();
+  usage += sizeof(JB2Image) - sizeof(JB2Dict);
+  usage += sizeof(JB2Blit) * blits.size();
+  return usage;
+}
+
+void 
+JB2Image::set_dimension(int awidth, int aheight)
+{
+  width = awidth;
+  height = aheight;
+}
+
+int  
+JB2Image::add_blit(const JB2Blit &blit)
+{
+  if (blit.shapeno >= (unsigned int)get_shape_count())
+    G_THROW( ERR_MSG("JB2Image.bad_shape") );
+  int index = blits.size();
+  blits.touch(index);
+  blits[index] = blit;
+  return index;
+}
+
+GP<GBitmap>
+JB2Image::get_bitmap(int subsample, int align) const
+{
+  if (width==0 || height==0)
+    G_THROW( ERR_MSG("JB2Image.cant_create") );
+  int swidth = (width + subsample - 1) / subsample;
+  int sheight = (height + subsample - 1) / subsample;
+  int border = ((swidth + align - 1) & ~(align - 1)) - swidth;
+  GP<GBitmap> bm = GBitmap::create(sheight, swidth, border);
+  bm->set_grays(1+subsample*subsample);
+  for (int blitno = 0; blitno < get_blit_count(); blitno++)
+    {
+      const JB2Blit *pblit = get_blit(blitno);
+      const JB2Shape  &pshape = get_shape(pblit->shapeno);
+      if (pshape.bits)
+        bm->blit(pshape.bits, pblit->left, pblit->bottom, subsample);
+    }
+  return bm;
+}
+
+GP<GBitmap>
+JB2Image::get_bitmap(const GRect &rect, int subsample, int align, int dispy) const
+{
+  if (width==0 || height==0)
+    G_THROW( ERR_MSG("JB2Image.cant_create") );
+  int rxmin = rect.xmin * subsample;
+  int rymin = rect.ymin * subsample;
+  int swidth = rect.width();
+  int sheight = rect.height();
+  int border = ((swidth + align - 1) & ~(align - 1)) - swidth;
+  GP<GBitmap> bm = GBitmap::create(sheight, swidth, border);
+  bm->set_grays(1+subsample*subsample);
+  for (int blitno = 0; blitno < get_blit_count(); blitno++)
+    {
+      const JB2Blit *pblit = get_blit(blitno);
+      const JB2Shape  &pshape = get_shape(pblit->shapeno);
+      if (pshape.bits)
+        bm->blit(pshape.bits, pblit->left-rxmin, pblit->bottom-rymin+dispy, subsample);
+    }
+  return bm;
+}
+
+void 
+JB2Image::decode(const GP<ByteStream> &gbs, JB2DecoderCallback *cb, void *arg)
+{
+  init();
+  JB2Codec::Decode codec;
+  codec.init(gbs);
+  codec.set_dict_callback(cb,arg);
+  codec.code(this);
+}
+
+
+
+////////////////////////////////////////
+//// CLASS JB2CODEC : IMPLEMENTATION
+////////////////////////////////////////
+
+
+
+#define START_OF_DATA                   (0)
+#define NEW_MARK                        (1)
+#define NEW_MARK_LIBRARY_ONLY           (2)
+#define NEW_MARK_IMAGE_ONLY             (3)
+#define MATCHED_REFINE                  (4)
+#define MATCHED_REFINE_LIBRARY_ONLY     (5)
+#define MATCHED_REFINE_IMAGE_ONLY       (6)
+#define MATCHED_COPY                    (7)
+#define NON_MARK_DATA                   (8)
+#define REQUIRED_DICT_OR_RESET          (9)
+#define PRESERVED_COMMENT               (10)
+#define END_OF_DATA                     (11)
+
+
+
+// STATIC DATA MEMBERS
+
+static const int BIGPOSITIVE = 262142;
+static const int BIGNEGATIVE = -262143;
+static const int CELLCHUNK = 20000;
+static const int CELLEXTRA =   500;
+
+
+// CONSTRUCTOR
+
+JB2Dict::JB2Codec::Decode::Decode(void)
+: JB2Dict::JB2Codec(0), cbfunc(0), cbarg(0) {}
+
+void
+JB2Dict::JB2Codec::Decode::init(const GP<ByteStream> &gbs)
+{
+  gzp=ZPCodec::create(gbs,false,true);
+}
+
+JB2Dict::JB2Codec::JB2Codec(const bool xencoding)
+  : encoding(xencoding),
+    cur_ncell(0),
+    gbitcells(bitcells,CELLCHUNK+CELLEXTRA),
+    gleftcell(leftcell,CELLCHUNK+CELLEXTRA),
+    grightcell(rightcell,CELLCHUNK+CELLEXTRA),
+    refinementp(false),
+    gotstartrecordp(0),
+    dist_comment_byte(0),
+    dist_comment_length(0),
+    dist_record_type(0),
+    dist_match_index(0),
+    dist_refinement_flag(0),
+    abs_loc_x(0),
+    abs_loc_y(0),
+    abs_size_x(0),
+    abs_size_y(0),
+    image_size_dist(0),
+    inherited_shape_count_dist(0),
+    offset_type_dist(0),
+    rel_loc_x_current(0),
+    rel_loc_x_last(0),
+    rel_loc_y_current(0),
+    rel_loc_y_last(0),
+    rel_size_x(0),
+    rel_size_y(0)
+{
+  memset(bitdist, 0, sizeof(bitdist));
+  memset(cbitdist, 0, sizeof(cbitdist));
+  // Initialize numcoder
+  bitcells[0] = 0; // dummy cell
+  leftcell[0] = rightcell[0] = 0;
+  cur_ncell = 1;
+}
+
+JB2Dict::JB2Codec::~JB2Codec() {}
+
+void 
+JB2Dict::JB2Codec::reset_numcoder()
+{
+  dist_comment_byte = 0;
+  dist_comment_length = 0;
+  dist_record_type = 0;
+  dist_match_index = 0;
+  abs_loc_x = 0;
+  abs_loc_y = 0;
+  abs_size_x = 0;
+  abs_size_y = 0;
+  image_size_dist = 0;
+  inherited_shape_count_dist = 0;
+  rel_loc_x_current = 0;
+  rel_loc_x_last = 0;
+  rel_loc_y_current = 0;
+  rel_loc_y_last = 0;
+  rel_size_x = 0;
+  rel_size_y = 0;
+  gbitcells.clear();
+  gleftcell.clear();
+  grightcell.clear();
+  cur_ncell = 1;
+}
+
+
+void 
+JB2Dict::JB2Codec::Decode::set_dict_callback(JB2DecoderCallback *cb, void *arg)
+{
+  cbfunc = cb;
+  cbarg = arg;
+}
+
+
+// CODE NUMBERS
+
+inline bool
+JB2Dict::JB2Codec::Decode::CodeBit(const bool, BitContext &ctx)
+{
+  return gzp->decoder(ctx)?true:false;
+}
+
+int
+JB2Dict::JB2Codec::Decode::CodeNum(int low, int high, NumContext &ctx)
+{
+  return JB2Codec::CodeNum(low,high,&ctx,0);
+}
+
+int
+JB2Dict::JB2Codec::CodeNum(int low, int high, NumContext *pctx, int v)
+{
+  bool negative=false;
+  int cutoff;
+  // Check
+  if (!pctx || ((int)*pctx >= cur_ncell))
+    G_THROW( ERR_MSG("JB2Image.bad_numcontext") );
+  // Start all phases
+  cutoff = 0;
+  for(int phase=1,range=0xffffffff;range != 1;)
+    {
+      if (! *pctx)
+        {
+          const int max_ncell=gbitcells;
+          if (cur_ncell >= max_ncell)
+            {
+              const int nmax_ncell = max_ncell+CELLCHUNK;
+              gbitcells.resize(nmax_ncell);
+              gleftcell.resize(nmax_ncell);
+              grightcell.resize(nmax_ncell);
+            }
+          *pctx = cur_ncell ++;
+          bitcells[*pctx] = 0;
+          leftcell[*pctx] = rightcell[*pctx] = 0;
+        }
+      // encode
+      const bool decision = encoding
+        ? ((low < cutoff && high >= cutoff)
+          ? CodeBit((v>=cutoff),bitcells[*pctx])
+          : (v >= cutoff))
+        : ((low>=cutoff)||((high>=cutoff)&&CodeBit(false,bitcells[*pctx])));
+      // context for new bit
+      pctx = decision?(&rightcell[*pctx]):(&leftcell[*pctx]);
+      // phase dependent part
+      switch (phase) 
+        {
+	case 1:
+          negative = !decision;
+          if (negative) 
+            {
+              if (encoding)
+                v = - v - 1;
+              const int temp = - low - 1; 
+              low = - high - 1; 
+              high = temp;
+	    }
+          phase = 2; cutoff =  1;
+          break;
+          
+	case 2:
+          if (!decision) 
+            {
+              phase = 3;
+              range = (cutoff + 1) / 2;
+              if (range == 1)
+                cutoff = 0;
+              else
+                cutoff -= range / 2;
+	    }
+          else 
+            { 
+              cutoff += cutoff + 1; 
+            }
+          break;
+
+	case 3:
+          range /= 2;
+          if (range != 1) 
+            {
+              if (!decision)
+                cutoff -= range / 2;
+              else               
+                cutoff += range / 2;
+	    }
+          else if (!decision) 
+            {
+                cutoff --;
+	    }
+          break;
+	}
+    }
+    return (negative)?(- cutoff - 1):cutoff;
+}
+
+
+
+// CODE COMMENTS
+
+void 
+JB2Dict::JB2Codec::Decode::code_comment(GUTF8String &comment)
+{
+      int size=CodeNum(0, BIGPOSITIVE, dist_comment_length);
+      comment.empty();
+      char *combuf = comment.getbuf(size);
+      for (int i=0; i<size; i++) 
+        {
+          combuf[i]=CodeNum(0, 255, dist_comment_byte);
+        }
+      comment.getbuf();
+}
+
+
+// LIBRARY
+
+
+void
+JB2Dict::JB2Codec::init_library(JB2Dict &jim)
+{
+  int nshape = jim.get_inherited_shape_count();
+  shape2lib.resize(0,nshape-1);
+  lib2shape.resize(0,nshape-1);
+  libinfo.resize(0,nshape-1);
+  for (int i=0; i<nshape; i++)
+    {
+      shape2lib[i] = i;
+      lib2shape[i] = i;
+      jim.get_bounding_box(i, libinfo[i]);
+    }
+}
+
+int 
+JB2Dict::JB2Codec::add_library(const int shapeno, JB2Shape &jshp)
+{
+  const int libno = lib2shape.hbound() + 1;
+  lib2shape.touch(libno);
+  lib2shape[libno] = shapeno;
+  shape2lib.touch(shapeno);
+  shape2lib[shapeno] = libno;
+  libinfo.touch(libno);
+  libinfo[libno].compute_bounding_box(*(jshp.bits));
+  return libno;
+}
+
+
+// CODE SIMPLE VALUES
+
+inline void 
+JB2Dict::JB2Codec::Decode::code_record_type(int &rectype)
+{
+  rectype=CodeNum( START_OF_DATA, END_OF_DATA, dist_record_type);
+}
+
+int 
+JB2Dict::JB2Codec::Decode::code_match_index(int &index, JB2Dict &)
+{
+    int match=CodeNum(0, lib2shape.hbound(), dist_match_index);
+    index = lib2shape[match];
+    return match;
+}
+
+
+// HANDLE SHORT LIST
+
+int 
+JB2Dict::JB2Codec::update_short_list(const int v)
+{
+  if (++ short_list_pos == 3)
+    short_list_pos = 0;
+  int * const s = short_list;
+  s[short_list_pos] = v;
+
+  return (s[0] >= s[1])
+    ?((s[0] > s[2])?((s[1] >= s[2])?s[1]:s[2]):s[0])
+    :((s[0] < s[2])?((s[1] >= s[2])?s[2]:s[1]):s[0]);
+}
+
+
+
+// CODE PAIRS
+
+
+void
+JB2Dict::JB2Codec::Decode::code_inherited_shape_count(JB2Dict &jim)
+{
+  int size=CodeNum(0, BIGPOSITIVE, inherited_shape_count_dist);
+    {
+      GP<JB2Dict> dict = jim.get_inherited_dict();
+      if (!dict && size>0)
+        {
+          // Call callback function to obtain dictionary
+          if (cbfunc)
+            dict = (*cbfunc)(cbarg);
+          if (dict)
+            jim.set_inherited_dict(dict);
+        }
+      if (!dict && size>0)
+        G_THROW( ERR_MSG("JB2Image.need_dict") );
+      if (dict && size!=dict->get_shape_count())
+        G_THROW( ERR_MSG("JB2Image.bad_dict") );
+    }
+}
+
+void 
+JB2Dict::JB2Codec::Decode::code_image_size(JB2Dict &jim)
+{
+  int w=CodeNum(0, BIGPOSITIVE, image_size_dist);
+  int h=CodeNum(0, BIGPOSITIVE, image_size_dist);
+  if (w || h)
+    G_THROW( ERR_MSG("JB2Image.bad_dict2") );
+  JB2Codec::code_image_size(jim);
+}
+
+void 
+JB2Dict::JB2Codec::code_image_size(JB2Dict &)
+{
+  last_left = 1;
+  last_row_left = 0;
+  last_row_bottom = 0;
+  last_right = 0;
+  fill_short_list(last_row_bottom);
+  gotstartrecordp = 1;
+}
+
+void 
+JB2Dict::JB2Codec::Decode::code_image_size(JB2Image &jim)
+{
+  image_columns=CodeNum(0, BIGPOSITIVE, image_size_dist);
+  image_rows=CodeNum(0, BIGPOSITIVE, image_size_dist);
+  if (!image_columns || !image_rows)
+    G_THROW( ERR_MSG("JB2Image.zero_dim") );
+  jim.set_dimension(image_columns, image_rows);
+  JB2Codec::code_image_size(jim);
+}
+
+void 
+JB2Dict::JB2Codec::code_image_size(JB2Image &)
+{
+  last_left = 1 + image_columns;
+  last_row_left = 0;
+  last_row_bottom = image_rows;
+  last_right = 0;
+  fill_short_list(last_row_bottom);
+  gotstartrecordp = 1;
+}
+
+inline int
+JB2Dict::JB2Codec::Decode::get_diff(int,NumContext &rel_loc)
+{
+   return CodeNum(BIGNEGATIVE, BIGPOSITIVE, rel_loc);
+}
+
+void 
+JB2Dict::JB2Codec::code_relative_location(JB2Blit *jblt, int rows, int columns)
+{
+  // Check start record
+  if (!gotstartrecordp)
+    G_THROW( ERR_MSG("JB2Image.no_start") );
+  // Find location
+  int bottom=0, left=0, top=0, right=0;
+  int x_diff, y_diff;
+  if (encoding)
+    {
+      left = jblt->left + 1;
+      bottom = jblt->bottom + 1;
+      right = left + columns - 1;
+      top = bottom + rows - 1;
+    }
+  // Code offset type
+  int new_row=CodeBit((left<last_left), offset_type_dist);
+  if (new_row)
+    {
+      // Begin a new row
+      x_diff=get_diff(left-last_row_left,rel_loc_x_last);
+      y_diff=get_diff(top-last_row_bottom,rel_loc_y_last);
+      if (!encoding)
+        {
+          left = last_row_left + x_diff;
+          top = last_row_bottom + y_diff;
+          right = left + columns - 1;
+          bottom = top - rows + 1;
+        }
+      last_left = last_row_left = left;
+      last_right = right;
+      last_bottom = last_row_bottom = bottom;
+      fill_short_list(bottom);
+    }
+  else
+    {
+      // Same row
+      x_diff=get_diff(left-last_right,rel_loc_x_current);
+      y_diff=get_diff(bottom-last_bottom,rel_loc_y_current);
+      if (!encoding)
+        {
+          left = last_right + x_diff;
+          bottom = last_bottom + y_diff;
+          right = left + columns - 1;
+          top = bottom + rows - 1;
+        }
+      last_left = left;
+      last_right = right;
+      last_bottom = update_short_list(bottom);
+    }
+  // Store in blit record
+  if (!encoding)
+    {
+      jblt->bottom = bottom - 1;
+      jblt->left = left - 1;
+    }
+}
+
+void 
+JB2Dict::JB2Codec::Decode::code_absolute_location(JB2Blit *jblt, int rows, int columns)
+{
+  // Check start record
+  if (!gotstartrecordp)
+    G_THROW( ERR_MSG("JB2Image.no_start") );
+  int left=CodeNum(1, image_columns, abs_loc_x);
+  int top=CodeNum(1, image_rows, abs_loc_y);
+  jblt->bottom = top - rows + 1 - 1;
+  jblt->left = left - 1;
+}
+
+void 
+JB2Dict::JB2Codec::Decode::code_absolute_mark_size(GBitmap &bm, int border)
+{
+  int xsize=CodeNum(0, BIGPOSITIVE, abs_size_x);
+  int ysize=CodeNum(0, BIGPOSITIVE, abs_size_y);
+  if ((xsize!=(unsigned short)xsize) || (ysize!=(unsigned short)ysize))
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  bm.init(ysize, xsize, border);
+}
+
+void 
+JB2Dict::JB2Codec::Decode::code_relative_mark_size(GBitmap &bm, int cw, int ch, int border)
+{
+  int xdiff=CodeNum(BIGNEGATIVE, BIGPOSITIVE, rel_size_x);
+  int ydiff=CodeNum(BIGNEGATIVE, BIGPOSITIVE, rel_size_y);
+  int xsize = cw + xdiff;
+  int ysize = ch + ydiff;
+  if ((xsize!=(unsigned short)xsize) || (ysize!=(unsigned short)ysize))
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  bm.init(ysize, xsize, border);
+}
+
+
+
+
+// CODE BITMAP DIRECTLY
+
+void 
+JB2Dict::JB2Codec::code_bitmap_directly (GBitmap &bm)
+{
+  // Make sure bitmap will not be disturbed
+  GMonitorLock lock(bm.monitor());
+  // ensure borders are adequate
+  bm.minborder(3);
+  // initialize row pointers
+  int dy = bm.rows() - 1;
+  code_bitmap_directly(bm,bm.columns(),dy,bm[dy+2],bm[dy+1],bm[dy]);
+}
+
+void 
+JB2Dict::JB2Codec::Decode::code_bitmap_directly(
+  GBitmap &bm,const int dw, int dy,
+  unsigned char *up2, unsigned char *up1, unsigned char *up0 )
+{
+      ZPCodec &zp=*gzp;
+      // iterate on rows (decoding)      
+      while (dy >= 0)
+        {
+          int context=get_direct_context(up2, up1, up0, 0);
+          for(int dx=0;dx < dw;)
+            {
+              int n = zp.decoder(bitdist[context]);
+              up0[dx++] = n;
+              context=shift_direct_context(context, n, up2, up1, up0, dx);
+            }
+          // next row
+          dy -= 1;
+          up2 = up1;
+          up1 = up0;
+          up0 = bm[dy];
+        }
+#ifndef NDEBUG
+      bm.check_border();
+#endif
+}
+
+
+
+
+
+// CODE BITMAP BY CROSS CODING
+
+void 
+JB2Dict::JB2Codec::code_bitmap_by_cross_coding (GBitmap &bm, GP<GBitmap> &cbm, const int libno)
+{
+  // Make sure bitmaps will not be disturbed
+  GP<GBitmap> copycbm=GBitmap::create();
+  if (cbm->monitor())
+    {
+      // Perform a copy when the bitmap is explicitely shared
+      GMonitorLock lock2(cbm->monitor());
+      copycbm->init(*cbm);
+      cbm = copycbm;
+    }
+  GMonitorLock lock1(bm.monitor());
+  // Center bitmaps
+  const int cw = cbm->columns();
+  const int dw = bm.columns();
+  const int dh = bm.rows();
+  const LibRect &l = libinfo[libno];
+  const int xd2c = (dw/2 - dw + 1) - ((l.right - l.left + 1)/2 - l.right);
+  const int yd2c = (dh/2 - dh + 1) - ((l.top - l.bottom + 1)/2 - l.top);
+  // Ensure borders are adequate
+  bm.minborder(2);
+  cbm->minborder(2-xd2c);
+  cbm->minborder(2+dw+xd2c-cw);
+  // Initialize row pointers
+  const int dy = dh - 1;
+  const int cy = dy + yd2c;
+#ifndef NDEBUG
+  bm.check_border();
+  cbm->check_border();
+#endif
+  code_bitmap_by_cross_coding (bm,*cbm, xd2c, dw, dy, cy, bm[dy+1], bm[dy],
+    (*cbm)[cy+1] + xd2c, (*cbm)[cy  ] + xd2c, (*cbm)[cy-1] + xd2c);
+}
+
+void 
+JB2Dict::JB2Codec::Decode::code_bitmap_by_cross_coding (GBitmap &bm, GBitmap &cbm,
+  const int xd2c, const int dw, int dy, int cy,
+  unsigned char *up1, unsigned char *up0, unsigned char *xup1, 
+  unsigned char *xup0, unsigned char *xdn1 )
+{
+      ZPCodec &zp=*gzp;
+      // iterate on rows (decoding)      
+      while (dy >= 0)
+        {
+          int context=get_cross_context(
+                            up1, up0, xup1, xup0, xdn1, 0);
+          for(int dx=0;dx < dw;)
+            {
+              const int n = zp.decoder(cbitdist[context]);
+              up0[dx++] = n;
+              context=shift_cross_context(context, n,  
+                                  up1, up0, xup1, xup0, xdn1, dx);
+            }
+          // next row
+          up1 = up0;
+          up0 = bm[--dy];
+          xup1 = xup0;
+          xup0 = xdn1;
+          xdn1 = cbm[(--cy)-1] + xd2c;
+#ifndef NDEBUG
+          bm.check_border();
+#endif
+        }
+}
+
+
+
+
+// CODE JB2DICT RECORD
+
+void
+JB2Dict::JB2Codec::code_record(
+  int &rectype, const GP<JB2Dict> &gjim, JB2Shape *xjshp)
+{
+  GP<GBitmap> cbm;
+  GP<GBitmap> bm;
+  int shapeno = -1;
+
+  // Code record type
+  code_record_type(rectype);
+  
+  // Pre-coding actions
+  switch(rectype)
+    {
+    case NEW_MARK_LIBRARY_ONLY:
+    case MATCHED_REFINE_LIBRARY_ONLY:
+      {
+        if(!xjshp)
+        {
+          G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Shape &jshp=*xjshp;
+        if (!encoding) 
+        {
+          jshp.bits = GBitmap::create();
+          jshp.parent = -1;
+        }
+        bm = jshp.bits;
+        break;
+      }
+    }
+  // Coding actions
+  switch (rectype)
+    {
+    case START_OF_DATA:
+      {
+        if(!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Dict &jim=*gjim;
+        code_image_size (jim);
+        code_eventual_lossless_refinement ();
+        if (! encoding)
+          init_library(jim);
+        break;
+      }
+    case NEW_MARK_LIBRARY_ONLY:
+      {
+        code_absolute_mark_size (*bm, 4);
+        code_bitmap_directly (*bm);
+        break;
+      }
+    case MATCHED_REFINE_LIBRARY_ONLY:
+      {
+        if(!xjshp||!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Dict &jim=*gjim;
+        JB2Shape &jshp=*xjshp;
+        int match = code_match_index (jshp.parent, jim);
+        cbm = jim.get_shape(jshp.parent).bits;
+        LibRect &l = libinfo[match];
+        code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4);
+        code_bitmap_by_cross_coding (*bm, cbm, jshp.parent);
+        break;
+      }
+    case PRESERVED_COMMENT:
+      {
+        if(!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Dict &jim=*gjim;
+        code_comment(jim.comment);
+        break;
+      }
+    case REQUIRED_DICT_OR_RESET:
+      {
+        if (! gotstartrecordp)
+        {
+	  // Indicates need for a shape dictionary
+          if(!gjim)
+          {
+             G_THROW( ERR_MSG("JB2Image.bad_number") );
+          }
+	  code_inherited_shape_count(*gjim);
+        }else
+	  // Reset all numerical contexts to zero
+	  reset_numcoder();
+        break;
+      }
+    case END_OF_DATA:
+      {
+        break;
+      }
+    default:
+      {
+        G_THROW( ERR_MSG("JB2Image.bad_type") );
+      }
+    }
+  // Post-coding action
+  if (!encoding)
+    {
+      // add shape to dictionary
+      switch(rectype)
+        {
+        case NEW_MARK_LIBRARY_ONLY:
+        case MATCHED_REFINE_LIBRARY_ONLY:
+          {
+            if(!xjshp||!gjim)
+            {
+               G_THROW( ERR_MSG("JB2Image.bad_number") );
+            }
+            JB2Shape &jshp=*xjshp;
+            shapeno = gjim->add_shape(jshp);
+            add_library(shapeno, jshp);
+            break;
+          }
+        }
+      // make sure everything is compacted
+      // decompaction will occur automatically when needed
+      if (bm)
+        bm->compress();
+    }
+}
+
+
+// CODE JB2DICT
+
+void 
+JB2Dict::JB2Codec::Decode::code(const GP<JB2Dict> &gjim)
+{
+  if(!gjim)
+  {
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  }
+  JB2Dict &jim=*gjim;
+  // -------------------------
+  // THIS IS THE DECODING PART
+  // -------------------------
+  int rectype;
+  JB2Shape tmpshape;
+  do {
+    code_record(rectype, gjim, &tmpshape);        
+  } while(rectype != END_OF_DATA);
+  if (!gotstartrecordp)
+    G_THROW( ERR_MSG("JB2Image.no_start") );
+  // cache bounding boxes
+  int nshapes = jim.get_shape_count();
+  int ishapes = jim.get_inherited_shape_count();
+  jim.boxes.resize(0, nshapes-ishapes-1);
+  for (int i = ishapes; i < nshapes; i++)
+    jim.boxes[i-ishapes] = libinfo[i];
+  // compress
+  jim.compress();
+}
+
+
+
+// CODE JB2IMAGE RECORD
+
+void
+JB2Dict::JB2Codec::code_record(
+  int &rectype, const GP<JB2Image> &gjim, JB2Shape *xjshp, JB2Blit *jblt)
+{
+  GP<GBitmap> bm;
+  GP<GBitmap> cbm;
+  int shapeno = -1;
+  int match;
+
+  // Code record type
+  code_record_type(rectype);
+  
+  // Pre-coding actions
+  switch(rectype)
+    {
+    case NEW_MARK:
+    case NEW_MARK_LIBRARY_ONLY:
+    case NEW_MARK_IMAGE_ONLY:
+    case MATCHED_REFINE:
+    case MATCHED_REFINE_LIBRARY_ONLY:
+    case MATCHED_REFINE_IMAGE_ONLY:
+    case NON_MARK_DATA:
+      {
+        if(!xjshp)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Shape &jshp=*xjshp;
+        if (!encoding) 
+        {
+          jshp.bits = GBitmap::create();
+          jshp.parent = -1;
+          if (rectype == NON_MARK_DATA)
+            jshp.parent = -2;
+        }
+        bm = jshp.bits;
+        break;
+      }
+    }
+  // Coding actions
+  switch (rectype)
+    {
+    case START_OF_DATA:
+      {
+        if(!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Image &jim=*gjim;
+        code_image_size (jim);
+        code_eventual_lossless_refinement ();
+        if (! encoding)
+          init_library(jim);
+        break;
+      }
+    case NEW_MARK:
+      {
+        code_absolute_mark_size (*bm, 4);
+        code_bitmap_directly (*bm);
+        code_relative_location (jblt, bm->rows(), bm->columns() );
+        break;
+      }
+    case NEW_MARK_LIBRARY_ONLY:
+      {
+        code_absolute_mark_size (*bm, 4);
+        code_bitmap_directly (*bm);
+        break;
+      }
+    case NEW_MARK_IMAGE_ONLY:
+      {
+        code_absolute_mark_size (*bm, 3);
+        code_bitmap_directly (*bm);
+        code_relative_location (jblt, bm->rows(), bm->columns() );
+        break;
+      }
+    case MATCHED_REFINE:
+      {
+        if(!xjshp || !gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Shape &jshp=*xjshp;
+        JB2Image &jim=*gjim;
+        match = code_match_index (jshp.parent, jim);
+        cbm = jim.get_shape(jshp.parent).bits;
+        LibRect &l = libinfo[match];
+        code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); 
+        code_bitmap_by_cross_coding (*bm, cbm, match);
+        code_relative_location (jblt, bm->rows(), bm->columns() );
+        break;
+      }
+    case MATCHED_REFINE_LIBRARY_ONLY:
+      {
+        if(!xjshp||!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Image &jim=*gjim;
+        JB2Shape &jshp=*xjshp;
+        match = code_match_index (jshp.parent, jim);
+        cbm = jim.get_shape(jshp.parent).bits;
+        LibRect &l = libinfo[match];
+        code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4);
+        break;
+      }
+    case MATCHED_REFINE_IMAGE_ONLY:
+      {
+        if(!xjshp||!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Image &jim=*gjim;
+        JB2Shape &jshp=*xjshp;
+        match = code_match_index (jshp.parent, jim);
+        cbm = jim.get_shape(jshp.parent).bits;
+        LibRect &l = libinfo[match];
+        code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4);
+        code_bitmap_by_cross_coding (*bm, cbm, match);
+        code_relative_location (jblt, bm->rows(), bm->columns() );
+        break;
+      }
+    case MATCHED_COPY:
+      {
+        int temp;
+        if (encoding) temp = jblt->shapeno;
+        if(!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Image &jim=*gjim;
+        match = code_match_index (temp, jim);
+        if (!encoding) jblt->shapeno = temp;
+        bm = jim.get_shape(jblt->shapeno).bits;
+        LibRect &l = libinfo[match];
+        jblt->left += l.left;
+        jblt->bottom += l.bottom;
+        if (jim.reproduce_old_bug)
+          code_relative_location (jblt, bm->rows(), bm->columns() );
+        else
+          code_relative_location (jblt, l.top-l.bottom+1, l.right-l.left+1 );
+        jblt->left -= l.left;
+        jblt->bottom -= l.bottom; 
+        break;
+      }
+    case NON_MARK_DATA:
+      {
+        code_absolute_mark_size (*bm, 3);
+        code_bitmap_directly (*bm);
+        code_absolute_location (jblt, bm->rows(), bm->columns() );
+        break;
+      }
+    case PRESERVED_COMMENT:
+      {
+        if(!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Image &jim=*gjim;
+        code_comment(jim.comment);
+        break;
+      }
+    case REQUIRED_DICT_OR_RESET:
+      {
+        if(!gjim)
+        {
+           G_THROW( ERR_MSG("JB2Image.bad_number") );
+        }
+        JB2Image &jim=*gjim;
+        if (! gotstartrecordp)
+	  // Indicates need for a shape dictionary
+	  code_inherited_shape_count(jim);
+	else
+	  // Reset all numerical contexts to zero
+	  reset_numcoder();
+        break;
+      }
+    case END_OF_DATA:
+      {
+        break;
+      }
+    default:
+      {
+        G_THROW( ERR_MSG("JB2Image.unknown_type") );
+      }
+    }
+  
+  // Post-coding action
+  if (!encoding)
+    {
+      // add shape to image
+      switch(rectype)
+        {
+        case NEW_MARK:
+        case NEW_MARK_LIBRARY_ONLY:
+        case NEW_MARK_IMAGE_ONLY:
+        case MATCHED_REFINE:
+        case MATCHED_REFINE_LIBRARY_ONLY:
+        case MATCHED_REFINE_IMAGE_ONLY:
+        case NON_MARK_DATA:
+          {
+            if(!xjshp||!gjim)
+            {
+              G_THROW( ERR_MSG("JB2Image.bad_number") );
+            }
+            JB2Shape &jshp=*xjshp;
+            shapeno = gjim->add_shape(jshp);
+            shape2lib.touch(shapeno);
+            shape2lib[shapeno] = -1;
+            break;
+          }
+        }
+      // add shape to library
+      switch(rectype)
+        {
+        case NEW_MARK:
+        case NEW_MARK_LIBRARY_ONLY:
+        case MATCHED_REFINE:
+        case MATCHED_REFINE_LIBRARY_ONLY:
+          if(!xjshp)
+          {
+            G_THROW( ERR_MSG("JB2Image.bad_number") );
+          }
+          add_library(shapeno, *xjshp);
+          break;
+        }
+      // make sure everything is compacted
+      // decompaction will occur automatically on cross-coding bitmaps
+      if (bm)
+        bm->compress();
+      // add blit to image
+      switch (rectype)
+        {
+        case NEW_MARK:
+        case NEW_MARK_IMAGE_ONLY:
+        case MATCHED_REFINE:
+        case MATCHED_REFINE_IMAGE_ONLY:
+        case NON_MARK_DATA:
+          jblt->shapeno = shapeno;
+        case MATCHED_COPY:
+          if(!gjim)
+          {
+            G_THROW( ERR_MSG("JB2Image.bad_number") );
+          }
+          gjim->add_blit(* jblt);
+          break;
+        }
+    }
+}
+
+
+// CODE JB2IMAGE
+
+void 
+JB2Dict::JB2Codec::Decode::code(const GP<JB2Image> &gjim)
+{
+  if(!gjim)
+  {
+    G_THROW( ERR_MSG("JB2Image.bad_number") );
+  }
+  JB2Image &jim=*gjim;
+      // -------------------------
+      // THIS IS THE DECODING PART
+      // -------------------------
+      int rectype;
+      JB2Blit tmpblit;
+      JB2Shape tmpshape;
+      do
+        {
+          code_record(rectype, gjim, &tmpshape, &tmpblit);        
+        } 
+      while(rectype!=END_OF_DATA);
+      if (!gotstartrecordp)
+        G_THROW( ERR_MSG("JB2Image.no_start") );
+      jim.compress();
+}
+
+
+
+////////////////////////////////////////
+//// HELPERS
+////////////////////////////////////////
+
+void 
+JB2Dict::LibRect::compute_bounding_box(const GBitmap &bm)
+{
+  // Avoid trouble
+  GMonitorLock lock(bm.monitor());
+  // Get size
+  const int w = bm.columns();
+  const int h = bm.rows();
+  const int s = bm.rowsize();
+  // Right border
+  for(right=w-1;right >= 0;--right)
+    {
+      unsigned char const *p = bm[0] + right;
+      unsigned char const * const pe = p+(s*h);
+      for (;(p<pe)&&(!*p);p+=s)
+      	continue;
+      if (p<pe)
+        break;
+    }
+  // Top border
+  for(top=h-1;top >= 0;--top)
+    {
+      unsigned char const *p = bm[top];
+      unsigned char const * const pe = p+w;
+      for (;(p<pe)&&(!*p); ++p)
+      	continue;
+      if (p<pe)
+        break;
+    }
+  // Left border
+  for (left=0;left <= right;++left)
+    {
+      unsigned char const *p = bm[0] + left;
+      unsigned char const * const pe=p+(s*h);
+      for (;(p<pe)&&(!*p);p+=s)
+      	continue;
+      if (p<pe)
+        break;
+    }
+  // Bottom border
+  for(bottom=0;bottom <= top;++bottom)
+    {
+      unsigned char const *p = bm[bottom];
+      unsigned char const * const pe = p+w;
+      for (;(p<pe)&&(!*p); ++p)
+      	continue;
+      if (p<pe)
+        break;
+    }
+}
+
+
+void
+JB2Dict::get_bounding_box(int shapeno, LibRect &dest)
+{
+  if (shapeno < inherited_shapes && inherited_dict)
+    {
+      inherited_dict->get_bounding_box(shapeno, dest);
+    }
+  else if (shapeno >= inherited_shapes &&
+           shapeno < inherited_shapes + boxes.size())
+    {
+      dest = boxes[shapeno - inherited_shapes];
+    }
+  else
+    {
+      JB2Shape &jshp = get_shape(shapeno);
+      dest.compute_bounding_box(*(jshp.bits));
+    }
+}
+
+
+GP<JB2Dict>
+JB2Dict::create(void)
+{
+  return new JB2Dict();
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/JB2Image.h b/libdjvu/JB2Image.h
new file mode 100644
index 0000000..a87a83b
--- /dev/null
+++ b/libdjvu/JB2Image.h
@@ -0,0 +1,805 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _JB2IMAGE_H
+#define _JB2IMAGE_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+/** @name JB2Image.h
+
+    Files #"JB2Image.h"# and #"JB2Image.cpp"# address the compression of
+    bilevel images using the JB2 soft pattern matching scheme.  These files
+    provide the complete decoder and the decoder back-end.  The JB2 scheme is
+    optimized for images containing a large number of self-similar small
+    components such as characters.  Typical text images can be compressed into
+    files 3 to 5 times smaller than with G4/MMR and 2 to 4 times smaller than
+    with JBIG1.
+
+    {\bf JB2 and JBIG2} --- JB2 has strong similarities with the forthcoming
+    JBIG2 standard developed by the "ISO/IEC JTC1 SC29 Working Group 1" which
+    is responsible for both the JPEG and JBIG standards.  This is hardly
+    surprising since JB2 was our own proposal for the JBIG2 standard
+    and remained the only proposal for years.  The full JBIG2 standard however
+    is significantly more complex and slighlty less efficient than JB2 because
+    it addresses a broader range of applications.  Full JBIG2 compliance may
+    be implemented in the future.
+
+    {\bf JB2 Images} --- Class \Ref{JB2Image} is the central data structure
+    implemented here.  A #JB2Image# is composed of an array of shapes
+    and an array of blits.  Each shape contains a small bitmap representing an
+    elementary blob of ink, such as a character or a segment of line art.
+    Each blit instructs the decoder to render a particular shape at a
+    specified position in the image.  Some compression is already achieved
+    because several blits can refer to the same shape.  A shape can also
+    contain a pointer to a parent shape.  Additional compression is achieved
+    when both shapes are similar because each shape is encoded using the
+    parent shape as a model.  A #"O"# shape for instance could be a parent for
+    both a #"C"# shape and a #"Q"# shape.
+
+    {\bf JB2 Dictionary} --- Class \Ref{JB2Dict} is a peculiar kind of
+    JB2Image which only contains an array of shapes.  These shapes can be
+    referenced from another JB2Dict/JB2Image.  This is arranged by setting the
+    ``inherited dictionary'' of a JB2Dict/JB2Image using function
+    \Ref{JB2Dict::set_inherited_dict}. Several JB2Images can use shapes from a
+    same JB2Dict encoded separately.  This is how several pages of a same
+    document can share information.
+    
+    {\bf Decoding JB2 data} --- The first step for decoding JB2 data consists of 
+    creating an empty #JB2Image# object.  Function \Ref{JB2Image::decode} then
+    reads the data and populates the #JB2Image# with the shapes and the blits.
+    Function \Ref{JB2Image::get_bitmap} finally produces an anti-aliased image.
+
+    {\bf Encoding JB2 data} --- The first step for decoding JB2 data also
+    consists of creating an empty #JB2Image# object.  You must then use
+    functions \Ref{JB2Image::add_shape} and \Ref{JB2Image::add_blit} to
+    populate the #JB2Image# object.  Function \Ref{JB2Image::encode} finally
+    produces the JB2 data.  Function #encode# sequentially encodes the blits
+    and the necessary shapes.  The compression ratio depends on several
+    factors:
+    \begin{itemize}
+    \item Blits should reuse shapes as often as possible.
+    \item Blits should be sorted in reading order because this facilitates
+          the prediction of the blit coordinates.
+    \item Shapes should be sorted according to the order of first appearance
+          in the sequence of blits because this facilitates the prediction of the
+          shape indices.
+    \item Shapes should be compared to all previous shapes in the shape array.
+          The shape parent pointer should be set to a suitable parent shape if
+          such a parent shape exists.  The parent shape should have almost the
+          same size and the same pixels.
+    \end{itemize}
+    All this is quite easy to achieve in the case of an electronically
+    produced document such as a DVI file or a PS file: we know what the
+    characters are and where they are located.  If you only have a scanned
+    image however you must first locate the characters (connected component
+    analysis) and cut the remaining pieces of ink into smaller blobs.
+    Ordering the blits and matching the shapes is then an essentially
+    heuristic process.  Although the quality of the heuristics substantially
+    effects the file size, misordering blits or mismatching shapes never
+    effects the quality of the image.  The last refinement consists in
+    smoothing the shapes in order to reduce the noise and maximize the
+    similarities between shapes.
+    
+    {\bf JB2 extensions} --- Two extensions of the JB2
+    encoding format have been introduced with DjVu files version 21. The first
+    extension addresses the shared shape dictionaries. The second extension
+    bounds the number of probability contexts used for coding numbers.
+    Both extensions maintain backward compatibility with JB2 as 
+    described in the ICFDD proposal. A more complete discussion
+    can be found in section \Ref{JB2 extensions for version 21.}.
+
+    {\bf References} 
+    \begin{itemize}
+    \item Paul G. Howard : {\em Text image compression using soft 
+          pattern matching}, Computer Journal, volume 40:2/3, 1997.
+    \item JBIG1 : \URL{http://www.jpeg.org/public/jbighomepage.htm}.
+    \item JBIG2 draft : \URL{http://www.jpeg.org/public/jbigpt2.htm}.
+    \item ICFDD Draft Proposed American National Standard, 1999-08-26.
+    \end{itemize}
+
+    @memo
+    Coding bilevel images with JB2.
+    @author
+    Paul Howard <pgh@research.att.com> -- JB2 design\\
+    L\'eon Bottou <leonb@research.att.com> -- this implementation 
+
+// From: Leon Bottou, 1/31/2002
+// Lizardtech has split the corresponding cpp file into a decoder and an encoder.
+// Only superficial changes.  The meat is mine.
+
+*/
+//@{
+
+
+#include "GString.h"
+#include "ZPCodec.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class JB2Dict;
+class JB2Image;
+class GRect;
+class GBitmap;
+class ByteStream;
+
+/** Blit data structure.  A #JB2Image# contains an array of #JB2Blit# data
+    structures.  Each array entry instructs the decoder to render a particular
+    shape at a particular location.  Members #left# and #bottom# specify the
+    coordinates of the bottom left corner of the shape bitmap.  All
+    coordinates are relative to the bottom left corner of the image.  Member
+    #shapeno# is the subscript of the shape to be rendered.  */
+
+class DJVUAPI JB2Blit {
+public:
+  /** Horizontal coordinate of the blit. */
+  unsigned short left;
+  /** Vertical coordinate of the blit. */
+  unsigned short bottom;
+  /** Index of the shape to blit. */
+  unsigned int shapeno;
+};
+
+
+/** Shape data structure.  A #JB2Image# contains an array of #JB2Shape# data
+    structures.  Each array entry represents an elementary blob of ink such as
+    a character or a segment of line art.  Member #bits# points to a bilevel
+    image representing the shape pixels.  Member #parent# is the subscript of
+    the parent shape.  */
+
+class DJVUAPI JB2Shape
+{ 
+public: 
+  /** Subscript of the parent shape.  The parent shape must always be located
+      before the current shape in the shape array.  A negative value indicates
+      that this shape has no parent.  Any negative values smaller than #-1#
+      further indicates that this shape does not look like a character.  This
+      is used to enable a few internal optimizations.  This information is
+      saved into the JB2 file, but the actual value of the #parent# variable
+      is not. */
+  int parent; 
+  /** Bilevel image of the shape pixels.  This must be a pointer to a bilevel
+      #GBitmap# image.  This pointer can also be null. The encoder will just
+      silently discard all blits referring to a shape containing a null
+      bitmap. */
+  GP<GBitmap> bits;
+  /** Private user data. This long word is provided as a convenience for users
+      of the JB2Image data structures.  Neither the rendering functions nor
+      the coding functions ever access this value. */
+  long userdata;
+};
+
+
+
+/** JB2 Dictionary callback.
+    The decoding function call this callback function when they discover that
+    the current JB2Image or JB2Dict needs a pre-existing shape dictionary. 
+    The callback function must return a pointer to the dictionary or NULL
+    if none is found. */
+
+typedef GP<JB2Dict> JB2DecoderCallback ( void* );
+
+
+/** Dictionary of JB2 shapes. */
+
+class DJVUAPI JB2Dict : public GPEnabled
+{
+protected:
+  JB2Dict(void);
+public:
+  class JB2Codec;
+
+  // CONSTRUCTION
+  /** Default creator.  Constructs an empty #JB2Dict# object.  You can then
+      call the decoding function #decode#.  You can also manually set the
+      image size using #add_shape#. */
+  static GP<JB2Dict> create(void);
+
+  // INITIALIZATION
+  /** Resets the #JB2Image# object.  This function reinitializes both the shape
+     and the blit arrays.  All allocated memory is freed. */
+  void init(void);
+
+  // INHERITED
+  /** Returns the inherited dictionary. */
+  GP<JB2Dict> get_inherited_dict(void) const;
+  /** Returns the number of inherited shapes. */
+  int get_inherited_shape_count(void) const;
+  /** Sets the inherited dictionary. */
+  void set_inherited_dict(const GP<JB2Dict> &dict);
+
+  // ACCESSING THE SHAPE LIBRARY
+  /** Returns the total number of shapes.
+      Shape indices range from #0# to #get_shape_count()-1#. */
+  int get_shape_count(void) const;
+  /** Returns a pointer to shape #shapeno#.
+      The returned pointer directly points into the shape array.
+      This pointer can be used for reading or writing the shape data. */
+  JB2Shape &get_shape(const int shapeno);
+  /** Returns a constant pointer to shape #shapeno#.
+      The returned pointer directly points into the shape array.
+      This pointer can only be used for reading the shape data. */
+  const JB2Shape &get_shape(const int shapeno) const;
+  /** Appends a shape to the shape array.  This function appends a copy of
+      shape #shape# to the shape array and returns the subscript of the new
+      shape.  The subscript of the parent shape #shape.parent# must 
+      actually designate an already existing shape. */
+  int  add_shape(const JB2Shape &shape);
+
+  // MEMORY OPTIMIZATION
+  /** Compresses all shape bitmaps.  This function reduces the memory required
+      by the #JB2Image# by calling \Ref{GBitmap::compress} on all shapes
+      bitmaps.  This function is best called after decoding a #JB2Image#,
+      because function \Ref{get_bitmap} can directly use the compressed
+      bitmaps.  */
+  void compress(void);
+  /** Returns the total memory used by the JB2Image.
+      The returned value is expressed in bytes. */
+  unsigned int get_memory_usage(void) const;
+
+  // CODING
+  /** Encodes the JB2Dict into ByteStream #bs#.  
+      This function generates the JB2 data stream without any header.   */
+  void encode(const GP<ByteStream> &gbs) const;
+  /** Decodes JB2 data from ByteStream #bs#. This function decodes the image
+      size and populates the shape and blit arrays.  The callback function
+      #cb# is called when the decoder determines that the ByteStream data
+      requires a shape dictionary which has not been set with
+      \Ref{JB2Dict::set_inherited_dict}. The callback receives argument #arg#
+      and must return a suitable dictionary which will be installed as the
+      inherited dictionary.  The callback should return null if no such
+      dictionary is found. */
+  void decode(const GP<ByteStream> &gbs, JB2DecoderCallback *cb=0, void *arg=0);
+
+  
+public:
+  /** Comment string coded by JB2 file. */
+  GUTF8String comment;
+
+
+private:
+  friend class JB2Codec;
+  int inherited_shapes;
+  GP<JB2Dict> inherited_dict;
+  GArray<JB2Shape> shapes;
+
+  struct LibRect {
+    int top,left,right,bottom;
+    void compute_bounding_box(const GBitmap &cbm);
+  };
+  GTArray<LibRect> boxes;
+  void get_bounding_box(int shapeno, LibRect &dest);
+};
+
+/** Main JB2 data structure.  Each #JB2Image# consists of an array of shapes
+    and an array of blits.  These arrays can be populated by hand using
+    functions \Ref{add_shape} and \Ref{add_blit}, or by decoding JB2 data
+    using function \Ref{decode}.  You can then use function \Ref{get_bitmap}
+    to render anti-aliased images, or use function \Ref{encode} to generate
+    JB2 data. */
+
+class DJVUAPI JB2Image : public JB2Dict
+{
+protected:
+  JB2Image(void);
+public:
+
+  /** Creates an empty #JB2Image# object.  You can then
+      call the decoding function #decode#.  You can also manually set the
+      image size using #set_dimension# and populate the shape and blit arrays
+      using #add_shape# and #add_blit#. */
+  static GP<JB2Image> create(void) { return new JB2Image(); }
+
+  // INITIALIZATION
+  /** Resets the #JB2Image# object.  This function reinitializes both the shape
+     and the blit arrays.  All allocated memory is freed. */
+  void init(void);
+
+  // DIMENSION
+  /** Returns the width of the image.  
+      This is the width value previously set with #set_dimension#. */
+  int get_width(void) const;
+  /** Returns the height of the image.  
+      This is the height value previously set with #set_dimension#. */
+  int get_height(void) const;
+  /** Sets the size of the JB2Image.
+      This function can be called at any time. 
+      The corresponding #width# and the #height# are stored
+      in the JB2 file. */
+  void set_dimension(int width, int height);
+
+  // RENDERING
+  /** Renders an anti-aliased gray level image.  This function renders the
+      JB2Image as a bilevel or gray level image.  Argument #subsample#
+      specifies the desired subsampling ratio in range #1# to #15#.  The
+      returned image uses #1+subsample^2# gray levels for representing
+      anti-aliased edges.  Argument #align# specified the alignment of the
+      rows of the returned images.  Setting #align# to #4#, for instance, will
+      adjust the bitmap border in order to make sure that each row of the
+      returned image starts on a word (four byte) boundary. */
+  GP<GBitmap> get_bitmap(int subsample = 1, int align = 1) const;
+  /** Renders an anti-aliased gray level sub-image.  This function renders a
+      segment of the JB2Image as a bilevel or gray level image.  Conceptually,
+      this function first renders the full JB2Image with subsampling ratio
+      #subsample# and then extracts rectangle #rect# in the subsampled image.
+      Both operations of course are efficiently performed simultaneously.
+      Argument #align# specified the alignment of the rows of the returned
+      images, as explained above.  Argument #dispy# should remain null. */
+  GP<GBitmap> get_bitmap(const GRect &rect, int subsample=1, int align=1, int dispy=0) const;
+
+  // ACCESSING THE BLIT LIBRARY
+  /** Returns the total number of blits.
+      Blit indices range from #0# to #get_blit_count(void)-1#. */
+  int get_blit_count(void) const;
+  /** Returns a pointer to blit #blitno#.
+      The returned pointer directly points into the blit array.
+      This pointer can be used for reading or writing the blit data. */
+  JB2Blit *get_blit(int blitno);
+  /** Returns a constant pointer to blit #blitno#.
+      The returned pointer directly points into the shape array.
+      This pointer can only be used for reading the shape data. */
+  const JB2Blit *get_blit(int blitno) const;
+  /** Appends a blit to the blit array.  This function appends a copy of blit
+      #blit# to the blit array and returns the subscript of the new blit.  The
+      shape subscript #blit.shapeno# must actually designate an already
+      existing shape. */
+  int  add_blit(const JB2Blit &blit);
+
+  // MEMORY OPTIMIZATION
+  /** Returns the total memory used by the JB2Image.
+      The returned value is expressed in bytes. */
+  unsigned int get_memory_usage(void) const;
+
+  // CODING
+  /** Encodes the JB2Image into ByteStream #bs#.  
+      This function generates the JB2 data stream without any header. */
+  void encode(const GP<ByteStream> &gbs) const;
+  /** Decodes JB2 data from ByteStream #bs#. This function decodes the image
+      size and populates the shape and blit arrays.  The callback function
+      #cb# is called when the decoder determines that the ByteStream data
+      requires a shape dictionary which has not been set with
+      \Ref{JB2Dict::set_inherited_dict}. The callback receives argument #arg#
+      and must return a suitable dictionary which will be installed as the
+      inherited dictionary.  The callback should return null if no such
+      dictionary is found. */
+  void decode(const GP<ByteStream> &gbs, JB2DecoderCallback *cb=0, void *arg=0);
+  
+private:
+  // Implementation
+  int width;
+  int height;
+  GTArray<JB2Blit> blits;
+public:
+  /** Reproduces a old bug.  Setting this flag may be necessary for accurately
+      decoding DjVu files with version smaller than #18#.  The default value
+      is of couse #false#. */
+  bool reproduce_old_bug;
+};
+
+
+
+// JB2DICT INLINE FUNCTIONS
+
+inline int
+JB2Dict::get_shape_count(void) const
+{
+  return inherited_shapes + shapes.size();
+}
+
+inline int
+JB2Dict::get_inherited_shape_count(void) const
+{
+  return inherited_shapes;
+}
+
+inline GP<JB2Dict>
+JB2Dict::get_inherited_dict(void) const
+{
+  return inherited_dict;
+}
+
+// JB2IMAGE INLINE FUNCTIONS
+
+inline int
+JB2Image::get_width(void) const
+{
+  return width;
+}
+
+inline int
+JB2Image::get_height(void) const
+{
+  return height;
+}
+
+
+inline int
+JB2Image::get_blit_count(void) const
+{
+  return blits.size();
+}
+
+
+inline JB2Blit *
+JB2Image::get_blit(int blitno)
+{
+  return & blits[blitno];
+}
+
+inline const JB2Blit *
+JB2Image::get_blit(int blitno) const
+{
+  return & blits[blitno];
+}
+
+
+
+
+
+/** @name JB2 extensions for version 21.
+
+    Two extensions of the JB2 encoding format have been introduced
+    with DjVu files version 21.  Both extensions maintain significant
+    backward compatibility with previous version of the JB2 format.
+    These extensions are described below by reference to the ICFDD
+    proposal dated August 1999.  Both extension make use of the unused
+    record type value #9# (cf. ICFDD page 24) which has been renamed
+    #REQUIRED_DICT_OR_RESET#.
+
+    {\bf Shared Shape Dictionaries} --- This extension provides
+    support for sharing symbol definitions between the pages of a
+    document.  To achieve this objective, the JB2 image data chunk
+    must be able to address symbols defined elsewhere by a JB2
+    dictionary data chunk shared by all the pages of a document.
+
+    The arithmetically encoded JB2 image data logically consist of a
+    sequence of records. The decoder processes these records in
+    sequence and maintains a library of symbols which can be addressed
+    by the following records.  The first record usually is a ``Start
+    Of Image'' record describing the size of the image.
+
+    Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record
+    type can appear {\em before} the #START_OF_DATA# (0) record.  The
+    record type field is followed by a single number arithmetically
+    encoded (cf. ICFDD page 26) using a sixteenth context (cf. ICFDD
+    page 25).  This record appears when the JB2 data chunk requires
+    symbols encoded in a separate JB2 dictionary data chunk.  The
+    number (the {\bf dictionary size}) indicates how many symbols
+    should have been defined by the JB2 dictionary data chunk.  The
+    decoder should simply load these symbols in the symbol library and
+    proceed as usual.  New symbols potentially defined by the
+    subsequent JB2 image data records will therefore be numbered with
+    integers greater or equal than the dictionary size.
+
+    The JB2 dictionary data format is a pure subset of the JB2 image
+    data format.  The #START_OF_DATA# (0) record always specifies an
+    image width of zero and an image height of zero.  The only allowed
+    record types are those defining library symbols only
+    (#NEW_SYMBOL_LIBRARY_ONLY# (2) and #MATCHED_REFINE_LIBRARY_ONLY#
+    (5) cf. ICFDD page 24) followed by a final #END_OF_DATA# (11)
+    record.
+
+    The JB2 dictionary data is usually located in an {\bf Djbz} chunk.
+    Each page {\bf FORM:DJVU} may directly contain a {\bf Djbz} chunk,
+    or may indirectly point to such a chunk using an {\bf INCL} chunk
+    (cf. \Ref{Multipage DjVu documents.}).
+    
+
+    {\bf Numcoder Reset} --- This extension addresses a problem for
+    hardware implementations.  The encoding of numbers (cf. ICFDD page
+    26) potentially uses an unbounded number of binary coding
+    contexts. These contexts are normally allocated when they are used
+    for the first time (cf. ICFDD informative note, page 27).
+
+    Starting with version 21, a #REQUIRED_DICT_OR_RESET# (9) record
+    type can appear {\em after} the #START_OF_DATA# (0) record.  The
+    decoder should proceed with the next record after {\em clearing
+    all binary contexts used for coding numbers}.  This operation
+    implies that all binary contexts previously allocated for coding
+    numbers can be deallocated.
+  
+    Starting with version 21, the JB2 encoder should insert a
+    #REQUIRED_DICT_OR_RESET# record type whenever the number of these
+    allocated binary contexts exceeds #20000#.  Only very large
+    documents ever reach such a large number of allocated binary
+    contexts (e.g large maps).  Hardware implementation however can
+    benefit greatly from a hard bound on the total number of binary
+    coding contexts.  Old JB2 decoders will treat this record type as
+    an #END_OF_DATA# record and cleanly stop decoding (cf. ICFDD page
+    30, Image refinement data).
+
+
+    {\bf References} ---
+    \begin{itemize}
+    \item ICFDD Draft Proposed American National Standard, 1999-08-26.
+    \item DjVu Specification, \URL{http://www.lizardtech.com/djvu/sci/djvuspec}.
+    \end{itemize}
+
+    @memo Extensions to the JB2 format introduced in version 21.  */
+
+//@}
+
+////////////////////////////////////////
+//// CLASS JB2CODEC:  DECLARATION
+////////////////////////////////////////
+
+// This class is accessed via the encode and decode
+// functions of class JB2Image
+
+
+//**** Class JB2Codec
+// This class implements the base class for both the JB2 coder and decoder.
+// The JB2Codec's Contains all contextual information for encoding/decoding
+// a JB2Image.
+
+class JB2Dict::JB2Codec
+{
+public:
+  class Decode;
+  class Encode;
+  typedef unsigned int NumContext;
+  virtual ~JB2Codec();
+protected:
+  // Constructors
+  JB2Codec(const bool xencoding=false);
+  // Forbidden assignment
+  JB2Codec(const JB2Codec &ref);
+  JB2Codec& operator=(const JB2Codec &ref);
+
+  int CodeNum(int lo, int hi, NumContext *pctx,int v);
+  void reset_numcoder(void);
+  inline void code_eventual_lossless_refinement(void);
+  void init_library(JB2Dict &jim);
+  int add_library(const int shapeno, JB2Shape &jshp);
+  void code_relative_location(JB2Blit *jblt, int rows, int columns);
+  void code_bitmap_directly (GBitmap &bm);
+  void code_bitmap_by_cross_coding (GBitmap &bm, GP<GBitmap> &cbm, const int libno);
+  void code_record(int &rectype, const GP<JB2Dict> &jim, JB2Shape *jshp);
+  void code_record(int &rectype, const GP<JB2Image> &jim, JB2Shape *jshp, JB2Blit *jblt);
+  static void compute_bounding_box(GBitmap &cbm, LibRect &lrect);
+  static int get_direct_context( unsigned char const * const up2,
+    unsigned char const * const up1, unsigned char const * const up0,
+    const int column);
+  static int shift_direct_context ( const int context,
+    const int next, unsigned char const * const up2,
+    unsigned char const * const up1, unsigned char const * const up0,
+    const int column);
+  static int get_cross_context( unsigned char const * const up1,
+    unsigned char const * const up0, unsigned char const * const xup1,
+    unsigned char const * const xup0, unsigned char const * const xdn1,
+    const int column );
+  static int shift_cross_context( const int context,
+    const int n, unsigned char const * const up1,
+    unsigned char const * const up0, unsigned char const * const xup1,
+    unsigned char const * const xup0, unsigned char const * const xdn1,
+    const int column );
+
+  virtual bool CodeBit(const bool bit, BitContext &ctx) = 0;
+  virtual void code_comment(GUTF8String &comment) = 0;
+  virtual void code_record_type(int &rectype) = 0;
+  virtual int code_match_index(int &index, JB2Dict &jim)=0;
+  virtual void code_inherited_shape_count(JB2Dict &jim)=0;
+  virtual void code_image_size(JB2Dict &jim);
+  virtual void code_image_size(JB2Image &jim);
+  virtual void code_absolute_location(JB2Blit *jblt,  int rows, int columns)=0;
+  virtual void code_absolute_mark_size(GBitmap &bm, int border=0) = 0;
+  virtual void code_relative_mark_size(GBitmap &bm, int cw, int ch, int border=0) = 0;
+  virtual void code_bitmap_directly(GBitmap &bm,const int dw, int dy,
+    unsigned char *up2, unsigned char *up1, unsigned char *up0 )=0;
+  virtual void code_bitmap_by_cross_coding (GBitmap &bm, GBitmap &cbm,
+    const int xd2c, const int dw, int dy, int cy,
+    unsigned char *up1, unsigned char *up0, unsigned char *xup1, 
+    unsigned char *xup0, unsigned char *xdn1 )=0;
+  // Code records
+  virtual int get_diff(const int x_diff,NumContext &rel_loc) = 0;
+
+private:
+  bool encoding;
+
+protected:
+  // NumCoder
+  int cur_ncell;
+  BitContext *bitcells;
+  GPBuffer<BitContext> gbitcells;
+  NumContext *leftcell;
+  GPBuffer<NumContext> gleftcell;
+  NumContext *rightcell;
+  GPBuffer<NumContext> grightcell;
+  // Info
+  bool refinementp;
+  char gotstartrecordp;
+  // Code comment
+  NumContext dist_comment_byte;
+  NumContext dist_comment_length;
+  // Code values
+  NumContext dist_record_type;
+  NumContext dist_match_index;
+  BitContext dist_refinement_flag;
+  // Library
+  GTArray<int> shape2lib;
+  GTArray<int> lib2shape;
+  GTArray<LibRect> libinfo;
+  // Code pairs
+  NumContext abs_loc_x;
+  NumContext abs_loc_y;
+  NumContext abs_size_x;
+  NumContext abs_size_y;
+  NumContext image_size_dist;
+  NumContext inherited_shape_count_dist;
+  BitContext offset_type_dist;
+  NumContext rel_loc_x_current;
+  NumContext rel_loc_x_last;
+  NumContext rel_loc_y_current;
+  NumContext rel_loc_y_last;
+  NumContext rel_size_x;
+  NumContext rel_size_y;
+  int last_bottom;
+  int last_left;
+  int last_right;
+  int last_row_bottom;
+  int last_row_left;
+  int image_columns;
+  int image_rows;
+  int short_list[3];
+  int short_list_pos;
+  inline void fill_short_list(const int v);
+  int update_short_list(const int v);
+  // Code bitmaps
+  BitContext bitdist[1024];
+  BitContext cbitdist[2048];
+};
+
+inline void
+JB2Dict::JB2Codec::code_eventual_lossless_refinement(void)
+{
+  refinementp=CodeBit(refinementp, dist_refinement_flag);
+}
+
+inline void
+JB2Dict::JB2Codec::fill_short_list(const int v)
+{
+  short_list[0] = short_list[1] = short_list[2] = v;
+  short_list_pos = 0;
+}
+
+inline int
+JB2Dict::JB2Codec::get_direct_context( unsigned char const * const up2,
+                    unsigned char const * const up1,
+                    unsigned char const * const up0,
+                    const int column)
+{
+  return ( (up2[column - 1] << 9) |
+              (up2[column    ] << 8) |
+              (up2[column + 1] << 7) |
+              (up1[column - 2] << 6) |
+              (up1[column - 1] << 5) |
+              (up1[column    ] << 4) |
+              (up1[column + 1] << 3) |
+              (up1[column + 2] << 2) |
+              (up0[column - 2] << 1) |
+              (up0[column - 1] << 0) );
+}
+
+inline int
+JB2Dict::JB2Codec::shift_direct_context(const int context, const int next,
+                     unsigned char const * const up2,
+                     unsigned char const * const up1,
+                     unsigned char const * const up0,
+                     const int column)
+{
+  return ( ((context << 1) & 0x37a) |
+              (up1[column + 2] << 2)   |
+              (up2[column + 1] << 7)   |
+              (next << 0)              );
+}
+
+inline int
+JB2Dict::JB2Codec::get_cross_context( unsigned char const * const up1,
+                   unsigned char const * const up0,
+                   unsigned char const * const xup1,
+                   unsigned char const * const xup0,
+                   unsigned char const * const xdn1,
+                   const int column )
+{
+  return ( ( up1[column - 1] << 10) |
+              ( up1[column    ] <<  9) |
+              ( up1[column + 1] <<  8) |
+              ( up0[column - 1] <<  7) |
+              (xup1[column    ] <<  6) |
+              (xup0[column - 1] <<  5) |
+              (xup0[column    ] <<  4) |
+              (xup0[column + 1] <<  3) |
+              (xdn1[column - 1] <<  2) |
+              (xdn1[column    ] <<  1) |
+              (xdn1[column + 1] <<  0) );
+}
+
+inline int
+JB2Dict::JB2Codec::shift_cross_context( const int context, const int n,
+                     unsigned char const * const up1,
+                     unsigned char const * const up0,
+                     unsigned char const * const xup1,
+                     unsigned char const * const xup0,
+                     unsigned char const * const xdn1,
+                     const int column )
+{
+  return ( ((context<<1) & 0x636)  |
+              ( up1[column + 1] << 8) |
+              (xup1[column    ] << 6) |
+              (xup0[column + 1] << 3) |
+              (xdn1[column + 1] << 0) |
+              (n << 7)             );
+}
+
+// ---------- THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
diff --git a/libdjvu/JPEGDecoder.cpp b/libdjvu/JPEGDecoder.cpp
new file mode 100644
index 0000000..6d35d2b
--- /dev/null
+++ b/libdjvu/JPEGDecoder.cpp
@@ -0,0 +1,407 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#ifdef NEED_JPEG_DECODER
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef HAVE_STDLIB_H
+#undef HAVE_STDDEF_H
+#define INT32 jpeg_INT32
+#define INT16 jpeg_INT16
+#include <stdio.h>
+#include <jconfig.h>
+#include <jpeglib.h>
+#include <jerror.h>
+#undef FAR
+#undef INT32
+#undef INT16
+#ifdef __cplusplus
+}
+#endif
+
+#include "JPEGDecoder.h"
+#include "ByteStream.h"
+#include "GPixmap.h"
+#ifdef LIBJPEGNAME
+#include "DjVuDynamic.h"
+#include "GString.h"
+#endif // LIBJPEGNAME
+
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+class JPEGDecoder::Impl : public JPEGDecoder
+{
+public:
+  static void jpeg_byte_stream_src(j_decompress_ptr, ByteStream &);
+};
+
+extern "C"
+{
+
+struct djvu_error_mgr
+{
+  struct jpeg_error_mgr pub;  /* "public" fields */
+
+  jmp_buf setjmp_buffer;  /* for return to caller */
+};
+
+typedef struct djvu_error_mgr * djvu_error_ptr;
+
+METHODDEF(void)
+djvu_error_exit (j_common_ptr cinfo)
+{
+  /* cinfo->err really points to a djvu_error_mgr struct, so coerce pointer */
+  djvu_error_ptr djvuerr = (djvu_error_ptr) cinfo->err;
+  /* Return control to the setjmp point */
+  longjmp(djvuerr->setjmp_buffer, 1);
+}
+
+}
+
+GP<GPixmap>
+JPEGDecoder::decode(ByteStream & bs )
+{
+  GP<GPixmap> retval=GPixmap::create();
+  decode(bs,*retval);
+  return retval;
+}
+
+void
+JPEGDecoder::decode(ByteStream & bs,GPixmap &pix)
+{
+  struct jpeg_decompress_struct cinfo;
+
+  /* We use our private extension JPEG error handler. */
+  struct djvu_error_mgr jerr;
+
+  JSAMPARRAY buffer;    /* Output row buffer */
+  int row_stride;   /* physical row width in output buffer */
+  int isGrey,i;
+
+  cinfo.err = jpeg_std_error(&jerr.pub);
+
+  jerr.pub.error_exit = djvu_error_exit;
+
+  if (setjmp(jerr.setjmp_buffer))
+  {
+    /* Prepare error message - untranslated */
+    char msg[JMSG_LENGTH_MAX + 100];
+    strcpy(msg, "LibJpeg error: ");
+    char *emsg = msg + strlen(msg);
+    (*cinfo.err->format_message) ((j_common_ptr)&cinfo, emsg);
+    /* clean and throw */
+    jpeg_destroy_decompress(&cinfo);
+    G_THROW( msg );
+  }
+
+  jpeg_create_decompress(&cinfo);
+
+  Impl::jpeg_byte_stream_src(&cinfo, bs);
+
+  (void) jpeg_read_header(&cinfo, TRUE);
+
+  jpeg_start_decompress(&cinfo);
+  
+  /* We may need to do some setup of our own at this point before reading
+   * the data.  After jpeg_start_decompress() we have the correct scaled
+   * output image dimensions available, as well as the output colormap
+   * if we asked for color quantization.
+   * In this example, we need to make an output work buffer of the right size.
+   */
+
+  /* JSAMPLEs per row in output buffer */
+  row_stride = cinfo.output_width * cinfo.output_components;
+
+  /* Make a one-row-high sample array that will go away when done with image */
+  buffer = (*cinfo.mem->alloc_sarray)
+    ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+
+  GP<ByteStream> goutputBlock=ByteStream::create();
+  ByteStream &outputBlock=*goutputBlock;
+  outputBlock.format("P6\n%d %d\n%d\n",cinfo.output_width, 
+                                 cinfo.output_height,255);
+
+  isGrey = ( cinfo.out_color_space == JCS_GRAYSCALE) ? 1 : 0; 
+
+  while (cinfo.output_scanline < cinfo.output_height)
+  {
+    (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+
+    if ( isGrey == 1 )
+    {
+      for (i=0; i<row_stride; i++)
+      {
+        outputBlock.write8((char)buffer[0][i]); 
+        outputBlock.write8((char)buffer[0][i]); 
+        outputBlock.write8((char)buffer[0][i]); 
+      }
+    }else
+    {
+      for (i=0; i<row_stride; i++) 
+        outputBlock.write8((char)buffer[0][i]); 
+    }
+  }
+
+  (void) jpeg_finish_decompress(&cinfo);   
+
+  jpeg_destroy_decompress(&cinfo);
+  
+  outputBlock.seek(0,SEEK_SET);
+
+  pix.init(outputBlock);
+}         
+
+/*** From here onwards code is to make ByteStream as the data
+     source for the JPEG library */
+
+extern "C"
+{
+
+typedef struct
+{
+  struct jpeg_source_mgr pub; /* public fields */
+
+  ByteStream * byteStream;    /* source stream */
+  JOCTET * buffer;    /* start of buffer */
+  boolean start_of_stream;  
+} byte_stream_src_mgr;
+                
+
+typedef byte_stream_src_mgr * byte_stream_src_ptr; 
+
+#define INPUT_BUF_SIZE   4096
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+  byte_stream_src_ptr src = (byte_stream_src_ptr) cinfo->src;
+
+  src->start_of_stream = TRUE;
+}
+
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+  byte_stream_src_ptr src = (byte_stream_src_ptr) cinfo->src;
+  size_t nbytes;
+
+  nbytes = src->byteStream->readall(src->buffer, INPUT_BUF_SIZE);
+
+  if (nbytes <= 0)
+  {
+    if (src->start_of_stream) /* Treat empty input as fatal error */
+      ERREXIT(cinfo, JERR_INPUT_EMPTY);
+    WARNMS(cinfo, JWRN_JPEG_EOF);
+    /* Insert a fake EOI marker */
+    src->buffer[0] = (JOCTET) 0xFF;
+    src->buffer[1] = (JOCTET) JPEG_EOI;
+    nbytes = 2;
+  }
+
+  src->pub.next_input_byte = src->buffer;
+  src->pub.bytes_in_buffer = nbytes;
+  src->start_of_stream = FALSE; 
+
+  return TRUE;
+}
+
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+  byte_stream_src_ptr src = (byte_stream_src_ptr) cinfo->src;
+
+  if (num_bytes > (long) src->pub.bytes_in_buffer)
+  {
+    src->byteStream->seek((num_bytes - src->pub.bytes_in_buffer), SEEK_CUR);
+    (void) fill_input_buffer(cinfo);
+  }else
+  {
+    src->pub.bytes_in_buffer -= num_bytes;
+    src->pub.next_input_byte += num_bytes;
+  }
+}
+                 
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+  /* no work necessary here */
+}
+
+}
+
+void
+JPEGDecoder::Impl::jpeg_byte_stream_src(j_decompress_ptr cinfo,ByteStream &bs)
+{
+  byte_stream_src_ptr src;
+
+  if (cinfo->src == NULL)
+  { /* first time for this JPEG object? */
+    cinfo->src = (struct jpeg_source_mgr *)      
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+          sizeof(byte_stream_src_mgr));
+    src = (byte_stream_src_ptr) cinfo->src;
+    src->buffer = (JOCTET *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+          INPUT_BUF_SIZE * sizeof(JOCTET));
+  }
+
+  src = (byte_stream_src_ptr) cinfo->src;
+  src->pub.init_source = init_source;
+  src->pub.fill_input_buffer = fill_input_buffer;
+  src->pub.skip_input_data = skip_input_data;
+  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+  src->pub.term_source = term_source;
+  src->byteStream = &bs;
+  src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
+  src->pub.next_input_byte = NULL; /* until buffer loaded */
+}
+
+#ifdef LIBJPEGNAME
+void *
+JPEGDecoder::jpeg_lookup(const GUTF8String &name)
+{
+  static DjVuDynamic lib(GUTF8String(LIBJPEGNAME));
+  void *sym=lib.lookup(name);
+  if(!sym)
+    G_THROW(ERR_MSG("DjVuFile.JPEG_bg2"));
+  return sym;
+}
+
+jpeg_error_mgr *
+JPEGDecoder::jpeg_std_error(jpeg_error_mgr *x)
+{
+  static void *sym=jpeg_lookup("jpeg_std_error");
+  return ((jpeg_error_mgr *(*)(jpeg_error_mgr *))sym)(x);
+}
+
+void
+JPEGDecoder::jpeg_CreateDecompress(jpeg_decompress_struct *x,int v, size_t s)
+{
+  static void *sym=jpeg_lookup("jpeg_CreateDecompress");
+  ((void (*)(jpeg_decompress_struct *,int,size_t))sym)(x,v,s);
+}
+
+void
+JPEGDecoder::jpeg_destroy_decompress(j_decompress_ptr x)
+{
+  static void *sym=jpeg_lookup("jpeg_destroy_decompress");
+  ((void (*)(j_decompress_ptr))sym)(x);
+}
+
+int
+JPEGDecoder::jpeg_read_header(j_decompress_ptr x,boolean y)
+{
+  static void *sym=jpeg_lookup("jpeg_read_header");
+  return ((int (*)(j_decompress_ptr,boolean))sym)(x,y);
+}
+
+JDIMENSION
+JPEGDecoder::jpeg_read_scanlines(j_decompress_ptr x,JSAMPARRAY y,JDIMENSION z)
+{
+  static void *sym=jpeg_lookup("jpeg_read_scanlines");
+  return ((JDIMENSION (*)(j_decompress_ptr,JSAMPARRAY,JDIMENSION))sym)(x,y,z);
+}
+
+boolean
+JPEGDecoder::jpeg_finish_decompress(j_decompress_ptr x)
+{
+  static void *sym=jpeg_lookup("jpeg_finish_decompress");
+  return ((boolean (*)(j_decompress_ptr))sym)(x);
+}
+
+boolean
+JPEGDecoder::jpeg_resync_to_restart(jpeg_decompress_struct *x,int d)
+{
+  static void *sym=jpeg_lookup("jpeg_resync_to_restart");
+  return ((boolean (*)(jpeg_decompress_struct *,int))sym)(x,d);
+}
+
+boolean
+JPEGDecoder::jpeg_start_decompress(j_decompress_ptr x)
+{
+  static void *sym=jpeg_lookup("jpeg_start_decompress");
+  return ((boolean (*)(j_decompress_ptr))sym)(x);
+}
+
+#endif // LIBJPEGNAME
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+#endif
+
diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h
new file mode 100644
index 0000000..fad1d4c
--- /dev/null
+++ b/libdjvu/JPEGDecoder.h
@@ -0,0 +1,131 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _JPEGDECODER_H_
+#define _JPEGDECODER_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#ifdef NEED_JPEG_DECODER
+
+#include <stddef.h>
+#include <string.h>
+#include <setjmp.h>
+
+#include "GSmartPointer.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+class GPixmap;
+
+
+/** @name JPEGDecoder.h
+    Files #"JPEGDecoder.h"# and #"JPEGDecoder.cpp"# implement an
+    interface to the decoding subset of the IJG JPEG library.
+    @memo
+    Decoding interface to the IJG JPEG library.
+    @author
+    Parag Deshmukh <parag@sanskrit.lz.att.com> 
+*/
+//@{
+
+class GUTF8String;
+
+/** This class ensures namespace isolation. */
+class JPEGDecoder
+{
+public:
+  class Impl;
+
+  /** Decodes the JPEG formated ByteStream */ 
+  static GP<GPixmap> decode(ByteStream & bs);
+  static void decode(ByteStream & bs,GPixmap &pix);
+#ifdef LIBJPEGNAME
+  static void *jpeg_lookup(const GUTF8String &name);
+  static jpeg_error_mgr *jpeg_std_error(jpeg_error_mgr *x);
+  static void jpeg_CreateDecompress(jpeg_decompress_struct *x,int v, size_t s);
+  static void jpeg_destroy_decompress(j_decompress_ptr x);
+  static int jpeg_read_header(j_decompress_ptr x,boolean y);
+  static JDIMENSION jpeg_read_scanlines(j_decompress_ptr x,JSAMPARRAY y,JDIMENSION z);
+  static boolean jpeg_finish_decompress(j_decompress_ptr x);
+  static boolean jpeg_resync_to_restart(jpeg_decompress_struct *x,int d);
+  static boolean jpeg_start_decompress(j_decompress_ptr x);
+#endif // LIBJPEGNAME
+};
+
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+#endif // NEED_JPEG_DECODER
+#endif // _JPEGDECODER_H_
+
diff --git a/libdjvu/MMRDecoder.cpp b/libdjvu/MMRDecoder.cpp
new file mode 100644
index 0000000..b56fa33
--- /dev/null
+++ b/libdjvu/MMRDecoder.cpp
@@ -0,0 +1,960 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "MMRDecoder.h"
+#include "JB2Image.h"
+#include "ByteStream.h"
+#include "GBitmap.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// ----------------------------------------
+// MMR CODEBOOKS
+
+static const char invalid_mmr_data[]= ERR_MSG("MMRDecoder.bad_data");
+
+struct VLCode 
+{
+  unsigned short code;
+  short codelen;
+  short value;
+};
+
+enum MMRMode
+{ 
+  P=0, H=1, V0=2, VR1=3, VR2=4, VR3=5, VL1=6, VL2=7, VL3=8 
+};
+
+static const VLCode mrcodes[] =
+{   // Codes on 7 bits
+  // 7 bit codes
+  { 0x08,   4,    P }, // 0001
+  { 0x10,   3,    H }, // 001
+  { 0x40,   1,   V0 }, // 1
+  { 0x30,   3,  VR1 }, // 011
+  { 0x06,   6,  VR2 }, // 000011
+  { 0x03,   7,  VR3 }, // 0000011
+  { 0x20,   3,  VL1 }, // 010
+  { 0x04,   6,  VL2 }, // 000010
+  { 0x02,   7,  VL3 }, // 0000010
+  { 0x00,   0,   -1 }  // Illegal entry
+};
+
+
+static const VLCode wcodes[] = {    
+  // 13 bit codes
+  { 0x06a0,  8,    0 }, // 00110101
+  { 0x0380,  6,    1 }, // 000111
+  { 0x0e00,  4,    2 }, // 0111
+  { 0x1000,  4,    3 }, // 1000
+  { 0x1600,  4,    4 }, // 1011
+  { 0x1800,  4,    5 }, // 1100
+  { 0x1c00,  4,    6 }, // 1110
+  { 0x1e00,  4,    7 }, // 1111
+  { 0x1300,  5,    8 }, // 10011
+  { 0x1400,  5,    9 }, // 10100
+  { 0x0700,  5,   10 }, // 00111
+  { 0x0800,  5,   11 }, // 01000
+  { 0x0400,  6,   12 }, // 001000
+  { 0x0180,  6,   13 }, // 000011
+  { 0x1a00,  6,   14 }, // 110100
+  { 0x1a80,  6,   15 }, // 110101
+  { 0x1500,  6,   16 }, // 101010
+  { 0x1580,  6,   17 }, // 101011
+  { 0x09c0,  7,   18 }, // 0100111
+  { 0x0300,  7,   19 }, // 0001100
+  { 0x0200,  7,   20 }, // 0001000
+  { 0x05c0,  7,   21 }, // 0010111
+  { 0x00c0,  7,   22 }, // 0000011
+  { 0x0100,  7,   23 }, // 0000100
+  { 0x0a00,  7,   24 }, // 0101000
+  { 0x0ac0,  7,   25 }, // 0101011
+  { 0x04c0,  7,   26 }, // 0010011
+  { 0x0900,  7,   27 }, // 0100100
+  { 0x0600,  7,   28 }, // 0011000
+  { 0x0040,  8,   29 }, // 00000010
+  { 0x0060,  8,   30 }, // 00000011
+  { 0x0340,  8,   31 }, // 00011010
+  { 0x0360,  8,   32 }, // 00011011
+  { 0x0240,  8,   33 }, // 00010010
+  { 0x0260,  8,   34 }, // 00010011
+  { 0x0280,  8,   35 }, // 00010100
+  { 0x02a0,  8,   36 }, // 00010101
+  { 0x02c0,  8,   37 }, // 00010110
+  { 0x02e0,  8,   38 }, // 00010111
+  { 0x0500,  8,   39 }, // 00101000
+  { 0x0520,  8,   40 }, // 00101001
+  { 0x0540,  8,   41 }, // 00101010
+  { 0x0560,  8,   42 }, // 00101011
+  { 0x0580,  8,   43 }, // 00101100
+  { 0x05a0,  8,   44 }, // 00101101
+  { 0x0080,  8,   45 }, // 00000100
+  { 0x00a0,  8,   46 }, // 00000101
+  { 0x0140,  8,   47 }, // 00001010
+  { 0x0160,  8,   48 }, // 00001011
+  { 0x0a40,  8,   49 }, // 01010010
+  { 0x0a60,  8,   50 }, // 01010011
+  { 0x0a80,  8,   51 }, // 01010100
+  { 0x0aa0,  8,   52 }, // 01010101
+  { 0x0480,  8,   53 }, // 00100100
+  { 0x04a0,  8,   54 }, // 00100101
+  { 0x0b00,  8,   55 }, // 01011000
+  { 0x0b20,  8,   56 }, // 01011001
+  { 0x0b40,  8,   57 }, // 01011010
+  { 0x0b60,  8,   58 }, // 01011011
+  { 0x0940,  8,   59 }, // 01001010
+  { 0x0960,  8,   60 }, // 01001011
+  { 0x0640,  8,   61 }, // 00110010
+  { 0x0660,  8,   62 }, // 00110011
+  { 0x0680,  8,   63 }, // 00110100
+  { 0x1b00,  5,   64 }, // 11011
+  { 0x1200,  5,  128 }, // 10010
+  { 0x0b80,  6,  192 }, // 010111
+  { 0x0dc0,  7,  256 }, // 0110111
+  { 0x06c0,  8,  320 }, // 00110110
+  { 0x06e0,  8,  384 }, // 00110111
+  { 0x0c80,  8,  448 }, // 01100100
+  { 0x0ca0,  8,  512 }, // 01100101
+  { 0x0d00,  8,  576 }, // 01101000
+  { 0x0ce0,  8,  640 }, // 01100111
+  { 0x0cc0,  9,  704 }, // 011001100
+  { 0x0cd0,  9,  768 }, // 011001101
+  { 0x0d20,  9,  832 }, // 011010010
+  { 0x0d30,  9,  896 }, // 011010011
+  { 0x0d40,  9,  960 }, // 011010100
+  { 0x0d50,  9, 1024 }, // 011010101
+  { 0x0d60,  9, 1088 }, // 011010110
+  { 0x0d70,  9, 1152 }, // 011010111
+  { 0x0d80,  9, 1216 }, // 011011000
+  { 0x0d90,  9, 1280 }, // 011011001
+  { 0x0da0,  9, 1344 }, // 011011010
+  { 0x0db0,  9, 1408 }, // 011011011
+  { 0x0980,  9, 1472 }, // 010011000
+  { 0x0990,  9, 1536 }, // 010011001
+  { 0x09a0,  9, 1600 }, // 010011010
+  { 0x0c00,  6, 1664 }, // 011000  (what did they think?)
+  { 0x09b0,  9, 1728 }, // 010011011
+  { 0x0020, 11, 1792 }, // 00000001000
+  { 0x0030, 11, 1856 }, // 00000001100
+  { 0x0034, 11, 1920 }, // 00000001101
+  { 0x0024, 12, 1984 }, // 000000010010
+  { 0x0026, 12, 2048 }, // 000000010011
+  { 0x0028, 12, 2112 }, // 000000010100
+  { 0x002a, 12, 2176 }, // 000000010101
+  { 0x002c, 12, 2240 }, // 000000010110
+  { 0x002e, 12, 2304 }, // 000000010111
+  { 0x0038, 12, 2368 }, // 000000011100
+  { 0x003a, 12, 2432 }, // 000000011101
+  { 0x003c, 12, 2496 }, // 000000011110
+  { 0x003e, 12, 2560 }, // 000000011111
+  { 0x0000,  0,   -1 }  // Illegal entry
+};
+
+
+static const VLCode bcodes[] = {
+  // 13 bit codes
+  { 0x01b8, 10,    0 }, // 0000110111
+  { 0x0800,  3,    1 }, // 010
+  { 0x1800,  2,    2 }, // 11
+  { 0x1000,  2,    3 }, // 10
+  { 0x0c00,  3,    4 }, // 011
+  { 0x0600,  4,    5 }, // 0011
+  { 0x0400,  4,    6 }, // 0010
+  { 0x0300,  5,    7 }, // 00011
+  { 0x0280,  6,    8 }, // 000101
+  { 0x0200,  6,    9 }, // 000100
+  { 0x0100,  7,   10 }, // 0000100
+  { 0x0140,  7,   11 }, // 0000101
+  { 0x01c0,  7,   12 }, // 0000111
+  { 0x0080,  8,   13 }, // 00000100
+  { 0x00e0,  8,   14 }, // 00000111
+  { 0x0180,  9,   15 }, // 000011000
+  { 0x00b8, 10,   16 }, // 0000010111
+  { 0x00c0, 10,   17 }, // 0000011000
+  { 0x0040, 10,   18 }, // 0000001000
+  { 0x019c, 11,   19 }, // 00001100111
+  { 0x01a0, 11,   20 }, // 00001101000
+  { 0x01b0, 11,   21 }, // 00001101100
+  { 0x00dc, 11,   22 }, // 00000110111
+  { 0x00a0, 11,   23 }, // 00000101000
+  { 0x005c, 11,   24 }, // 00000010111
+  { 0x0060, 11,   25 }, // 00000011000
+  { 0x0194, 12,   26 }, // 000011001010
+  { 0x0196, 12,   27 }, // 000011001011
+  { 0x0198, 12,   28 }, // 000011001100
+  { 0x019a, 12,   29 }, // 000011001101
+  { 0x00d0, 12,   30 }, // 000001101000
+  { 0x00d2, 12,   31 }, // 000001101001
+  { 0x00d4, 12,   32 }, // 000001101010
+  { 0x00d6, 12,   33 }, // 000001101011
+  { 0x01a4, 12,   34 }, // 000011010010
+  { 0x01a6, 12,   35 }, // 000011010011
+  { 0x01a8, 12,   36 }, // 000011010100
+  { 0x01aa, 12,   37 }, // 000011010101
+  { 0x01ac, 12,   38 }, // 000011010110
+  { 0x01ae, 12,   39 }, // 000011010111
+  { 0x00d8, 12,   40 }, // 000001101100
+  { 0x00da, 12,   41 }, // 000001101101
+  { 0x01b4, 12,   42 }, // 000011011010
+  { 0x01b6, 12,   43 }, // 000011011011
+  { 0x00a8, 12,   44 }, // 000001010100
+  { 0x00aa, 12,   45 }, // 000001010101
+  { 0x00ac, 12,   46 }, // 000001010110
+  { 0x00ae, 12,   47 }, // 000001010111
+  { 0x00c8, 12,   48 }, // 000001100100
+  { 0x00ca, 12,   49 }, // 000001100101
+  { 0x00a4, 12,   50 }, // 000001010010
+  { 0x00a6, 12,   51 }, // 000001010011
+  { 0x0048, 12,   52 }, // 000000100100
+  { 0x006e, 12,   53 }, // 000000110111
+  { 0x0070, 12,   54 }, // 000000111000
+  { 0x004e, 12,   55 }, // 000000100111
+  { 0x0050, 12,   56 }, // 000000101000
+  { 0x00b0, 12,   57 }, // 000001011000
+  { 0x00b2, 12,   58 }, // 000001011001
+  { 0x0056, 12,   59 }, // 000000101011
+  { 0x0058, 12,   60 }, // 000000101100
+  { 0x00b4, 12,   61 }, // 000001011010
+  { 0x00cc, 12,   62 }, // 000001100110
+  { 0x00ce, 12,   63 }, // 000001100111
+  { 0x0078, 10,   64 }, // 0000001111
+  { 0x0190, 12,  128 }, // 000011001000
+  { 0x0192, 12,  192 }, // 000011001001
+  { 0x00b6, 12,  256 }, // 000001011011
+  { 0x0066, 12,  320 }, // 000000110011
+  { 0x0068, 12,  384 }, // 000000110100
+  { 0x006a, 12,  448 }, // 000000110101
+  { 0x006c, 13,  512 }, // 0000001101100
+  { 0x006d, 13,  576 }, // 0000001101101
+  { 0x004a, 13,  640 }, // 0000001001010
+  { 0x004b, 13,  704 }, // 0000001001011
+  { 0x004c, 13,  768 }, // 0000001001100
+  { 0x004d, 13,  832 }, // 0000001001101
+  { 0x0072, 13,  896 }, // 0000001110010
+  { 0x0073, 13,  960 }, // 0000001110011
+  { 0x0074, 13, 1024 }, // 0000001110100
+  { 0x0075, 13, 1088 }, // 0000001110101
+  { 0x0076, 13, 1152 }, // 0000001110110
+  { 0x0077, 13, 1216 }, // 0000001110111
+  { 0x0052, 13, 1280 }, // 0000001010010
+  { 0x0053, 13, 1344 }, // 0000001010011
+  { 0x0054, 13, 1408 }, // 0000001010100
+  { 0x0055, 13, 1472 }, // 0000001010101
+  { 0x005a, 13, 1536 }, // 0000001011010
+  { 0x005b, 13, 1600 }, // 0000001011011
+  { 0x0064, 13, 1664 }, // 0000001100100
+  { 0x0065, 13, 1728 }, // 0000001100101
+  { 0x0020, 11, 1792 }, // 00000001000
+  { 0x0030, 11, 1856 }, // 00000001100
+  { 0x0034, 11, 1920 }, // 00000001101
+  { 0x0024, 12, 1984 }, // 000000010010
+  { 0x0026, 12, 2048 }, // 000000010011
+  { 0x0028, 12, 2112 }, // 000000010100
+  { 0x002a, 12, 2176 }, // 000000010101
+  { 0x002c, 12, 2240 }, // 000000010110
+  { 0x002e, 12, 2304 }, // 000000010111
+  { 0x0038, 12, 2368 }, // 000000011100
+  { 0x003a, 12, 2432 }, // 000000011101
+  { 0x003c, 12, 2496 }, // 000000011110
+  { 0x003e, 12, 2560 }, // 000000011111
+  { 0x0000,  0,   -1 }  // Illegal entry
+};
+
+
+
+
+// ----------------------------------------
+// SOURCE OF BITS
+
+#define VLSBUFSIZE    64
+
+class MMRDecoder::VLSource : public GPEnabled
+{
+protected:
+  VLSource(GP<ByteStream> &inp);
+  void init(const bool striped);
+public:
+  // Initializes a bit source on a bytestream
+  static GP<VLSource> create(GP<ByteStream> &inp, const bool striped);
+
+  // Synchronize on the next stripe
+  void nextstripe(void);
+  // Returns a 32 bits integer with at least the 
+  // next sixteen code bits in the high order bits.
+  inline unsigned int peek(void);
+  // Ensures that next #peek()# contains at least
+  // the next 24 code bits.
+  void preload(void);
+  // Consumes #n# bits.
+  void shift(const int n);
+private:
+  GP<ByteStream> ginp;
+  ByteStream &inp;
+  unsigned char buffer[ VLSBUFSIZE ];
+  unsigned int codeword;
+  int lowbits;
+  int bufpos;
+  int bufmax;
+  int readmax;
+};
+
+MMRDecoder::VLSource::VLSource(GP<ByteStream> &xinp)
+: ginp(xinp), inp(*ginp), codeword(0), 
+  lowbits(0), bufpos(0), bufmax(0),
+  readmax(-1)
+{}
+
+void
+MMRDecoder::VLSource::init(const bool striped)
+{
+  if (striped)
+    readmax = inp.read32();
+  lowbits = 32;
+  preload();
+}
+
+GP<MMRDecoder::VLSource>
+MMRDecoder::VLSource::create(GP<ByteStream> &inp, const bool striped)
+{
+  VLSource *src=new VLSource(inp);
+  GP<VLSource> retval=src;
+  src->init(striped);
+  return retval;
+}
+
+void 
+MMRDecoder::VLSource::shift(const int n)
+{ 
+  codeword<<=n;
+  lowbits+=n;
+  if (lowbits>=16)
+    preload();
+}
+
+inline unsigned int
+MMRDecoder::VLSource::peek(void)
+{
+  return codeword;
+}
+
+
+void
+MMRDecoder::VLSource::nextstripe(void)
+{
+  while (readmax>0)
+    {
+      int size = sizeof(buffer);
+      if (readmax < size) 
+        size = readmax;
+      inp.readall(buffer, size);
+      readmax -= size;
+    }
+  bufpos = bufmax = 0;
+  memset(buffer,0,sizeof(buffer));
+  readmax = inp.read32();
+  codeword = 0; 
+  lowbits = 32;
+  preload();
+}
+
+void
+MMRDecoder::VLSource::preload(void)
+{
+  while (lowbits>=8) 
+    {
+      if (bufpos >= bufmax) 
+	{
+          // Refill buffer
+	  bufpos = bufmax = 0;
+          int size = sizeof(buffer);
+          if (readmax>=0 && readmax<size) 
+            size = readmax;
+          if (size>0)
+            bufmax = inp.read((void*)buffer, size);
+          readmax -= bufmax;
+	  if (bufmax <= 0)
+            return;
+	}
+      lowbits -= 8;
+      codeword |= buffer[bufpos++] << lowbits;
+    }
+}
+
+
+
+// ----------------------------------------
+// VARIABLE LENGTH CODES
+
+
+
+class MMRDecoder::VLTable : public GPEnabled
+{
+protected:
+  VLTable(const VLCode *codes);
+  void init(const int nbits);
+public:
+  // Construct a VLTable given a codebook with #nbits# long codes.
+  static GP<VLTable> create(VLCode const * const codes, const int nbits);
+
+  // Reads one symbol from a VLSource
+  int decode(MMRDecoder::VLSource *src);
+
+  const VLCode *code;
+  int codewordshift;
+  unsigned char *index;
+  GPBuffer<unsigned char> gindex;
+};
+
+GP<MMRDecoder::VLTable>
+MMRDecoder::VLTable::create(VLCode const * const codes, const int nbits)
+{
+  VLTable *table=new VLTable(codes);
+  GP<VLTable> retval=table;
+  table->init(nbits);
+  return retval;
+}
+
+inline int
+MMRDecoder::VLTable::decode(MMRDecoder::VLSource *src)    
+{ 
+  const VLCode &c = code[ index[ src->peek() >> codewordshift ] ];
+  src->shift(c.codelen); 
+  return c.value; 
+}
+
+MMRDecoder::VLTable::VLTable(const VLCode *codes)
+: code(codes), codewordshift(0), gindex(index,0)
+{}
+
+void
+MMRDecoder::VLTable::init(const int nbits)
+{
+  // count entries
+  int ncodes = 0;
+  while (code[ncodes].codelen)
+    ncodes++;
+  // check arguments
+  if (nbits<=1 || nbits>16)
+    G_THROW(invalid_mmr_data);
+  if (ncodes>=256)
+    G_THROW(invalid_mmr_data);
+  codewordshift = 32 - nbits;
+  // allocate table
+  int size = (1<<nbits);
+  gindex.resize(size);
+  gindex.set(ncodes);
+  // process codes
+  for (int i=0; i<ncodes; i++) {
+    const int c = code[i].code;
+    const int b = code[i].codelen;
+    if(b<=0 || b>nbits)
+    {
+      G_THROW(invalid_mmr_data);
+    }
+    // fill table entries whose index high bits are code.
+    int n = c + (1<<(nbits-b));
+    while ( --n >= c ) {
+      if(index[n] != ncodes)
+       G_THROW( ERR_MSG("MMRDecoder.bad_codebook") );
+      index[n] = i;
+    }
+  }
+}
+
+// ----------------------------------------
+// MMR DECODER
+
+
+
+MMRDecoder::~MMRDecoder() {}
+
+MMRDecoder::MMRDecoder( const int xwidth, const int xheight )
+: width(xwidth), height(xheight), lineno(0), 
+  striplineno(0), rowsperstrip(0), gline(line,width+8),
+  glineruns(lineruns,width+4), gprevruns(prevruns,width+4)
+{
+  gline.clear();
+  glineruns.clear();
+  gprevruns.clear();
+  lineruns[0] = width;
+  prevruns[0] = width;
+}
+
+void
+MMRDecoder::init(GP<ByteStream> gbs, const bool striped)
+{
+  rowsperstrip = (striped ? gbs->read16() : height);
+  src = VLSource::create(gbs, striped);
+  mrtable = VLTable::create(mrcodes, 7);
+  btable = VLTable::create(bcodes, 13);
+  wtable = VLTable::create(wcodes, 13);
+}
+
+GP<MMRDecoder> 
+MMRDecoder::create( GP<ByteStream> gbs, const int width,
+  const int height, const bool striped )
+{
+  MMRDecoder *mmr=new MMRDecoder(width,height);
+  GP<MMRDecoder> retval=mmr;
+  mmr->init(gbs,striped);
+  return retval;
+}
+
+const unsigned short *
+MMRDecoder::scanruns(const unsigned short **endptr)
+{
+  // Check if all lines have been returned
+  if (lineno >= height)
+    return 0;
+  // Check end of stripe
+  if ( striplineno == rowsperstrip )
+    {
+      striplineno=0;
+      lineruns[0] = prevruns[0] = width;
+      src->nextstripe();
+    }
+  // Swap run buffers
+  unsigned short *pr = lineruns;
+  unsigned short *xr = prevruns;
+  prevruns = pr;
+  lineruns = xr;
+  // Loop until scanline is complete
+  bool a0color = false;
+  int a0,rle,b1;
+  for(a0=0,rle=0,b1=*pr++;a0 < width;)
+    {
+      // Process MMR codes
+      const int c=mrtable->decode(src);
+      switch ( c )
+      {
+          /* Pass Mode */
+        case P: 
+          { 
+            b1 += *pr++;
+            rle += b1 - a0;
+            a0 = b1;
+            b1 += *pr++;
+            break;
+          }
+          /* Horizontal Mode */
+        case H: 
+          { 
+            // First run
+            VLTable &table1 = *(a0color ? btable : wtable);
+            int inc;
+            do { inc=table1.decode(src); a0+=inc; rle+=inc; } while (inc>=64);
+            *xr = rle; xr++; rle = 0;
+            // Second run
+            VLTable &table2 = *(!a0color ? btable : wtable);
+            do { inc=table2.decode(src); a0+=inc; rle+=inc; } while (inc>=64);
+            *xr = rle; xr++; rle = 0;
+            break;
+          }
+          /* Vertical Modes */
+        case V0:
+        case VR3:
+        case VR2:
+        case VR1:
+        case VL3:
+        case VL2:
+        case VL1:
+        {
+          int inc=b1;
+          switch ( c )
+          {
+          case V0:
+            inc = b1;
+            b1 += *pr++;
+            break;
+          case VR3:
+            inc = b1+3;
+            b1 += *pr++;
+            break;
+          case VR2:
+            inc = b1+2;
+            b1 += *pr++;
+            break;
+          case VR1:
+            inc = b1+1;
+            b1 += *pr++;
+            break;
+          case VL3:
+            inc = b1-3;
+            b1 -= *--pr;
+            break;
+          case VL2:
+            inc = b1-2;
+            b1 -= *--pr;
+            break;
+          case VL1:
+            inc = b1-1;
+            b1 -= *--pr;
+            break;
+          }
+          *xr = inc+rle-a0;
+          xr++;
+          a0 = inc;
+          rle = 0;
+          a0color = !a0color;
+          break;
+        }
+          /* Uncommon modes */
+        default: 
+          {
+            src->preload();
+            unsigned int m = src->peek();
+            // -- Could be EOFB ``000000000001000000000001''
+            //    TIFF6 says that all remaining lines are white
+            if ((m & 0xffffff00) == 0x00100100)
+              {
+                lineno = height;
+                return 0;
+              }
+            // -- Could be UNCOMPRESSED ``0000001111''
+            //    TIFF6 says people should not do this.
+            //    RFC1314 says people should do this.
+            else if ((m & 0xffc00000) == 0x03c00000)
+              {
+#ifdef MMRDECODER_REFUSES_UNCOMPRESSED
+                G_THROW( ERR_MSG("MMRDecoder.cant_process") );
+#else
+                // ---THE-FOLLOWING-CODE-IS-POORLY-TESTED---
+                src->shift(10);
+                while ((m = (src->peek() & 0xfc000000)))
+                  {
+                    if (m == 0x04000000)       // 000001
+                      {
+                        src->shift(6);
+                        if (a0color)
+                        {
+                          *xr = rle;
+                          xr++;
+                          rle = 0;
+                          a0color = !a0color;
+                        }
+                        rle += 5;
+                        a0 += 5;
+                      }
+                    else                       // 000010 to 111111 
+                      { 
+                        src->shift(1);
+                        if (a0color == !(m & 0x80000000))
+                        {
+                          *xr = rle;
+                          xr++;
+                          rle = 0;
+                          a0color = !a0color;
+                        }
+                        rle++;
+                        a0++;
+                      }
+                    if (a0 > width)
+                      G_THROW(invalid_mmr_data);
+                  }
+                // Analyze uncompressed termination code.
+                m = src->peek() & 0xff000000;  
+                src->shift(8);
+                if ( (m & 0xfe000000) != 0x02000000 )
+                  G_THROW(invalid_mmr_data);
+                if (rle)
+                {
+                  *xr = rle;
+                  xr++;
+                  rle = 0;
+                  a0color = !a0color;
+                }                  
+                if (a0color == !(m & 0x01000000))
+                {
+                  *xr = rle;
+                  xr++;
+                  rle = 0;
+                  a0color = !a0color;
+                }
+                // Cross fingers and proceed ...
+                break;
+#endif
+              }
+            // -- Unknown MMR code.
+            G_THROW(invalid_mmr_data);
+          }
+      }
+      // Next reference run
+      for(;b1<=a0 && b1<width;pr+=2)
+      {
+        b1 += pr[0]+pr[1];
+      }
+    }
+  // Final P must be followed by V0 (they say!)
+  if (rle > 0)
+  {
+    if (mrtable->decode(src) != V0)
+    {
+      G_THROW(invalid_mmr_data);
+    }
+  }
+  if (rle > 0)
+  {
+    *xr = rle;
+    xr++;
+  }
+  // At this point we should have A0 equal to WIDTH
+  // But there are buggy files around (Kofax!)
+  // and we are not the CCITT police.
+  if (a0 > width) 
+    {
+      while (a0 > width && xr > lineruns)
+        a0 -= *--xr;
+      if (a0 < width)
+      {
+        *xr = width-a0;
+        xr++;
+      }
+    }
+  /* Increment and return */
+  if (endptr) 
+    *endptr = xr;
+  xr[0] = 0;
+  xr[1] = 0;
+  lineno ++;
+  striplineno ++;
+  return lineruns;
+}
+
+
+
+const unsigned char *
+MMRDecoder::scanrle(const bool invert, const unsigned char **endptr)
+{
+  // Obtain run lengths
+  const unsigned short *xr = scanruns();
+  if (!xr) return 0;
+  unsigned char *p=line;
+  // Process inversion
+  if (invert)
+    {
+      if (! *xr) 
+      {
+        xr++;
+      }else
+      {
+        *p = 0; p++;
+      }
+    }
+  // Encode lenghts using the RLE format
+  for(int a0=0;a0 < width;)
+  {
+    int count = *xr++;
+    a0 += count;
+    GBitmap::append_run(p, count);
+  }
+  if (endptr)
+    *endptr = p;
+  p[0] = 0;
+  p[1] = 0;
+  return line;
+}
+
+
+#if 0
+const unsigned char *
+MMRDecoder::scanline(void)
+{
+  // Obtain run lengths
+  const unsigned short *xr = scanruns();
+  if (!xr) return 0;
+  // Allocate data buffer if needed
+  unsigned char *p = line;
+  // Decode run lengths
+  int a0 = 0;
+  int a0color = 0;
+  while (a0 < width)
+    {
+      int a1 = a0 + *xr++;
+      while (a0<a1 && a0<width)
+        line[a0++] = a0color;
+      a0color = !a0color;
+    }
+  return line;
+}
+#endif
+
+
+
+
+// ----------------------------------------
+// MAIN DECODING ROUTINE
+
+bool
+MMRDecoder::decode_header(
+  ByteStream &inp, int &width, int &height, int &invert)
+{
+  unsigned long int magic = inp.read32();
+  if((magic&0xfffffffc) != 0x4d4d5200)
+    G_THROW( ERR_MSG("MMRDecoder.unrecog_header") ); 
+  invert = ((magic & 0x1) ? 1 : 0);
+  const bool strip =  ((magic & 0x2) ? 1 : 0);
+  width = inp.read16();
+  height = inp.read16();
+  if (width<=0 || height<=0)
+    G_THROW( ERR_MSG("MMRDecoder.bad_header") );
+  return strip;
+}
+
+static inline int MAX(int a, int b) { return a>b ? a : b; }
+static inline int MIN(int a, int b) { return a<b ? a : b; }
+
+GP<JB2Image>
+MMRDecoder::decode(GP<ByteStream> gbs)
+{
+  ByteStream &inp=*gbs;
+  // Read header
+  int width, height, invert;
+  const bool striped=decode_header(inp, width, height, invert);
+  // Prepare image
+  GP<JB2Image> jimg = JB2Image::create();
+  jimg->set_dimension(width, height);
+  // Choose pertinent blocksize
+  int blocksize = MIN(500,MAX(64,MAX(width/17,height/22)));
+  int blocksperline = (width+blocksize-1)/blocksize;
+  // Prepare decoder
+  GP<MMRDecoder> gdcd=MMRDecoder::create(gbs, width, height, striped);
+  MMRDecoder &dcd=*gdcd;
+  // Loop on JB2 bands
+  int line = height-1;
+  while (line >= 0)
+    {
+      int bandline = MIN(blocksize-1,line);
+      GPArray<GBitmap> blocks(0,blocksperline-1);
+      // Loop on scanlines
+      for(; bandline >= 0; bandline--,line--)
+      {
+        // Decode one scanline
+        const unsigned short *s = dcd.scanruns();
+        if (s)
+        {
+	  // Loop on blocks
+          int x = 0;
+          int b = 0;
+          int firstx = 0;
+          bool c = !!invert;
+          while (x < width)
+            {
+              int xend = x + *s++;
+              while (b<blocksperline)
+                {
+                  int lastx = MIN(firstx+blocksize,width);
+                  if (c)
+                    {
+                      if (!blocks[b])
+                        blocks[b] = GBitmap::create(bandline+1, lastx-firstx);
+                      unsigned char *bptr = (*blocks[b])[bandline] - firstx;
+                      int x1 = MAX(x,firstx);
+                      int x2 = MIN(xend,lastx);
+                      while (x1 < x2)
+                        bptr[x1++] = 1;
+                    }
+                  if (xend < lastx)
+                    break;
+                  firstx = lastx;
+                  b ++;
+                }
+              x = xend;
+              c = !c; 
+            }
+	}
+      }
+      // Insert blocks into JB2Image
+      for (int b=0; b<blocksperline; b++)
+	{
+	  JB2Shape shape;
+	  shape.bits = blocks[b];
+	  if (shape.bits) 
+	    {
+	      shape.parent = -1;
+	      shape.bits->compress();
+	      JB2Blit blit;
+	      blit.left = b*blocksize;
+	      blit.bottom = line+1;
+	      blit.shapeno = jimg->add_shape(shape);
+	      jimg->add_blit(blit);
+	    }
+	}
+    }
+  // Return
+  return jimg;
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/MMRDecoder.h b/libdjvu/MMRDecoder.h
new file mode 100644
index 0000000..1c838da
--- /dev/null
+++ b/libdjvu/MMRDecoder.h
@@ -0,0 +1,235 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _MMRDECODER_H_
+#define _MMRDECODER_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+#include "GSmartPointer.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+class JB2Image;
+
+/** @name MMRDecoder.h
+    Files #"MMRDecoder.h"# and #"MMRDecoder.cpp"# implement a 
+    CCITT-G4/MMR decoder suitable for use in DjVu.  The main 
+    entry point is function \Ref{MMRDecoder::decode}.
+
+    The foreground mask layer of a DjVu file is usually encoded with a
+    #"Sjbz"# chunk containing JB2 encoded data (cf. \Ref{JB2Image.h}).
+    Alternatively, the qmask layer may be encoded with a #"Smmr"#
+    chunk containing a small header followed by MMR encoded data.
+    This encoding scheme produces significantly larger files. On the
+    other hand, many scanners a printers talk MMR using very efficient
+    hardware components.  This is the reason behind the introduction
+    of #"Smmr"# chunks.
+
+    The #Smmr# chunk starts by a header containing the following data:
+    \begin{verbatim}
+        BYTE*3    :  'M' 'M' 'R'
+        BYTE      :  0xb000000<s><i>
+        INT16     :  <width> (MSB first)
+        INT16     :  <height> (MSB first)
+    \end{verbatim}
+
+    The header is followed by the encoded data.  Bit 0 of the fourth header
+    byte (#<i>#) is similar to TIFF's ``min-is-black'' tag.  This bit is set
+    for a reverse video image.  The encoded data can be in either ``regular''
+    MMR form or ``striped'' MMR form.  This is indicated by bit 1 of the
+    fourth header byte (#<s>#).  This bit is set to indicate ``striped''
+    data.  The ``regular'' data format consists of ordinary MMR encoded data.
+    The ``striped'' data format consists of one sixteen bit integer (msb
+    first) containing the number of rows per stripe, followed by data for each
+    stripe as follows.
+    \begin{verbatim}
+        INT16     :  <rowsperstripe> (MSB first)
+        INT32          :  <nbytes1>
+        BYTE*<nbytes1> :  <mmrdata1>
+        INT32          :  <nbytes2>
+        BYTE*<nbytes2> :  <mmrdata2>
+          ...
+    \end{verbatim}
+    Static function \Ref{MMRDecoder::decode_header} decodes the header.  You
+    can then create a \Ref{MMRDecoder} object with the flags #inverted# and
+    #striped# as obtained when decoding the header.  One can also decode raw
+    MMR data by simply initialising a \Ref{MMRDecoder} object with flag
+    #striped# unset.  Each call to \Ref{MMRDecoder::scanruns},
+    \Ref{MMRDecoder::scanrle} or \Ref{MMRDecoder::scanline} will then decode a
+    row of the MMR encoded image.
+
+    Function \Ref{MMRDecoder::decode} is a convenience function for decoding
+    the contents of a #"Smmr"# chunk.  It returns a \Ref{JB2Image} divided
+    into manageable blocks in order to provide the zooming and panning
+    features implemented by class \Ref{JB2Image}.
+
+    @memo
+    CCITT-G4/MMR decoder.
+    @author
+    Parag Deshmukh <parag@sanskrit.lz.att.com> \\
+    Leon Bottou <leonb@research.att.com> */
+//@{
+
+
+
+#define MMRDECODER_HAS_SCANRUNS  1
+#define MMRDECODER_HAS_SCANRLE   1
+
+
+
+/** Class for G4/MMR decoding.  The simplest way to use this class is
+    the static member function \Ref{MMRDecoder::decode}.  This
+    function internally creates an instance of #MMRDecoder# which
+    processes the MMR data scanline by scanline.  */
+class DJVUAPI MMRDecoder : public GPEnabled
+{
+protected:
+  MMRDecoder(const int width, const int height);
+  void init(GP<ByteStream> gbs, const bool striped=false);
+public:
+  /** Main decoding routine that (a) decodes the header using
+      #decode_header#, (b) decodes the MMR data using an instance of
+      #MMRDecoder#, and returns a new \Ref{JB2Image} composed of tiles
+      whose maximal width and height is derived from the size of the
+      image. */
+  static GP<JB2Image> decode(GP<ByteStream> gbs);
+
+  /// Only decode the header.
+  static bool decode_header(ByteStream &inp, 
+                            int &width, int &height, int &invert);
+
+public:
+  /// Non-virtual destructor.
+  ~MMRDecoder();
+  /** Create a MMRDecoder object for decoding an image
+      of size #width# by #height#. Flag $striped# must be set
+      if the image is composed of multiple stripes. */
+  static GP<MMRDecoder> create(GP<ByteStream> gbs, 
+                               const int width, const int height,
+                               const bool striped=false );
+
+  /** Decodes a scanline and returns a pointer to an array of run lengths.
+      The returned buffer contains the length of alternative white and black
+      runs.  These run lengths sum to the image width. They are followed by
+      two zeroes.  The position of these two zeroes is stored in the pointer
+      specified by the optional argument #endptr#.  The buffer data should be
+      processed before calling this function again. */
+  const unsigned short *scanruns(const unsigned short **endptr=0);
+  /** Decodes a scanline and returns a pointer to RLE encoded data.  The
+      buffer contains the length of the runs for the current line encoded as
+      described in \Ref{PNM and RLE file formats}.)  The flag #invert# can be
+      used to indicate that the MMR data is encoded in reverse video.  The RLE
+      data is followed by two zero bytes.  The position of these two zeroes is
+      stored in the pointer specified by the optional argument #endptr#.  The
+      buffer data should be processed before calling this function again. This
+      is implemented by calling \Ref{MMRDecoder::scanruns}. */
+  const unsigned char  *scanrle(const bool invert, 
+                                const unsigned char **endptr=0);
+#if 0
+  /** Decodes a scanline and returns a pointer to an array of #0# or #1# bytes.
+      Returns a pointer to the scanline buffer containing one byte per pixel. 
+      The buffer data should be processed before calling this function again.
+      This is implemented by calling \Ref{MMRDecoder::scanruns}. */
+  const unsigned char *scanline();
+#endif
+ private:
+  int width;
+  int height;
+  int lineno;
+  int striplineno;
+  int rowsperstrip;
+  unsigned char  *line;
+  GPBuffer<unsigned char> gline;
+  unsigned short *lineruns;
+  GPBuffer<unsigned short> glineruns;
+  unsigned short *prevruns;
+  GPBuffer<unsigned short> gprevruns;
+public:
+  class VLSource;
+  class VLTable;
+private:
+  GP<VLSource> src;
+  GP<VLTable> mrtable;
+  GP<VLTable> wtable;
+  GP<VLTable> btable;
+  friend class VLSource;
+  friend class VLTable;
+};
+
+
+//@}
+
+
+// -----------
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp
new file mode 100644
index 0000000..e70fdd8
--- /dev/null
+++ b/libdjvu/MMX.cpp
@@ -0,0 +1,228 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "MMX.h"
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+// ----------------------------------------
+// PRINTING MMX REGISTERS (Debug)
+
+
+#if defined(MMX) && defined(DEBUG)
+extern "C" void
+mmx_show()
+{
+  /* This function can be called from a debugger
+     in order to visualize the contents of the MMX registers. */
+  int mmregs[16];
+  MMXra( movq,  mm0, &mmregs[0]);
+  MMXra( movq,  mm1, &mmregs[2]);
+  MMXra( movq,  mm2, &mmregs[4]);
+  MMXra( movq,  mm3, &mmregs[6]);
+  MMXra( movq,  mm4, &mmregs[8]);
+  MMXra( movq,  mm5, &mmregs[10]);
+  MMXra( movq,  mm6, &mmregs[12]);
+  MMXra( movq,  mm7, &mmregs[14]);
+  MMXemms;
+  for (int i=0; i<8; i++)
+    DjVuPrintMessageUTF8("mm%d: %08x%08x\n", i, 
+           mmregs[i+i+1], mmregs[i+i]);
+  MMXar( movq,  &mmregs[0], mm0);
+  MMXar( movq,  &mmregs[2], mm1);
+  MMXar( movq,  &mmregs[4], mm2);
+  MMXar( movq,  &mmregs[6], mm3);
+  MMXar( movq,  &mmregs[8], mm4);
+  MMXar( movq,  &mmregs[10], mm5);
+  MMXar( movq,  &mmregs[12], mm6);
+  MMXar( movq,  &mmregs[14], mm7);
+}
+#endif
+
+
+
+// ----------------------------------------
+// MMX ENABLE/DISABLE
+
+// Default settings autodetect MMX.
+// Use macro DISABLE_MMX to disable MMX by default.
+
+#if defined(MMX) && !defined(DISABLE_MMX)
+int MMXControl::mmxflag = -1;
+#else
+int MMXControl::mmxflag = 0;
+#endif
+
+int 
+MMXControl::disable_mmx()
+{
+  mmxflag = 0;
+  return mmxflag;
+}
+
+int 
+MMXControl::enable_mmx()
+{
+  int cpuflags = 0;
+  const char *envvar = getenv("LIBDJVU_DISABLE_MMX");
+  if (envvar && envvar[0] && envvar[0]!='0')
+    return ((mmxflag = 0));
+  
+#if defined(MMX) && defined(__GNUC__) && defined(__i386__)
+  // Detection of MMX for GCC
+  __asm__ volatile ("pushl %%ebx\n\t"
+                    "pushfl\n\t"    
+                    "popl %%ecx\n\t"
+                    "xorl %%edx,%%edx\n\t"
+                    // Check that CPUID exists
+                    "movl %%ecx,%%eax\n\t"
+                    "xorl $0x200000,%%eax\n\t"
+                    "pushl %%eax\n\t"
+                    "popfl\n\t"
+                    "pushfl\n\t"
+                    "popl %%eax\n\t"
+                    "xorl %%ecx,%%eax\n\t"
+                    "jz 1f\n\t"
+                    "pushl %%ecx\n\t"
+                    "popfl\n\t"
+                    // Check that CR0:EM is clear
+                    "smsw %%ax\n\t"
+                    "andl $4,%%eax\n\t"
+                    "jnz 1f\n\t"
+                    // Execute CPUID
+                    "movl $1,%%eax\n\t"
+                    "cpuid\n"
+                    // EBX contains magic when -fPIC is on.
+		    "1:\tpopl %%ebx\n\t"
+                    "movl %%edx, %0"
+                    : "=m" (cpuflags) :
+                    : "eax","ecx","edx");
+#endif
+#if defined(MMX) && defined(__GNUC__) && defined(__x86_64__)
+  // Detection of MMX for GCC
+  __asm__ volatile (// Check that CR0:EM is clear
+                    "xorl %%edx,%%edx\n\t"
+                    "smsw %%ax\n\t"
+                    "andl $4,%%eax\n\t"
+                    "jnz 1f\n\t"
+                    // Execute CPUID
+                    "movl $1,%%eax\n\t"
+                    "cpuid\n"
+                    // Finish
+		    "1:\tmovl %%edx, %0"
+                    : "=m" (cpuflags) :
+                    : "eax","ebx","ecx","edx");
+#endif
+#if defined(MMX) && defined(_MSC_VER) && defined(_M_IX86)
+  // Detection of MMX for MSVC 32 bits
+  __asm {  pushfd
+           pop     ecx
+           xor     edx,edx
+             ;// Check that CPUID exists
+           mov     eax,ecx        
+           xor     eax,0x200000
+           push    eax
+           popfd
+           pushfd
+           pop     eax
+           xor     eax,ecx
+           jz      fini
+           push    ecx
+           popfd
+             ;// Check that CR0:EM is zero
+           smsw    ax
+           and     eax,4
+           jnz     fini
+             ;// Execute CPUID
+           mov     eax,1
+           _emit   0xf
+           _emit   0xa2
+         fini:
+           mov     cpuflags,edx
+             ;// MSVC determines clobbered registers by scanning the assembly code.
+             ;// Since it does not know CPUID, it would not know that EBX is clobbered
+             ;// without the dummy instruction below...
+           xor     ebx,ebx
+         }
+#endif
+  mmxflag = !!(cpuflags & 0x800000);
+  return mmxflag;
+}
+
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/MMX.h b/libdjvu/MMX.h
new file mode 100644
index 0000000..f8780af
--- /dev/null
+++ b/libdjvu/MMX.h
@@ -0,0 +1,192 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _MMX_H_
+#define _MMX_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#include "DjVuGlobal.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+/** @name MMX.h
+    Files #"MMX.h"# and #"MMX.cpp"# implement basic routines for
+    supporting the MMX instructions on x86.  Future instruction sets
+    for other processors may be supported in this file as well.
+
+    Macro #MMX# is defined if the compiler supports the X86-MMX instructions.
+    It does not mean however that the processor supports the instruction set.
+    Variable #MMXControl::mmxflag# must be used to decide whether MMX.
+    instructions can be executed.  MMX instructions are entered in the middle
+    of C++ code using the following macros.  Examples can be found in
+    #"IWTransform.cpp"#.
+
+    \begin{description}
+    \item[MMXrr( insn, srcreg, dstreg)] 
+       Encode a register to register MMX instruction 
+       (e.g. #paddw# or #punpcklwd#).
+    \item[MMXar( insn, addr, dstreg )]
+       Encode a memory to register MMX instruction 
+       (e.g. #moveq# from memory).
+    \item[MMXra( insn, srcreg, addr )]
+       Encode a register to memory MMX instruction 
+       (e.g. #moveq# to memory).
+    \item[MMXir( insn, imm, dstreg )]
+       Encode a immediate to register MMX instruction 
+       (e.g #psraw#).
+    \item[MMXemms]
+       Execute the #EMMS# instruction to reset the FPU state.
+    \end{description}
+
+    @memo
+    Essential support for MMX.
+    @author: 
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation */
+//@{
+
+
+/** MMX Control. 
+    Class #MMXControl# encapsulates a few static functions for 
+    globally enabling or disabling MMX support. */
+
+class MMXControl
+{
+ public:
+  // MMX DETECTION
+  /** Detects and enable MMX or similar technologies.  This function checks
+      whether the CPU supports a vectorial instruction set (such as Intel's
+      MMX) and enables them.  Returns a boolean indicating whether such an
+      instruction set is available.  Speedups factors may vary. */
+  static int enable_mmx();
+  /** Disables MMX or similar technologies.  The transforms will then be
+      performed using the baseline code. */
+  static int disable_mmx();
+  /** Contains a value greater than zero if the CPU supports vectorial
+      instructions. A negative value means that you must call \Ref{enable_mmx}
+      and test the value again. Direct access to this member should only be
+      used to transfer the instruction flow to the vectorial branch of the
+      code. Never modify the value of this variable.  Use #enable_mmx# or
+      #disable_mmx# instead. */
+  static int mmxflag;  // readonly
+};
+
+//@}
+
+
+
+
+// ----------------------------------------
+// GCC MMX MACROS
+
+#ifndef NO_MMX
+
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+typedef struct{ char c[8]; } MMX_t;
+#define MMXemms \
+  __asm__ volatile("emms" : : : "memory" ) 
+#define MMXrr(op,src,dst) \
+  __asm__ volatile( #op " %%" #src ",%%" #dst : : : "memory" ) 
+#define MMXir(op,imm,dst) \
+  __asm__ volatile( #op " %0,%%" #dst : : "i" (imm) : "memory" )
+#define MMXar(op,addr,dst) \
+  __asm__ volatile( #op " %0,%%" #dst : : "m" (*(MMX_t*)(addr)) : "memory" ) 
+#define MMXra(op,src,addr) \
+  __asm__ volatile( #op " %%" #src ",%0" : "=m" (*(MMX_t*)(addr)) : : "memory") 
+#define MMX 1
+#endif
+
+
+// ----------------------------------------
+// MSVC MMX MACROS
+
+#if defined(_MSC_VER) && defined(_M_IX86)
+// Compiler option /GM is required
+#pragma warning( disable : 4799 )
+#define MMXemms \
+  __asm { emms }
+#define MMXrr(op,src,dst) \
+  __asm { op dst,src }
+#define MMXir(op,imm,dst) \
+  __asm { op dst,imm }
+#define MMXar(op,addr,dst) \
+  { register __int64 var=*(__int64*)(addr); __asm { op dst,var } }
+#define MMXra(op,src,addr) \
+  { register __int64 var; __asm { op [var],src };  *(__int64*)addr = var; } 
+// Probably not as efficient as GCC macros
+#define MMX 1
+#endif
+
+#endif
+
+// -----------
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/Makefile.am b/libdjvu/Makefile.am
new file mode 100644
index 0000000..e9f34ed
--- /dev/null
+++ b/libdjvu/Makefile.am
@@ -0,0 +1,60 @@
+lib_LTLIBRARIES = libdjvulibre.la
+
+includesdir = $(includedir)/libdjvu
+includes_HEADERS = ddjvuapi.h miniexp.h
+
+libdjvulibre_la_SOURCES = Arrays.cpp BSByteStream.cpp			\
+ BSEncodeByteStream.cpp ByteStream.cpp DataPool.cpp DjVmDir.cpp		\
+ DjVmDir0.cpp DjVmDoc.cpp DjVmNav.cpp DjVuAnno.cpp DjVuDocEditor.cpp	\
+ DjVuDocument.cpp DjVuDumpHelper.cpp DjVuErrorList.cpp DjVuFile.cpp	\
+ DjVuFileCache.cpp DjVuGlobal.cpp DjVuGlobalMemory.cpp DjVuImage.cpp	\
+ DjVuInfo.cpp DjVuMessage.cpp DjVuMessageLite.cpp DjVuNavDir.cpp	\
+ DjVuPalette.cpp DjVuPort.cpp DjVuText.cpp DjVuToPS.cpp GBitmap.cpp	\
+ GContainer.cpp GException.cpp GIFFManager.cpp GMapAreas.cpp GOS.cpp	\
+ GPixmap.cpp GRect.cpp GScaler.cpp GSmartPointer.cpp GString.cpp	\
+ GThreads.cpp GURL.cpp GUnicode.cpp IFFByteStream.cpp			\
+ IW44EncodeCodec.cpp IW44Image.cpp JB2EncodeCodec.cpp JB2Image.cpp	\
+ JPEGDecoder.cpp MMRDecoder.cpp MMX.cpp UnicodeByteStream.cpp		\
+ XMLParser.cpp XMLTags.cpp ZPCodec.cpp atomic.cpp ddjvuapi.cpp		\
+ debug.cpp miniexp.cpp Arrays.h BSByteStream.h ByteStream.h		\
+ DataPool.h DjVmDir.h DjVmDir0.h DjVmDoc.h DjVmNav.h DjVuAnno.h		\
+ DjVuDocEditor.h DjVuDocument.h DjVuDumpHelper.h DjVuErrorList.h	\
+ DjVuFile.h DjVuFileCache.h DjVuGlobal.h DjVuImage.h DjVuInfo.h		\
+ DjVuMessage.h DjVuMessageLite.h DjVuNavDir.h DjVuPalette.h		\
+ DjVuPort.h DjVuText.h DjVuToPS.h GBitmap.h GContainer.h GException.h	\
+ GIFFManager.h GMapAreas.h GOS.h GPixmap.h GRect.h GScaler.h		\
+ GSmartPointer.h GString.h GThreads.h GURL.h IFFByteStream.h		\
+ IW44Image.h JB2Image.h JPEGDecoder.h MMRDecoder.h MMX.h Template.h	\
+ UnicodeByteStream.h XMLParser.h XMLTags.h ZPCodec.h atomic.h debug.h
+
+libdjvulibre_la_CPPFLAGS = -DDIR_DATADIR=\"$(datadir)\"
+libdjvulibre_la_CXXFLAGS = $(JPEG_CFLAGS) $(PTHREAD_CFLAGS)
+libdjvulibre_la_LIBADD = $(JPEG_LIBS) $(PTHREAD_LIBS)
+libdjvulibre_la_LDFLAGS = -no-undefined -version-info $(version_info)
+
+if HAVE_OS_WIN32
+libdjvulibre_la_LDFLAGS += -Wl,--export-all-symbols
+endif
+
+sed_process = $(SED) \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@prefix\@,$(prefix),g' \
+ -e 's,@exec_prefix\@,$(exec_prefix),g' \
+ -e 's,@libdir\@,$(libdir),g' \
+ -e 's,@includedir\@,$(includedir),g' \
+ -e 's,@Libs\@,-L$(libdir) -ldjvulibre,g' \
+ -e 's,@Libsprivate\@,$(JPEG_LIBS) $(PTHREAD_LIBS) $(LIBS),g' \
+ -e 's,@Cflags\@,-I$(includedir) $(JPEG_CFLAGS) $(PTHREAD_CFLAGS),g' \
+ < $< > $@ || (rm $@; exit 1)
+
+pc_verbose = $(pc_verbose_@AM_V@)
+pc_verbose_ = $(pc_verbose_@AM_DEFAULT_V@)
+pc_verbose_0 = @echo "  PC      " $@;
+
+ddjvuapi.pc: ddjvuapi.pc.in Makefile
+	$(AM_V_at)rm -f $@
+	$(pc_verbose)$(sed_process)
+
+pkgconfig_DATA = ddjvuapi.pc
+EXTRA_DIST = ddjvuapi.pc.in
+MOSTLYCLEANFILES = ddjvuapi.pc
diff --git a/libdjvu/Makefile.in b/libdjvu/Makefile.in
new file mode 100644
index 0000000..99e8e38
--- /dev/null
+++ b/libdjvu/Makefile.in
@@ -0,0 +1,1265 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@HAVE_OS_WIN32_TRUE@am__append_1 = -Wl,--export-all-symbols
+subdir = libdjvu
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/config/depcomp $(includes_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(includesdir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libdjvulibre_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_libdjvulibre_la_OBJECTS = libdjvulibre_la-Arrays.lo \
+	libdjvulibre_la-BSByteStream.lo \
+	libdjvulibre_la-BSEncodeByteStream.lo \
+	libdjvulibre_la-ByteStream.lo libdjvulibre_la-DataPool.lo \
+	libdjvulibre_la-DjVmDir.lo libdjvulibre_la-DjVmDir0.lo \
+	libdjvulibre_la-DjVmDoc.lo libdjvulibre_la-DjVmNav.lo \
+	libdjvulibre_la-DjVuAnno.lo libdjvulibre_la-DjVuDocEditor.lo \
+	libdjvulibre_la-DjVuDocument.lo \
+	libdjvulibre_la-DjVuDumpHelper.lo \
+	libdjvulibre_la-DjVuErrorList.lo libdjvulibre_la-DjVuFile.lo \
+	libdjvulibre_la-DjVuFileCache.lo libdjvulibre_la-DjVuGlobal.lo \
+	libdjvulibre_la-DjVuGlobalMemory.lo \
+	libdjvulibre_la-DjVuImage.lo libdjvulibre_la-DjVuInfo.lo \
+	libdjvulibre_la-DjVuMessage.lo \
+	libdjvulibre_la-DjVuMessageLite.lo \
+	libdjvulibre_la-DjVuNavDir.lo libdjvulibre_la-DjVuPalette.lo \
+	libdjvulibre_la-DjVuPort.lo libdjvulibre_la-DjVuText.lo \
+	libdjvulibre_la-DjVuToPS.lo libdjvulibre_la-GBitmap.lo \
+	libdjvulibre_la-GContainer.lo libdjvulibre_la-GException.lo \
+	libdjvulibre_la-GIFFManager.lo libdjvulibre_la-GMapAreas.lo \
+	libdjvulibre_la-GOS.lo libdjvulibre_la-GPixmap.lo \
+	libdjvulibre_la-GRect.lo libdjvulibre_la-GScaler.lo \
+	libdjvulibre_la-GSmartPointer.lo libdjvulibre_la-GString.lo \
+	libdjvulibre_la-GThreads.lo libdjvulibre_la-GURL.lo \
+	libdjvulibre_la-GUnicode.lo libdjvulibre_la-IFFByteStream.lo \
+	libdjvulibre_la-IW44EncodeCodec.lo \
+	libdjvulibre_la-IW44Image.lo libdjvulibre_la-JB2EncodeCodec.lo \
+	libdjvulibre_la-JB2Image.lo libdjvulibre_la-JPEGDecoder.lo \
+	libdjvulibre_la-MMRDecoder.lo libdjvulibre_la-MMX.lo \
+	libdjvulibre_la-UnicodeByteStream.lo \
+	libdjvulibre_la-XMLParser.lo libdjvulibre_la-XMLTags.lo \
+	libdjvulibre_la-ZPCodec.lo libdjvulibre_la-atomic.lo \
+	libdjvulibre_la-ddjvuapi.lo libdjvulibre_la-debug.lo \
+	libdjvulibre_la-miniexp.lo
+libdjvulibre_la_OBJECTS = $(am_libdjvulibre_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libdjvulibre_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) \
+	$(libdjvulibre_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libdjvulibre_la_SOURCES)
+DIST_SOURCES = $(libdjvulibre_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(pkgconfig_DATA)
+HEADERS = $(includes_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INKSCAPE = @INKSCAPE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JPEG_CFLAGS = @JPEG_CFLAGS@
+JPEG_LIBS = @JPEG_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RM = @RM@
+RSVG = @RSVG@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TIFF_CFLAGS = @TIFF_CFLAGS@
+TIFF_LIBS = @TIFF_LIBS@
+TOUCH = @TOUCH@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+version_info = @version_info@
+lib_LTLIBRARIES = libdjvulibre.la
+includesdir = $(includedir)/libdjvu
+includes_HEADERS = ddjvuapi.h miniexp.h
+libdjvulibre_la_SOURCES = Arrays.cpp BSByteStream.cpp			\
+ BSEncodeByteStream.cpp ByteStream.cpp DataPool.cpp DjVmDir.cpp		\
+ DjVmDir0.cpp DjVmDoc.cpp DjVmNav.cpp DjVuAnno.cpp DjVuDocEditor.cpp	\
+ DjVuDocument.cpp DjVuDumpHelper.cpp DjVuErrorList.cpp DjVuFile.cpp	\
+ DjVuFileCache.cpp DjVuGlobal.cpp DjVuGlobalMemory.cpp DjVuImage.cpp	\
+ DjVuInfo.cpp DjVuMessage.cpp DjVuMessageLite.cpp DjVuNavDir.cpp	\
+ DjVuPalette.cpp DjVuPort.cpp DjVuText.cpp DjVuToPS.cpp GBitmap.cpp	\
+ GContainer.cpp GException.cpp GIFFManager.cpp GMapAreas.cpp GOS.cpp	\
+ GPixmap.cpp GRect.cpp GScaler.cpp GSmartPointer.cpp GString.cpp	\
+ GThreads.cpp GURL.cpp GUnicode.cpp IFFByteStream.cpp			\
+ IW44EncodeCodec.cpp IW44Image.cpp JB2EncodeCodec.cpp JB2Image.cpp	\
+ JPEGDecoder.cpp MMRDecoder.cpp MMX.cpp UnicodeByteStream.cpp		\
+ XMLParser.cpp XMLTags.cpp ZPCodec.cpp atomic.cpp ddjvuapi.cpp		\
+ debug.cpp miniexp.cpp Arrays.h BSByteStream.h ByteStream.h		\
+ DataPool.h DjVmDir.h DjVmDir0.h DjVmDoc.h DjVmNav.h DjVuAnno.h		\
+ DjVuDocEditor.h DjVuDocument.h DjVuDumpHelper.h DjVuErrorList.h	\
+ DjVuFile.h DjVuFileCache.h DjVuGlobal.h DjVuImage.h DjVuInfo.h		\
+ DjVuMessage.h DjVuMessageLite.h DjVuNavDir.h DjVuPalette.h		\
+ DjVuPort.h DjVuText.h DjVuToPS.h GBitmap.h GContainer.h GException.h	\
+ GIFFManager.h GMapAreas.h GOS.h GPixmap.h GRect.h GScaler.h		\
+ GSmartPointer.h GString.h GThreads.h GURL.h IFFByteStream.h		\
+ IW44Image.h JB2Image.h JPEGDecoder.h MMRDecoder.h MMX.h Template.h	\
+ UnicodeByteStream.h XMLParser.h XMLTags.h ZPCodec.h atomic.h debug.h
+
+libdjvulibre_la_CPPFLAGS = -DDIR_DATADIR=\"$(datadir)\"
+libdjvulibre_la_CXXFLAGS = $(JPEG_CFLAGS) $(PTHREAD_CFLAGS)
+libdjvulibre_la_LIBADD = $(JPEG_LIBS) $(PTHREAD_LIBS)
+libdjvulibre_la_LDFLAGS = -no-undefined -version-info $(version_info) \
+	$(am__append_1)
+sed_process = $(SED) \
+ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ -e 's,@prefix\@,$(prefix),g' \
+ -e 's,@exec_prefix\@,$(exec_prefix),g' \
+ -e 's,@libdir\@,$(libdir),g' \
+ -e 's,@includedir\@,$(includedir),g' \
+ -e 's,@Libs\@,-L$(libdir) -ldjvulibre,g' \
+ -e 's,@Libsprivate\@,$(JPEG_LIBS) $(PTHREAD_LIBS) $(LIBS),g' \
+ -e 's,@Cflags\@,-I$(includedir) $(JPEG_CFLAGS) $(PTHREAD_CFLAGS),g' \
+ < $< > $@ || (rm $@; exit 1)
+
+pc_verbose = $(pc_verbose_@AM_V@)
+pc_verbose_ = $(pc_verbose_@AM_DEFAULT_V@)
+pc_verbose_0 = @echo "  PC      " $@;
+pkgconfig_DATA = ddjvuapi.pc
+EXTRA_DIST = ddjvuapi.pc.in
+MOSTLYCLEANFILES = ddjvuapi.pc
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libdjvu/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libdjvu/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libdjvulibre.la: $(libdjvulibre_la_OBJECTS) $(libdjvulibre_la_DEPENDENCIES) $(EXTRA_libdjvulibre_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libdjvulibre_la_LINK) -rpath $(libdir) $(libdjvulibre_la_OBJECTS) $(libdjvulibre_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-Arrays.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-BSByteStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-BSEncodeByteStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-ByteStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DataPool.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVmDir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVmDir0.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVmDoc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVmNav.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuAnno.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuDocEditor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuDocument.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuDumpHelper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuErrorList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuFile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuFileCache.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuGlobal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuGlobalMemory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuImage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuInfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuMessage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuMessageLite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuNavDir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuPalette.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuPort.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuText.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-DjVuToPS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GBitmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GContainer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GException.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GIFFManager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GMapAreas.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GOS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GPixmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GRect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GScaler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GSmartPointer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GString.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GThreads.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GURL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-GUnicode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-IFFByteStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-IW44EncodeCodec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-IW44Image.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-JB2EncodeCodec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-JB2Image.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-JPEGDecoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-MMRDecoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-MMX.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-UnicodeByteStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-XMLParser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-XMLTags.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-ZPCodec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-atomic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-ddjvuapi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-debug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdjvulibre_la-miniexp.Plo@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+libdjvulibre_la-Arrays.lo: Arrays.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-Arrays.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-Arrays.Tpo -c -o libdjvulibre_la-Arrays.lo `test -f 'Arrays.cpp' || echo '$(srcdir)/'`Arrays.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-Arrays.Tpo $(DEPDIR)/libdjvulibre_la-Arrays.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='Arrays.cpp' object='libdjvulibre_la-Arrays.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-Arrays.lo `test -f 'Arrays.cpp' || echo '$(srcdir)/'`Arrays.cpp
+
+libdjvulibre_la-BSByteStream.lo: BSByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-BSByteStream.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-BSByteStream.Tpo -c -o libdjvulibre_la-BSByteStream.lo `test -f 'BSByteStream.cpp' || echo '$(srcdir)/'`BSByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-BSByteStream.Tpo $(DEPDIR)/libdjvulibre_la-BSByteStream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BSByteStream.cpp' object='libdjvulibre_la-BSByteStream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-BSByteStream.lo `test -f 'BSByteStream.cpp' || echo '$(srcdir)/'`BSByteStream.cpp
+
+libdjvulibre_la-BSEncodeByteStream.lo: BSEncodeByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-BSEncodeByteStream.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-BSEncodeByteStream.Tpo -c -o libdjvulibre_la-BSEncodeByteStream.lo `test -f 'BSEncodeByteStream.cpp' || echo '$(srcdir)/'`BSEncodeByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-BSEncodeByteStream.Tpo $(DEPDIR)/libdjvulibre_la-BSEncodeByteStream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BSEncodeByteStream.cpp' object='libdjvulibre_la-BSEncodeByteStream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-BSEncodeByteStream.lo `test -f 'BSEncodeByteStream.cpp' || echo '$(srcdir)/'`BSEncodeByteStream.cpp
+
+libdjvulibre_la-ByteStream.lo: ByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-ByteStream.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-ByteStream.Tpo -c -o libdjvulibre_la-ByteStream.lo `test -f 'ByteStream.cpp' || echo '$(srcdir)/'`ByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-ByteStream.Tpo $(DEPDIR)/libdjvulibre_la-ByteStream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ByteStream.cpp' object='libdjvulibre_la-ByteStream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-ByteStream.lo `test -f 'ByteStream.cpp' || echo '$(srcdir)/'`ByteStream.cpp
+
+libdjvulibre_la-DataPool.lo: DataPool.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DataPool.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DataPool.Tpo -c -o libdjvulibre_la-DataPool.lo `test -f 'DataPool.cpp' || echo '$(srcdir)/'`DataPool.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DataPool.Tpo $(DEPDIR)/libdjvulibre_la-DataPool.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DataPool.cpp' object='libdjvulibre_la-DataPool.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DataPool.lo `test -f 'DataPool.cpp' || echo '$(srcdir)/'`DataPool.cpp
+
+libdjvulibre_la-DjVmDir.lo: DjVmDir.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVmDir.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVmDir.Tpo -c -o libdjvulibre_la-DjVmDir.lo `test -f 'DjVmDir.cpp' || echo '$(srcdir)/'`DjVmDir.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVmDir.Tpo $(DEPDIR)/libdjvulibre_la-DjVmDir.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVmDir.cpp' object='libdjvulibre_la-DjVmDir.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVmDir.lo `test -f 'DjVmDir.cpp' || echo '$(srcdir)/'`DjVmDir.cpp
+
+libdjvulibre_la-DjVmDir0.lo: DjVmDir0.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVmDir0.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVmDir0.Tpo -c -o libdjvulibre_la-DjVmDir0.lo `test -f 'DjVmDir0.cpp' || echo '$(srcdir)/'`DjVmDir0.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVmDir0.Tpo $(DEPDIR)/libdjvulibre_la-DjVmDir0.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVmDir0.cpp' object='libdjvulibre_la-DjVmDir0.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVmDir0.lo `test -f 'DjVmDir0.cpp' || echo '$(srcdir)/'`DjVmDir0.cpp
+
+libdjvulibre_la-DjVmDoc.lo: DjVmDoc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVmDoc.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVmDoc.Tpo -c -o libdjvulibre_la-DjVmDoc.lo `test -f 'DjVmDoc.cpp' || echo '$(srcdir)/'`DjVmDoc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVmDoc.Tpo $(DEPDIR)/libdjvulibre_la-DjVmDoc.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVmDoc.cpp' object='libdjvulibre_la-DjVmDoc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVmDoc.lo `test -f 'DjVmDoc.cpp' || echo '$(srcdir)/'`DjVmDoc.cpp
+
+libdjvulibre_la-DjVmNav.lo: DjVmNav.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVmNav.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVmNav.Tpo -c -o libdjvulibre_la-DjVmNav.lo `test -f 'DjVmNav.cpp' || echo '$(srcdir)/'`DjVmNav.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVmNav.Tpo $(DEPDIR)/libdjvulibre_la-DjVmNav.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVmNav.cpp' object='libdjvulibre_la-DjVmNav.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVmNav.lo `test -f 'DjVmNav.cpp' || echo '$(srcdir)/'`DjVmNav.cpp
+
+libdjvulibre_la-DjVuAnno.lo: DjVuAnno.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuAnno.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuAnno.Tpo -c -o libdjvulibre_la-DjVuAnno.lo `test -f 'DjVuAnno.cpp' || echo '$(srcdir)/'`DjVuAnno.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuAnno.Tpo $(DEPDIR)/libdjvulibre_la-DjVuAnno.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuAnno.cpp' object='libdjvulibre_la-DjVuAnno.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuAnno.lo `test -f 'DjVuAnno.cpp' || echo '$(srcdir)/'`DjVuAnno.cpp
+
+libdjvulibre_la-DjVuDocEditor.lo: DjVuDocEditor.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuDocEditor.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuDocEditor.Tpo -c -o libdjvulibre_la-DjVuDocEditor.lo `test -f 'DjVuDocEditor.cpp' || echo '$(srcdir)/'`DjVuDocEditor.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuDocEditor.Tpo $(DEPDIR)/libdjvulibre_la-DjVuDocEditor.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuDocEditor.cpp' object='libdjvulibre_la-DjVuDocEditor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuDocEditor.lo `test -f 'DjVuDocEditor.cpp' || echo '$(srcdir)/'`DjVuDocEditor.cpp
+
+libdjvulibre_la-DjVuDocument.lo: DjVuDocument.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuDocument.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuDocument.Tpo -c -o libdjvulibre_la-DjVuDocument.lo `test -f 'DjVuDocument.cpp' || echo '$(srcdir)/'`DjVuDocument.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuDocument.Tpo $(DEPDIR)/libdjvulibre_la-DjVuDocument.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuDocument.cpp' object='libdjvulibre_la-DjVuDocument.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuDocument.lo `test -f 'DjVuDocument.cpp' || echo '$(srcdir)/'`DjVuDocument.cpp
+
+libdjvulibre_la-DjVuDumpHelper.lo: DjVuDumpHelper.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuDumpHelper.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuDumpHelper.Tpo -c -o libdjvulibre_la-DjVuDumpHelper.lo `test -f 'DjVuDumpHelper.cpp' || echo '$(srcdir)/'`DjVuDumpHelper.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuDumpHelper.Tpo $(DEPDIR)/libdjvulibre_la-DjVuDumpHelper.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuDumpHelper.cpp' object='libdjvulibre_la-DjVuDumpHelper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuDumpHelper.lo `test -f 'DjVuDumpHelper.cpp' || echo '$(srcdir)/'`DjVuDumpHelper.cpp
+
+libdjvulibre_la-DjVuErrorList.lo: DjVuErrorList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuErrorList.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuErrorList.Tpo -c -o libdjvulibre_la-DjVuErrorList.lo `test -f 'DjVuErrorList.cpp' || echo '$(srcdir)/'`DjVuErrorList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuErrorList.Tpo $(DEPDIR)/libdjvulibre_la-DjVuErrorList.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuErrorList.cpp' object='libdjvulibre_la-DjVuErrorList.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuErrorList.lo `test -f 'DjVuErrorList.cpp' || echo '$(srcdir)/'`DjVuErrorList.cpp
+
+libdjvulibre_la-DjVuFile.lo: DjVuFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuFile.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuFile.Tpo -c -o libdjvulibre_la-DjVuFile.lo `test -f 'DjVuFile.cpp' || echo '$(srcdir)/'`DjVuFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuFile.Tpo $(DEPDIR)/libdjvulibre_la-DjVuFile.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuFile.cpp' object='libdjvulibre_la-DjVuFile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuFile.lo `test -f 'DjVuFile.cpp' || echo '$(srcdir)/'`DjVuFile.cpp
+
+libdjvulibre_la-DjVuFileCache.lo: DjVuFileCache.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuFileCache.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuFileCache.Tpo -c -o libdjvulibre_la-DjVuFileCache.lo `test -f 'DjVuFileCache.cpp' || echo '$(srcdir)/'`DjVuFileCache.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuFileCache.Tpo $(DEPDIR)/libdjvulibre_la-DjVuFileCache.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuFileCache.cpp' object='libdjvulibre_la-DjVuFileCache.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuFileCache.lo `test -f 'DjVuFileCache.cpp' || echo '$(srcdir)/'`DjVuFileCache.cpp
+
+libdjvulibre_la-DjVuGlobal.lo: DjVuGlobal.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuGlobal.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuGlobal.Tpo -c -o libdjvulibre_la-DjVuGlobal.lo `test -f 'DjVuGlobal.cpp' || echo '$(srcdir)/'`DjVuGlobal.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuGlobal.Tpo $(DEPDIR)/libdjvulibre_la-DjVuGlobal.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuGlobal.cpp' object='libdjvulibre_la-DjVuGlobal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuGlobal.lo `test -f 'DjVuGlobal.cpp' || echo '$(srcdir)/'`DjVuGlobal.cpp
+
+libdjvulibre_la-DjVuGlobalMemory.lo: DjVuGlobalMemory.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuGlobalMemory.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuGlobalMemory.Tpo -c -o libdjvulibre_la-DjVuGlobalMemory.lo `test -f 'DjVuGlobalMemory.cpp' || echo '$(srcdir)/'`DjVuGlobalMemory.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuGlobalMemory.Tpo $(DEPDIR)/libdjvulibre_la-DjVuGlobalMemory.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuGlobalMemory.cpp' object='libdjvulibre_la-DjVuGlobalMemory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuGlobalMemory.lo `test -f 'DjVuGlobalMemory.cpp' || echo '$(srcdir)/'`DjVuGlobalMemory.cpp
+
+libdjvulibre_la-DjVuImage.lo: DjVuImage.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuImage.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuImage.Tpo -c -o libdjvulibre_la-DjVuImage.lo `test -f 'DjVuImage.cpp' || echo '$(srcdir)/'`DjVuImage.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuImage.Tpo $(DEPDIR)/libdjvulibre_la-DjVuImage.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuImage.cpp' object='libdjvulibre_la-DjVuImage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuImage.lo `test -f 'DjVuImage.cpp' || echo '$(srcdir)/'`DjVuImage.cpp
+
+libdjvulibre_la-DjVuInfo.lo: DjVuInfo.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuInfo.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuInfo.Tpo -c -o libdjvulibre_la-DjVuInfo.lo `test -f 'DjVuInfo.cpp' || echo '$(srcdir)/'`DjVuInfo.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuInfo.Tpo $(DEPDIR)/libdjvulibre_la-DjVuInfo.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuInfo.cpp' object='libdjvulibre_la-DjVuInfo.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuInfo.lo `test -f 'DjVuInfo.cpp' || echo '$(srcdir)/'`DjVuInfo.cpp
+
+libdjvulibre_la-DjVuMessage.lo: DjVuMessage.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuMessage.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuMessage.Tpo -c -o libdjvulibre_la-DjVuMessage.lo `test -f 'DjVuMessage.cpp' || echo '$(srcdir)/'`DjVuMessage.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuMessage.Tpo $(DEPDIR)/libdjvulibre_la-DjVuMessage.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuMessage.cpp' object='libdjvulibre_la-DjVuMessage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuMessage.lo `test -f 'DjVuMessage.cpp' || echo '$(srcdir)/'`DjVuMessage.cpp
+
+libdjvulibre_la-DjVuMessageLite.lo: DjVuMessageLite.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuMessageLite.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuMessageLite.Tpo -c -o libdjvulibre_la-DjVuMessageLite.lo `test -f 'DjVuMessageLite.cpp' || echo '$(srcdir)/'`DjVuMessageLite.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuMessageLite.Tpo $(DEPDIR)/libdjvulibre_la-DjVuMessageLite.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuMessageLite.cpp' object='libdjvulibre_la-DjVuMessageLite.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuMessageLite.lo `test -f 'DjVuMessageLite.cpp' || echo '$(srcdir)/'`DjVuMessageLite.cpp
+
+libdjvulibre_la-DjVuNavDir.lo: DjVuNavDir.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuNavDir.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuNavDir.Tpo -c -o libdjvulibre_la-DjVuNavDir.lo `test -f 'DjVuNavDir.cpp' || echo '$(srcdir)/'`DjVuNavDir.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuNavDir.Tpo $(DEPDIR)/libdjvulibre_la-DjVuNavDir.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuNavDir.cpp' object='libdjvulibre_la-DjVuNavDir.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuNavDir.lo `test -f 'DjVuNavDir.cpp' || echo '$(srcdir)/'`DjVuNavDir.cpp
+
+libdjvulibre_la-DjVuPalette.lo: DjVuPalette.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuPalette.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuPalette.Tpo -c -o libdjvulibre_la-DjVuPalette.lo `test -f 'DjVuPalette.cpp' || echo '$(srcdir)/'`DjVuPalette.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuPalette.Tpo $(DEPDIR)/libdjvulibre_la-DjVuPalette.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuPalette.cpp' object='libdjvulibre_la-DjVuPalette.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuPalette.lo `test -f 'DjVuPalette.cpp' || echo '$(srcdir)/'`DjVuPalette.cpp
+
+libdjvulibre_la-DjVuPort.lo: DjVuPort.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuPort.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuPort.Tpo -c -o libdjvulibre_la-DjVuPort.lo `test -f 'DjVuPort.cpp' || echo '$(srcdir)/'`DjVuPort.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuPort.Tpo $(DEPDIR)/libdjvulibre_la-DjVuPort.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuPort.cpp' object='libdjvulibre_la-DjVuPort.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuPort.lo `test -f 'DjVuPort.cpp' || echo '$(srcdir)/'`DjVuPort.cpp
+
+libdjvulibre_la-DjVuText.lo: DjVuText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuText.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuText.Tpo -c -o libdjvulibre_la-DjVuText.lo `test -f 'DjVuText.cpp' || echo '$(srcdir)/'`DjVuText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuText.Tpo $(DEPDIR)/libdjvulibre_la-DjVuText.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuText.cpp' object='libdjvulibre_la-DjVuText.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuText.lo `test -f 'DjVuText.cpp' || echo '$(srcdir)/'`DjVuText.cpp
+
+libdjvulibre_la-DjVuToPS.lo: DjVuToPS.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-DjVuToPS.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-DjVuToPS.Tpo -c -o libdjvulibre_la-DjVuToPS.lo `test -f 'DjVuToPS.cpp' || echo '$(srcdir)/'`DjVuToPS.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-DjVuToPS.Tpo $(DEPDIR)/libdjvulibre_la-DjVuToPS.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DjVuToPS.cpp' object='libdjvulibre_la-DjVuToPS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-DjVuToPS.lo `test -f 'DjVuToPS.cpp' || echo '$(srcdir)/'`DjVuToPS.cpp
+
+libdjvulibre_la-GBitmap.lo: GBitmap.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GBitmap.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GBitmap.Tpo -c -o libdjvulibre_la-GBitmap.lo `test -f 'GBitmap.cpp' || echo '$(srcdir)/'`GBitmap.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GBitmap.Tpo $(DEPDIR)/libdjvulibre_la-GBitmap.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GBitmap.cpp' object='libdjvulibre_la-GBitmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GBitmap.lo `test -f 'GBitmap.cpp' || echo '$(srcdir)/'`GBitmap.cpp
+
+libdjvulibre_la-GContainer.lo: GContainer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GContainer.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GContainer.Tpo -c -o libdjvulibre_la-GContainer.lo `test -f 'GContainer.cpp' || echo '$(srcdir)/'`GContainer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GContainer.Tpo $(DEPDIR)/libdjvulibre_la-GContainer.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GContainer.cpp' object='libdjvulibre_la-GContainer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GContainer.lo `test -f 'GContainer.cpp' || echo '$(srcdir)/'`GContainer.cpp
+
+libdjvulibre_la-GException.lo: GException.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GException.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GException.Tpo -c -o libdjvulibre_la-GException.lo `test -f 'GException.cpp' || echo '$(srcdir)/'`GException.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GException.Tpo $(DEPDIR)/libdjvulibre_la-GException.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GException.cpp' object='libdjvulibre_la-GException.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GException.lo `test -f 'GException.cpp' || echo '$(srcdir)/'`GException.cpp
+
+libdjvulibre_la-GIFFManager.lo: GIFFManager.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GIFFManager.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GIFFManager.Tpo -c -o libdjvulibre_la-GIFFManager.lo `test -f 'GIFFManager.cpp' || echo '$(srcdir)/'`GIFFManager.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GIFFManager.Tpo $(DEPDIR)/libdjvulibre_la-GIFFManager.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GIFFManager.cpp' object='libdjvulibre_la-GIFFManager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GIFFManager.lo `test -f 'GIFFManager.cpp' || echo '$(srcdir)/'`GIFFManager.cpp
+
+libdjvulibre_la-GMapAreas.lo: GMapAreas.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GMapAreas.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GMapAreas.Tpo -c -o libdjvulibre_la-GMapAreas.lo `test -f 'GMapAreas.cpp' || echo '$(srcdir)/'`GMapAreas.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GMapAreas.Tpo $(DEPDIR)/libdjvulibre_la-GMapAreas.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GMapAreas.cpp' object='libdjvulibre_la-GMapAreas.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GMapAreas.lo `test -f 'GMapAreas.cpp' || echo '$(srcdir)/'`GMapAreas.cpp
+
+libdjvulibre_la-GOS.lo: GOS.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GOS.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GOS.Tpo -c -o libdjvulibre_la-GOS.lo `test -f 'GOS.cpp' || echo '$(srcdir)/'`GOS.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GOS.Tpo $(DEPDIR)/libdjvulibre_la-GOS.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GOS.cpp' object='libdjvulibre_la-GOS.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GOS.lo `test -f 'GOS.cpp' || echo '$(srcdir)/'`GOS.cpp
+
+libdjvulibre_la-GPixmap.lo: GPixmap.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GPixmap.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GPixmap.Tpo -c -o libdjvulibre_la-GPixmap.lo `test -f 'GPixmap.cpp' || echo '$(srcdir)/'`GPixmap.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GPixmap.Tpo $(DEPDIR)/libdjvulibre_la-GPixmap.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GPixmap.cpp' object='libdjvulibre_la-GPixmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GPixmap.lo `test -f 'GPixmap.cpp' || echo '$(srcdir)/'`GPixmap.cpp
+
+libdjvulibre_la-GRect.lo: GRect.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GRect.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GRect.Tpo -c -o libdjvulibre_la-GRect.lo `test -f 'GRect.cpp' || echo '$(srcdir)/'`GRect.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GRect.Tpo $(DEPDIR)/libdjvulibre_la-GRect.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GRect.cpp' object='libdjvulibre_la-GRect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GRect.lo `test -f 'GRect.cpp' || echo '$(srcdir)/'`GRect.cpp
+
+libdjvulibre_la-GScaler.lo: GScaler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GScaler.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GScaler.Tpo -c -o libdjvulibre_la-GScaler.lo `test -f 'GScaler.cpp' || echo '$(srcdir)/'`GScaler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GScaler.Tpo $(DEPDIR)/libdjvulibre_la-GScaler.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GScaler.cpp' object='libdjvulibre_la-GScaler.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GScaler.lo `test -f 'GScaler.cpp' || echo '$(srcdir)/'`GScaler.cpp
+
+libdjvulibre_la-GSmartPointer.lo: GSmartPointer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GSmartPointer.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GSmartPointer.Tpo -c -o libdjvulibre_la-GSmartPointer.lo `test -f 'GSmartPointer.cpp' || echo '$(srcdir)/'`GSmartPointer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GSmartPointer.Tpo $(DEPDIR)/libdjvulibre_la-GSmartPointer.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GSmartPointer.cpp' object='libdjvulibre_la-GSmartPointer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GSmartPointer.lo `test -f 'GSmartPointer.cpp' || echo '$(srcdir)/'`GSmartPointer.cpp
+
+libdjvulibre_la-GString.lo: GString.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GString.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GString.Tpo -c -o libdjvulibre_la-GString.lo `test -f 'GString.cpp' || echo '$(srcdir)/'`GString.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GString.Tpo $(DEPDIR)/libdjvulibre_la-GString.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GString.cpp' object='libdjvulibre_la-GString.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GString.lo `test -f 'GString.cpp' || echo '$(srcdir)/'`GString.cpp
+
+libdjvulibre_la-GThreads.lo: GThreads.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GThreads.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GThreads.Tpo -c -o libdjvulibre_la-GThreads.lo `test -f 'GThreads.cpp' || echo '$(srcdir)/'`GThreads.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GThreads.Tpo $(DEPDIR)/libdjvulibre_la-GThreads.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GThreads.cpp' object='libdjvulibre_la-GThreads.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GThreads.lo `test -f 'GThreads.cpp' || echo '$(srcdir)/'`GThreads.cpp
+
+libdjvulibre_la-GURL.lo: GURL.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GURL.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GURL.Tpo -c -o libdjvulibre_la-GURL.lo `test -f 'GURL.cpp' || echo '$(srcdir)/'`GURL.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GURL.Tpo $(DEPDIR)/libdjvulibre_la-GURL.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GURL.cpp' object='libdjvulibre_la-GURL.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GURL.lo `test -f 'GURL.cpp' || echo '$(srcdir)/'`GURL.cpp
+
+libdjvulibre_la-GUnicode.lo: GUnicode.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-GUnicode.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-GUnicode.Tpo -c -o libdjvulibre_la-GUnicode.lo `test -f 'GUnicode.cpp' || echo '$(srcdir)/'`GUnicode.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-GUnicode.Tpo $(DEPDIR)/libdjvulibre_la-GUnicode.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GUnicode.cpp' object='libdjvulibre_la-GUnicode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-GUnicode.lo `test -f 'GUnicode.cpp' || echo '$(srcdir)/'`GUnicode.cpp
+
+libdjvulibre_la-IFFByteStream.lo: IFFByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-IFFByteStream.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-IFFByteStream.Tpo -c -o libdjvulibre_la-IFFByteStream.lo `test -f 'IFFByteStream.cpp' || echo '$(srcdir)/'`IFFByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-IFFByteStream.Tpo $(DEPDIR)/libdjvulibre_la-IFFByteStream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='IFFByteStream.cpp' object='libdjvulibre_la-IFFByteStream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-IFFByteStream.lo `test -f 'IFFByteStream.cpp' || echo '$(srcdir)/'`IFFByteStream.cpp
+
+libdjvulibre_la-IW44EncodeCodec.lo: IW44EncodeCodec.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-IW44EncodeCodec.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-IW44EncodeCodec.Tpo -c -o libdjvulibre_la-IW44EncodeCodec.lo `test -f 'IW44EncodeCodec.cpp' || echo '$(srcdir)/'`IW44EncodeCodec.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-IW44EncodeCodec.Tpo $(DEPDIR)/libdjvulibre_la-IW44EncodeCodec.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='IW44EncodeCodec.cpp' object='libdjvulibre_la-IW44EncodeCodec.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-IW44EncodeCodec.lo `test -f 'IW44EncodeCodec.cpp' || echo '$(srcdir)/'`IW44EncodeCodec.cpp
+
+libdjvulibre_la-IW44Image.lo: IW44Image.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-IW44Image.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-IW44Image.Tpo -c -o libdjvulibre_la-IW44Image.lo `test -f 'IW44Image.cpp' || echo '$(srcdir)/'`IW44Image.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-IW44Image.Tpo $(DEPDIR)/libdjvulibre_la-IW44Image.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='IW44Image.cpp' object='libdjvulibre_la-IW44Image.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-IW44Image.lo `test -f 'IW44Image.cpp' || echo '$(srcdir)/'`IW44Image.cpp
+
+libdjvulibre_la-JB2EncodeCodec.lo: JB2EncodeCodec.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-JB2EncodeCodec.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-JB2EncodeCodec.Tpo -c -o libdjvulibre_la-JB2EncodeCodec.lo `test -f 'JB2EncodeCodec.cpp' || echo '$(srcdir)/'`JB2EncodeCodec.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-JB2EncodeCodec.Tpo $(DEPDIR)/libdjvulibre_la-JB2EncodeCodec.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='JB2EncodeCodec.cpp' object='libdjvulibre_la-JB2EncodeCodec.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-JB2EncodeCodec.lo `test -f 'JB2EncodeCodec.cpp' || echo '$(srcdir)/'`JB2EncodeCodec.cpp
+
+libdjvulibre_la-JB2Image.lo: JB2Image.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-JB2Image.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-JB2Image.Tpo -c -o libdjvulibre_la-JB2Image.lo `test -f 'JB2Image.cpp' || echo '$(srcdir)/'`JB2Image.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-JB2Image.Tpo $(DEPDIR)/libdjvulibre_la-JB2Image.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='JB2Image.cpp' object='libdjvulibre_la-JB2Image.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-JB2Image.lo `test -f 'JB2Image.cpp' || echo '$(srcdir)/'`JB2Image.cpp
+
+libdjvulibre_la-JPEGDecoder.lo: JPEGDecoder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-JPEGDecoder.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-JPEGDecoder.Tpo -c -o libdjvulibre_la-JPEGDecoder.lo `test -f 'JPEGDecoder.cpp' || echo '$(srcdir)/'`JPEGDecoder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-JPEGDecoder.Tpo $(DEPDIR)/libdjvulibre_la-JPEGDecoder.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='JPEGDecoder.cpp' object='libdjvulibre_la-JPEGDecoder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-JPEGDecoder.lo `test -f 'JPEGDecoder.cpp' || echo '$(srcdir)/'`JPEGDecoder.cpp
+
+libdjvulibre_la-MMRDecoder.lo: MMRDecoder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-MMRDecoder.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-MMRDecoder.Tpo -c -o libdjvulibre_la-MMRDecoder.lo `test -f 'MMRDecoder.cpp' || echo '$(srcdir)/'`MMRDecoder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-MMRDecoder.Tpo $(DEPDIR)/libdjvulibre_la-MMRDecoder.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MMRDecoder.cpp' object='libdjvulibre_la-MMRDecoder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-MMRDecoder.lo `test -f 'MMRDecoder.cpp' || echo '$(srcdir)/'`MMRDecoder.cpp
+
+libdjvulibre_la-MMX.lo: MMX.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-MMX.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-MMX.Tpo -c -o libdjvulibre_la-MMX.lo `test -f 'MMX.cpp' || echo '$(srcdir)/'`MMX.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-MMX.Tpo $(DEPDIR)/libdjvulibre_la-MMX.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MMX.cpp' object='libdjvulibre_la-MMX.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-MMX.lo `test -f 'MMX.cpp' || echo '$(srcdir)/'`MMX.cpp
+
+libdjvulibre_la-UnicodeByteStream.lo: UnicodeByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-UnicodeByteStream.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-UnicodeByteStream.Tpo -c -o libdjvulibre_la-UnicodeByteStream.lo `test -f 'UnicodeByteStream.cpp' || echo '$(srcdir)/'`UnicodeByteStream.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-UnicodeByteStream.Tpo $(DEPDIR)/libdjvulibre_la-UnicodeByteStream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UnicodeByteStream.cpp' object='libdjvulibre_la-UnicodeByteStream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-UnicodeByteStream.lo `test -f 'UnicodeByteStream.cpp' || echo '$(srcdir)/'`UnicodeByteStream.cpp
+
+libdjvulibre_la-XMLParser.lo: XMLParser.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-XMLParser.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-XMLParser.Tpo -c -o libdjvulibre_la-XMLParser.lo `test -f 'XMLParser.cpp' || echo '$(srcdir)/'`XMLParser.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-XMLParser.Tpo $(DEPDIR)/libdjvulibre_la-XMLParser.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XMLParser.cpp' object='libdjvulibre_la-XMLParser.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-XMLParser.lo `test -f 'XMLParser.cpp' || echo '$(srcdir)/'`XMLParser.cpp
+
+libdjvulibre_la-XMLTags.lo: XMLTags.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-XMLTags.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-XMLTags.Tpo -c -o libdjvulibre_la-XMLTags.lo `test -f 'XMLTags.cpp' || echo '$(srcdir)/'`XMLTags.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-XMLTags.Tpo $(DEPDIR)/libdjvulibre_la-XMLTags.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XMLTags.cpp' object='libdjvulibre_la-XMLTags.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-XMLTags.lo `test -f 'XMLTags.cpp' || echo '$(srcdir)/'`XMLTags.cpp
+
+libdjvulibre_la-ZPCodec.lo: ZPCodec.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-ZPCodec.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-ZPCodec.Tpo -c -o libdjvulibre_la-ZPCodec.lo `test -f 'ZPCodec.cpp' || echo '$(srcdir)/'`ZPCodec.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-ZPCodec.Tpo $(DEPDIR)/libdjvulibre_la-ZPCodec.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ZPCodec.cpp' object='libdjvulibre_la-ZPCodec.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-ZPCodec.lo `test -f 'ZPCodec.cpp' || echo '$(srcdir)/'`ZPCodec.cpp
+
+libdjvulibre_la-atomic.lo: atomic.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-atomic.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-atomic.Tpo -c -o libdjvulibre_la-atomic.lo `test -f 'atomic.cpp' || echo '$(srcdir)/'`atomic.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-atomic.Tpo $(DEPDIR)/libdjvulibre_la-atomic.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='atomic.cpp' object='libdjvulibre_la-atomic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-atomic.lo `test -f 'atomic.cpp' || echo '$(srcdir)/'`atomic.cpp
+
+libdjvulibre_la-ddjvuapi.lo: ddjvuapi.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-ddjvuapi.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-ddjvuapi.Tpo -c -o libdjvulibre_la-ddjvuapi.lo `test -f 'ddjvuapi.cpp' || echo '$(srcdir)/'`ddjvuapi.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-ddjvuapi.Tpo $(DEPDIR)/libdjvulibre_la-ddjvuapi.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ddjvuapi.cpp' object='libdjvulibre_la-ddjvuapi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-ddjvuapi.lo `test -f 'ddjvuapi.cpp' || echo '$(srcdir)/'`ddjvuapi.cpp
+
+libdjvulibre_la-debug.lo: debug.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-debug.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-debug.Tpo -c -o libdjvulibre_la-debug.lo `test -f 'debug.cpp' || echo '$(srcdir)/'`debug.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-debug.Tpo $(DEPDIR)/libdjvulibre_la-debug.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='debug.cpp' object='libdjvulibre_la-debug.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-debug.lo `test -f 'debug.cpp' || echo '$(srcdir)/'`debug.cpp
+
+libdjvulibre_la-miniexp.lo: miniexp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -MT libdjvulibre_la-miniexp.lo -MD -MP -MF $(DEPDIR)/libdjvulibre_la-miniexp.Tpo -c -o libdjvulibre_la-miniexp.lo `test -f 'miniexp.cpp' || echo '$(srcdir)/'`miniexp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libdjvulibre_la-miniexp.Tpo $(DEPDIR)/libdjvulibre_la-miniexp.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='miniexp.cpp' object='libdjvulibre_la-miniexp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdjvulibre_la_CPPFLAGS) $(CPPFLAGS) $(libdjvulibre_la_CXXFLAGS) $(CXXFLAGS) -c -o libdjvulibre_la-miniexp.lo `test -f 'miniexp.cpp' || echo '$(srcdir)/'`miniexp.cpp
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-includesHEADERS: $(includes_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
+	done
+
+uninstall-includesHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-includesHEADERS install-pkgconfigDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-includesHEADERS uninstall-libLTLIBRARIES \
+	uninstall-pkgconfigDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includesHEADERS install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-pkgconfigDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-includesHEADERS \
+	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
+
+
+ddjvuapi.pc: ddjvuapi.pc.in Makefile
+	$(AM_V_at)rm -f $@
+	$(pc_verbose)$(sed_process)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libdjvu/Template.h b/libdjvu/Template.h
new file mode 100644
index 0000000..887fa71
--- /dev/null
+++ b/libdjvu/Template.h
@@ -0,0 +1,255 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+//T// This is a template for the header files in the
+//T// DjVu reference library. It describes the general
+//T// conventions as well as the documentation. 
+//T// Comments prefixed with '//T//' explain the template
+//T// features and should be removed.
+
+#ifndef _TEMPLATE_H_
+#define _TEMPLATE_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+//T// Always include "DjVuGlobal.h"
+#include "DjVuGlobal.h"
+
+//T// Other include files
+#include <string.h>
+#include "GException.h"
+
+//T// Begin name space
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+/** @name Template.h
+    
+    Files #"Template.h"# and #"Template.cpp"# are not used for anything but
+    the current programming and documentation standards in the DjVu reference
+    library. This doc++ comment briefly describes the abstractions defined in
+    this files.  It must mention all the files involved in implementing this
+    features, as well as references to the main classes \Ref{classname}.  
+
+    This comment may contain additional sections as follows:
+
+    {\bf Algorithmic Remarks} --- Comments about the algorithms, their
+    performance and their limitations.
+
+    {\bf Historical Remarks} --- Comments about the successive revisions of
+    this file and other anecdotical details. This is where we can amuse the
+    reader with funny details.
+
+    {\bf ToDo} --- Things that we have been thinking to do but did not
+    fully implement yet. It should explain how we plan to modify the current
+    code could be modified to implement these things. People who change this
+    code thus should avoid jeopardizing these plans.
+    
+    {\bf Example} --- It would be cool to demonstrate how these functions
+    can be used by providing a small segment of C/C++ code.
+    \begin{verbatim}
+       ExampleClass toto(3,4);
+       toto.draw(mywin);
+    \end{verbatim}
+
+    This main doc++ comment is followed by a few doc++ entries.
+    \begin{itemize}
+    \item the "memo" field contains a single line description of the file.
+    \item the "version" field contains a cvs magic expression.
+    \item the author fields contains a list of authors and email addresses.
+          (the #\\# termination breaks the line.)
+    \end{itemize}
+
+    @memo 
+    Template header file
+    @author: 
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation \\
+    Andrew Erofeev <eaf@geocities.com> -- implemented EXTERNAL_TEMPLATES */
+//@{
+//T// The magic doc++ comment above opens a doc++ context.
+
+
+
+//T// Now comes the 'interface part' of the file.
+//T// The c++ classes and public functions are defined there.
+//T// Doc++ comments must be inserted for all functions
+//T// intended to be used by other people. 
+//T//
+//T// Quite often c++ sucks and it is necessary to have public or external symbols
+//T// that actually are only there for implementation purposes. 
+//T// It is good to give a comment but this should not be a doc++ comment
+//T// (see class GPool in GContainer.h).  All other 'public' and 'protected' 
+//T// members should have a doc++ comment. There is no need to comment 'private'
+//T// members, although a regular comment can be useful (not a doc++ comment). 
+
+
+
+/** One-line class description.
+    Long description. There is no need to repeat the class name in the
+    one-line description. The long description should describe the abstraction
+    and point the user to the main member functions.  An example could be
+    inserted when this is informative and not redundant with the file
+    description.  Templates should document which member functions are
+    required for their type argument. The availability of non availabilty of a
+    copy constructor/copy operator can be specified when appropriate. 
+    See the doc++ documentation for available LaTeX constructs. 
+*/
+
+class ExampleClass
+{
+public:
+  /** Virtual Destructor. */
+  ~ExampleClass();
+  /** Null Constructor. */
+  ExampleClass();
+  /** Copy Constructor. */
+  ExampleClass(ExampleClass &ref);
+  /** Copy operator. */
+  ExampleClass& operator=(ExampleClass &ref);
+  /** Example of member function. The first sentence of the member
+      function description must be a short single line description.
+      The rest can be more verbose. Excerpts of C or C++ text should 
+      be surrounded by dieze characters (as in #win#).  The doc++ #@param#
+      construct should be used when there is a need for additional details
+      about the arguments. In that case all the arguments must be documented
+      with a #@param# directive.
+      @param win drawing window.
+      This window must be created with #CreateWindow# and must be visible when
+      function #draw# is called.
+   */
+  void draw(Window win);
+protected:
+  /** Minimal x-coordinate. */
+  int xmin;
+  /** Maximal x-coordinate. */
+  int xmax;
+private:
+  int whatever;
+  float encode;
+};
+
+
+/** One-line function description.
+    Long description. Public external functions should be documented
+    as classes. Note that a family of public external function can be 
+    introduced by a generic entry (see below) */
+
+ExampleClass combine_example_classes(const ExampleClass&, 
+                                     const ExampleClass &b);
+
+
+/** @name Generic entry.
+    Long description. there is sometimes a need to add documentation
+    entries for grouping things which are not connected by the C++ 
+    syntax (a family of functions, a family of defines, etc...).
+    The description starts with a very short name (introduced with #@name#)
+    followed by a long description.  Because of doc++ limitations,
+    the one-line description must appear after the long description
+    in a #@memo# entry.
+    @memo One-line description
+*/
+
+//T// The following comments should be used when
+//T// the preceding generic entry contains sub-entries
+//@{
+//T// Sub-entries (both DOC++ and C++) should be declared there.
+//@}
+
+
+
+
+
+
+//@}
+//T// The magic doc++ comment above closes the doc++ file context.
+//T// The rest of the file only contains implementation stuff.
+
+// ------------ CLASSEXAMPLE INLINES
+//T// This is where all the inline/template functions should be written
+//T// This part of the file is segmented with comments.
+
+inline void 
+ClassExample::width()
+{
+  return xmax-xmin;
+}
+
+
+
+// ------------ THE END
+//T// End name space
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+//T// Terminates the multiple inclusion #ifndef
+      
+      
+             
+
+    
diff --git a/libdjvu/UnicodeByteStream.cpp b/libdjvu/UnicodeByteStream.cpp
new file mode 100644
index 0000000..3fbeead
--- /dev/null
+++ b/libdjvu/UnicodeByteStream.cpp
@@ -0,0 +1,367 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "UnicodeByteStream.h"
+#include "ByteStream.h"
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+UnicodeByteStream::UnicodeByteStream(const UnicodeByteStream &uni)
+: bs(uni.bs), buffer(uni.buffer), bufferpos(uni.bufferpos), linesread(0)
+{
+  startpos=bs->tell();
+}
+
+UnicodeByteStream::UnicodeByteStream(
+  GP<ByteStream> ibs,const GStringRep::EncodeType et)
+: bs(ibs), bufferpos(0), linesread(0)
+{
+  buffer=GUTF8String::create(0,0,et);
+  startpos=bs->tell();
+}
+
+UnicodeByteStream::~UnicodeByteStream()
+{}
+
+static int
+CountLines(const GUTF8String &str)
+{
+  int retval=0;
+  static const unsigned long lf='\n';
+  for(int pos=0;(pos=str.search(lf,pos)+1)>0;++retval)
+    EMPTY_LOOP;
+  return retval;
+}
+
+void
+UnicodeByteStream::set_encodetype(const GStringRep::EncodeType et)
+{
+  seek(startpos,SEEK_SET);
+  bufferpos=0;
+  buffer=GUTF8String::create(0,0,et);
+}
+
+void
+UnicodeByteStream::set_encoding(const GUTF8String &xencoding)
+{
+  seek(startpos,SEEK_SET);
+  bufferpos=0;
+  buffer=GUTF8String::create(0,0,xencoding);
+}
+
+size_t
+UnicodeByteStream::read(void *buf, size_t size)
+{
+  bufferpos=0;
+  const int retval=bs->read(buf,size);
+  if(retval)
+  {
+    buffer=GUTF8String::create(
+      (unsigned char const *)buf,retval,buffer.get_remainder());
+  }else
+  {
+    buffer=GUTF8String::create(0,0,buffer.get_remainder());
+  }
+  return retval;
+}
+
+size_t
+UnicodeByteStream::write(const void *buf, size_t size)
+{
+  bufferpos=0;
+  buffer=GUTF8String::create(0,0,buffer.get_remainder());
+  return bs->write(buf,size);
+}
+
+long 
+UnicodeByteStream::tell(void) const
+{
+  return bs->tell();
+}
+
+UnicodeByteStream & 
+UnicodeByteStream::operator=(UnicodeByteStream &uni)
+{
+  bs=uni.bs;
+  bufferpos=uni.bufferpos;
+  buffer=uni.buffer;
+  return *this;
+}
+
+int 
+UnicodeByteStream::seek
+(long offset, int whence, bool nothrow)
+{
+  int retval=bs->seek(offset,whence,nothrow);
+  bufferpos=0;
+  buffer=GUTF8String::create(0,0,buffer.get_remainder());
+  return retval;
+}
+
+void 
+UnicodeByteStream::flush(void)
+{
+  bs->flush();
+  bufferpos=0;
+  buffer=GUTF8String::create(0,0,buffer.get_remainder());
+}
+
+
+
+GUTF8String
+UnicodeByteStream::gets(
+  size_t const t,unsigned long const stopat,bool const inclusive)
+{
+  GUTF8String retval;
+  unsigned int len=buffer.length()-bufferpos;
+  if(!len)
+  {
+    int i;
+    char *buf;
+  	static const size_t bufsize=327680;
+    GPBuffer<char> gbuf(buf,bufsize);
+    while((i=read(buf,bufsize)>0))
+    {
+      if((len=buffer.length()-bufferpos))
+        break;
+    }
+  }
+  if(len)
+  {
+    int i=buffer.search((char)stopat,bufferpos);
+    if(i>=0)
+    {
+      if(inclusive)
+      {
+        ++i;
+      }
+      if(t&&(i>(int)t+bufferpos))
+      {
+        i=t+bufferpos;
+      }
+      if(i>bufferpos)
+      {
+        retval=buffer.substr(bufferpos,i-bufferpos);
+      }
+      bufferpos=i;
+      linesread+=CountLines(retval);
+    }else
+    {
+      retval=buffer.substr(bufferpos,len);
+      bufferpos=buffer.length();
+      linesread+=CountLines(retval);
+      retval+=gets(t?(t-(i-bufferpos)):0,stopat,inclusive);
+    }
+  }
+  return retval;
+}
+
+XMLByteStream::XMLByteStream(UnicodeByteStream &uni)
+: UnicodeByteStream(uni) {}
+
+XMLByteStream::XMLByteStream(GP<ByteStream> &ibs) 
+: UnicodeByteStream(ibs,GStringRep::XOTHER)
+{}
+
+GP<XMLByteStream>
+XMLByteStream::create(GP<ByteStream> ibs) 
+{
+  XMLByteStream *xml=new XMLByteStream(ibs);
+  GP<XMLByteStream> retval=xml;
+  xml->init();
+  return retval;
+}
+
+void
+XMLByteStream::init(void)
+{
+  unsigned char buf[4];
+  GP<ByteStream> ibs=bs;
+  bufferpos=0;
+  bs->readall(buf,sizeof(buf));
+  const unsigned int i=(buf[0]<<8)+buf[1];
+  switch(i)
+  {
+    case 0x0000:
+    {
+      const unsigned int j=(buf[2]<<8)+buf[3];
+      switch(j)
+      {
+        case 0x003C:
+        {
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUCS4BE);
+          break;
+        }
+        case 0x3C00:
+        {
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUCS4_2143);
+          break;
+        }
+        case 0xFEFF:
+        {
+          buffer=GUTF8String::create(0,0,GStringRep::XUCS4BE);
+          startpos+=sizeof(buf);
+          break;
+        }
+        case 0xFFFE:
+        {
+          buffer=GUTF8String::create(0,0,GStringRep::XUCS4_2143);
+          startpos+=sizeof(buf);
+          break;
+        }
+        default:
+        {
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUTF8);
+          break;
+        }
+      }
+    }
+    case 0x003C:
+    {
+      const unsigned int j=(buf[2]<<8)+buf[3];
+      switch(j)
+      {
+        case 0x0000:
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUCS4_3412);
+          break;
+        case 0x003F:
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUTF16BE);
+          break;
+        default:
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUTF8);
+          break;
+      }
+      break;
+    }
+    case 0x3C00:
+    {
+      const unsigned int j=(buf[2]<<8)+buf[3];
+      switch(j)
+      {
+        case 0x0000:
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUCS4LE);
+          break;
+        case 0x3F00:
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUTF16LE);
+          break;
+        default:
+          buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUTF8);
+          break;
+      }
+      break;
+    }
+    case 0x4C6F:
+    {
+      const unsigned int j=(buf[2]<<8)+buf[3];
+      buffer=GUTF8String::create(buf,sizeof(buf),
+         (j == 0xA794)?(GStringRep::XEBCDIC):(GStringRep::XUTF8));
+      break;
+    }
+    case 0xFFFE:
+    {
+      buffer=GUTF8String::create(buf+2,sizeof(buf)-2,GStringRep::XUTF16LE);
+      startpos+=2;
+      break;
+    }
+    case 0xFEFF:
+    {
+      buffer=GUTF8String::create(buf+2,sizeof(buf)-2,GStringRep::XUTF16BE);
+      startpos+=2;
+      break;
+    }
+    case 0xEFBB:
+    {
+      if(buf[2] == 0xBF)
+      {
+        buffer=GUTF8String::create(buf+3,sizeof(buf)-3,GStringRep::XUTF8);
+        startpos+=3;
+      }else
+      {
+        buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUTF8);
+      }
+      break;
+    }
+    case 0x3C3F:
+    default:
+    {
+      buffer=GUTF8String::create(buf,sizeof(buf),GStringRep::XUTF8);
+    }
+  }
+  bs=ibs;
+}
+
+XMLByteStream::~XMLByteStream()
+{}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h
new file mode 100644
index 0000000..9b49a17
--- /dev/null
+++ b/libdjvu/UnicodeByteStream.h
@@ -0,0 +1,199 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _UNICODEBYTESTREAM_H_
+#define _UNICODEBYTESTREAM_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+
+/** @name UnicodeByteStream.h
+
+    Files #"UnicodeByteStream.h"# and #"UnicodeByteStream.cpp"# 
+    implement a parser for files structured W3C Extensible Markup 
+    Language (XML) 1.0 (Second Edition).
+    
+    Class \Ref{UnicodeByteStream} provides a way to read or write XML files.
+    files.  Member functions provide an easy mean to position the underlying
+    \Ref{ByteStream}.
+
+    {\bf References:} 
+    W3C Extensible Markup Language (XML) 1.0 (Second Edition)
+    \URL{http://www.w3.org/TR/2000/REC-xml-20001006.html}
+
+    @memo 
+    XML file parser.
+    @author
+    Bill C Riemers <docbill@sourceforge.net>
+*/
+//@{
+
+#include "DjVuGlobal.h"
+#include "GString.h"
+#include "ByteStream.h"
+
+#include <stddef.h>
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+
+/** ByteStream interface for an Unicode file. 
+
+    Class #UnicodeByteStream# augments the #ByteStream# interface with
+    functions for navigating Unicode documents.  It works in relation
+    with a ByteStream specified at construction time. 
+
+    {\bf Reading an Unicode file} --- You can read an Unicode file by
+    constructing an #UnicodeByteStream# object attached to the ByteStream
+    containing the Unicode file.
+    
+    {\bf Writing an Unicode file} --- You can write an Unicode file by
+    constructing an #UnicodeByteStream# object attached to the seekable
+    ByteStream object that will contain the XML file.
+
+    Writing an XML file requires a seekable ByteStream (see
+    \Ref{ByteStream::is_seekable}).  This is not much of a problem because you
+    can always create the XML file into a \Ref{MemoryByteStream} and then use
+    \Ref{ByteStream::copy} to transfer the XML file into a non seekable
+    ByteStream.  */
+
+class UnicodeByteStream : public ByteStream
+{
+protected:
+  UnicodeByteStream(const UnicodeByteStream &bs);
+  UnicodeByteStream(GP<ByteStream> bs,
+    const GStringRep::EncodeType encodetype=GStringRep::XUTF8);
+public:
+  /** Constructs an UnicodeByteStream object attached to ByteStream #bs#.
+      Any ByteStream can be used when reading an XML file.  Writing
+      an XML file however requires a seekable ByteStream. */
+  static GP<UnicodeByteStream> create(GP<ByteStream> bs,
+    const GStringRep::EncodeType encodetype=GStringRep::XUTF8)
+  { return new UnicodeByteStream(bs,encodetype); }
+
+  // --- BYTESTREAM INTERFACE
+  ~UnicodeByteStream();
+  /// Sets the encoding type and seek's to position 0.
+  void set_encodetype(const GStringRep::EncodeType et=GStringRep::XUTF8);
+  void set_encoding(const GUTF8String &encoding);
+  /// Simmular to fgets(), except read aheads effect the tell() position.
+  virtual GUTF8String gets(size_t const t=0,unsigned long const stopat='\n',bool const inclusive=true); 
+  /// Resets the gets buffering as well as physically seeking.
+  virtual int seek(long offset, int whence = SEEK_SET, bool nothrow=false);
+  /** Physically reads the specified bytes, and truncate the read ahead buffer.
+    */
+  virtual size_t read(void *buffer, size_t size);
+  /// Not correctly implimented...
+  virtual size_t write(const void *buffer, size_t size);
+  /// tell will tell you the read position, including read ahead for gets()...
+  virtual long tell(void) const;
+  /// Does a flush, and clears the read ahead buffer.
+  virtual void flush(void);
+
+  /// Find out how many lines have been read with gets.
+  int get_lines_read(void) const { return linesread; }
+protected:
+  /// The real byte stream.
+  GP<ByteStream> bs;
+  GUTF8String buffer;
+  int bufferpos;
+  int linesread;
+  long startpos;
+private:
+  // Cancel C++ default stuff
+  UnicodeByteStream & operator=(UnicodeByteStream &);
+};
+
+
+class XMLByteStream : public UnicodeByteStream
+{
+protected:
+  XMLByteStream(GP<ByteStream> &bs);
+  XMLByteStream(UnicodeByteStream &bs);
+  void init(void);
+public:
+  static GP<XMLByteStream> create(GP<ByteStream> bs);
+  static GP<XMLByteStream> create(UnicodeByteStream &bs);
+  // --- BYTESTREAM INTERFACE
+  ~XMLByteStream();
+};
+
+inline GP<XMLByteStream>
+XMLByteStream::create(UnicodeByteStream &bs)
+{
+  return new XMLByteStream(bs);
+}
+
+//@}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp
new file mode 100644
index 0000000..c3b93bf
--- /dev/null
+++ b/libdjvu/XMLParser.cpp
@@ -0,0 +1,1131 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// This is purely Lizardtech stuff.
+
+#include "XMLParser.h"
+#include "XMLTags.h"
+#include "ByteStream.h"
+#include "GOS.h"
+#include "DjVuDocument.h"
+#include "DjVuText.h"
+#include "DjVuAnno.h"
+#include "DjVuFile.h"
+#include "DjVuImage.h"
+#include "debug.h"
+#include <stdio.h>
+#include <ctype.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+static const char mimetype[]="image/x.djvu";
+static const char bodytag[]="BODY";
+static const char areatag[]="AREA";
+static const char maptag[]="MAP";
+static const char objecttag[]="OBJECT";
+static const char paramtag[]="PARAM";
+static const char charactertag[]="CHARACTER";
+static const char wordtag[]="WORD";
+static const char linetag[]="LINE";
+static const char paragraphtag[]="PARAGRAPH";
+static const char regiontag[]="REGION";
+static const char pagecolumntag[]="PAGECOLUMN";
+static const char hiddentexttag[]="HIDDENTEXT";
+static const char metadatatag[]="METADATA";
+
+class lt_XMLParser::Impl : public lt_XMLParser
+{
+public:
+  Impl(void);
+  virtual ~Impl();
+  /// Parse the specified bytestream.
+  virtual void parse(const GP<ByteStream> &bs, GURL *pdjvufile);
+  /// Parse the specified tags - this one does all the work
+  virtual void parse(const lt_XMLTags &tags, GURL *pdjvufile);
+  /// write to disk.
+  virtual void save(void);
+  /// erase.
+  virtual void empty(void);
+protected:
+  GP<DjVuFile> get_file(const GURL &url,GUTF8String page);
+
+  void parse_anno(const int width, const int height,
+    const lt_XMLTags &GObject,
+    GMap<GUTF8String,GP<lt_XMLTags> > &Maps, DjVuFile &dfile);
+
+  void parse_text(const int width, const int height,
+    const lt_XMLTags &GObject, DjVuFile &dfile);
+
+  void parse_meta(const lt_XMLTags &GObject, DjVuFile &dfile);
+
+  void ChangeAnno( const int width, const int height,
+    DjVuFile &dfile, const lt_XMLTags &map);
+
+  void ChangeInfo(DjVuFile &dfile,const int dpi,const double gamma);
+
+  void ChangeText( const int width, const int height,
+    DjVuFile &dfile, const lt_XMLTags &map);
+
+  void ChangeMeta( DjVuFile &dfile, const lt_XMLTags &map);
+
+  void ChangeTextOCR( const GUTF8String &value, 
+    const int width, const int height,
+    const GP<DjVuFile> &dfile);
+
+  // we may want to make these list of modified file static so
+  // they only needed to be loaded and saved once.
+
+  GMap<GUTF8String,GP<DjVuFile> > m_files;
+  GMap<GUTF8String,GP<DjVuDocument> > m_docs;
+
+  GURL m_codebase; 
+  GCriticalSection xmlparser_lock;
+};
+
+static GP<ByteStream>
+OCRcallback(
+  void * const xarg,
+  lt_XMLParser::mapOCRcallback * const xcallback,
+  const GUTF8String &value=GUTF8String(),
+  const GP<DjVuImage> &image=0 );
+
+static inline GP<ByteStream>
+OCRcallback(const GUTF8String &value, const GP<DjVuImage> &image)
+{
+  return OCRcallback(0,0,value,image);
+}
+
+lt_XMLParser::lt_XMLParser() {}
+lt_XMLParser::~lt_XMLParser() {}
+lt_XMLParser::Impl::Impl() {}
+lt_XMLParser::Impl::~Impl() {}
+
+GP<lt_XMLParser>
+lt_XMLParser::create(void)
+{
+  return new lt_XMLParser::Impl;
+}
+
+// helper function for args
+static void 
+intList(GUTF8String coords, GList<int> &retval)
+{
+  int pos=0;
+  while(coords.length())
+  {
+    int epos;
+    unsigned long i=coords.toLong(pos,epos,10);
+    if(epos>=0)
+    {
+      retval.append(i);
+      const int n=coords.nextNonSpace(epos);
+      if(coords[n] != ',')
+        break;
+      pos=n+1;
+    }
+  }
+}
+
+void 
+lt_XMLParser::Impl::empty(void)
+{
+  GCriticalSectionLock lock(&xmlparser_lock);
+  m_files.empty();
+  m_docs.empty();
+}
+
+void 
+lt_XMLParser::Impl::save(void)
+{
+  GCriticalSectionLock lock(&xmlparser_lock);
+  for(GPosition pos=m_docs;pos;++pos)
+  {
+    const GP<DjVuDocument> doc(m_docs[pos]);
+    const GURL url=doc->get_init_url();
+    
+    DEBUG_MSG("Saving "<<(const char *)url<<" with new text and annotations\n");
+    const bool bundle=doc->is_bundled()||(doc->get_doc_type()==DjVuDocument::SINGLE_PAGE);
+    doc->save_as(url,bundle);
+  }
+  empty();
+}
+
+void
+lt_XMLParser::Impl::parse(const GP<ByteStream> &bs, GURL *pdjvufile)
+{
+  const GP<lt_XMLTags> tags(lt_XMLTags::create(bs));
+  parse(*tags, pdjvufile);
+}
+  
+static const GMap<GUTF8String,GMapArea::BorderType> &
+BorderTypeMap(void)
+{
+  static GMap<GUTF8String,GMapArea::BorderType> typeMap;
+  if (! typeMap.size()) 
+    {
+      typeMap["none"]=GMapArea::NO_BORDER;
+      typeMap["xor"]=GMapArea::XOR_BORDER;
+      typeMap["solid"]=GMapArea::SOLID_BORDER;
+      typeMap["default"]=GMapArea::SOLID_BORDER;
+      typeMap["shadowout"]=GMapArea::SHADOW_OUT_BORDER;
+      typeMap["shadowin"]=GMapArea::SHADOW_IN_BORDER;
+      typeMap["etchedin"]=GMapArea::SHADOW_EIN_BORDER;
+      typeMap["etchedout"]=GMapArea::SHADOW_EOUT_BORDER;
+    }
+  return typeMap;
+}
+
+static unsigned long
+convertToColor(const GUTF8String &s)
+{
+  unsigned long retval=0;
+  if(s.length())
+  {
+    int endpos = -1;
+    if(s[0] == '#')
+    {
+      retval=s.substr(1,-1).toULong(0,endpos,16);
+    }
+    if(endpos < 0)
+    {
+      G_THROW( (ERR_MSG("XMLAnno.bad_color") "\t")+s );
+    }
+  }
+  return retval;
+}
+
+void
+lt_XMLParser::Impl::ChangeInfo(DjVuFile &dfile,const int dpi,const double gamma)
+{
+  GP<DjVuInfo> info;
+  if(dpi >= 5 && dpi <= 4800)
+  {
+    dfile.resume_decode(true);
+    if(dfile.info && (dpi != dfile.info->dpi) )
+    {
+      info=new DjVuInfo(*dfile.info);
+      info->dpi=dpi;
+    }
+  }
+  if(gamma >= 0.1 && gamma <= 5.0)
+  {
+    dfile.resume_decode(true);
+    if(dfile.info && (gamma != dfile.info->gamma) )
+    {
+      if(!info)
+        info=new DjVuInfo(*dfile.info);
+      info->gamma=gamma;
+    }
+  }
+  if(info)
+  {
+    dfile.change_info(info);
+  }
+}
+
+void
+lt_XMLParser::Impl::ChangeAnno(
+  const int width, const int height,
+  DjVuFile &dfile, 
+  const lt_XMLTags &map )
+{
+  dfile.resume_decode(true);
+  const GP<DjVuInfo> info(dfile.info);
+  const GP<DjVuAnno> ganno(DjVuAnno::create());
+  DjVuAnno &anno=*ganno;
+  GPosition map_pos;
+  map_pos=map.contains(areatag);
+  if(dfile.contains_anno())
+  {
+    GP<ByteStream> annobs=dfile.get_merged_anno();
+    if(annobs)
+    {
+      anno.decode(annobs);
+      if(anno.ant && info)
+      {
+        anno.ant->map_areas.empty();
+      }
+    }
+//    dfile.remove_anno();
+  }
+  if(info && map_pos)
+  {
+    const int h=info->height;
+    const int w=info->width;
+    double ws=1.0;
+    double hs=1.0;
+    if(width && width != w)
+    {
+      ws=((double)w)/((double)width); 
+    }
+    if(height && height != h)
+    {
+      hs=((double)h)/((double)height); 
+    }
+    if(!anno.ant)
+    {
+      anno.ant=DjVuANT::create();
+    }
+    GPList<GMapArea> &map_areas=anno.ant->map_areas;
+    map_areas.empty();
+    GPList<lt_XMLTags> gareas=map[map_pos];
+    for(GPosition pos=gareas;pos;++pos)
+    {
+      if(gareas[pos])
+      {
+        lt_XMLTags &areas=*(gareas[pos]);
+        GMap<GUTF8String,GUTF8String> args(areas.get_args());
+        GList<int> coords;
+        // ******************************************************
+        // Parse the coords attribute:  first read the raw data into
+        // a list, then scale the x, y data into another list.  For
+        // circles, you also get a radius element with (looks like an x
+        // with no matching y).
+        // ******************************************************
+        {
+          GPosition coords_pos=args.contains("coords");
+          if(coords_pos)
+          {
+            GList<int> raw_coords;
+            intList(args[coords_pos],raw_coords);
+            for(GPosition raw_pos=raw_coords;raw_pos;++raw_pos)
+            {
+              const int r=raw_coords[raw_pos];
+              const int x=(int)(ws*(double)r+0.5);
+              coords.append(x);
+              int y=h-1;
+              if(! ++raw_pos)
+              {
+                y-=(int)(hs*(double)r+0.5);
+              }else
+              {
+                y-=(int)(hs*(double)raw_coords[raw_pos]+0.5);
+              }
+              coords.append(y);
+//            DjVuPrintMessage("Coords (%d,%d)\n",x,y);
+            }
+          }
+        }
+        GUTF8String shape;
+        {
+          GPosition shape_pos=args.contains("shape");
+          if(shape_pos)
+          {
+            shape=args[shape_pos];
+          }
+        }
+        GP<GMapArea> a;
+        if(shape == "default")
+        {
+          GRect rect(0,0,w,h);
+          a=GMapRect::create(rect);
+        }else if(!shape.length() || shape == "rect")
+        {
+          int xx[4];
+          int i=0;
+          for(GPosition rect_pos=coords;(rect_pos)&&(i<4);++rect_pos,++i)
+          {
+            xx[i]=coords[rect_pos];
+          }
+          if(i!=4)
+          {
+            G_THROW( ERR_MSG("XMLAnno.bad_rect") );
+          }
+          int xmin,xmax; 
+          if(xx[0]>xx[2])
+          {
+            xmax=xx[0];
+            xmin=xx[2];
+          }else
+          {
+            xmin=xx[0];
+            xmax=xx[2];
+          }
+          int ymin,ymax; 
+          if(xx[1]>xx[3])
+          {
+            ymax=xx[1];
+            ymin=xx[3];
+          }else
+          {
+            ymin=xx[1];
+            ymax=xx[3];
+          }
+          GRect rect(xmin,ymin,xmax-xmin,ymax-ymin);
+          a=GMapRect::create(rect);
+        }else if(shape == "circle")
+        {
+          int xx[4];
+          int i=0;
+          GPosition rect_pos=coords.lastpos();
+          if(rect_pos)
+          {
+            coords.append(coords[rect_pos]);
+            for(rect_pos=coords;(rect_pos)&&(i<4);++rect_pos)
+            {
+              xx[i++]=coords[rect_pos];
+            }
+          }
+          if(i!=4)
+          {
+            G_THROW( ERR_MSG("XMLAnno.bad_circle") );
+          }
+          int x=xx[0],y=xx[1],rx=xx[2],ry=(h-xx[3])-1;
+          GRect rect(x-rx,y-ry,2*rx,2*ry);
+          a=GMapOval::create(rect);
+        }else if(shape == "oval")
+        {
+          int xx[4];
+          int i=0;
+          for(GPosition rect_pos=coords;(rect_pos)&&(i<4);++rect_pos,++i)
+          {
+            xx[i]=coords[rect_pos];
+          }
+          if(i!=4)
+          {
+            G_THROW( ERR_MSG("XMLAnno.bad_oval") );
+          }
+          int xmin,xmax; 
+          if(xx[0]>xx[2])
+          {
+            xmax=xx[0];
+            xmin=xx[2];
+          }else
+          {
+            xmin=xx[0];
+            xmax=xx[2];
+          }
+          int ymin,ymax; 
+          if(xx[1]>xx[3])
+          {
+            ymax=xx[1];
+            ymin=xx[3];
+          }else
+          {
+            ymin=xx[1];
+            ymax=xx[3];
+          }
+          GRect rect(xmin,ymin,xmax-xmin,ymax-ymin);
+          a=GMapOval::create(rect);
+        }else if(shape == "poly")
+        {
+          GP<GMapPoly> p=GMapPoly::create();
+          for(GPosition poly_pos=coords;poly_pos;++poly_pos)
+          {
+            int x=coords[poly_pos];
+            if(! ++poly_pos)
+              break;
+            int y=coords[poly_pos];
+            p->add_vertex(x,y);
+          }
+          p->close_poly();
+          a=p;
+        }else
+        {
+          G_THROW( ( ERR_MSG("XMLAnno.unknown_shape") "\t")+shape );
+        }
+        if(a)
+        {
+          GPosition pos;
+          if((pos=args.contains("href")))
+          {
+            a->url=args[pos];
+          }
+          if((pos=args.contains("target")))
+          {
+            a->target=args[pos];
+          }
+          if((pos=args.contains("alt")))
+          {
+            a->comment=args[pos];
+          }
+          if((pos=args.contains("bordertype")))
+          {
+            GUTF8String b=args[pos];
+            static const GMap<GUTF8String,GMapArea::BorderType> typeMap=BorderTypeMap();
+            if((pos=typeMap.contains(b)))
+            {
+              a->border_type=typeMap[pos];
+            }else
+            {
+              G_THROW( (ERR_MSG("XMLAnno.unknown_border") "\t")+b );
+            }
+          }
+          a->border_always_visible=!!args.contains("visible");
+          if((pos=args.contains("bordercolor")))
+          {
+            a->border_color=convertToColor(args[pos]);
+          }
+          if((pos=args.contains("highlight")))
+          {
+            a->hilite_color=convertToColor(args[pos]);
+          }
+          if((pos=args.contains("border")))
+          {
+             a->border_width=args[pos].toInt(); //atoi(args[pos]);
+          }
+          map_areas.append(a);
+        }
+      }
+    }
+  }
+  dfile.set_modified(true);
+  dfile.anno=ByteStream::create();
+  anno.encode(dfile.anno);
+}
+
+GP<DjVuFile>
+lt_XMLParser::Impl::get_file(const GURL &url,GUTF8String id)
+{
+  GP<DjVuFile> dfile;
+  GP<DjVuDocument> doc;
+  GCriticalSectionLock lock(&xmlparser_lock);
+  {
+    GPosition pos=m_docs.contains(url.get_string());
+    if(pos)
+    {
+      doc=m_docs[pos];
+    }else
+    {
+      doc=DjVuDocument::create_wait(url);
+      if(! doc->wait_for_complete_init())
+      {
+        G_THROW(( ERR_MSG("XMLAnno.fail_init") "\t")+url.get_string() );
+      }
+      m_docs[url.get_string()]=doc;
+    }
+    if(id.is_int())
+    {
+      const int xpage=id.toInt(); //atoi((char const *)page); 
+      if(xpage>0)
+        id=doc->page_to_id(xpage-1);
+    }else if(!id.length())
+    { 
+      id=doc->page_to_id(0);
+    }
+  }
+  const GURL fileurl(doc->id_to_url(id));
+  GPosition dpos(m_files.contains(fileurl.get_string()));
+  if(!dpos)
+  {
+    if(!doc->get_id_list().contains(id))
+    {
+      G_THROW( ERR_MSG("XMLAnno.bad_page") );
+    }
+    dfile=doc->get_djvu_file(id,false);
+    if(!dfile)
+    {
+      G_THROW( ERR_MSG("XMLAnno.bad_page") );
+    }
+    m_files[fileurl.get_string()]=dfile;
+  }else
+  {
+    dfile=m_files[dpos];
+  }
+  return dfile;
+}
+  
+void
+lt_XMLParser::Impl::parse(const lt_XMLTags &tags, GURL *pdjvufile)
+{
+  const GPList<lt_XMLTags> Body(tags.get_Tags(bodytag));
+  GPosition pos=Body;
+ 
+  if(!pos || (pos != Body.lastpos()))
+  {
+    G_THROW( ERR_MSG("XMLAnno.extra_body") );
+  }
+  const GP<lt_XMLTags> GBody(Body[pos]);
+  if(!GBody)
+  {
+    G_THROW( ERR_MSG("XMLAnno.no_body") );
+  }
+
+  GMap<GUTF8String,GP<lt_XMLTags> > Maps;
+  lt_XMLTags::get_Maps(maptag,"name",Body,Maps);
+
+  const GPList<lt_XMLTags> Objects(GBody->get_Tags(objecttag));
+  lt_XMLTags::get_Maps(maptag,"name",Objects,Maps);
+
+  for(GPosition Objpos=Objects;Objpos;++Objpos)
+  {
+    lt_XMLTags &GObject=*Objects[Objpos];
+    // Map of attributes to value (e.g. "width" --> "500")
+    const GMap<GUTF8String,GUTF8String> &args=GObject.get_args();
+    GURL codebase;
+    {
+      DEBUG_MSG("Setting up codebase... m_codebase = " << m_codebase << "\n");
+      GPosition codebasePos=args.contains("codebase");
+      // If user specified a codebase attribute, assume it is correct (absolute URL):
+      //  the GURL constructor will throw an exception if it isn't
+      if(codebasePos)
+      {
+        codebase=GURL::UTF8(args[codebasePos]);
+      }else if (m_codebase.is_dir())
+      {
+        codebase=m_codebase;
+      }else
+      {
+        codebase=GURL::Filename::UTF8(GOS::cwd());
+      }
+      DEBUG_MSG("codebase = " << codebase << "\n");
+    }
+    // the data attribute specifies the input file.  This can be
+    //  either an absolute URL (starts with file:/) or a relative
+    //  URL (for now, just a path and file name).  If it's absolute,
+    //  our GURL will adequately wrap it.  If it's relative, we need
+    //  to use the codebase attribute to form an absolute URL first.
+    GPosition datapos=args.contains("data");
+    if(datapos)
+    {
+      GPosition typePos(args.contains("type"));
+      if(typePos)
+        {
+          if(args[typePos] != mimetype)
+          continue;
+        }
+      const GURL url = (pdjvufile) ? *pdjvufile 
+        : GURL::UTF8(args[datapos], 
+                     (args[datapos][0] == '/') ? codebase.base() : codebase);
+      int width;
+      {
+        GPosition widthPos=args.contains("width");
+        width=(widthPos)?args[widthPos].toInt():0;
+      }
+      int height;
+      {
+        GPosition heightPos=args.contains("height");
+        height=(heightPos)?args[heightPos].toInt():0;
+      }
+      GUTF8String gamma;
+      GUTF8String dpi;
+      GUTF8String page;
+      GUTF8String do_ocr;
+      {
+        GPosition paramPos(GObject.contains(paramtag));
+        if(paramPos)
+        {
+          const GPList<lt_XMLTags> Params(GObject[paramPos]);
+          for(GPosition loc=Params;loc;++loc)
+          {
+            const GMap<GUTF8String,GUTF8String> &pargs=Params[loc]->get_args();
+            GPosition namepos=pargs.contains("name");
+            if(namepos)
+            {
+              GPosition valuepos=pargs.contains("value");
+              if(valuepos)
+              {
+                const GUTF8String name=pargs[namepos].downcase();
+                const GUTF8String &value=pargs[valuepos];
+                if(name == "flags")
+                {
+                  GMap<GUTF8String,GUTF8String> args;
+                  lt_XMLTags::ParseValues(value,args,true);
+                  if(args.contains("page"))
+                  {
+                    page=args["page"];
+                  }
+                  if(args.contains("dpi"))
+                  {
+                    dpi=args["dpi"];
+                  }
+                  if(args.contains("gamma"))
+                  {
+                    gamma=args["gamma"];
+                  }
+                  if(args.contains("ocr"))
+                  {
+                    do_ocr=args["ocr"];
+                  }
+                }else if(name == "page")
+                {
+                  page=value;
+                }else if(name == "dpi")
+                {
+                  dpi=value;
+                }else if(name == "gamma")
+                {
+                  gamma=value;
+                }else if(name == "ocr")
+                {
+                  do_ocr=value;
+                }
+              }
+            }
+          }
+        }
+      }
+      const GP<DjVuFile> dfile(get_file(url,page));
+      if(dpi.is_int() || gamma.is_float())
+      {
+        int pos=0;
+        ChangeInfo(*dfile,dpi.toInt(),gamma.toDouble(pos,pos));
+      }
+      parse_anno(width,height,GObject,Maps,*dfile);
+      parse_meta(GObject,*dfile);
+      parse_text(width,height,GObject,*dfile);
+      ChangeTextOCR(do_ocr,width,height,dfile);
+    }
+  }
+}
+
+void
+lt_XMLParser::Impl::parse_anno(
+  const int width,
+  const int height,
+  const lt_XMLTags &GObject,
+  GMap<GUTF8String,GP<lt_XMLTags> > &Maps,
+  DjVuFile &dfile )
+{
+  GP<lt_XMLTags> map;
+  {
+    GPosition usemappos=GObject.get_args().contains("usemap");
+    if(usemappos)
+    {
+      const GUTF8String mapname(GObject.get_args()[usemappos]);
+      GPosition mappos=Maps.contains(mapname);
+      if(!mappos)
+      {
+        G_THROW((ERR_MSG("XMLAnno.map_find") "\t")+mapname );
+      }else
+      {
+        map=Maps[mappos];
+      }
+    }
+  }
+  if(map)
+  {
+    ChangeAnno(width,height,dfile,*map);
+  }
+}
+
+#ifdef max
+#undef max
+#endif
+template<class TYPE>
+static inline TYPE max(TYPE a,TYPE b) { return (a>b)?a:b; }
+#ifdef min
+#undef min
+#endif
+template<class TYPE>
+static inline TYPE min(TYPE a,TYPE b) { return (a<b)?a:b; }
+
+// used to build the zone tree
+// true is returned if the GRect is known for this object,
+// and false, if the rectangle's size is just the parent size.
+static bool
+make_child_layer(
+  DjVuTXT::Zone &parent,
+  const lt_XMLTags &tag, ByteStream &bs,
+  const int height, const double ws, const double hs)
+{
+  bool retval=true;
+  // the plugin thinks there are only Pages, Lines and Words
+  // so we don't make Paragraphs, Regions and Columns zones
+  // if we did the plugin is not able to search the text but 
+  // DjVuToText writes out all the text anyway
+  DjVuTXT::Zone *self_ptr;
+  char sepchar;
+  const GUTF8String name(tag.get_name());
+  if(name == charactertag)
+  {
+    self_ptr=parent.append_child();
+    self_ptr->ztype = DjVuTXT::CHARACTER;
+    sepchar=0;  
+  }else if(name == wordtag)
+  {
+    self_ptr=parent.append_child();
+    self_ptr->ztype = DjVuTXT::WORD;
+    sepchar=' ';
+  }else if(name == linetag)
+  {
+    self_ptr=parent.append_child();
+    self_ptr->ztype = DjVuTXT::LINE;
+    sepchar=DjVuTXT::end_of_line;
+  }else if(name == paragraphtag)
+  {
+    self_ptr=parent.append_child();
+    self_ptr->ztype = DjVuTXT::PARAGRAPH;
+    sepchar=DjVuTXT::end_of_paragraph;
+  }else if(name == regiontag)
+  {
+    self_ptr=parent.append_child();
+    self_ptr->ztype = DjVuTXT::REGION;
+    sepchar=DjVuTXT::end_of_region;
+  }else if(name == pagecolumntag)
+  {
+    self_ptr=parent.append_child();
+    self_ptr->ztype = DjVuTXT::COLUMN;
+    sepchar=DjVuTXT::end_of_column;
+  }else
+  {
+    self_ptr = &parent;
+    self_ptr->ztype = DjVuTXT::PAGE;
+    sepchar=0;
+  }
+  DjVuTXT::Zone &self = *self_ptr;
+  self.text_start = bs.tell();
+  int &xmin=self.rect.xmin, &ymin=self.rect.ymin, 
+    &xmax=self.rect.xmax, &ymax=self.rect.ymax;
+  GRect default_rect;
+  default_rect.xmin=max(parent.rect.xmax,parent.rect.xmin);
+  default_rect.xmax=min(parent.rect.xmax,parent.rect.xmin);
+  default_rect.ymin=max(parent.rect.ymax,parent.rect.ymin);
+  default_rect.ymax=min(parent.rect.ymax,parent.rect.ymin);
+  // Now if there are coordinates, use those.
+  GPosition pos(tag.get_args().contains("coords"));
+  if(pos)
+  {
+    GList<int> rectArgs;
+    intList(tag.get_args()[pos], rectArgs);
+    if((pos=rectArgs))
+    {
+      xmin=(int)(ws*(double)rectArgs[pos]);
+      if(++pos)
+      {
+        ymin=(height-1)-(int)(hs*(double)rectArgs[pos]);
+        if(++pos)
+        {
+          xmax=(int)(ws*(double)rectArgs[pos]);
+          if(++pos)
+          {
+            ymax=(height-1)-(int)(hs*(double)rectArgs[pos]);
+            if(xmin>xmax) // Make sure xmin is really minimum
+            {
+              const int t=xmin;
+              xmin=xmax;
+              xmax=t;
+            }
+            if(ymin>ymax) // Make sure ymin is really minimum
+            {
+              const int t=ymin;
+              ymin=ymax;
+              ymax=t;
+            }
+          }
+        }
+      }
+    }
+  }
+  if(self.ztype == DjVuTXT::CHARACTER)
+  {
+    if(! pos)
+    {
+      self.rect=default_rect;
+      retval=false;
+    }
+    const GUTF8String raw(tag.get_raw().fromEscaped());
+    const int i=raw.nextNonSpace(0);
+    bs.writestring(raw.substr(i,raw.firstEndSpace(i)-i));
+    if(sepchar)
+      bs.write8(sepchar);
+    self.text_length = bs.tell() - self.text_start;
+  }else if(pos)
+  {
+    pos=tag.get_content();
+    if(pos)
+    {
+      for(pos=tag.get_content(); pos; ++pos)
+      {
+        const GP<lt_XMLTags> t(tag.get_content()[pos].tag);
+        make_child_layer(self, *t, bs, height,ws,hs);
+      }
+      if(sepchar)
+        bs.write8(sepchar);
+      self.text_length = bs.tell() - self.text_start;
+    }else
+    {
+      const GUTF8String raw(tag.get_raw().fromEscaped());
+      const int i=raw.nextNonSpace(0);
+      bs.writestring(raw.substr(i,raw.firstEndSpace(i)-i));
+      if(sepchar)
+        bs.write8(sepchar);
+      self.text_length = bs.tell() - self.text_start;
+    }
+  }else
+  {
+    self.rect=default_rect;
+    if((pos=tag.get_content()))
+    {
+      do
+      {
+        const GP<lt_XMLTags> t(tag.get_content()[pos].tag);
+        const GRect save_rect(self.rect);
+        self.rect=default_rect;
+	if ((retval = make_child_layer(self, *t, bs, height, ws, hs)))
+        {
+          xmin=min(save_rect.xmin,xmin);
+          xmax=max(save_rect.xmax,xmax);
+          ymin=min(save_rect.ymin,ymin);
+          ymax=max(save_rect.ymax,ymax);
+        }else
+        {
+          // If the child doesn't have coordinates, we need to use a box
+          // at least as big as the parent's coordinates.
+          xmin=min(save_rect.xmin,default_rect.xmax);
+          xmax=max(save_rect.xmax,default_rect.xmin);
+          ymin=min(save_rect.ymin,default_rect.ymax);
+          ymax=max(save_rect.ymax,default_rect.ymin);
+          for(; pos; ++pos)
+          {
+            const GP<lt_XMLTags> t(tag.get_content()[pos].tag);
+            make_child_layer(self, *t, bs, height,ws,hs);
+          }
+          break;
+        }
+      } while(++pos);
+      if(sepchar)
+        bs.write8(sepchar);
+      self.text_length = bs.tell() - self.text_start;
+    }else
+    {
+      const GUTF8String raw(tag.get_raw().fromEscaped());
+      const int i=raw.nextNonSpace(0);
+      bs.writestring(raw.substr(i,raw.firstEndSpace(i)-i));
+      if(sepchar)
+        bs.write8(sepchar);
+      self.text_length = bs.tell() - self.text_start;
+    }
+  }
+  parent.rect.xmin=min(xmin,parent.rect.xmin);
+  parent.rect.ymin=min(ymin,parent.rect.ymin);
+  parent.rect.xmax=max(xmax,parent.rect.xmax);
+  parent.rect.ymax=max(ymax,parent.rect.ymax);
+  if(xmin>xmax)
+  {
+    const int t=xmin;
+    xmin=xmax;
+    xmax=t;
+  }
+  if(ymin>ymax)
+  {
+    const int t=ymin;
+    ymin=ymax;
+    ymax=t;
+  }
+//  DjVuPrintMessage("(%d,%d)(%d,%d)<<<\\%o>>>\n",
+//    xmin,ymin,xmax,ymax, sepchar);
+  return retval;
+}
+
+void 
+lt_XMLParser::Impl::ChangeTextOCR(
+  const GUTF8String &value,
+  const int width,
+  const int height,
+  const GP<DjVuFile> &dfile)
+{
+  if(value.length() && value.downcase() != "false")
+  {
+    const GP<ByteStream> bs=OCRcallback(value,DjVuImage::create(dfile));
+    if( bs && bs->size() )
+    {
+      const GP<lt_XMLTags> tags(lt_XMLTags::create(bs));
+      ChangeText(width,height,*dfile,*tags);
+    }
+  }
+}
+
+void 
+lt_XMLParser::Impl::ChangeMeta(
+  DjVuFile &dfile, const lt_XMLTags &tags )
+{
+  dfile.resume_decode(true);
+  GP<ByteStream> gbs(ByteStream::create());
+  tags.write(*gbs,false);
+  gbs->seek(0L);
+  GUTF8String raw(gbs->getAsUTF8());
+  if(raw.length())
+  {
+     //GUTF8String gs="<"+(metadatatag+(">"+raw))+"</"+metadatatag+">\n");
+    dfile.change_meta(raw+"\n");
+  }else
+  {
+    dfile.change_meta(GUTF8String());
+  }
+}
+
+void 
+lt_XMLParser::Impl::ChangeText(
+  const int width, const int height,
+  DjVuFile &dfile, const lt_XMLTags &tags )
+{
+  dfile.resume_decode(true);
+  
+  GP<DjVuText> text = DjVuText::create();
+  GP<DjVuTXT> txt = text->txt = DjVuTXT::create();
+  
+  // to store the new text
+  GP<ByteStream> textbs = ByteStream::create(); 
+  
+  GP<DjVuInfo> info=(dfile.info);
+  if(info)
+  {
+    const int h=info->height;
+    const int w=info->width;
+    txt->page_zone.text_start = 0;
+    DjVuTXT::Zone &parent=txt->page_zone;
+    parent.rect.xmin=0;
+    parent.rect.ymin=0;
+    parent.rect.ymax=h;
+    parent.rect.xmax=w;
+    double ws=1.0;
+    if(width && width != w)
+    {
+      ws=((double)w)/((double)width);
+    }
+    double hs=1.0;
+    if(height && height != h)
+    {
+      hs=((double)h)/((double)height);
+    }
+    make_child_layer(parent, tags, *textbs, h, ws,hs);
+    textbs->write8(0);
+    long len = textbs->tell();
+    txt->page_zone.text_length = len;
+    textbs->seek(0,SEEK_SET);
+    textbs->read(txt->textUTF8.getbuf(len), len);
+  
+    dfile.change_text(txt,false);
+  }
+}
+
+void
+lt_XMLParser::Impl::parse_text(
+  const int width,
+  const int height,
+  const lt_XMLTags &GObject,
+  DjVuFile &dfile )
+{
+  GPosition textPos = GObject.contains(hiddentexttag);
+  if(textPos)
+  {
+    // loop through the hidden text - there should only be one 
+    // if there are more ??only the last one will be saved??
+    GPList<lt_XMLTags> textTags = GObject[textPos];
+    GPosition pos = textTags;
+    ChangeText(width,height,dfile,*textTags[pos]);
+  }
+}
+
+void
+lt_XMLParser::Impl::parse_meta(
+  const lt_XMLTags &GObject,
+  DjVuFile &dfile )
+{
+  GPosition metaPos = GObject.contains(metadatatag);
+  if(metaPos)
+  {
+    // loop through the hidden text - there should only be one 
+    // if there are more ??only the last one will be saved??
+    GPList<lt_XMLTags> metaTags = GObject[metaPos];
+    GPosition pos = metaTags;
+    ChangeMeta(dfile,*metaTags[pos]);
+  }
+}
+
+static GP<ByteStream>
+OCRcallback(
+  void * const xarg,
+  lt_XMLParser::mapOCRcallback * const xcallback,
+  const GUTF8String &value,
+  const GP<DjVuImage> &image )
+{
+  GP<ByteStream> retval;
+  static void *arg=0;
+  static lt_XMLParser::mapOCRcallback *callback=0;
+  if(image)
+  {
+    if(callback)
+      retval=callback(arg,value,image);
+  }else
+  {
+    arg=xarg;
+    callback=xcallback;
+  }
+  return retval;
+}
+
+void
+lt_XMLParser::setOCRcallback(
+  void * const arg,
+  mapOCRcallback * const callback)
+{
+  ::OCRcallback(arg,callback);
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/XMLParser.h b/libdjvu/XMLParser.h
new file mode 100644
index 0000000..1c6b5ed
--- /dev/null
+++ b/libdjvu/XMLParser.h
@@ -0,0 +1,122 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _LT_XMLPARSER__
+#define _LT_XMLPARSER__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// This is purely Lizardtech stuff.
+
+#include "GContainer.h"
+#include "GURL.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+class lt_XMLTags;
+class lt_XMLContents;
+class DjVuFile;
+class DjVuDocument;
+class DjVuImage;
+class GBitmap;
+
+// this is the base class for using XML to change DjVu Docs.
+
+class DJVUAPI lt_XMLParser : public GPEnabled
+{
+public:
+  class Impl;
+  typedef GP<ByteStream> mapOCRcallback(
+    void *,const GUTF8String &value,const GP<DjVuImage> &);
+protected:
+  lt_XMLParser(void);
+  virtual ~lt_XMLParser();
+public:
+  static GP<lt_XMLParser> create(void);
+  /// Parse the specified bytestream.
+  virtual void parse(const GP<ByteStream> &bs, GURL *pdjvufile=0) = 0;
+  /// Parse the specified tags - this one does all the work
+  virtual void parse(const lt_XMLTags &tags, GURL *pdjvufile=0) = 0;
+  /// write to disk.
+  virtual void save(void) = 0;
+  /// erase.
+  virtual void empty(void) = 0;
+
+  // helper function for args
+  static void setOCRcallback(
+    void * const arg,mapOCRcallback * const );
+};
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif /* _LT_XMLPARSER__ */
+
+
diff --git a/libdjvu/XMLTags.cpp b/libdjvu/XMLTags.cpp
new file mode 100644
index 0000000..9617231
--- /dev/null
+++ b/libdjvu/XMLTags.cpp
@@ -0,0 +1,416 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// This is purely Lizardtech stuff.
+
+#include "XMLTags.h"
+#include "UnicodeByteStream.h"
+#include <ctype.h>
+#if HAS_WCTYPE
+#include <wctype.h>
+#endif
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+lt_XMLContents::lt_XMLContents(void) {}
+
+lt_XMLContents::lt_XMLContents(GP<lt_XMLTags> t)
+{
+  tag=t;
+}
+
+static GUTF8String
+getargn(char const tag[], char const *&t)
+{
+  char const *s;
+  for(s=tag;isspace(*s);s++);
+  for(t=s;(*t)&&((*t)!='/')&&((*t)!='>')&&((*t)!='=')&&!isspace(*t);++t);
+  return GUTF8String(s,t-s);
+}
+
+static GUTF8String
+getargv(char const tag[], char const *&t)
+{
+  GUTF8String retval;
+  if(tag && tag[0] == '=')
+  {
+    char const *s=t=tag+1;
+    if((*t == '"')||(*t == '\47'))
+    {
+      char const q=*(t++);
+      for(s++;(*t)&&((*t)!=q)&&((*t)!='>');++t);
+      retval=GUTF8String(s,t-s);
+      if (t[0] == q)
+      {
+        ++t;
+      }
+    }else
+    {
+      for(t=s;(*t)&&((*t)!='/')&&((*t)!='>')&&!isspace(*t);++t);
+      retval=GUTF8String(s,t-s);
+    }
+  }else
+  {
+    t=tag;
+  }
+  return retval;
+}
+
+static GUTF8String
+tagtoname(char const tag[],char const *&t)
+{
+  char const *s;
+  for(s=tag;isspace(*s);s++);
+  for(t=s;(*t)&&((*t)!='>')&&((*t)!='/')&&!isspace(*t);++t);
+  return GUTF8String(s,t-s);
+}
+
+static inline GUTF8String
+tagtoname(char const tag[])
+{
+  char const *t;
+  return tagtoname(tag,t);
+}
+
+static inline bool
+isspaces(const GUTF8String &raw)
+{
+  return (raw.nextNonSpace() == (int)raw.length());
+}
+
+void
+lt_XMLTags::ParseValues(char const *t, GMap<GUTF8String,GUTF8String> &args,bool downcase)
+{
+  GUTF8String argn;
+  char const *tt;
+  while((argn=getargn(t,tt)).length())
+  {
+    if(downcase)
+      argn=argn.downcase();
+    args[argn]=getargv(tt,t).fromEscaped();
+  }
+}
+
+lt_XMLTags::~lt_XMLTags() {}
+
+lt_XMLTags::lt_XMLTags(void) : startline(0) {}
+
+lt_XMLTags::lt_XMLTags(const char n[]) : startline(0)
+{
+  char const *t;
+  name=tagtoname(n,t);
+  ParseValues(t,args);
+}
+
+void
+lt_XMLTags::init(const GP<ByteStream> &bs)
+{
+  GP<XMLByteStream> gxmlbs=XMLByteStream::create(bs);
+  init(*gxmlbs);
+}
+
+void
+lt_XMLTags::init(const GURL &url)
+{
+  const GP<ByteStream> bs=ByteStream::create(url,"rb");
+  init(bs);
+}
+
+void
+lt_XMLTags::init(XMLByteStream &xmlbs)
+{
+  if(!get_count())
+  {
+    G_THROW( ERR_MSG("XMLTags.no_GP") );
+  }
+  GPList<lt_XMLTags> level;
+  GUTF8String tag,raw(xmlbs.gets(0,'<',false));
+  int linesread=xmlbs.get_lines_read();
+  if(!isspaces(raw))
+  {
+    G_THROW( (ERR_MSG("XMLTags.raw_string") "\t")+raw);
+  }
+  GUTF8String encoding;
+  for(int len;(len=(tag=xmlbs.gets(0,'>',true)).length());)
+  {
+    if(tag[len-1] != '>')
+    {
+      G_THROW((ERR_MSG("XMLTags.bad_tag") "\t")+tag);
+    }
+    switch(tag[1])
+    {
+      case '?':
+      {
+        while(len < 4 || tag.substr(len-2,len) != "?>")
+        {
+          GUTF8String cont(xmlbs.gets(0,'>',true));
+          if(!cont.length())
+          { 
+            G_THROW( (ERR_MSG("XMLTags.bad_PI") "\t")+tag);
+          }
+          len=((tag+=cont).length());
+        }
+        char const *n;
+        GUTF8String xtag = tag.substr(2,-1);
+        GUTF8String xname = tagtoname(xtag,n);
+        if(xname.downcase() == "xml")
+        {
+          ParseValues(n,args);
+          for(GPosition pos=args;pos;++pos)
+          {
+            if(args.key(pos) == "encoding")
+            {
+              const GUTF8String e=args[pos].upcase();
+              if(e != encoding)
+              {
+                xmlbs.set_encoding((encoding=e));
+              }
+            }
+          }
+        }
+        break;
+      }
+      case '!':
+      {
+        if(tag[2] == '-' && tag[3] == '-')
+        {
+          while((len < 7) ||
+            (tag.substr(len-3,-1) != "-->"))
+          {
+            GUTF8String cont(xmlbs.gets(0,'>',true));
+            if(!cont.length())
+            { 
+              GUTF8String mesg;
+              mesg.format( ERR_MSG("XMLTags.bad_comment") "\t%s",(const char *)tag);
+              G_THROW(mesg);
+            }
+            len=((tag+=cont).length());
+          }
+        }
+        break;
+      }
+      case '/':
+      {
+        GUTF8String xname=tagtoname(tag.substr(2,-1));
+        GPosition last=level.lastpos();
+        if(last)
+        {
+          if(level[last]->name != xname)
+          {
+            G_THROW( (ERR_MSG("XMLTags.unmatched_end") "\t")
+              +level[last]->name+("\t"+GUTF8String(level[last]->get_Line()))
+              +("\t"+xname)+("\t"+GUTF8String(linesread+1)));
+          }
+          level.del(last);
+        }else
+        {
+          G_THROW( ERR_MSG("XMLTags.bad_form") );
+        }
+        break;
+      }
+      default:
+      {
+        GPosition last=level.lastpos();
+        GP<lt_XMLTags> t;
+        if(last)
+        {
+          t=new lt_XMLTags(tag.substr(1,len-1));
+          level[last]->addtag(t);
+          if(tag[len-2] != '/')
+          {
+            level.append(t);
+          }
+        }else if(tag[len-2] != '/')
+        {
+          char const *n;
+          GUTF8String xtag = tag.substr(1,-1); 
+          name=tagtoname(xtag, n);
+          ParseValues(n,args);
+          t=this;
+          level.append(t);
+        }else
+        {
+          G_THROW( ERR_MSG("XMLTags.no_body") );
+        }
+        t->set_Line(linesread+1);
+        break;
+      }
+    }
+    if((raw=xmlbs.gets(0,'<',false))[0])
+    { 
+      linesread=xmlbs.get_lines_read();
+      GPosition last=level.lastpos();
+      if(last)
+      {
+        level[last]->addraw(raw);
+      }else if(!isspaces(raw))
+      {
+        G_THROW(( ERR_MSG("XMLTags.raw_string") "\t")+raw);
+      }
+    }
+  }
+}
+
+GPList<lt_XMLTags>
+lt_XMLTags::get_Tags(char const tagname[]) const
+{
+  GPosition pos=allTags.contains(tagname);
+  GPList<lt_XMLTags> retval;
+  return (pos?allTags[pos]:retval);
+}
+
+void
+lt_XMLTags::get_Maps(char const tagname[],
+                     char const argn[],
+                     GPList<lt_XMLTags> list,
+                     GMap<GUTF8String, GP<lt_XMLTags> > &map)
+{
+  for(GPosition pos=list;pos;++pos)
+  {
+    GP<lt_XMLTags> &tag=list[pos];
+    if(tag)
+    {
+      GPosition loc;
+      if((loc=tag->contains(tagname)))
+      {
+        GPList<lt_XMLTags> maps=(GPList<lt_XMLTags> &)((*tag)[loc]);
+        for(GPosition mloc=maps;mloc;++mloc)
+        {
+          GP<lt_XMLTags> gtag=maps[mloc];
+          if(gtag)
+          {
+            GMap<GUTF8String,GUTF8String> &args=gtag->args;
+            GPosition gpos;
+            if((gpos=args.contains(argn)))
+            {
+              map[args[gpos]]=gtag;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void
+lt_XMLTags::write(ByteStream &bs,bool const top) const
+{
+  if(name.length())
+  {
+    GUTF8String tag="<"+name;
+    for(GPosition pos=args;pos;++pos)
+    {
+      tag+=GUTF8String(' ')+args.key(pos)+GUTF8String("=\42")+args[pos].toEscaped()+GUTF8String("\42");
+    }
+    GPosition tags=content;
+    if(tags||raw.length()) 
+    {
+      tag+=">";
+      bs.writall((const char *)tag,tag.length());
+      tag="</"+name+">";
+      if(raw.length())
+      {
+        bs.writestring(raw);
+      }
+      for(;tags;++tags)
+      {
+        content[tags].write(bs);
+      }
+    }else if(!raw.length())
+    {
+      tag+="/>";
+    }
+    bs.writall((const char *)tag,tag.length());
+  }
+  if(top)
+  {
+     bs.writall("\n",1);
+  }
+}
+
+void
+lt_XMLContents::write(ByteStream &bs) const
+{
+  if(tag)
+  {
+    tag->write(bs,false);
+  }
+  if(raw.length())
+  {
+    bs.writestring(raw);
+  } 
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/XMLTags.h b/libdjvu/XMLTags.h
new file mode 100644
index 0000000..74536db
--- /dev/null
+++ b/libdjvu/XMLTags.h
@@ -0,0 +1,241 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _LT_XMLTAGS__
+#define _LT_XMLTAGS__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// This is purely Lizardtech stuff.
+
+#include "GContainer.h"
+#include "GString.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class lt_XMLContents;
+class DjVuFile;
+class DjVuDocument;
+class ByteStream;
+class XMLByteStream;
+class GURL;
+
+class DJVUAPI lt_XMLTags : public GPEnabled
+{
+protected:
+  lt_XMLTags();
+  lt_XMLTags(const char n[]);
+
+public:
+  /// Empty creator.
+  static GP<lt_XMLTags> create(void) { return new lt_XMLTags; }
+  /// Default the specified tag.
+  static GP<lt_XMLTags> create(const char n[]) { return new lt_XMLTags(n); }
+  /// Initialize from the specified URL.
+  void init(const GURL & url);
+  /// Create from the specified URL.
+  static GP<lt_XMLTags> create(const GURL &url);
+  /// Initialize from the specified bytestream.
+  void init(const GP<ByteStream> &bs);
+  /// Create from the specified bytestream.
+  static GP<lt_XMLTags> create(const GP<ByteStream> &bs);
+  /// Initialize from an XMLByteStream.
+  void init(XMLByteStream &xmlbs);
+  /// Create from an XML bytestream.
+  static GP<lt_XMLTags> create(XMLByteStream &xmlbs);
+  /// Non-virtual destructor.
+  ~lt_XMLTags();
+
+  inline int get_Line(void) const;
+  inline const GUTF8String& get_raw(void) const;
+  inline const GUTF8String& get_name(void) const;
+  inline const GList<lt_XMLContents>& get_content(void) const;
+  inline const GMap<GUTF8String,GUTF8String>& get_args(void) const;
+  inline const GMap<GUTF8String,GPList<lt_XMLTags> >& get_allTags(void) const;
+
+  GPList<lt_XMLTags> get_Tags(char const tagname[]) const;
+  inline void set_Line(const int xstartline) { startline=xstartline; }
+
+  inline void addtag(GP<lt_XMLTags> x);
+  inline void addraw(GUTF8String raw);
+  inline GPosition contains(GUTF8String name) const;
+  inline const GPList<lt_XMLTags> & operator [] (const GUTF8String name) const;
+  inline const GPList<lt_XMLTags> & operator [] (const GPosition &pos) const;
+  static void ParseValues(char const *t, GMap<GUTF8String,GUTF8String> &args,bool downcase=true);
+  static void get_Maps(char const tagname[],char const argn[],
+    GPList<lt_XMLTags> list, GMap<GUTF8String, GP<lt_XMLTags> > &map);
+  void write(ByteStream &bs,bool const top=true) const;
+
+protected:
+  GUTF8String name;
+  GMap<GUTF8String,GUTF8String> args;
+  GList<lt_XMLContents> content;
+  GUTF8String raw;
+  GMap<GUTF8String,GPList<lt_XMLTags> > allTags;
+  int startline;
+};
+
+class lt_XMLContents
+{
+public:
+  lt_XMLContents(void);
+  lt_XMLContents(GP<lt_XMLTags> tag);
+  GP<lt_XMLTags> tag;
+  GUTF8String raw;
+  void write(ByteStream &bs) const;
+};
+
+inline GP<lt_XMLTags>
+lt_XMLTags::create(const GURL &url)
+{
+  const GP<lt_XMLTags> retval(new lt_XMLTags);
+  retval->init(url);
+  return retval;
+}
+
+inline GP<lt_XMLTags>
+lt_XMLTags::create(const GP<ByteStream> &bs)
+{
+  const GP<lt_XMLTags> retval(new lt_XMLTags);
+  retval->init(bs);
+  return retval;
+}
+
+inline GP<lt_XMLTags>
+lt_XMLTags::create(XMLByteStream &xmlbs)
+{
+  const GP<lt_XMLTags> retval(new lt_XMLTags);
+  retval->init(xmlbs);
+  return retval;
+}
+
+/// Non-virtual destructor.
+inline void
+lt_XMLTags::addtag (GP<lt_XMLTags> x)
+{
+  content.append(lt_XMLContents(x));
+  allTags[x->name].append(x);
+}
+
+inline void
+lt_XMLTags::addraw (GUTF8String r)
+{
+  GPosition pos=content;
+  if(pos)
+  {
+    content[pos].raw+=r;
+  }else
+  {
+    raw+=r;
+  }
+}
+
+inline int
+lt_XMLTags::get_Line(void) const
+{ return startline; }
+
+inline const GUTF8String &
+lt_XMLTags::get_name(void) const { return name; }
+
+inline const GUTF8String &
+lt_XMLTags::get_raw(void) const { return raw; }
+
+inline const GList<lt_XMLContents> &
+lt_XMLTags::get_content(void) const { return content; }
+
+inline const GMap<GUTF8String,GUTF8String> &
+lt_XMLTags::get_args(void) const { return args; }
+
+inline const GMap<GUTF8String,GPList<lt_XMLTags> > &
+lt_XMLTags::get_allTags(void) const { return allTags; }
+
+inline GPosition
+lt_XMLTags::contains(GUTF8String name) const
+{
+  return allTags.contains(name);
+}
+
+inline const GPList<lt_XMLTags> &
+lt_XMLTags::operator [] (const GUTF8String name) const
+{
+  return allTags[name];
+}
+
+inline const GPList<lt_XMLTags> &
+lt_XMLTags::operator [] (const GPosition &pos) const
+{
+  return allTags[pos];
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif /* _LT_XMLTAGS__ */
+
+
diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp
new file mode 100644
index 0000000..ff5b9bf
--- /dev/null
+++ b/libdjvu/ZPCodec.cpp
@@ -0,0 +1,1293 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// Almost equal to my initial code.
+
+#include "ZPCodec.h"
+#include "ByteStream.h"
+#include "GException.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+////////////////////////////////////////////////////////////////
+// CODER SPECIFICATION
+////////////////////////////////////////////////////////////////
+
+
+#ifndef ZPCODER
+#ifndef ZCODER
+#define ZPCODER
+#endif
+#endif
+#ifdef ZCODER
+
+// The ZCODER option is provided for documentation purposes only. The ZCODER
+// might come dangerously close to U.S. patent 5059976 (Mitsubishi).  This is
+// why we always use the ZPCODER, although it usually produces 1% larger files.
+#warning "The ZCODER may infringe non-LizardTech patent(s)."
+#warning "You should use the ZPCODER instead."
+#endif
+
+
+////////////////////////////////////////////////////////////////
+// ZP CODER DEFAULT ADAPTATION TABLE
+////////////////////////////////////////////////////////////////
+
+
+// See ZPCodec::ZPCodec to see how this
+// default table is modified when not
+// using the DjVu compatibility mode.
+
+
+static ZPCodec::Table default_ztable[256] = 
+{
+#ifdef ZPCODER
+  /* This table has been designed for the ZPCoder
+   * by running the following command in file 'zptable.sn':
+   * (fast-crude (steady-mat 0.0035  0.0002) 260)))
+   */
+  { 0x8000,  0x0000,  84, 145 },    /* 000: p=0.500000 (    0,    0) */
+  { 0x8000,  0x0000,   3,   4 },    /* 001: p=0.500000 (    0,    0) */
+  { 0x8000,  0x0000,   4,   3 },    /* 002: p=0.500000 (    0,    0) */
+  { 0x6bbd,  0x10a5,   5,   1 },    /* 003: p=0.465226 (    0,    0) */
+  { 0x6bbd,  0x10a5,   6,   2 },    /* 004: p=0.465226 (    0,    0) */
+  { 0x5d45,  0x1f28,   7,   3 },    /* 005: p=0.430708 (    0,    0) */
+  { 0x5d45,  0x1f28,   8,   4 },    /* 006: p=0.430708 (    0,    0) */
+  { 0x51b9,  0x2bd3,   9,   5 },    /* 007: p=0.396718 (    0,    0) */
+  { 0x51b9,  0x2bd3,  10,   6 },    /* 008: p=0.396718 (    0,    0) */
+  { 0x4813,  0x36e3,  11,   7 },    /* 009: p=0.363535 (    0,    0) */
+  { 0x4813,  0x36e3,  12,   8 },    /* 010: p=0.363535 (    0,    0) */
+  { 0x3fd5,  0x408c,  13,   9 },    /* 011: p=0.331418 (    0,    0) */
+  { 0x3fd5,  0x408c,  14,  10 },    /* 012: p=0.331418 (    0,    0) */
+  { 0x38b1,  0x48fd,  15,  11 },    /* 013: p=0.300585 (    0,    0) */
+  { 0x38b1,  0x48fd,  16,  12 },    /* 014: p=0.300585 (    0,    0) */
+  { 0x3275,  0x505d,  17,  13 },    /* 015: p=0.271213 (    0,    0) */
+  { 0x3275,  0x505d,  18,  14 },    /* 016: p=0.271213 (    0,    0) */
+  { 0x2cfd,  0x56d0,  19,  15 },    /* 017: p=0.243438 (    0,    0) */
+  { 0x2cfd,  0x56d0,  20,  16 },    /* 018: p=0.243438 (    0,    0) */
+  { 0x2825,  0x5c71,  21,  17 },    /* 019: p=0.217391 (    0,    0) */
+  { 0x2825,  0x5c71,  22,  18 },    /* 020: p=0.217391 (    0,    0) */
+  { 0x23ab,  0x615b,  23,  19 },    /* 021: p=0.193150 (    0,    0) */
+  { 0x23ab,  0x615b,  24,  20 },    /* 022: p=0.193150 (    0,    0) */
+  { 0x1f87,  0x65a5,  25,  21 },    /* 023: p=0.170728 (    0,    0) */
+  { 0x1f87,  0x65a5,  26,  22 },    /* 024: p=0.170728 (    0,    0) */
+  { 0x1bbb,  0x6962,  27,  23 },    /* 025: p=0.150158 (    0,    0) */
+  { 0x1bbb,  0x6962,  28,  24 },    /* 026: p=0.150158 (    0,    0) */
+  { 0x1845,  0x6ca2,  29,  25 },    /* 027: p=0.131418 (    0,    0) */
+  { 0x1845,  0x6ca2,  30,  26 },    /* 028: p=0.131418 (    0,    0) */
+  { 0x1523,  0x6f74,  31,  27 },    /* 029: p=0.114460 (    0,    0) */
+  { 0x1523,  0x6f74,  32,  28 },    /* 030: p=0.114460 (    0,    0) */
+  { 0x1253,  0x71e6,  33,  29 },    /* 031: p=0.099230 (    0,    0) */
+  { 0x1253,  0x71e6,  34,  30 },    /* 032: p=0.099230 (    0,    0) */
+  { 0x0fcf,  0x7404,  35,  31 },    /* 033: p=0.085611 (    0,    0) */
+  { 0x0fcf,  0x7404,  36,  32 },    /* 034: p=0.085611 (    0,    0) */
+  { 0x0d95,  0x75d6,  37,  33 },    /* 035: p=0.073550 (    0,    0) */
+  { 0x0d95,  0x75d6,  38,  34 },    /* 036: p=0.073550 (    0,    0) */
+  { 0x0b9d,  0x7768,  39,  35 },    /* 037: p=0.062888 (    0,    0) */
+  { 0x0b9d,  0x7768,  40,  36 },    /* 038: p=0.062888 (    0,    0) */
+  { 0x09e3,  0x78c2,  41,  37 },    /* 039: p=0.053539 (    0,    0) */
+  { 0x09e3,  0x78c2,  42,  38 },    /* 040: p=0.053539 (    0,    0) */
+  { 0x0861,  0x79ea,  43,  39 },    /* 041: p=0.045365 (    0,    0) */
+  { 0x0861,  0x79ea,  44,  40 },    /* 042: p=0.045365 (    0,    0) */
+  { 0x0711,  0x7ae7,  45,  41 },    /* 043: p=0.038272 (    0,    0) */
+  { 0x0711,  0x7ae7,  46,  42 },    /* 044: p=0.038272 (    0,    0) */
+  { 0x05f1,  0x7bbe,  47,  43 },    /* 045: p=0.032174 (    0,    0) */
+  { 0x05f1,  0x7bbe,  48,  44 },    /* 046: p=0.032174 (    0,    0) */
+  { 0x04f9,  0x7c75,  49,  45 },    /* 047: p=0.026928 (    0,    0) */
+  { 0x04f9,  0x7c75,  50,  46 },    /* 048: p=0.026928 (    0,    0) */
+  { 0x0425,  0x7d0f,  51,  47 },    /* 049: p=0.022444 (    0,    0) */
+  { 0x0425,  0x7d0f,  52,  48 },    /* 050: p=0.022444 (    0,    0) */
+  { 0x0371,  0x7d91,  53,  49 },    /* 051: p=0.018636 (    0,    0) */
+  { 0x0371,  0x7d91,  54,  50 },    /* 052: p=0.018636 (    0,    0) */
+  { 0x02d9,  0x7dfe,  55,  51 },    /* 053: p=0.015421 (    0,    0) */
+  { 0x02d9,  0x7dfe,  56,  52 },    /* 054: p=0.015421 (    0,    0) */
+  { 0x0259,  0x7e5a,  57,  53 },    /* 055: p=0.012713 (    0,    0) */
+  { 0x0259,  0x7e5a,  58,  54 },    /* 056: p=0.012713 (    0,    0) */
+  { 0x01ed,  0x7ea6,  59,  55 },    /* 057: p=0.010419 (    0,    0) */
+  { 0x01ed,  0x7ea6,  60,  56 },    /* 058: p=0.010419 (    0,    0) */
+  { 0x0193,  0x7ee6,  61,  57 },    /* 059: p=0.008525 (    0,    0) */
+  { 0x0193,  0x7ee6,  62,  58 },    /* 060: p=0.008525 (    0,    0) */
+  { 0x0149,  0x7f1a,  63,  59 },    /* 061: p=0.006959 (    0,    0) */
+  { 0x0149,  0x7f1a,  64,  60 },    /* 062: p=0.006959 (    0,    0) */
+  { 0x010b,  0x7f45,  65,  61 },    /* 063: p=0.005648 (    0,    0) */
+  { 0x010b,  0x7f45,  66,  62 },    /* 064: p=0.005648 (    0,    0) */
+  { 0x00d5,  0x7f6b,  67,  63 },    /* 065: p=0.004506 (    0,    0) */
+  { 0x00d5,  0x7f6b,  68,  64 },    /* 066: p=0.004506 (    0,    0) */
+  { 0x00a5,  0x7f8d,  69,  65 },    /* 067: p=0.003480 (    0,    0) */
+  { 0x00a5,  0x7f8d,  70,  66 },    /* 068: p=0.003480 (    0,    0) */
+  { 0x007b,  0x7faa,  71,  67 },    /* 069: p=0.002602 (    0,    0) */
+  { 0x007b,  0x7faa,  72,  68 },    /* 070: p=0.002602 (    0,    0) */
+  { 0x0057,  0x7fc3,  73,  69 },    /* 071: p=0.001843 (    0,    0) */
+  { 0x0057,  0x7fc3,  74,  70 },    /* 072: p=0.001843 (    0,    0) */
+  { 0x003b,  0x7fd7,  75,  71 },    /* 073: p=0.001248 (    0,    0) */
+  { 0x003b,  0x7fd7,  76,  72 },    /* 074: p=0.001248 (    0,    0) */
+  { 0x0023,  0x7fe7,  77,  73 },    /* 075: p=0.000749 (    0,    0) */
+  { 0x0023,  0x7fe7,  78,  74 },    /* 076: p=0.000749 (    0,    0) */
+  { 0x0013,  0x7ff2,  79,  75 },    /* 077: p=0.000402 (    0,    0) */
+  { 0x0013,  0x7ff2,  80,  76 },    /* 078: p=0.000402 (    0,    0) */
+  { 0x0007,  0x7ffa,  81,  77 },    /* 079: p=0.000153 (    0,    0) */
+  { 0x0007,  0x7ffa,  82,  78 },    /* 080: p=0.000153 (    0,    0) */
+  { 0x0001,  0x7fff,  81,  79 },    /* 081: p=0.000027 (    0,    0) */
+  { 0x0001,  0x7fff,  82,  80 },    /* 082: p=0.000027 (    0,    0) */
+  { 0x5695,  0x0000,   9,  85 },    /* 083: p=0.411764 (    2,    3) */
+  { 0x24ee,  0x0000,  86, 226 },    /* 084: p=0.199988 (    1,    0) */
+  { 0x8000,  0x0000,   5,   6 },    /* 085: p=0.500000 (    3,    3) */
+  { 0x0d30,  0x0000,  88, 176 },    /* 086: p=0.071422 (    4,    0) */
+  { 0x481a,  0x0000,  89, 143 },    /* 087: p=0.363634 (    1,    2) */
+  { 0x0481,  0x0000,  90, 138 },    /* 088: p=0.024388 (   13,    0) */
+  { 0x3579,  0x0000,  91, 141 },    /* 089: p=0.285711 (    1,    3) */
+  { 0x017a,  0x0000,  92, 112 },    /* 090: p=0.007999 (   41,    0) */
+  { 0x24ef,  0x0000,  93, 135 },    /* 091: p=0.199997 (    1,    5) */
+  { 0x007b,  0x0000,  94, 104 },    /* 092: p=0.002611 (  127,    0) */
+  { 0x1978,  0x0000,  95, 133 },    /* 093: p=0.137929 (    1,    8) */
+  { 0x0028,  0x0000,  96, 100 },    /* 094: p=0.000849 (  392,    0) */
+  { 0x10ca,  0x0000,  97, 129 },    /* 095: p=0.090907 (    1,   13) */
+  { 0x000d,  0x0000,  82,  98 },    /* 096: p=0.000276 ( 1208,    0) */
+  { 0x0b5d,  0x0000,  99, 127 },    /* 097: p=0.061537 (    1,   20) */
+  { 0x0034,  0x0000,  76,  72 },    /* 098: p=0.001102 ( 1208,    1) */
+  { 0x078a,  0x0000, 101, 125 },    /* 099: p=0.040815 (    1,   31) */
+  { 0x00a0,  0x0000,  70, 102 },    /* 100: p=0.003387 (  392,    1) */
+  { 0x050f,  0x0000, 103, 123 },    /* 101: p=0.027397 (    1,   47) */
+  { 0x0117,  0x0000,  66,  60 },    /* 102: p=0.005912 (  392,    2) */
+  { 0x0358,  0x0000, 105, 121 },    /* 103: p=0.018099 (    1,   72) */
+  { 0x01ea,  0x0000, 106, 110 },    /* 104: p=0.010362 (  127,    1) */
+  { 0x0234,  0x0000, 107, 119 },    /* 105: p=0.011940 (    1,  110) */
+  { 0x0144,  0x0000,  66, 108 },    /* 106: p=0.006849 (  193,    1) */
+  { 0x0173,  0x0000, 109, 117 },    /* 107: p=0.007858 (    1,  168) */
+  { 0x0234,  0x0000,  60,  54 },    /* 108: p=0.011925 (  193,    2) */
+  { 0x00f5,  0x0000, 111, 115 },    /* 109: p=0.005175 (    1,  256) */
+  { 0x0353,  0x0000,  56,  48 },    /* 110: p=0.017995 (  127,    2) */
+  { 0x00a1,  0x0000,  69, 113 },    /* 111: p=0.003413 (    1,  389) */
+  { 0x05c5,  0x0000, 114, 134 },    /* 112: p=0.031249 (   41,    1) */
+  { 0x011a,  0x0000,  65,  59 },    /* 113: p=0.005957 (    2,  389) */
+  { 0x03cf,  0x0000, 116, 132 },    /* 114: p=0.020618 (   63,    1) */
+  { 0x01aa,  0x0000,  61,  55 },    /* 115: p=0.009020 (    2,  256) */
+  { 0x0285,  0x0000, 118, 130 },    /* 116: p=0.013652 (   96,    1) */
+  { 0x0286,  0x0000,  57,  51 },    /* 117: p=0.013672 (    2,  168) */
+  { 0x01ab,  0x0000, 120, 128 },    /* 118: p=0.009029 (  146,    1) */
+  { 0x03d3,  0x0000,  53,  47 },    /* 119: p=0.020710 (    2,  110) */
+  { 0x011a,  0x0000, 122, 126 },    /* 120: p=0.005961 (  222,    1) */
+  { 0x05c5,  0x0000,  49,  41 },    /* 121: p=0.031250 (    2,   72) */
+  { 0x00ba,  0x0000, 124,  62 },    /* 122: p=0.003925 (  338,    1) */
+  { 0x08ad,  0x0000,  43,  37 },    /* 123: p=0.046979 (    2,   47) */
+  { 0x007a,  0x0000,  72,  66 },    /* 124: p=0.002586 (  514,    1) */
+  { 0x0ccc,  0x0000,  39,  31 },    /* 125: p=0.069306 (    2,   31) */
+  { 0x01eb,  0x0000,  60,  54 },    /* 126: p=0.010386 (  222,    2) */
+  { 0x1302,  0x0000,  33,  25 },    /* 127: p=0.102940 (    2,   20) */
+  { 0x02e6,  0x0000,  56,  50 },    /* 128: p=0.015695 (  146,    2) */
+  { 0x1b81,  0x0000,  29, 131 },    /* 129: p=0.148935 (    2,   13) */
+  { 0x045e,  0x0000,  52,  46 },    /* 130: p=0.023648 (   96,    2) */
+  { 0x24ef,  0x0000,  23,  17 },    /* 131: p=0.199999 (    3,   13) */
+  { 0x0690,  0x0000,  48,  40 },    /* 132: p=0.035533 (   63,    2) */
+  { 0x2865,  0x0000,  23,  15 },    /* 133: p=0.218748 (    2,    8) */
+  { 0x09de,  0x0000,  42, 136 },    /* 134: p=0.053434 (   41,    2) */
+  { 0x3987,  0x0000, 137,   7 },    /* 135: p=0.304346 (    2,    5) */
+  { 0x0dc8,  0x0000,  38,  32 },    /* 136: p=0.074626 (   41,    3) */
+  { 0x2c99,  0x0000,  21, 139 },    /* 137: p=0.241378 (    2,    7) */
+  { 0x10ca,  0x0000, 140, 172 },    /* 138: p=0.090907 (   13,    1) */
+  { 0x3b5f,  0x0000,  15,   9 },    /* 139: p=0.312499 (    3,    7) */
+  { 0x0b5d,  0x0000, 142, 170 },    /* 140: p=0.061537 (   20,    1) */
+  { 0x5695,  0x0000,   9,  85 },    /* 141: p=0.411764 (    2,    3) */
+  { 0x078a,  0x0000, 144, 168 },    /* 142: p=0.040815 (   31,    1) */
+  { 0x8000,  0x0000, 141, 248 },    /* 143: p=0.500000 (    2,    2) */
+  { 0x050f,  0x0000, 146, 166 },    /* 144: p=0.027397 (   47,    1) */
+  { 0x24ee,  0x0000, 147, 247 },    /* 145: p=0.199988 (    0,    1) */
+  { 0x0358,  0x0000, 148, 164 },    /* 146: p=0.018099 (   72,    1) */
+  { 0x0d30,  0x0000, 149, 197 },    /* 147: p=0.071422 (    0,    4) */
+  { 0x0234,  0x0000, 150, 162 },    /* 148: p=0.011940 (  110,    1) */
+  { 0x0481,  0x0000, 151,  95 },    /* 149: p=0.024388 (    0,   13) */
+  { 0x0173,  0x0000, 152, 160 },    /* 150: p=0.007858 (  168,    1) */
+  { 0x017a,  0x0000, 153, 173 },    /* 151: p=0.007999 (    0,   41) */
+  { 0x00f5,  0x0000, 154, 158 },    /* 152: p=0.005175 (  256,    1) */
+  { 0x007b,  0x0000, 155, 165 },    /* 153: p=0.002611 (    0,  127) */
+  { 0x00a1,  0x0000,  70, 156 },    /* 154: p=0.003413 (  389,    1) */
+  { 0x0028,  0x0000, 157, 161 },    /* 155: p=0.000849 (    0,  392) */
+  { 0x011a,  0x0000,  66,  60 },    /* 156: p=0.005957 (  389,    2) */
+  { 0x000d,  0x0000,  81, 159 },    /* 157: p=0.000276 (    0, 1208) */
+  { 0x01aa,  0x0000,  62,  56 },    /* 158: p=0.009020 (  256,    2) */
+  { 0x0034,  0x0000,  75,  71 },    /* 159: p=0.001102 (    1, 1208) */
+  { 0x0286,  0x0000,  58,  52 },    /* 160: p=0.013672 (  168,    2) */
+  { 0x00a0,  0x0000,  69, 163 },    /* 161: p=0.003387 (    1,  392) */
+  { 0x03d3,  0x0000,  54,  48 },    /* 162: p=0.020710 (  110,    2) */
+  { 0x0117,  0x0000,  65,  59 },    /* 163: p=0.005912 (    2,  392) */
+  { 0x05c5,  0x0000,  50,  42 },    /* 164: p=0.031250 (   72,    2) */
+  { 0x01ea,  0x0000, 167, 171 },    /* 165: p=0.010362 (    1,  127) */
+  { 0x08ad,  0x0000,  44,  38 },    /* 166: p=0.046979 (   47,    2) */
+  { 0x0144,  0x0000,  65, 169 },    /* 167: p=0.006849 (    1,  193) */
+  { 0x0ccc,  0x0000,  40,  32 },    /* 168: p=0.069306 (   31,    2) */
+  { 0x0234,  0x0000,  59,  53 },    /* 169: p=0.011925 (    2,  193) */
+  { 0x1302,  0x0000,  34,  26 },    /* 170: p=0.102940 (   20,    2) */
+  { 0x0353,  0x0000,  55,  47 },    /* 171: p=0.017995 (    2,  127) */
+  { 0x1b81,  0x0000,  30, 174 },    /* 172: p=0.148935 (   13,    2) */
+  { 0x05c5,  0x0000, 175, 193 },    /* 173: p=0.031249 (    1,   41) */
+  { 0x24ef,  0x0000,  24,  18 },    /* 174: p=0.199999 (   13,    3) */
+  { 0x03cf,  0x0000, 177, 191 },    /* 175: p=0.020618 (    1,   63) */
+  { 0x2b74,  0x0000, 178, 222 },    /* 176: p=0.235291 (    4,    1) */
+  { 0x0285,  0x0000, 179, 189 },    /* 177: p=0.013652 (    1,   96) */
+  { 0x201d,  0x0000, 180, 218 },    /* 178: p=0.173910 (    6,    1) */
+  { 0x01ab,  0x0000, 181, 187 },    /* 179: p=0.009029 (    1,  146) */
+  { 0x1715,  0x0000, 182, 216 },    /* 180: p=0.124998 (    9,    1) */
+  { 0x011a,  0x0000, 183, 185 },    /* 181: p=0.005961 (    1,  222) */
+  { 0x0fb7,  0x0000, 184, 214 },    /* 182: p=0.085105 (   14,    1) */
+  { 0x00ba,  0x0000,  69,  61 },    /* 183: p=0.003925 (    1,  338) */
+  { 0x0a67,  0x0000, 186, 212 },    /* 184: p=0.056337 (   22,    1) */
+  { 0x01eb,  0x0000,  59,  53 },    /* 185: p=0.010386 (    2,  222) */
+  { 0x06e7,  0x0000, 188, 210 },    /* 186: p=0.037382 (   34,    1) */
+  { 0x02e6,  0x0000,  55,  49 },    /* 187: p=0.015695 (    2,  146) */
+  { 0x0496,  0x0000, 190, 208 },    /* 188: p=0.024844 (   52,    1) */
+  { 0x045e,  0x0000,  51,  45 },    /* 189: p=0.023648 (    2,   96) */
+  { 0x030d,  0x0000, 192, 206 },    /* 190: p=0.016529 (   79,    1) */
+  { 0x0690,  0x0000,  47,  39 },    /* 191: p=0.035533 (    2,   63) */
+  { 0x0206,  0x0000, 194, 204 },    /* 192: p=0.010959 (  120,    1) */
+  { 0x09de,  0x0000,  41, 195 },    /* 193: p=0.053434 (    2,   41) */
+  { 0x0155,  0x0000, 196, 202 },    /* 194: p=0.007220 (  183,    1) */
+  { 0x0dc8,  0x0000,  37,  31 },    /* 195: p=0.074626 (    3,   41) */
+  { 0x00e1,  0x0000, 198, 200 },    /* 196: p=0.004750 (  279,    1) */
+  { 0x2b74,  0x0000, 199, 243 },    /* 197: p=0.235291 (    1,    4) */
+  { 0x0094,  0x0000,  72,  64 },    /* 198: p=0.003132 (  424,    1) */
+  { 0x201d,  0x0000, 201, 239 },    /* 199: p=0.173910 (    1,    6) */
+  { 0x0188,  0x0000,  62,  56 },    /* 200: p=0.008284 (  279,    2) */
+  { 0x1715,  0x0000, 203, 237 },    /* 201: p=0.124998 (    1,    9) */
+  { 0x0252,  0x0000,  58,  52 },    /* 202: p=0.012567 (  183,    2) */
+  { 0x0fb7,  0x0000, 205, 235 },    /* 203: p=0.085105 (    1,   14) */
+  { 0x0383,  0x0000,  54,  48 },    /* 204: p=0.019021 (  120,    2) */
+  { 0x0a67,  0x0000, 207, 233 },    /* 205: p=0.056337 (    1,   22) */
+  { 0x0547,  0x0000,  50,  44 },    /* 206: p=0.028571 (   79,    2) */
+  { 0x06e7,  0x0000, 209, 231 },    /* 207: p=0.037382 (    1,   34) */
+  { 0x07e2,  0x0000,  46,  38 },    /* 208: p=0.042682 (   52,    2) */
+  { 0x0496,  0x0000, 211, 229 },    /* 209: p=0.024844 (    1,   52) */
+  { 0x0bc0,  0x0000,  40,  34 },    /* 210: p=0.063636 (   34,    2) */
+  { 0x030d,  0x0000, 213, 227 },    /* 211: p=0.016529 (    1,   79) */
+  { 0x1178,  0x0000,  36,  28 },    /* 212: p=0.094593 (   22,    2) */
+  { 0x0206,  0x0000, 215, 225 },    /* 213: p=0.010959 (    1,  120) */
+  { 0x19da,  0x0000,  30,  22 },    /* 214: p=0.139999 (   14,    2) */
+  { 0x0155,  0x0000, 217, 223 },    /* 215: p=0.007220 (    1,  183) */
+  { 0x24ef,  0x0000,  26,  16 },    /* 216: p=0.199998 (    9,    2) */
+  { 0x00e1,  0x0000, 219, 221 },    /* 217: p=0.004750 (    1,  279) */
+  { 0x320e,  0x0000,  20, 220 },    /* 218: p=0.269229 (    6,    2) */
+  { 0x0094,  0x0000,  71,  63 },    /* 219: p=0.003132 (    1,  424) */
+  { 0x432a,  0x0000,  14,   8 },    /* 220: p=0.344827 (    6,    3) */
+  { 0x0188,  0x0000,  61,  55 },    /* 221: p=0.008284 (    2,  279) */
+  { 0x447d,  0x0000,  14, 224 },    /* 222: p=0.349998 (    4,    2) */
+  { 0x0252,  0x0000,  57,  51 },    /* 223: p=0.012567 (    2,  183) */
+  { 0x5ece,  0x0000,   8,   2 },    /* 224: p=0.434782 (    4,    3) */
+  { 0x0383,  0x0000,  53,  47 },    /* 225: p=0.019021 (    2,  120) */
+  { 0x8000,  0x0000, 228,  87 },    /* 226: p=0.500000 (    1,    1) */
+  { 0x0547,  0x0000,  49,  43 },    /* 227: p=0.028571 (    2,   79) */
+  { 0x481a,  0x0000, 230, 246 },    /* 228: p=0.363634 (    2,    1) */
+  { 0x07e2,  0x0000,  45,  37 },    /* 229: p=0.042682 (    2,   52) */
+  { 0x3579,  0x0000, 232, 244 },    /* 230: p=0.285711 (    3,    1) */
+  { 0x0bc0,  0x0000,  39,  33 },    /* 231: p=0.063636 (    2,   34) */
+  { 0x24ef,  0x0000, 234, 238 },    /* 232: p=0.199997 (    5,    1) */
+  { 0x1178,  0x0000,  35,  27 },    /* 233: p=0.094593 (    2,   22) */
+  { 0x1978,  0x0000, 138, 236 },    /* 234: p=0.137929 (    8,    1) */
+  { 0x19da,  0x0000,  29,  21 },    /* 235: p=0.139999 (    2,   14) */
+  { 0x2865,  0x0000,  24,  16 },    /* 236: p=0.218748 (    8,    2) */
+  { 0x24ef,  0x0000,  25,  15 },    /* 237: p=0.199998 (    2,    9) */
+  { 0x3987,  0x0000, 240,   8 },    /* 238: p=0.304346 (    5,    2) */
+  { 0x320e,  0x0000,  19, 241 },    /* 239: p=0.269229 (    2,    6) */
+  { 0x2c99,  0x0000,  22, 242 },    /* 240: p=0.241378 (    7,    2) */
+  { 0x432a,  0x0000,  13,   7 },    /* 241: p=0.344827 (    3,    6) */
+  { 0x3b5f,  0x0000,  16,  10 },    /* 242: p=0.312499 (    7,    3) */
+  { 0x447d,  0x0000,  13, 245 },    /* 243: p=0.349998 (    2,    4) */
+  { 0x5695,  0x0000,  10,   2 },    /* 244: p=0.411764 (    3,    2) */
+  { 0x5ece,  0x0000,   7,   1 },    /* 245: p=0.434782 (    3,    4) */
+  { 0x8000,  0x0000, 244,  83 },    /* 246: p=0.500000 (    2,    2) */
+  { 0x8000,  0x0000, 249, 250 },    /* 247: p=0.500000 (    1,    1) */
+  { 0x5695,  0x0000,  10,   2 },    /* 248: p=0.411764 (    3,    2) */
+  { 0x481a,  0x0000,  89, 143 },    /* 249: p=0.363634 (    1,    2) */
+  { 0x481a,  0x0000, 230, 246 },    /* 250: p=0.363634 (    2,    1) */
+#endif
+#ifdef ZCODER
+  /* This table has been designed for the ZCoder
+   * by running the following command in file 'ztable2.sn':
+   * (fast-crude (steady-mat 0.0035  0.0002) 260)))
+   */
+  { 0x8000,  0x0000,  84, 139 },    /* 000: p=0.500000 (    0,    0) */
+  { 0x8000,  0x0000,   3,   4 },    /* 001: p=0.500000 (    0,    0) */
+  { 0x8000,  0x0000,   4,   3 },    /* 002: p=0.500000 (    0,    0) */
+  { 0x7399,  0x10a5,   5,   1 },    /* 003: p=0.465226 (    0,    0) */
+  { 0x7399,  0x10a5,   6,   2 },    /* 004: p=0.465226 (    0,    0) */
+  { 0x6813,  0x1f28,   7,   3 },    /* 005: p=0.430708 (    0,    0) */
+  { 0x6813,  0x1f28,   8,   4 },    /* 006: p=0.430708 (    0,    0) */
+  { 0x5d65,  0x2bd3,   9,   5 },    /* 007: p=0.396718 (    0,    0) */
+  { 0x5d65,  0x2bd3,  10,   6 },    /* 008: p=0.396718 (    0,    0) */
+  { 0x5387,  0x36e3,  11,   7 },    /* 009: p=0.363535 (    0,    0) */
+  { 0x5387,  0x36e3,  12,   8 },    /* 010: p=0.363535 (    0,    0) */
+  { 0x4a73,  0x408c,  13,   9 },    /* 011: p=0.331418 (    0,    0) */
+  { 0x4a73,  0x408c,  14,  10 },    /* 012: p=0.331418 (    0,    0) */
+  { 0x421f,  0x48fe,  15,  11 },    /* 013: p=0.300562 (    0,    0) */
+  { 0x421f,  0x48fe,  16,  12 },    /* 014: p=0.300562 (    0,    0) */
+  { 0x3a85,  0x5060,  17,  13 },    /* 015: p=0.271166 (    0,    0) */
+  { 0x3a85,  0x5060,  18,  14 },    /* 016: p=0.271166 (    0,    0) */
+  { 0x339b,  0x56d3,  19,  15 },    /* 017: p=0.243389 (    0,    0) */
+  { 0x339b,  0x56d3,  20,  16 },    /* 018: p=0.243389 (    0,    0) */
+  { 0x2d59,  0x5c73,  21,  17 },    /* 019: p=0.217351 (    0,    0) */
+  { 0x2d59,  0x5c73,  22,  18 },    /* 020: p=0.217351 (    0,    0) */
+  { 0x27b3,  0x615e,  23,  19 },    /* 021: p=0.193091 (    0,    0) */
+  { 0x27b3,  0x615e,  24,  20 },    /* 022: p=0.193091 (    0,    0) */
+  { 0x22a1,  0x65a7,  25,  21 },    /* 023: p=0.170683 (    0,    0) */
+  { 0x22a1,  0x65a7,  26,  22 },    /* 024: p=0.170683 (    0,    0) */
+  { 0x1e19,  0x6963,  27,  23 },    /* 025: p=0.150134 (    0,    0) */
+  { 0x1e19,  0x6963,  28,  24 },    /* 026: p=0.150134 (    0,    0) */
+  { 0x1a0f,  0x6ca3,  29,  25 },    /* 027: p=0.131397 (    0,    0) */
+  { 0x1a0f,  0x6ca3,  30,  26 },    /* 028: p=0.131397 (    0,    0) */
+  { 0x167b,  0x6f75,  31,  27 },    /* 029: p=0.114441 (    0,    0) */
+  { 0x167b,  0x6f75,  32,  28 },    /* 030: p=0.114441 (    0,    0) */
+  { 0x1353,  0x71e6,  33,  29 },    /* 031: p=0.099214 (    0,    0) */
+  { 0x1353,  0x71e6,  34,  30 },    /* 032: p=0.099214 (    0,    0) */
+  { 0x108d,  0x7403,  35,  31 },    /* 033: p=0.085616 (    0,    0) */
+  { 0x108d,  0x7403,  36,  32 },    /* 034: p=0.085616 (    0,    0) */
+  { 0x0e1f,  0x75d7,  37,  33 },    /* 035: p=0.073525 (    0,    0) */
+  { 0x0e1f,  0x75d7,  38,  34 },    /* 036: p=0.073525 (    0,    0) */
+  { 0x0c01,  0x7769,  39,  35 },    /* 037: p=0.062871 (    0,    0) */
+  { 0x0c01,  0x7769,  40,  36 },    /* 038: p=0.062871 (    0,    0) */
+  { 0x0a2b,  0x78c2,  41,  37 },    /* 039: p=0.053524 (    0,    0) */
+  { 0x0a2b,  0x78c2,  42,  38 },    /* 040: p=0.053524 (    0,    0) */
+  { 0x0895,  0x79ea,  43,  39 },    /* 041: p=0.045374 (    0,    0) */
+  { 0x0895,  0x79ea,  44,  40 },    /* 042: p=0.045374 (    0,    0) */
+  { 0x0737,  0x7ae7,  45,  41 },    /* 043: p=0.038280 (    0,    0) */
+  { 0x0737,  0x7ae7,  46,  42 },    /* 044: p=0.038280 (    0,    0) */
+  { 0x060b,  0x7bbe,  47,  43 },    /* 045: p=0.032175 (    0,    0) */
+  { 0x060b,  0x7bbe,  48,  44 },    /* 046: p=0.032175 (    0,    0) */
+  { 0x050b,  0x7c75,  49,  45 },    /* 047: p=0.026926 (    0,    0) */
+  { 0x050b,  0x7c75,  50,  46 },    /* 048: p=0.026926 (    0,    0) */
+  { 0x0431,  0x7d10,  51,  47 },    /* 049: p=0.022430 (    0,    0) */
+  { 0x0431,  0x7d10,  52,  48 },    /* 050: p=0.022430 (    0,    0) */
+  { 0x0379,  0x7d92,  53,  49 },    /* 051: p=0.018623 (    0,    0) */
+  { 0x0379,  0x7d92,  54,  50 },    /* 052: p=0.018623 (    0,    0) */
+  { 0x02dd,  0x7dff,  55,  51 },    /* 053: p=0.015386 (    0,    0) */
+  { 0x02dd,  0x7dff,  56,  52 },    /* 054: p=0.015386 (    0,    0) */
+  { 0x025b,  0x7e5b,  57,  53 },    /* 055: p=0.012671 (    0,    0) */
+  { 0x025b,  0x7e5b,  58,  54 },    /* 056: p=0.012671 (    0,    0) */
+  { 0x01ef,  0x7ea7,  59,  55 },    /* 057: p=0.010414 (    0,    0) */
+  { 0x01ef,  0x7ea7,  60,  56 },    /* 058: p=0.010414 (    0,    0) */
+  { 0x0195,  0x7ee6,  61,  57 },    /* 059: p=0.008529 (    0,    0) */
+  { 0x0195,  0x7ee6,  62,  58 },    /* 060: p=0.008529 (    0,    0) */
+  { 0x0149,  0x7f1b,  63,  59 },    /* 061: p=0.006935 (    0,    0) */
+  { 0x0149,  0x7f1b,  64,  60 },    /* 062: p=0.006935 (    0,    0) */
+  { 0x010b,  0x7f46,  65,  61 },    /* 063: p=0.005631 (    0,    0) */
+  { 0x010b,  0x7f46,  66,  62 },    /* 064: p=0.005631 (    0,    0) */
+  { 0x00d5,  0x7f6c,  67,  63 },    /* 065: p=0.004495 (    0,    0) */
+  { 0x00d5,  0x7f6c,  68,  64 },    /* 066: p=0.004495 (    0,    0) */
+  { 0x00a5,  0x7f8d,  69,  65 },    /* 067: p=0.003484 (    0,    0) */
+  { 0x00a5,  0x7f8d,  70,  66 },    /* 068: p=0.003484 (    0,    0) */
+  { 0x007b,  0x7faa,  71,  67 },    /* 069: p=0.002592 (    0,    0) */
+  { 0x007b,  0x7faa,  72,  68 },    /* 070: p=0.002592 (    0,    0) */
+  { 0x0057,  0x7fc3,  73,  69 },    /* 071: p=0.001835 (    0,    0) */
+  { 0x0057,  0x7fc3,  74,  70 },    /* 072: p=0.001835 (    0,    0) */
+  { 0x0039,  0x7fd8,  75,  71 },    /* 073: p=0.001211 (    0,    0) */
+  { 0x0039,  0x7fd8,  76,  72 },    /* 074: p=0.001211 (    0,    0) */
+  { 0x0023,  0x7fe7,  77,  73 },    /* 075: p=0.000740 (    0,    0) */
+  { 0x0023,  0x7fe7,  78,  74 },    /* 076: p=0.000740 (    0,    0) */
+  { 0x0013,  0x7ff2,  79,  75 },    /* 077: p=0.000402 (    0,    0) */
+  { 0x0013,  0x7ff2,  80,  76 },    /* 078: p=0.000402 (    0,    0) */
+  { 0x0007,  0x7ffa,  81,  77 },    /* 079: p=0.000153 (    0,    0) */
+  { 0x0007,  0x7ffa,  82,  78 },    /* 080: p=0.000153 (    0,    0) */
+  { 0x0001,  0x7fff,  81,  79 },    /* 081: p=0.000027 (    0,    0) */
+  { 0x0001,  0x7fff,  82,  80 },    /* 082: p=0.000027 (    0,    0) */
+  { 0x620b,  0x0000,   9,  85 },    /* 083: p=0.411764 (    2,    3) */
+  { 0x294a,  0x0000,  86, 216 },    /* 084: p=0.199988 (    1,    0) */
+  { 0x8000,  0x0000,   5,   6 },    /* 085: p=0.500000 (    3,    3) */
+  { 0x0db3,  0x0000,  88, 168 },    /* 086: p=0.071422 (    4,    0) */
+  { 0x538e,  0x0000,  89, 137 },    /* 087: p=0.363634 (    1,    2) */
+  { 0x0490,  0x0000,  90, 134 },    /* 088: p=0.024388 (   13,    0) */
+  { 0x3e3e,  0x0000,  91, 135 },    /* 089: p=0.285711 (    1,    3) */
+  { 0x017c,  0x0000,  92, 112 },    /* 090: p=0.007999 (   41,    0) */
+  { 0x294a,  0x0000,  93, 133 },    /* 091: p=0.199997 (    1,    5) */
+  { 0x007c,  0x0000,  94, 104 },    /* 092: p=0.002611 (  127,    0) */
+  { 0x1b75,  0x0000,  95, 131 },    /* 093: p=0.137929 (    1,    8) */
+  { 0x0028,  0x0000,  96, 100 },    /* 094: p=0.000849 (  392,    0) */
+  { 0x12fc,  0x0000,  97, 129 },    /* 095: p=0.097559 (    1,   12) */
+  { 0x000d,  0x0000,  82,  98 },    /* 096: p=0.000276 ( 1208,    0) */
+  { 0x0cfb,  0x0000,  99, 125 },    /* 097: p=0.067795 (    1,   18) */
+  { 0x0034,  0x0000,  76,  72 },    /* 098: p=0.001102 ( 1208,    1) */
+  { 0x08cd,  0x0000, 101, 123 },    /* 099: p=0.046511 (    1,   27) */
+  { 0x00a0,  0x0000,  70, 102 },    /* 100: p=0.003387 (  392,    1) */
+  { 0x05de,  0x0000, 103, 119 },    /* 101: p=0.031249 (    1,   41) */
+  { 0x0118,  0x0000,  66,  60 },    /* 102: p=0.005912 (  392,    2) */
+  { 0x03e9,  0x0000, 105, 117 },    /* 103: p=0.020942 (    1,   62) */
+  { 0x01ed,  0x0000, 106, 110 },    /* 104: p=0.010362 (  127,    1) */
+  { 0x0298,  0x0000, 107, 115 },    /* 105: p=0.013937 (    1,   94) */
+  { 0x0145,  0x0000,  66, 108 },    /* 106: p=0.006849 (  193,    1) */
+  { 0x01b6,  0x0000, 109, 113 },    /* 107: p=0.009216 (    1,  143) */
+  { 0x0237,  0x0000,  60,  54 },    /* 108: p=0.011925 (  193,    2) */
+  { 0x0121,  0x0000,  65, 111 },    /* 109: p=0.006097 (    1,  217) */
+  { 0x035b,  0x0000,  56,  48 },    /* 110: p=0.017995 (  127,    2) */
+  { 0x01f9,  0x0000,  59,  53 },    /* 111: p=0.010622 (    2,  217) */
+  { 0x05de,  0x0000, 114, 130 },    /* 112: p=0.031249 (   41,    1) */
+  { 0x02fc,  0x0000,  55,  49 },    /* 113: p=0.016018 (    2,  143) */
+  { 0x03e9,  0x0000, 116, 128 },    /* 114: p=0.020942 (   62,    1) */
+  { 0x0484,  0x0000,  51,  45 },    /* 115: p=0.024138 (    2,   94) */
+  { 0x0298,  0x0000, 118, 126 },    /* 116: p=0.013937 (   94,    1) */
+  { 0x06ca,  0x0000,  47,  39 },    /* 117: p=0.036082 (    2,   62) */
+  { 0x01b6,  0x0000, 120, 124 },    /* 118: p=0.009216 (  143,    1) */
+  { 0x0a27,  0x0000,  41, 121 },    /* 119: p=0.053434 (    2,   41) */
+  { 0x0121,  0x0000,  66, 122 },    /* 120: p=0.006097 (  217,    1) */
+  { 0x0e57,  0x0000,  37,  31 },    /* 121: p=0.074626 (    3,   41) */
+  { 0x01f9,  0x0000,  60,  54 },    /* 122: p=0.010622 (  217,    2) */
+  { 0x0f25,  0x0000,  37,  29 },    /* 123: p=0.078651 (    2,   27) */
+  { 0x02fc,  0x0000,  56,  50 },    /* 124: p=0.016018 (  143,    2) */
+  { 0x1629,  0x0000,  33, 127 },    /* 125: p=0.112902 (    2,   18) */
+  { 0x0484,  0x0000,  52,  46 },    /* 126: p=0.024138 (   94,    2) */
+  { 0x1ee8,  0x0000,  27,  21 },    /* 127: p=0.153845 (    3,   18) */
+  { 0x06ca,  0x0000,  48,  40 },    /* 128: p=0.036082 (   62,    2) */
+  { 0x200f,  0x0000,  27,  19 },    /* 129: p=0.159089 (    2,   12) */
+  { 0x0a27,  0x0000,  42, 132 },    /* 130: p=0.053434 (   41,    2) */
+  { 0x2dae,  0x0000,  21,  15 },    /* 131: p=0.218748 (    2,    8) */
+  { 0x0e57,  0x0000,  38,  32 },    /* 132: p=0.074626 (   41,    3) */
+  { 0x4320,  0x0000,  15,   7 },    /* 133: p=0.304346 (    2,    5) */
+  { 0x11a0,  0x0000, 136, 164 },    /* 134: p=0.090907 (   13,    1) */
+  { 0x620b,  0x0000,   9,  85 },    /* 135: p=0.411764 (    2,    3) */
+  { 0x0bbe,  0x0000, 138, 162 },    /* 136: p=0.061537 (   20,    1) */
+  { 0x8000,  0x0000, 135, 248 },    /* 137: p=0.500000 (    2,    2) */
+  { 0x07f3,  0x0000, 140, 160 },    /* 138: p=0.042104 (   30,    1) */
+  { 0x294a,  0x0000, 141, 247 },    /* 139: p=0.199988 (    0,    1) */
+  { 0x053e,  0x0000, 142, 158 },    /* 140: p=0.027971 (   46,    1) */
+  { 0x0db3,  0x0000, 143, 199 },    /* 141: p=0.071422 (    0,    4) */
+  { 0x0378,  0x0000, 144, 156 },    /* 142: p=0.018604 (   70,    1) */
+  { 0x0490,  0x0000, 145, 167 },    /* 143: p=0.024388 (    0,   13) */
+  { 0x024d,  0x0000, 146, 154 },    /* 144: p=0.012384 (  106,    1) */
+  { 0x017c,  0x0000, 147, 101 },    /* 145: p=0.007999 (    0,   41) */
+  { 0x0185,  0x0000, 148, 152 },    /* 146: p=0.008197 (  161,    1) */
+  { 0x007c,  0x0000, 149, 159 },    /* 147: p=0.002611 (    0,  127) */
+  { 0x0100,  0x0000,  68, 150 },    /* 148: p=0.005405 (  245,    1) */
+  { 0x0028,  0x0000, 151, 155 },    /* 149: p=0.000849 (    0,  392) */
+  { 0x01c0,  0x0000,  62,  56 },    /* 150: p=0.009421 (  245,    2) */
+  { 0x000d,  0x0000,  81, 153 },    /* 151: p=0.000276 (    0, 1208) */
+  { 0x02a7,  0x0000,  58,  52 },    /* 152: p=0.014256 (  161,    2) */
+  { 0x0034,  0x0000,  75,  71 },    /* 153: p=0.001102 (    1, 1208) */
+  { 0x0403,  0x0000,  54,  46 },    /* 154: p=0.021472 (  106,    2) */
+  { 0x00a0,  0x0000,  69, 157 },    /* 155: p=0.003387 (    1,  392) */
+  { 0x0608,  0x0000,  48,  42 },    /* 156: p=0.032110 (   70,    2) */
+  { 0x0118,  0x0000,  65,  59 },    /* 157: p=0.005912 (    2,  392) */
+  { 0x0915,  0x0000,  44,  38 },    /* 158: p=0.047945 (   46,    2) */
+  { 0x01ed,  0x0000, 161, 165 },    /* 159: p=0.010362 (    1,  127) */
+  { 0x0db4,  0x0000,  40,  32 },    /* 160: p=0.071428 (   30,    2) */
+  { 0x0145,  0x0000,  65, 163 },    /* 161: p=0.006849 (    1,  193) */
+  { 0x1417,  0x0000,  34,  26 },    /* 162: p=0.102940 (   20,    2) */
+  { 0x0237,  0x0000,  59,  53 },    /* 163: p=0.011925 (    2,  193) */
+  { 0x1dd6,  0x0000,  30, 166 },    /* 164: p=0.148935 (   13,    2) */
+  { 0x035b,  0x0000,  55,  47 },    /* 165: p=0.017995 (    2,  127) */
+  { 0x294a,  0x0000,  24,  18 },    /* 166: p=0.199999 (   13,    3) */
+  { 0x11a0,  0x0000, 169, 195 },    /* 167: p=0.090907 (    1,   13) */
+  { 0x31a3,  0x0000, 170, 212 },    /* 168: p=0.235291 (    4,    1) */
+  { 0x0bbe,  0x0000, 171, 193 },    /* 169: p=0.061537 (    1,   20) */
+  { 0x235a,  0x0000, 172, 208 },    /* 170: p=0.173910 (    6,    1) */
+  { 0x07f3,  0x0000, 173, 191 },    /* 171: p=0.042104 (    1,   30) */
+  { 0x18b3,  0x0000, 174, 206 },    /* 172: p=0.124998 (    9,    1) */
+  { 0x053e,  0x0000, 175, 189 },    /* 173: p=0.027971 (    1,   46) */
+  { 0x1073,  0x0000, 176, 204 },    /* 174: p=0.085105 (   14,    1) */
+  { 0x0378,  0x0000, 177, 187 },    /* 175: p=0.018604 (    1,   70) */
+  { 0x0b35,  0x0000, 178, 200 },    /* 176: p=0.058822 (   21,    1) */
+  { 0x024d,  0x0000, 179, 185 },    /* 177: p=0.012384 (    1,  106) */
+  { 0x0778,  0x0000, 180, 198 },    /* 178: p=0.039603 (   32,    1) */
+  { 0x0185,  0x0000, 181, 183 },    /* 179: p=0.008197 (    1,  161) */
+  { 0x04ed,  0x0000, 182, 194 },    /* 180: p=0.026315 (   49,    1) */
+  { 0x0100,  0x0000,  67,  59 },    /* 181: p=0.005405 (    1,  245) */
+  { 0x0349,  0x0000, 184, 192 },    /* 182: p=0.017621 (   74,    1) */
+  { 0x02a7,  0x0000,  57,  51 },    /* 183: p=0.014256 (    2,  161) */
+  { 0x022e,  0x0000, 186, 190 },    /* 184: p=0.011730 (  112,    1) */
+  { 0x0403,  0x0000,  53,  45 },    /* 185: p=0.021472 (    2,  106) */
+  { 0x0171,  0x0000,  64, 188 },    /* 186: p=0.007767 (  170,    1) */
+  { 0x0608,  0x0000,  47,  41 },    /* 187: p=0.032110 (    2,   70) */
+  { 0x0283,  0x0000,  58,  52 },    /* 188: p=0.013513 (  170,    2) */
+  { 0x0915,  0x0000,  43,  37 },    /* 189: p=0.047945 (    2,   46) */
+  { 0x03cc,  0x0000,  54,  48 },    /* 190: p=0.020349 (  112,    2) */
+  { 0x0db4,  0x0000,  39,  31 },    /* 191: p=0.071428 (    2,   30) */
+  { 0x05b6,  0x0000,  50,  42 },    /* 192: p=0.030434 (   74,    2) */
+  { 0x1417,  0x0000,  33,  25 },    /* 193: p=0.102940 (    2,   20) */
+  { 0x088a,  0x0000,  44, 196 },    /* 194: p=0.045161 (   49,    2) */
+  { 0x1dd6,  0x0000,  29, 197 },    /* 195: p=0.148935 (    2,   13) */
+  { 0x0c16,  0x0000,  40,  34 },    /* 196: p=0.063291 (   49,    3) */
+  { 0x294a,  0x0000,  23,  17 },    /* 197: p=0.199999 (    3,   13) */
+  { 0x0ce2,  0x0000,  40,  32 },    /* 198: p=0.067307 (   32,    2) */
+  { 0x31a3,  0x0000, 201, 243 },    /* 199: p=0.235291 (    1,    4) */
+  { 0x1332,  0x0000,  36, 202 },    /* 200: p=0.098590 (   21,    2) */
+  { 0x235a,  0x0000, 203, 239 },    /* 201: p=0.173910 (    1,    6) */
+  { 0x1adc,  0x0000,  30,  24 },    /* 202: p=0.135134 (   21,    3) */
+  { 0x18b3,  0x0000, 205, 237 },    /* 203: p=0.124998 (    1,    9) */
+  { 0x1be7,  0x0000,  30,  22 },    /* 204: p=0.139999 (   14,    2) */
+  { 0x1073,  0x0000, 207, 235 },    /* 205: p=0.085105 (    1,   14) */
+  { 0x294a,  0x0000,  26,  16 },    /* 206: p=0.199998 (    9,    2) */
+  { 0x0b35,  0x0000, 209, 231 },    /* 207: p=0.058822 (    1,   21) */
+  { 0x3a07,  0x0000,  20, 210 },    /* 208: p=0.269229 (    6,    2) */
+  { 0x0778,  0x0000, 211, 229 },    /* 209: p=0.039603 (    1,   32) */
+  { 0x4e30,  0x0000,  14,   8 },    /* 210: p=0.344827 (    6,    3) */
+  { 0x04ed,  0x0000, 213, 225 },    /* 211: p=0.026315 (    1,   49) */
+  { 0x4fa6,  0x0000,  14, 214 },    /* 212: p=0.349998 (    4,    2) */
+  { 0x0349,  0x0000, 215, 223 },    /* 213: p=0.017621 (    1,   74) */
+  { 0x6966,  0x0000,   8,   2 },    /* 214: p=0.434782 (    4,    3) */
+  { 0x022e,  0x0000, 217, 221 },    /* 215: p=0.011730 (    1,  112) */
+  { 0x8000,  0x0000, 218,  87 },    /* 216: p=0.500000 (    1,    1) */
+  { 0x0171,  0x0000,  63, 219 },    /* 217: p=0.007767 (    1,  170) */
+  { 0x538e,  0x0000, 220, 246 },    /* 218: p=0.363634 (    2,    1) */
+  { 0x0283,  0x0000,  57,  51 },    /* 219: p=0.013513 (    2,  170) */
+  { 0x3e3e,  0x0000, 222, 244 },    /* 220: p=0.285711 (    3,    1) */
+  { 0x03cc,  0x0000,  53,  47 },    /* 221: p=0.020349 (    2,  112) */
+  { 0x294a,  0x0000, 224, 242 },    /* 222: p=0.199997 (    5,    1) */
+  { 0x05b6,  0x0000,  49,  41 },    /* 223: p=0.030434 (    2,   74) */
+  { 0x1b75,  0x0000, 226, 240 },    /* 224: p=0.137929 (    8,    1) */
+  { 0x088a,  0x0000,  43, 227 },    /* 225: p=0.045161 (    2,   49) */
+  { 0x12fc,  0x0000, 228, 238 },    /* 226: p=0.097559 (   12,    1) */
+  { 0x0c16,  0x0000,  39,  33 },    /* 227: p=0.063291 (    3,   49) */
+  { 0x0cfb,  0x0000, 230, 234 },    /* 228: p=0.067795 (   18,    1) */
+  { 0x0ce2,  0x0000,  39,  31 },    /* 229: p=0.067307 (    2,   32) */
+  { 0x08cd,  0x0000, 112, 232 },    /* 230: p=0.046511 (   27,    1) */
+  { 0x1332,  0x0000,  35, 233 },    /* 231: p=0.098590 (    2,   21) */
+  { 0x0f25,  0x0000,  38,  30 },    /* 232: p=0.078651 (   27,    2) */
+  { 0x1adc,  0x0000,  29,  23 },    /* 233: p=0.135134 (    3,   21) */
+  { 0x1629,  0x0000,  34, 236 },    /* 234: p=0.112902 (   18,    2) */
+  { 0x1be7,  0x0000,  29,  21 },    /* 235: p=0.139999 (    2,   14) */
+  { 0x1ee8,  0x0000,  28,  22 },    /* 236: p=0.153845 (   18,    3) */
+  { 0x294a,  0x0000,  25,  15 },    /* 237: p=0.199998 (    2,    9) */
+  { 0x200f,  0x0000,  28,  20 },    /* 238: p=0.159089 (   12,    2) */
+  { 0x3a07,  0x0000,  19, 241 },    /* 239: p=0.269229 (    2,    6) */
+  { 0x2dae,  0x0000,  22,  16 },    /* 240: p=0.218748 (    8,    2) */
+  { 0x4e30,  0x0000,  13,   7 },    /* 241: p=0.344827 (    3,    6) */
+  { 0x4320,  0x0000,  16,   8 },    /* 242: p=0.304346 (    5,    2) */
+  { 0x4fa6,  0x0000,  13, 245 },    /* 243: p=0.349998 (    2,    4) */
+  { 0x620b,  0x0000,  10,   2 },    /* 244: p=0.411764 (    3,    2) */
+  { 0x6966,  0x0000,   7,   1 },    /* 245: p=0.434782 (    3,    4) */
+  { 0x8000,  0x0000, 244,  83 },    /* 246: p=0.500000 (    2,    2) */
+  { 0x8000,  0x0000, 249, 250 },    /* 247: p=0.500000 (    1,    1) */
+  { 0x620b,  0x0000,  10,   2 },    /* 248: p=0.411764 (    3,    2) */
+  { 0x538e,  0x0000,  89, 137 },    /* 249: p=0.363634 (    1,    2) */
+  { 0x538e,  0x0000, 220, 246 },    /* 250: p=0.363634 (    2,    1) */
+#endif
+};
+
+
+
+////////////////////////////////////////////////////////////////
+// CONSTRUCTOR/DESTRUCTOR
+////////////////////////////////////////////////////////////////
+
+class ZPCodec::Encode : public ZPCodec
+{
+public:
+  Encode(GP<ByteStream> gbs, const bool djvucompat);
+  virtual ~Encode();
+private:
+  void init(void); 
+};
+
+ZPCodec::Encode::Encode(GP<ByteStream> gbs, const bool djvucompat)
+: ZPCodec(gbs,true,djvucompat)
+{
+  init();
+  // Codebit counter
+#ifdef ZPCODEC_BITCOUNT
+  bitcount = 0;
+#endif
+}
+
+ZPCodec::Encode::~Encode()
+{
+  eflush();
+}
+ 
+class ZPCodec::Decode : public ZPCodec
+{
+public:
+  Decode(GP<ByteStream> gbs, const bool djvucompat);
+  virtual ~Decode();
+private:
+  void init(void); 
+};
+
+ZPCodec::Decode::Decode(GP<ByteStream> gbs, const bool djvucompat)
+: ZPCodec(gbs,false,djvucompat)
+{
+  init();
+  // Codebit counter
+#ifdef ZPCODEC_BITCOUNT
+  bitcount = 0;
+#endif
+}
+ 
+ZPCodec::Decode::~Decode() {}
+
+ZPCodec::ZPCodec(GP<ByteStream> xgbs, const bool xencoding, const bool djvucompat)
+: gbs(xgbs), bs(xgbs), encoding(xencoding), fence(0), subend(0), buffer(0), nrun(0)
+{
+  // Create machine independent ffz table
+  for (int i=0; i<256; i++)
+    {
+      ffzt[i]=0;
+      for (int j=i; j&0x80; j<<=1)
+        ffzt[i] += 1;
+    }
+  // Initialize table
+  newtable(default_ztable);
+  // Patch table table (and lose DjVu compatibility).
+  if (!djvucompat)
+    {
+      for (int j=0; j<256; j++)
+        {
+          unsigned short a = 0x10000-p[j];
+          while (a>=0x8000)  a=(unsigned short)(a<<1);
+          if (m[j]>0 && a+p[j]>=0x8000 && a>=m[j])
+            {
+              BitContext x = default_ztable[j].dn;
+              BitContext y = default_ztable[x].dn;
+              dn[j] = y;
+            }
+        }
+    }
+}
+
+ZPCodec::~ZPCodec() {}
+
+GP<ZPCodec>
+ZPCodec::create(GP<ByteStream> gbs, const bool encoding, const bool djvucompat)
+{
+  GP<ZPCodec> retval;
+  if(encoding)
+  {
+    retval=new ZPCodec::Encode(gbs,djvucompat);
+  }else
+  {
+    retval=new ZPCodec::Decode(gbs,djvucompat);
+  }
+  return retval;
+}
+
+////////////////////////////////////////////////////////////////
+// Z CODER DECODE ALGORITHM
+////////////////////////////////////////////////////////////////
+
+
+
+void 
+ZPCodec::Decode::init(void)
+{
+  assert(sizeof(unsigned int)==4);
+  assert(sizeof(unsigned short)==2);
+  a = 0;
+  /* Read first 16 bits of code */
+  if (! bs->read((void*)&byte, 1))
+    byte = 0xff;
+  code = (byte<<8);
+  if (! bs->read((void*)&byte, 1))
+    byte = 0xff;
+  code = code | byte;
+  /* Preload buffer */
+  delay = 25;
+  scount = 0;
+  preload();
+  /* Compute initial fence */
+  fence = code;
+  if (code >= 0x8000)
+    fence = 0x7fff;
+}
+
+
+void
+ZPCodec::preload(void)
+{
+  while (scount<=24)
+    {
+      if (bs->read((void*)&byte, 1) < 1) 
+        {
+          byte = 0xff;
+          if (--delay < 1)
+            G_THROW( ByteStream::EndOfFile );
+        }
+      buffer = (buffer<<8) | byte;
+      scount += 8;
+    }
+}
+
+
+inline int
+ZPCodec::ffz(unsigned int x)
+{
+  // DO NOT DEFINE FASTBSR : 
+  // Test shows that it hardly helps on a PPro,
+  // and rumors are that BSR is very slow on PPlain.
+#if defined(FASTBSR) && defined(_MSC_VER) && defined(_M_IX86)
+  int r;
+  __asm  { 
+        mov  ebx, x
+        xor  ebx, 0xffff
+        mov  eax, -1
+        bsr  eax, ebx
+        mov  r, eax
+  }
+  return 15 - r;
+#elif defined(FASTBSR) && defined(__GNUC__) && defined(__i386__)
+  int r, dummy;
+  __asm__ const ( "movl %2,%1\n\t"
+                  "xorl $0xffff, %1\n\t"
+                  "movl $-1, %0\n\t"
+                  "bsrl %1, %0"
+                  : "=&q" (r), "=q" (dummy) : "rm" (x) );
+  return 15 - r;
+#else
+  return (x>=0xff00) ? (ffzt[x&0xff]+8) : (ffzt[(x>>8)&0xff]);
+#endif
+}
+
+
+int 
+ZPCodec::decode_sub(BitContext &ctx, unsigned int z)
+{
+  /* Save bit */
+  int bit = (ctx & 1);
+  /* Avoid interval reversion */
+#ifdef ZPCODER
+  unsigned int d = 0x6000 + ((z+a)>>2);
+  if (z > d) 
+    z = d;
+#endif
+#ifdef ZCODER
+  if (z >= 0x8000)
+    z = 0x4000 + (z>>1);
+#endif
+  /* Test MPS/LPS */
+  if (z > code)
+    {
+      /* LPS branch */
+      z = 0x10000 - z;
+      a = a + z;
+      code = code + z;
+      /* LPS adaptation */
+      ctx = dn[ctx];
+      /* LPS renormalization */
+      int shift = ffz(a);
+      scount -= shift;
+      a = (unsigned short)(a<<shift);
+      code = (unsigned short)(code<<shift) | ((buffer>>scount) & ((1<<shift)-1));
+#ifdef ZPCODEC_BITCOUNT
+      bitcount += shift;
+#endif
+      if (scount<16) preload();
+      /* Adjust fence */
+      fence = code;
+      if (code >= 0x8000)
+        fence = 0x7fff;
+      return bit ^ 1;
+    }
+  else
+    {
+      /* MPS adaptation */
+      if (a >= m[ctx])
+        ctx = up[ctx];
+      /* MPS renormalization */
+      scount -= 1;
+      a = (unsigned short)(z<<1);
+      code = (unsigned short)(code<<1) | ((buffer>>scount) & 1);
+#ifdef ZPCODEC_BITCOUNT
+      bitcount += 1;
+#endif
+      if (scount<16) preload();
+      /* Adjust fence */
+      fence = code;
+      if (code >= 0x8000)
+        fence = 0x7fff;
+      return bit;
+    }
+}
+
+
+int 
+ZPCodec::decode_sub_simple(int mps, unsigned int z)
+{
+  /* Test MPS/LPS */
+  if (z > code)
+    {
+      /* LPS branch */
+      z = 0x10000 - z;
+      a = a + z;
+      code = code + z;
+      /* LPS renormalization */
+      int shift = ffz(a);
+      scount -= shift;
+      a = (unsigned short)(a<<shift);
+      code = (unsigned short)(code<<shift) | ((buffer>>scount) & ((1<<shift)-1));
+#ifdef ZPCODEC_BITCOUNT
+      bitcount += shift;
+#endif
+      if (scount<16) preload();
+      /* Adjust fence */
+      fence = code;
+      if (code >= 0x8000)
+        fence = 0x7fff;
+      return mps ^ 1;
+    }
+  else
+    {
+      /* MPS renormalization */
+      scount -= 1;
+      a = (unsigned short)(z<<1);
+      code = (unsigned short)(code<<1) | ((buffer>>scount) & 1);
+#ifdef ZPCODEC_BITCOUNT
+      bitcount += 1;
+#endif
+      if (scount<16) preload();
+      /* Adjust fence */
+      fence = code;
+      if (code >= 0x8000)
+        fence = 0x7fff;
+      return mps;
+    }
+}
+
+
+int  
+ZPCodec::decode_sub_nolearn(int mps, unsigned int z)
+{
+#ifdef ZPCODER
+  unsigned int d = 0x6000 + ((z+a)>>2);
+  if (z > d) 
+        z = d;
+#endif
+#ifdef ZCODER
+  if (z >= 0x8000)
+    z = 0x4000 + (z>>1);
+#endif
+  /* Test MPS/LPS */
+  if (z > code)
+    {
+      /* LPS branch */
+      z = 0x10000 - z;
+      a = a + z;
+      code = code + z;
+      /* LPS renormalization */
+      int shift = ffz(a);
+      scount -= shift;
+      a = (unsigned short)(a<<shift);
+      code = (unsigned short)(code<<shift) | ((buffer>>scount) & ((1<<shift)-1));
+#ifdef ZPCODEC_BITCOUNT
+      bitcount += shift;
+#endif
+      if (scount<16) preload();
+      /* Adjust fence */
+      fence = code;
+      if (code >= 0x8000)
+        fence = 0x7fff;
+      return mps ^ 1;
+    }
+  else
+    {
+      /* MPS renormalization */
+      scount -= 1;
+      a = (unsigned short)(z<<1);
+      code = (unsigned short)(code<<1) | ((buffer>>scount) & 1);
+#ifdef ZPCODEC_BITCOUNT
+      bitcount += 1;
+#endif
+      if (scount<16) preload();
+      /* Adjust fence */
+      fence = code;
+      if (code >= 0x8000)
+        fence = 0x7fff;
+      return mps;
+    }
+}
+
+
+
+
+
+////////////////////////////////////////////////////////////////
+// Z CODER ENCODE ALGORITHM
+////////////////////////////////////////////////////////////////
+
+
+
+
+void 
+ZPCodec::Encode::init(void)
+{
+  assert(sizeof(unsigned int)==4);
+  assert(sizeof(unsigned short)==2);
+  a = 0;
+  scount = 0;
+  byte = 0;
+  delay = 25;
+  subend = 0;
+  buffer = 0xffffff;
+  nrun = 0;
+}
+
+void
+ZPCodec::outbit(int bit)
+{
+  if (delay > 0)
+    {
+      if (delay < 0xff) // delay=0xff suspends emission forever
+        delay -= 1;
+    }
+  else
+    {
+      /* Insert a bit */
+      byte = (byte<<1) | bit;
+      /* Output a byte */
+      if (++scount == 8)
+        {
+          if (!encoding)
+            G_THROW( ERR_MSG("ZPCodec.no_encoding") );
+          if (bs->write((void*)&byte, 1) != 1)
+            G_THROW( ERR_MSG("ZPCodec.write_error") );
+          scount = 0;
+          byte = 0;
+        }
+    }
+}
+
+void 
+ZPCodec::zemit(int b)
+{
+  /* Shift new bit into 3bytes buffer */
+  buffer = (buffer<<1) + b;
+  /* Examine bit going out of the 3bytes buffer */
+  b = (buffer >> 24);
+  buffer = (buffer & 0xffffff);
+  /* The following lines have been changed in order to emphazise the
+   * similarity between this bit counting and the scheme of Witten, Neal & Cleary
+   * (WN&C).  Corresponding changes have been made in outbit and eflush.
+   * Variable 'nrun' is similar to the 'bits_to_follow' in the W&N code.
+   */
+  switch(b)
+    {
+      /* Similar to WN&C upper renormalization */
+    case 1:
+      outbit(1);
+      while (nrun-- > 0)
+        outbit(0);
+      nrun = 0;
+      break;
+      /* Similar to WN&C lower renormalization */
+    case 0xff:
+      outbit(0);
+      while (nrun-- > 0)
+        outbit(1);
+      nrun = 0;
+      break;
+      /* Similar to WN&C central renormalization */
+    case 0:
+      nrun += 1;
+      break;
+    default:
+      assert(0);
+    }
+  /* Code bit counter */
+#ifdef ZPCODEC_BITCOUNT
+  bitcount += 1;
+#endif
+}
+
+void 
+ZPCodec::eflush()
+{
+  /* adjust subend */
+  if (subend > 0x8000)
+    subend = 0x10000;
+  else if (subend > 0)
+    subend = 0x8000;
+  /* zemit many mps bits */
+  while (buffer != 0xffffff  || subend )
+    {
+      zemit(1 - (subend>>15) );
+      subend = (unsigned short)(subend<<1);
+    }
+  /* zemit pending run */
+  outbit(1);
+  while (nrun-- > 0)
+    outbit(0);
+  nrun = 0;
+  /* zemit 1 until full byte */
+  while (scount > 0)
+    outbit(1);
+  /* prevent further emission */
+  delay = 0xff;
+}
+
+void 
+ZPCodec::encode_mps(BitContext &ctx, unsigned int z)
+{
+  /* Avoid interval reversion */
+#ifdef ZPCODER
+  unsigned int d = 0x6000 + ((z+a)>>2);
+  if (z > d) 
+    z = d;
+#endif
+#ifdef ZCODER
+  if (z >= 0x8000)
+    z = 0x4000 + (z>>1);
+#endif
+  /* Adaptation */
+  if (a >= m[ctx])
+    ctx = up[ctx];
+  /* Code MPS */
+  a = z;
+  /* Export bits */
+  if (a >= 0x8000)
+    {
+      zemit(1 - (subend>>15) );
+      subend = (unsigned short)(subend<<1);
+      a = (unsigned short)(a<<1);
+    }
+}
+
+
+void 
+ZPCodec::encode_lps(BitContext &ctx, unsigned int z)
+{
+  /* Avoid interval reversion */
+#ifdef ZPCODER
+  unsigned int d = 0x6000 + ((z+a)>>2);
+  if (z > d) 
+    z = d;
+#endif
+#ifdef ZCODER
+  if (z >= 0x8000)
+    z = 0x4000 + (z>>1);
+#endif
+  /* Adaptation */
+  ctx = dn[ctx];
+  /* Code LPS */
+  z = 0x10000 - z;
+  subend += z;
+  a += z;
+  /* Export bits */
+  while (a >= 0x8000)
+    {
+      zemit(1 - (subend>>15) );
+      subend = (unsigned short)(subend<<1);
+      a = (unsigned short)(a<<1);
+    }
+}
+
+
+void 
+ZPCodec::encode_mps_simple(unsigned int z)
+{
+  /* Code MPS */
+  a = z;
+  /* Export bits */
+  if (a >= 0x8000)
+    {
+      zemit(1 - (subend>>15) );
+      subend = (unsigned short)(subend<<1);
+      a = (unsigned short)(a<<1);
+    }
+}
+
+void 
+ZPCodec::encode_lps_simple(unsigned int z)
+{
+  /* Code LPS */
+  z = 0x10000 - z;
+  subend += z;
+  a += z;
+  /* Export bits */
+  while (a >= 0x8000)
+    {
+      zemit(1 - (subend>>15) );
+      subend = (unsigned short)(subend<<1);
+      a = (unsigned short)(a<<1);
+    }
+}
+
+
+void 
+ZPCodec::encode_mps_nolearn(unsigned int z)
+{
+#ifdef ZPCODER
+  unsigned int d = 0x6000 + ((z+a)>>2);
+  if (z > d) 
+    z = d;
+#endif
+#ifdef ZCODER
+  if (z >= 0x8000)
+    z = 0x4000 + (z>>1);
+#endif
+  /* Code MPS */
+  a = z;
+  /* Export bits */
+  if (a >= 0x8000)
+    {
+      zemit(1 - (subend>>15) );
+      subend = (unsigned short)(subend<<1);
+      a = (unsigned short)(a<<1);
+    }
+}
+
+
+void 
+ZPCodec::encode_lps_nolearn(unsigned int z)
+{
+#ifdef ZPCODER
+  unsigned int d = 0x6000 + ((z+a)>>2);
+  if (z > d) 
+    z = d;
+#endif
+#ifdef ZCODER
+  if (z >= 0x8000)
+    z = 0x4000 + (z>>1);
+#endif
+  /* Code LPS */
+  z = 0x10000 - z;
+  subend += z;
+  a += z;
+  /* Export bits */
+  while (a >= 0x8000)
+    {
+      zemit(1 - (subend>>15) );
+      subend = (unsigned short)(subend<<1);
+      a = (unsigned short)(a<<1);
+    }
+}
+
+
+
+
+
+
+////////////////////////////////////////////////////////////////
+// TABLE AND PARAMETER MANAGEMENT
+////////////////////////////////////////////////////////////////
+
+
+
+
+void 
+ZPCodec::newtable(ZPCodec::Table *table)
+{
+  for (int i=0; i<256; i++)
+    {
+      p[i]  = table[i].p;
+      m[i]  = table[i].m;
+      up[i] = table[i].up;
+      dn[i] = table[i].dn;
+    }
+}
+
+static float 
+p_to_plps(unsigned short p)
+{
+  float fplps;
+  float fp = (float)(p) / (float)(0x10000);
+  const float log2 = (float)0.69314718055994530942;
+#ifdef ZCODER
+  fplps = fp - (fp+0.5) * log(fp+0.5) + (fp-0.5)*log2;
+#endif
+#ifdef ZPCODER
+  if (fp <= (1.0/6.0) )
+    fplps = fp * 2 * log2;
+  else
+    fplps = (float)((1.5*fp-0.25) - (1.5*fp+0.25)*log(1.5*fp+0.25) + (0.5*fp-0.25)*log2);
+#endif
+  return fplps;
+}
+
+
+BitContext 
+ZPCodec::state(float prob1)
+{
+  // Return a state representing 'prob1' in the steady chain
+  // FixMe: This is quite slow! 
+  int mps = (prob1 <= 0.5 ? 0 : 1);
+  float plps = (float)(mps ? 1.0 - prob1 : prob1);
+  // Locate steady chain (ordered, decreasing)
+  int sz = 0;
+  int lo = (mps ? 1 : 2);
+  while (p[lo+sz+sz+2] < p[lo+sz+sz]) sz+=1;
+  // Bisection
+  while (sz > 1)
+    {
+      int nsz = sz >> 1;
+      float nplps = p_to_plps( p[lo+nsz+nsz] );
+      if (nplps < plps)
+        { sz=nsz; }
+      else
+        { lo=lo+nsz+nsz; sz=sz-nsz; }
+    }
+  // Choose closest one
+  float f1 = p_to_plps(p[lo])-plps;
+  float f2 = plps-p_to_plps(p[lo+2]);
+  return (f1<f2) ? lo : lo+2;
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
diff --git a/libdjvu/ZPCodec.h b/libdjvu/ZPCodec.h
new file mode 100644
index 0000000..a27bd58
--- /dev/null
+++ b/libdjvu/ZPCodec.h
@@ -0,0 +1,744 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _ZPCODEC_H
+#define _ZPCODEC_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+// From: Leon Bottou, 1/31/2002
+// Almost equal to my initial code.
+
+#include "GContainer.h"
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+class ByteStream;
+
+
+
+/** @name ZPCodec.h
+    
+    Files #"ZPCodec.h"# and #"ZPCodec.cpp"# implement a fast binary adaptive
+    quasi-arithmetic coder named ZP-Coder.  Because of its speed and
+    convenience, the ZP-Coder is used in several parts of the DjVu reference
+    library (See \Ref{BSByteStream.h}, \Ref{JB2Image.h}, \Ref{IW44Image.h}).
+    The following comments avoid the theory (see the historical remarks for
+    useful pointers) and concentrate on the user perspective on the ZP-Coder.
+
+    {\bf Introduction} ---
+    Encoding consists of transforming a sequence of {\em message bits} into a
+    sequence of {\em code bits}. Decoding consists of retrieving the message
+    bits using only the code bits.  We can make the code smaller than the
+    message as soon as we can predict a message bit on the basis of a {\em
+    coding context} composed of previously encoded or decoded bits. If the
+    prediction is always correct, we do not even need to encode the message
+    bit. If the prediction is totally unreliable, we need to generate one code
+    bit in order to unambiguously specify the message bit.  In other words,
+    the more reliable the prediction, the more compression we get.
+
+    The ZP-Coder handles prediction by means of {\em context variables} (see
+    \Ref{BitContext}).  There must be a context variable for each possible
+    combination of context bits.  Both the encoder and the decoder use same
+    context variable for coding each message bit.  For instance, we can code a
+    binary image by successively coding all the pixels (the message bits) in
+    row and column order.  It is reasonable to assume that each pixel can be
+    reasonably well predicted by looking at a few (say 10) neighboring pixels
+    located above and to the left of the current pixel.  Since these 10 pixels
+    make 1024 combinations, we need 1024 context variables. Each pixel is
+    encoded using the context variable corresponding to the values of the 10
+    neighboring pixels.  Each pixel will be decoded by specifying the same
+    context variable corresponding to the values of these 10 pixels. This is
+    possible because these 10 pixels (located above and to the left) have
+    already been decoded and therefore are known by the decoder program.
+
+    The context variables are initially set to zero, which mean that we do not
+    know yet how to predict the current message bit on the basis of the
+    context bits. While coding the message bits, the ZP-Coder automatically
+    estimates the frequencies of #0#s and #1#s coded using each context
+    variable.  These frequencies actually provide a prediction (the most
+    probable bit value) and an estimation of the prediction reliability (how
+    often the prediction was correct in the past).  All this statistical
+    information is stored into the context variable after coding each bit.  In
+    other words, the more we code bits within a particular context, the better
+    the ZP-Coder adapts its prediction model, and the more compression we can
+    obtain.
+
+    All this adaptation works indeed because both the encoder program and the
+    decoder program are always synchronized. Both the encoder and the decoder
+    see the same message bits encoded (or decoded) with the same context
+    variables.  Both the encoder and the decoder apply the same rules to
+    update the context variables and improve the predictors.  Both the encoder
+    and the decoder programs use the same predictors for any given message
+    bit.  The decoder could not work if this was not the case.
+    
+    Just before encoding a message bit, all the context variables in the
+    encoder program contain certain values. Just before decoding this message
+    bit, all the context variables in the decoder program must contain the same
+    values as for the encoder program.  This is guaranteed as long as
+    each prediction only depends on already coded bits: {\em the coding context,
+    on which the each prediction is based, must be composed of message bits which
+    have already been coded. }
+
+    {\bf Usage} ---
+    Once you know how to organize the predictions (i.e. which coding context
+    to use, how many context variables to initialize, etc.), using the
+    ZP-Coder is straightforward (see \Ref{ZPCodec Examples}):
+    \begin{itemize}
+    \item The {\em encoder program} allocates context variables and
+    initializes them to zero. It then constructs a \Ref{ZPCodec} object for
+    encoding. For each message bit, the encoder program retrieves the context
+    bits, selects a context variable on the basis of the context bits and
+    calls member function \Ref{ZPCodec::encoder} with the message bit and a
+    reference to the context variable.
+    \item The {\em decoder program} allocates context variables and
+    initializes them to zero. It then constructs a \Ref{ZPCodec} object for
+    decoding. For each message bit, the decoder program retrieves the context
+    bits, selects a context variable on the basis of the context bits and
+    calls member function \Ref{ZPCodec::decoder} with a reference to the
+    context variable. This function returns the message bit.
+    \end{itemize}
+    Functions #encoder# and #decoder# only require a few machine cycles to
+    perform two essential tasks, namely {\em coding} and {\em context
+    adaptation}.  Function #decoder# often returns after two arithmetic
+    operations only.  To make your program fast, you just need to feed message
+    bits and context variables fast enough.
+
+    {\bf History} --- The ZP-Coder is similar in function and performance to
+    the seminal Q-Coder (Pennebaker, Mitchell, Langdon, Arps, IBM J. Res
+    Dev. 32, 1988). An improved version of the Q-Coder, named QM-Coder, has
+    been described in certain parts of the JPEG standard.  Unfortunate patent
+    policies have made these coders very difficult to use in general purpose
+    applications.  The Z-Coder is constructed using a new approach based on an
+    extension of the Golomb codes (Bottou, Howard, Bengio, IEEE DCC 98, 1998
+    \URL[DjVu]{http://www.research.att.com/~leonb/DJVU/bottou-howard-bengio/}
+    \URL[PostScript]{http://www.research.att.com/~leonb/PS/bottou-howard-bengio.ps.gz})
+    This new approach does not infringe the QM-Coder patents.  Unfortunately
+    the Z-Coder is dangerously close to the patented Arithmetic MEL Coder.
+    Therefore we wrote the ZP-Coder (pronounce Zee-Prime Coder) which we
+    believe is clear of legal problems.  Needless to say, AT&T has patents
+    pending for both the Z-Coder and the ZP-Coder, licenced to LizardTech.
+    The good news however is that we can grant a license to use the ZP-Coder
+    in ``free software'' without further complication. See the Copyright
+    for more information.
+    
+    @memo
+    Binary adaptive quasi-arithmetic coder.
+    @author
+    L\'eon Bottou <leonb@research.att.com> */
+//@{
+
+
+/** Context variable.  
+    Variables of type #BitContext# hold a single byte describing how to encode
+    or decode message bits with similar statistical properties.  This single
+    byte simultaneously represents the current estimate of the bit probability
+    distribution (which is determined by the frequencies of #1#s and #0#s
+    already coded with this context) and the confidence in this estimate
+    (which determines how fast the estimate can change.)
+
+    A coding program typically allocates hundreds of context variables.  Each
+    coding context is initialized to zero before encoding or decoding.  Value
+    zero represents equal probabilities for #1#s and #0#s with a minimal
+    confidence and therefore a maximum adaptation speed.  Each message bit is
+    encoded using a coding context determined as a function of previously
+    encoded message bits.  The decoder therefore can examine the previously
+    decoded message bits and decode the current bit using the same context as
+    the encoder.  This is critical for proper decoding.  
+*/
+typedef unsigned char  BitContext;
+
+
+/** Performs ZP-Coder encoding and decoding.  A ZPCodec object must either
+    constructed for encoding or for decoding.  The ZPCodec object is connected
+    with a \Ref{ByteStream} object specified at construction time.  A ZPCodec
+    object constructed for decoding reads code bits from the ByteStream and
+    returns a message bit whenever function \Ref{decoder} is called.  A
+    ZPCodec constructed for encoding processes the message bits provided by
+    function \Ref{encoder} and writes the corresponding code bits to
+    ByteStream #bs#.
+
+    You should never directly access a ByteStream object connected to a valid
+    ZPCodec object. The most direct way to access the ByteStream object
+    consists of using the "pass-thru" versions of functions \Ref{encoder} and
+    \Ref{decoder}.
+
+    The ByteStream object can be accessed again after the destruction of the
+    ZPCodec object.  Note that the encoder always flushes its internal buffers
+    and writes a few final code bytes when the ZPCodec object is destroyed.
+    Note also that the decoder often reads a few bytes beyond the last code byte
+    written by the encoder.  This lag means that you must reposition the
+    ByteStream after the destruction of the ZPCodec object and before re-using
+    the ByteStream object (see \Ref{IFFByteStream}.)
+
+    Please note also that the decoder has no way to reliably indicate the end
+    of the message bit sequence.  The content of the message must be designed
+    in a way which indicates when to stop decoding.  Simple ways to achieve
+    this consists of announcing the message length at the beginning (like a
+    pascal style string), or of defining a termination code (like a null
+    terminated string).  */
+
+class ZPCodec : public GPEnabled {
+protected:
+  ZPCodec (GP<ByteStream> gbs, const bool encoding, const bool djvucompat=false);
+public:
+  class Encode;
+  class Decode;
+
+  /// Non-virtual destructor.
+  ~ZPCodec();
+  /** Constructs a ZP-Coder.  If argument #encoding# is zero, the ZP-Coder
+      object will read code bits from the ByteStream #bs# and return a message
+      bit whenever function #decoder# is called.  If flag #encoding# is set
+      the ZP-Coder object will process the message bits provided by function
+      #encoder# and write code bits to ByteStream #bs#.  Optional flag
+      #djvucompat# selects a slightly less efficient adaptation table which is
+      used by the DjVu project.  This is required in order to ensure the
+      bitstream compatibility.  You should not use this flag unless you want
+      to decode JB2, IW44 or BZZ encoded data. */
+  static GP<ZPCodec> create(
+     GP<ByteStream> gbs, const bool encoding, const bool djvucompat=false);
+
+  /** Encodes bit #bit# using context variable #ctx#.  Argument #bit# must be
+      #0# or #1#. This function should only be used with ZP-Coder objects
+      created for encoding. It may modify the contents of variable #ctx# in
+      order to perform context adaptation. */
+  void encoder(int bit, BitContext &ctx);
+
+  /** Decodes a bit using context variable #ctx#. This function should only be
+      used with ZP-Coder objects created for decoding. It may modify the
+      contents of variable #ctx# in order to perform context adaptation. */
+  int  decoder(BitContext &ctx);
+
+  /** Encodes bit #bit# without compression (pass-thru encoder).  Argument
+      #bit# must be #0# or #1#. No compression will be applied. Calling this
+      function always increases the length of the code bit sequence by one
+      bit. */
+  void encoder(int bit);
+
+  /** Decodes a bit without compression (pass-thru decoder).  This function
+      retrieves bits encoded with the pass-thru encoder. */
+  int  decoder(void);
+#ifdef ZPCODEC_BITCOUNT
+  /** Counter for code bits (requires #-DZPCODEC_BITCOUNT#). This member
+      variable is available when the ZP-Coder is compiled with option
+      #-DZPCODEC_BITCOUNT#.  Variable #bitcount# counts the number of code
+      bits processed by the coder since the construction of the object.  This
+      variable can be used to evaluate how many code bits are spent on various
+      components of the message. */
+  int bitcount;
+#endif
+  // Table management (advanced stuff)
+  struct Table { 
+    unsigned short p;
+    unsigned short m;
+    BitContext     up;
+    BitContext     dn;
+  };
+  void newtable(ZPCodec::Table *table);
+  BitContext state(float prob1);
+  // Non-adaptive encoder/decoder
+  void encoder_nolearn(int pix, BitContext &ctx);
+  int  decoder_nolearn(BitContext &ctx);
+  inline int  IWdecoder(void);
+  inline void IWencoder(const bool bit);
+protected:
+  // coder status
+  GP<ByteStream> gbs;           // Where the data goes/comes from
+  ByteStream *bs;               // Where the data goes/comes from
+  const bool encoding;          // Direction (0=decoding, 1=encoding)
+  unsigned char byte;
+  unsigned char scount;
+  unsigned char delay;
+  unsigned int  a;
+  unsigned int  code;
+  unsigned int  fence;
+  unsigned int  subend;
+  unsigned int  buffer;
+  unsigned int  nrun;
+  // table
+  unsigned int  p[256];
+  unsigned int  m[256];
+  BitContext    up[256];
+  BitContext    dn[256];
+  // machine independent ffz
+  char          ffzt[256];
+  // encoder private
+  void einit (void);
+  void eflush (void);
+  void outbit(int bit);
+  void zemit(int b);
+  void encode_mps(BitContext &ctx, unsigned int z);
+  void encode_lps(BitContext &ctx, unsigned int z);
+  void encode_mps_simple(unsigned int z);
+  void encode_lps_simple(unsigned int z);
+  void encode_mps_nolearn(unsigned int z);
+  void encode_lps_nolearn(unsigned int z);
+  // decoder private
+  void dinit(void);
+  void preload(void);
+  int  ffz(unsigned int x);
+  int  decode_sub(BitContext &ctx, unsigned int z);
+  int  decode_sub_simple(int mps, unsigned int z);
+  int  decode_sub_nolearn(int mps, unsigned int z);
+private:
+  // no copy allowed (hate c++)
+  ZPCodec(const ZPCodec&);
+  ZPCodec& operator=(const ZPCodec&);
+#ifdef ZPCODEC_FRIEND
+  friend ZPCODEC_FRIEND;
+#endif
+};
+
+
+
+
+
+
+// INLINE CODE
+
+inline void 
+ZPCodec::encoder(int bit, BitContext &ctx) 
+{
+  unsigned int z = a + p[ctx];
+  if (bit != (ctx & 1))
+  {
+    encode_lps(ctx, z);
+  }else if (z >= 0x8000)
+  {
+    encode_mps(ctx, z);
+  }else
+  {
+    a = z;
+  }
+}
+
+inline int
+ZPCodec::IWdecoder(void)
+{
+  return decode_sub_simple(0,0x8000 + ((a+a+a) >> 3));
+}
+
+inline int
+ZPCodec::decoder(BitContext &ctx) 
+{
+  unsigned int z = a + p[ctx];
+  if (z <= fence) 
+    { a = z; return (ctx&1); } 
+  return decode_sub(ctx, z);
+}
+
+inline void 
+ZPCodec::encoder_nolearn(int bit, BitContext &ctx) 
+{
+  unsigned int z = a + p[ctx];
+  if (bit != (ctx & 1))
+    encode_lps_nolearn(z);
+  else if (z >= 0x8000)
+    encode_mps_nolearn(z);
+  else
+    a = z;
+}
+
+inline int
+ZPCodec::decoder_nolearn(BitContext &ctx) 
+{
+  unsigned int z = a + p[ctx];
+  if (z <= fence) 
+    { a = z; return (ctx&1); } 
+  return decode_sub_nolearn( (ctx&1), z);
+}
+
+inline void 
+ZPCodec::encoder(int bit)
+{
+  if (bit)
+    encode_lps_simple(0x8000 + (a>>1));
+  else
+    encode_mps_simple(0x8000 + (a>>1));
+}
+
+inline int
+ZPCodec::decoder(void)
+{
+  return decode_sub_simple(0, 0x8000 + (a>>1));
+}
+
+inline void
+ZPCodec::IWencoder(const bool bit)
+{
+  const int z = 0x8000 + ((a+a+a) >> 3);
+  if (bit)
+  {
+    encode_lps_simple(z);
+  }else
+  {
+    encode_mps_simple(z);
+  }
+}
+
+// ------------ ADDITIONAL DOCUMENTATION
+
+/** @name ZPCodec Examples
+    
+    Binary adaptive coders are efficient and very flexible.  Unfortunate
+    intellectual property issues however have limited their popularity.  As a
+    consequence, few programmers have a direct experience of using such a
+    coding device.  The few examples provided in this section demonstrate how
+    we think the ZP-Coder should be used.
+    
+    {\bf Encoding Multivalued Symbols} ---
+    Since the ZP-Coder is a strictly binary coder, every message must be
+    reduced to a sequence of bits (#0#s or #1#s).  It is often convenient to
+    consider that a message is a sequence of symbols taking more than two
+    values.  For instance, a character string may be a sequence of bytes, and
+    each byte can take 256 values.  Each byte of course is composed of eight
+    bits that we can encode in sequence.  The real issue however consists of
+    deciding how we will use context variables in order to let the ZP-Coder
+    learn the probability distribution of the byte values.
+
+    The most significant bit #b0# decides whether the byte is in range 0..127
+    or in range 128..255.  We let the ZP-Coder learn how to predict this bit
+    by allocating one context variable for it.  The second most significant
+    byte #b1# has two distinct meanings depending of bit #b0#.  If bit #b0# is
+    #0#, bit #b1# decides whether the byte is in range 0..63 or 64..127.  If
+    bit #b0# is #1#, bit #b1# decides whether the byte is in range 128..191 or
+    192..255.  The prediction for bit #b1# must therefore depend on the value
+    of #b0#.  This is why we will allocate two context variables for this bit.
+    If bit #b0# is #0#, we will use the first variable; if bit #b0# is #1#, we
+    will use the second variable.  The next bit #b2# has four meanings and
+    therefore we will use four context variables, etc.  This analysis leads to
+    a total of #1+2+4+...+128# = #255# context variables for encoding one
+    byte.  This encoding procedure can be understood as a binary decision
+    tree with a dedicated context variable for predicting each decision.
+    \begin{verbatim}
+    [>=128]----n---[>=64?]----n----[>31?]  ... 
+           \              `---y----[>95?]  ...
+            \
+             `--y---[>=192?]----n---[>=160?] ...
+                            `---y---[>=224?] ...
+    \end{verbatim}
+    The following decoding function illustrates a very compact way to
+    implement such a decision tree.  Argument #ctx# points to an array of 255
+    #BitContext# variables.  Macro #REPEAT8# is a shorthand notation for eight
+    repetitions of its argument.  
+    \begin{verbatim}
+    int decode_8_bits(ZPCodec &zp, BitContext *ctx )
+    {
+      int n = 1;
+      REPEAT8( { n = (n<<1) | (zp.decoder(ctx[n-1])); } );
+      return n & 0xff;
+    }
+    \end{verbatim}
+    The binary representation of variable #n# is always composed of a #1#
+    followed by whichever bits have been decoded so far. This extra bit #1# in
+    fact is a nice trick to flatten out the tree structure and directly
+    address the array of context variables.  Bit #b0# is decoded using the
+    first context variable since #n# is initially #1#.  Bit #b1# is decoded
+    using one of the next two variables in the array, since #n# is either #2#
+    (#10# in binary) or #3# (#11# in binary).  Bit #b2# will be decoded using
+    one of the next four variables, since #n# ranges from #4# (#100# in
+    binary) to #7# (#111# in binary).  The final result is given by removing
+    the extra #1# in variable #n#.
+
+    The corresponding encoding function is almost as compact. Argument #ctx#
+    again is an array of 255 #BitContext# variables.  Each bit of byte #x# is
+    encoded and shifted into variable #n# as in the decoding function.
+    Variable #x# in fact contains the bits to be encoded. Variable #n#
+    contains a #1# followed by the already encoded bits.
+    \begin{verbatim}
+    void encode_8_bits(ZPCodec &zp, int x, BitContext *ctx )
+    {
+      int n = 1;
+      REPEAT8( { int b=((x&0x80)?1:0);  x=(x<<1);
+                 zp.encoder(b,ctx[n-1]);  n=(n<<1)|(b); } );
+    }
+    \end{verbatim}
+    The ZP-Coder automatically adjusts the content of the context variables
+    while coding (recall the context variable argument is passed to functions
+    #encoder# and #decoder# by reference).  The whole array of 255 context
+    variables can be understood as a "byte context variable".  The estimated
+    probability of each byte value is indeed the product of the estimated
+    probabilities of the eight binary decisions that lead to that value in the
+    decision tree.  All these probabilities are adapted by the underlying
+    adaptation algorithm of the ZP-Coder.
+
+    {\bf Application} ---
+    We consider now a simple applications consisting of encoding the
+    horizontal and vertical coordinates of a cloud of points. Each coordinate
+    requires one byte.  The following function illustrates a possible
+    implementation:
+    \begin{verbatim}
+    void encode_points(const char *filename, int n, int *x, int *y)
+    {
+       StdioByteStream bs(filename, "wb");
+       bs.write32(n);             // Write number of points.
+       ZPCodec zp(bs, 1);         // Construct encoder and context vars.
+       BitContext ctxX[255], ctxY[255];
+       memset(ctxX, 0, sizeof(ctxX));
+       memset(ctxY, 0, sizeof(ctxY));
+       for (int i=0; i<n; i++) {  // Encode coordinates.
+          encode_8_bits(zp, x[i], ctxX);
+          encode_8_bits(zp, y[i], ctxY);
+       }
+    }
+    \end{verbatim}
+    The decoding function is very similar to the encoding function:
+    \begin{verbatim}
+    int decode_points(const char *filename, int *x, int *y)
+    {
+       StdioByteStream bs(filename,"rb");
+       int n = bs.read32();      // Read number of points.
+       ZPCodec zp(bs, 0);        // Construct decoder and context vars.
+       BitContext ctxX[255], ctxY[255];
+       memset(ctxX, 0, sizeof(ctxX));
+       memset(ctxY, 0, sizeof(ctxY));
+       for (int i=0; i<n; i++) { // Decode coordinates.
+         x[i] = decode_8_bits(zp, ctxX);
+         y[i] = decode_8_bits(zp, ctxY);
+       }
+       return n;                 // Return number of points.
+    }
+    \end{verbatim}
+    The ZP-Coder automatically estimates the probability distributions of both
+    the horizontal and vertical coordinates. These estimates are used to
+    efficiently encode the point coordinates.  This particular implementation
+    is a good option if we assume that the order of the points is significant
+    and that successive points are independent.  It would be much smarter
+    otherwise to sort the points and encode relative displacements between
+    successive points.
+
+
+    {\bf Huffman Coding Tricks} --- 
+    Programmers with experience in Huffman codes can see the similarity in the
+    ZP-Coder.  Huffman codes also organize the symbol values as a decision
+    tree. The tree is balanced in such a way that each decision is as
+    unpredictable as possible (i.e. both branches must be equally probable).
+    This is very close to the ZP-Coder technique described above.  Since we
+    allocate one context variable for each decision, our tree need not be
+    balanced: the context variable will track the decision statistics and the
+    ZP-Coder will compensate optimally.
+
+    There are good reasons however to avoid unbalanced trees with the ZP-Coder.
+    Frequent symbol values may be located quite deep in a poorly balanced
+    tree.  This increases the average number of message bits (the number of
+    decisions) required to code a symbol.  The ZP-Coder will be called more
+    often, making the coding program slower.  Furthermore, each message
+    bit is encoded using an estimated distribution.  All these useless message
+    bits mean that the ZP-Coder has more distributions to adapt.  This
+    extra adaptation work will probably increase the file size.
+
+    Huffman codes are very fast when the tree structure is fixed beforehand.
+    Such {\em static Huffman codes} are unfortunately not very efficient
+    because the tree never matches the actual data distribution.  This is why
+    such programs almost always define a data dependent tree structure.  This
+    structure must then be encoded in the file since the decoder must know it
+    before decoding the symbols.  Static Huffman codes however become very
+    efficient when decisions are encoded with the ZP-Coder.  The tree
+    structure represents a priori knowledge about the distribution of the
+    symbol values.  Small data discrepancies will be addressed transparently
+    by the ZP-Coder.
+
+
+    {\bf Encoding Numbers} ---
+    This technique is illustrated with the following number encoding example.
+    The multivalued technique described above is not practical with large
+    numbers because the decision tree has too many nodes and requires too many
+    context variables.  This problem can be solved by using a priori knowledge
+    about the probability distribution of our numbers.
+
+    Assume for instance that the distribution is symmetrical and that small
+    numbers are much more probable than large numbers.  We will first group
+    our numbers into several sets.  Each number is coded by first coding which
+    set contains the number and then coding a position within the set.  Each
+    set contains #2^n# numbers that we consider roughly equiprobable.  Since
+    the most probable values occur much more often, we want to model their
+    probability more precisely. Therefore we use small sets for the most
+    probable values and large sets for the least probable values, as
+    demonstrated below.
+    \begin{verbatim} 
+    A---------------- {0}                                 (size=1)
+     `------B---C---- {1}            or {-1}              (size=1)
+             \   `--- {2,3}          or {-2,-3}           (size=2)
+              D------ {4...131}      or {-4...-131}       (size=128)
+               `----- {132...32899}  or {-132...-32899}   (size=32768)
+    \end{verbatim}
+    We then organize a decision tree for coding the set identifier.  This
+    decision tree is balanced using whatever a priori knowledge we have about
+    the probability distribution of the number values, just like a static
+    Huffman tree.  Each decision (except the sign decision) is then coded
+    using a dedicated context variable.
+    \begin{verbatim}
+        if (! zp.decoder(ctx_A)) {             // decision A
+           return 0;
+        } else {
+           if (! zp.decoder(ctx_B)) {          // + decision B
+             if (! zp.decoder(ctx_C)) {        // ++ decision C
+               if (! zp.decoder())             // +++ sign decision
+                 return +1;
+               else
+                 return -1;
+             } else {
+               if (! zp.decoder())             // +++ sign decision
+                 return + 2 + zp.decoder();
+               else
+                 return - 2 - zp.decoder();
+             }
+           } else {
+             if (! zp.decoder(ctx_D)) {        // ++ decision D
+               if (! zp.decoder())             // +++ sign decision
+                 return + 4 + decode_7_bits(zp);
+               else
+                 return - 4 - decode_7_bits(zp);
+             } else {
+               if (! zp.decoder())             // +++ sign decision
+                 return + 132 + decode_15_bits(zp);
+               else
+                 return - 132 - decode_15_bits(zp);
+             }
+           }
+        } 
+   \end{verbatim}
+   Note that the call #zp.decoder()# for coding the sign decision does not use
+   a context variable.  This is a "pass-thru" variant of \Ref{decoder} which
+   bypasses the ZP-Coder and just reads a bit from the code sequence.  There
+   is a corresponding "pass-thru" version of \Ref{encoder} for encoding such
+   bits.  Similarly, functions #decode_7_bits# and #decode_15_bits# do not
+   take an array of context variables because, unlike function #decode_8_bits#
+   listed above, they are based on the pass-thru decoder instead of the
+   regular decoder.
+
+   The ZP-Coder will not learn the probabilities of the numbers within a set
+   since no context variables have been allocated for that purpose.  This
+   could be improved by allocating additional context variables for encoding
+   the position within the smaller sets and using the regular decoding
+   functions instead of the pass-thru variants.  Only experimentation can tell
+   what works best for your particular encoding problem.
+
+
+   {\bf Understanding Adaptation} ---
+   We have so far explained that the ZP-Coder adaptation algorithm is able to
+   quickly estimate of the probability distribution of the message bits coded
+   using a particular context variable.  It is also able to track slow
+   variations when the actual probabilities change while coding.
+   
+   Let us consider the ``cloud of points'' application presented above.
+   Suppose that we first code points located towards the left side and then
+   slowly move towards points located on the right side.  The ZP-Coder will
+   first estimate that the X coordinates are rather on the left side. This
+   estimation will be progressively revised after seeing more points on the
+   right side.  Such an ordering of the points obviously violates the point
+   independence assumption on which our code is based.  Despite our inexact
+   assumptions, the tracking mechanism allows for better prediction of the X
+   coordinates and therefore better compression.
+
+   However, this is not a perfect solution. The ZP-Coder tracks the changes
+   because every point seems to be a little bit more on the right side than
+   suggested by the previous points.  The ZP-Coder coding algorithm is always
+   slightly misadjusted and we always lose a little on possible compression
+   ratio.  This is not much of a problem when the probabilities drift slowly.
+   On the other hand, this can be very significant if the probabilities change
+   drastically.
+
+   Adaptation is always associated with a small loss of efficiency.  The
+   ZP-Coder updates the probability model whenever it suspects, {\em after
+   coding}, that the current settings were not optimal.  The model will be
+   better next time, but a slight loss in compression has occurred.  The
+   design of ZP-Coder of course minimizes this effect as much as possible.
+   Yet you will pay a price if you ask too much to the adaptation algorithm.
+   If you have millions of context variables, it will be difficult to train
+   them all.  If the probability distributions change drastically while
+   coding, it will be difficult to track the changes fast enough.
+
+   Adaptation on the other hand is a great simplification.  A good data
+   compression program must (a) represent the data in order to make its
+   predictability apparent, and (b) perform the predictions and generate the
+   code bits.  The ZP-Coder is an efficient and effortless solution for
+   implementing task (b).
+
+
+   {\bf Practical Debugging Tricks} ---
+   Sometimes you write an encoding program and a decoding program.
+   Unfortunately there is a bug: the decoding program decodes half the file
+   and then just outputs garbage.  There is a simple way to locate the
+   problem.  In the encoding program, after each call to #encoder#, print the
+   encoded bit and the value of the context variable.  In the decoding
+   program, after each call to #decoder#, print the decoded bit and the value
+   of the context variable.  Both program should print exactly the same thing.
+   When you find the difference, you find the bug.
+   
+   @memo Suggestions for efficiently using the ZP-Coder.  */
+//@}
+
+// ------------ THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
+
+
diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp
new file mode 100644
index 0000000..7765646
--- /dev/null
+++ b/libdjvu/atomic.cpp
@@ -0,0 +1,132 @@
+/* -*- C -*-
+// -------------------------------------------------------------------
+// Atomic primitives
+// Copyright (c) 2008  Leon Bottou. All rights reserved
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// ------------------------------------------------------------------- */
+
+#include "atomic.h"
+
+#ifndef ATOMIC_MACROS
+
+#if HAVE_PTHREAD
+# include <pthread.h>
+#elif HAVE_QTHREAD  // never defined at the moment.
+# include <QMutex>
+# include <QWaitCondition>
+#else
+# include "GThreads.h"
+#endif
+
+/* Select synchronization primitives */
+
+# if defined(_WIN32) || defined(_WIN64)
+
+namespace {
+  struct CS { 
+    CRITICAL_SECTION cs; 
+    CS() { InitializeCriticalSection(&cs); }
+    ~CS() { DeleteCriticalSecton(&cs); } }; }
+static CS globalCS;
+# define MUTEX_LEAVE LeaveCriticalSection(&globalCS.cs)
+# define MUTEX_ENTER EnterCriticalSection(&globalCS.cs);
+
+# elif defined (PTHREAD_MUTEX_INITIALIZER)
+
+static pthread_mutex_t ptm = PTHREAD_MUTEX_INITIALIZER;
+# define MUTEX_ENTER  pthread_mutex_lock(&ptm)
+# define MUTEX_LEAVE  pthread_mutex_unlock(&ptm)
+
+# elif defined(__cplusplus) && defined(_GTHREADS_H_)
+
+static GMonitor m;
+# define MUTEX_ENTER  m.enter()
+# define MUTEX_LEAVE  m.leave()
+
+# elif defined(__cplusplus) && defined(QMUTEX_H)
+
+static QMutex qtm;
+# define MUTEX_ENTER  qtm.lock()
+# define MUTEX_LEAVE  qtm.unlock()
+
+# endif
+
+
+/* atomic primitive emulation */
+
+int
+atomicIncrement(int volatile *var)
+{
+  int res;
+  MUTEX_ENTER;
+  res = ++(*var);
+  MUTEX_LEAVE;
+  return res;
+}
+
+int 
+atomicDecrement(int volatile *var)
+{
+  int res;
+  MUTEX_ENTER;
+  res = --(*var);
+  MUTEX_LEAVE;
+  return res;
+}
+
+int 
+atomicCompareAndSwap(int volatile *var, int oldval, int newval)
+{
+  int ret;
+  MUTEX_ENTER;
+  ret = *var;
+  if (ret == oldval)
+    *var = newval;
+  MUTEX_LEAVE;
+  return ret;
+}
+
+int 
+atomicExchange(int volatile *var, int newval)
+{
+  int ret;
+  MUTEX_ENTER;
+  ret = *var;
+  *var = newval;
+  MUTEX_LEAVE;
+  return ret;
+}
+
+void* 
+atomicExchangePointer(void* volatile *var, void* newval)
+{
+  void *ret;
+  MUTEX_ENTER;
+  ret = *var;
+  *var = newval;
+  MUTEX_LEAVE;
+  return ret;
+}
+
+#endif 
+
+
diff --git a/libdjvu/atomic.h b/libdjvu/atomic.h
new file mode 100644
index 0000000..84fc4f1
--- /dev/null
+++ b/libdjvu/atomic.h
@@ -0,0 +1,165 @@
+/* -*- C -*-
+// -------------------------------------------------------------------
+// Atomic primitives
+// Copyright (c) 2008  Leon Bottou. All rights reserved
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// ------------------------------------------------------------------- */
+
+#ifndef ATOMIC_H
+#define ATOMIC_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* This file defines macros or functions performing
+// the following atomic operations with a full memory barrier. 
+//
+//   int atomicIncrement(int volatile *var) 
+//   { *var += 1; return *var; } 
+//   
+//   int atomicDecrement(int volatile *var);
+//   { *var -= 1; return *var; } 
+//   
+//   int atomicCompareAndSwap(int volatile *var, int oldval, int newval);
+//   { int val = *var; if (val == oldval) { *var = newval };  returl val; }
+//   
+//   int atomicExchange(int volatile *var, int val);
+//   { int tmp = *var; *var = val; return tmp; }
+//   
+//   void* atomicExchangePointer(void* volatile *var, int val);
+//   { void* tmp = *var; *var = val; return tmp; }
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(ATOMIC_MACROS) && defined(_WIN64)
+# define ATOMIC_MACROS "WIN64"
+# include <windows.h>
+# define atomicIncrement(var) \
+  (int)(InterlockedIncrement((LONG volatile*)(var)))
+# define atomicDecrement(var) \
+  (int)(InterlockedDecrement((LONG volatile*)(var)))
+# define atomicCompareAndSwap(var,ov,nv) \
+  (InterlockedCompareExchange((LONG volatile*)(var),(LONG)(nv),(LONG)(ov)))
+# define atomicExchange(var,nv) \
+  (int)(InterlockedExchange((LONG volatile*)(var),(LONG)(nv)))
+# define atomicExchangePointer(var,nv) \
+  (void*)(InterlockedExchangePointer((PVOID volatile*)(var),(PVOID)(nv)))
+#endif
+
+#if !defined(ATOMIC_MACROS) && defined(_WIN32)
+# define ATOMIC_MACROS "WIN32"
+# include <windows.h>
+# define atomicIncrement(var) \
+  (int)(InterlockedIncrement((LONG volatile*)(var)))
+# define atomicDecrement(var) \
+  (int)(InterlockedDecrement((LONG volatile*)(var)))
+# define atomicCompareAndSwap(var,ov,nv) \
+  (InterlockedCompareExchange((LONG volatile*)(var),(LONG)(nv),(LONG)(ov)))
+# define atomicExchange(var,nv) \
+  (int)(InterlockedExchange((LONG volatile*)(var),(LONG)(nv)))
+# define atomicExchangePointer(var,nv) \
+  (void*)(InterlockedExchange((LONG volatile*)(var),(LONG)(nv)))
+#endif
+
+#if !defined(ATOMIC_MACROS) && defined(HAVE_INTEL_ATOMIC_BUILTINS)
+# define ATOMIC_MACROS "INTEL"
+# define atomicIncrement(var) \
+  (__sync_add_and_fetch((int volatile *)(var), 1))
+# define atomicDecrement(var) \
+  (__sync_add_and_fetch((int volatile *)(var), -1))
+# define atomicCompareAndSwap(var,ov,nv) \
+  (__sync_val_compare_and_swap((int volatile*)(var),(int)(ov),(int)(nv)))
+# if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
+#  define atomicExchange(var,nv) \
+   (__sync_lock_test_and_set((int volatile*)(var),(int)(nv)))
+#  define atomicExchangePointer(var,nv) \
+   (__sync_lock_test_and_set((void* volatile*)(var),(void*)(nv)))
+# else
+  static inline int atomicExchange(int volatile *var, int nv) {
+    int ov; do { ov = *var;  /* overkill */
+    } while (! __sync_bool_compare_and_swap(var, ov, nv));
+    return ov;
+  }
+  static inline void* atomicExchangePointer(void* volatile *var, void* nv) {
+    void *ov; do { ov = *var;  /* overkill */
+    } while (! __sync_bool_compare_and_swap(var, ov, nv));
+    return ov;
+  }
+# endif
+#endif
+
+#if !defined(ATOMIC_MACROS) && defined(__GNUC__)
+# if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
+#  define ATOMIC_MACROS "GNU86"
+  static inline int atomicIncrement(int volatile *var) {
+    int ov; __asm__ __volatile__ ("lock; xaddl %0, %1" 
+          : "=r" (ov), "=m" (*var) : "0" (1), "m" (*var) : "cc" );
+    return ov + 1;
+  }
+  static inline int atomicDecrement(int volatile *var) {
+    int ov; __asm__ __volatile__ ("lock; xaddl %0, %1" 
+         : "=r" (ov), "=m" (*var) : "0" (-1), "m" (*var) : "cc" );
+    return ov - 1;
+  }
+  static inline int atomicExchange(int volatile *var, int nv) {
+    int ov; __asm__ __volatile__ ("xchgl %0, %1"
+        : "=r" (ov), "=m" (*var) : "0" (nv), "m" (*var)); 
+    return ov; 
+  }
+  static inline int atomicCompareAndSwap(int volatile *var, int ov, int nv) {
+    int rv; __asm __volatile ("lock; cmpxchgl %2, %1"
+        : "=a" (rv), "=m" (*var) : "r" (nv), "0" (ov), "m" (*var) : "cc");
+    return rv;
+  }
+  static inline void *atomicExchangePointer(void * volatile *var, void *nv) {
+    void *ov;  __asm__ __volatile__ (
+#  if defined(__x86_64__) || defined(__amd64__)
+         "xchgq %0, %1"
+#  else
+         "xchgl %0, %1"
+#  endif
+         : "=r" (ov), "=m" (*var) : "0" (nv), "m" (*var)); 
+    return ov; 
+  }
+# endif
+#endif
+
+
+#ifndef ATOMIC_MACROS
+  /* emulation */
+  extern int atomicIncrement(int volatile *var);
+  extern int atomicDecrement(int volatile *var);
+  extern int atomicCompareAndSwap(int volatile *var, int ov, int nv);
+  extern int atomicExchange(int volatile *var, int nv);
+  extern void* atomicExchangePointer(void* volatile *var, void* nv);
+#endif
+
+  
+# ifdef __cplusplus
+}
+# endif
+
+#endif
diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp
new file mode 100644
index 0000000..072db01
--- /dev/null
+++ b/libdjvu/ddjvuapi.cpp
@@ -0,0 +1,4092 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation "ddjvuapi.h"
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <locale.h>
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+  struct ddjvu_context_s;
+  struct ddjvu_job_s;
+  struct ddjvu_document_s;
+  struct ddjvu_page_s;
+  struct ddjvu_format_s;
+  struct ddjvu_message_p;
+  struct ddjvu_thumbnail_p;
+  struct ddjvu_runnablejob_s;
+  struct ddjvu_printjob_s;
+  struct ddjvu_savejob_s;
+}
+using namespace DJVU;
+# define DJVUNS DJVU::
+#else
+# define DJVUNS /**/
+#endif
+
+#include "GException.h"
+#include "GSmartPointer.h"
+#include "GThreads.h"
+#include "GContainer.h"
+#include "ByteStream.h"
+#include "IFFByteStream.h"
+#include "BSByteStream.h"
+#include "GString.h"
+#include "GBitmap.h"
+#include "GPixmap.h"
+#include "GScaler.h"
+#include "DjVuPort.h"
+#include "DataPool.h"
+#include "DjVuInfo.h"
+#include "IW44Image.h"
+#include "DjVuImage.h"
+#include "DjVuFileCache.h"
+#include "DjVuDocument.h"
+#include "DjVuDumpHelper.h"
+#include "DjVuMessageLite.h"
+#include "DjVuMessage.h"
+#include "DjVmNav.h"
+#include "DjVuText.h"
+#include "DjVuAnno.h"
+#include "DjVuToPS.h"
+#include "DjVmDir.h"
+#include "DjVmDir0.h"
+#include "DjVuNavDir.h"
+#include "DjVmDoc.h"
+
+
+#include "miniexp.h"
+#include "ddjvuapi.h"
+
+
+// ----------------------------------------
+// Private structures
+
+
+struct DJVUNS ddjvu_message_p : public GPEnabled
+{
+  GNativeString tmp1;
+  GNativeString tmp2;
+  ddjvu_message_t p;
+  ddjvu_message_p() { memset(&p, 0, sizeof(p)); }
+};
+
+struct DJVUNS ddjvu_thumbnail_p : public GPEnabled
+{
+  ddjvu_document_t *document;
+  int pagenum;
+  GTArray<char> data;
+  GP<DataPool> pool;
+  static void callback(void *);
+}; 
+
+
+// ----------------------------------------
+// Context, Jobs, Document, Pages
+
+
+struct DJVUNS ddjvu_context_s : public GPEnabled
+{
+  GMonitor monitor;
+  GP<DjVuFileCache> cache;
+  GPList<ddjvu_message_p> mlist;
+  GP<ddjvu_message_p> mpeeked;
+  int uniqueid;
+  ddjvu_message_callback_t callbackfun;
+  void *callbackarg;
+};
+
+struct DJVUNS ddjvu_job_s : public DjVuPort
+{
+  GMonitor monitor;
+  void *userdata;
+  GP<ddjvu_context_s> myctx;
+  GP<ddjvu_document_s> mydoc;
+  bool released;
+  ddjvu_job_s();
+  // virtual port functions:
+  virtual bool inherits(const GUTF8String&) const;
+  virtual bool notify_error(const DjVuPort*, const GUTF8String&);  
+  virtual bool notify_status(const DjVuPort*, const GUTF8String&);
+  // default implementation of virtual job functions:
+  virtual ddjvu_status_t status() {return DDJVU_JOB_NOTSTARTED;}
+  virtual void release() {}
+  virtual void stop() {}
+};
+
+struct DJVUNS ddjvu_document_s : public ddjvu_job_s
+{
+  GP<DjVuDocument> doc;
+  GPMap<int,DataPool> streams;
+  GMap<GUTF8String, int> names;
+  GPMap<int,ddjvu_thumbnail_p> thumbnails;
+  int streamid;
+  bool fileflag;
+  bool urlflag;
+  bool docinfoflag;
+  bool pageinfoflag;
+  minivar_t protect;
+  // virtual job functions:
+  virtual ddjvu_status_t status();
+  virtual void release();
+  // virtual port functions:
+  virtual bool inherits(const GUTF8String&) const;
+  virtual bool notify_error(const DjVuPort*, const GUTF8String&);  
+  virtual bool notify_status(const DjVuPort*, const GUTF8String&);
+  virtual void notify_doc_flags_changed(const DjVuDocument*, long, long);
+  virtual GP<DataPool> request_data(const DjVuPort*, const GURL&);
+  static void callback(void *);
+  bool want_pageinfo(void);
+};
+
+struct DJVUNS ddjvu_page_s : public ddjvu_job_s
+{
+  GP<DjVuImage> img;
+  ddjvu_job_t *job;
+  bool pageinfoflag;            // was the first m_pageinfo sent?
+  bool pagedoneflag;            // was the final m_pageinfo sent?
+  // virtual job functions:
+  virtual ddjvu_status_t status();
+  virtual void release();
+  // virtual port functions:
+  virtual bool inherits(const GUTF8String&) const;
+  virtual bool notify_error(const DjVuPort*, const GUTF8String&);  
+  virtual bool notify_status(const DjVuPort*, const GUTF8String&);
+  virtual void notify_file_flags_changed(const DjVuFile*, long, long);
+  virtual void notify_relayout(const class DjVuImage*);
+  virtual void notify_redisplay(const class DjVuImage*);
+  virtual void notify_chunk_done(const DjVuPort*, const GUTF8String &);
+  void sendmessages();
+};
+
+
+// ----------------------------------------
+// Helpers
+
+
+// Hack to increment counter
+static void 
+ref(GPEnabled *p)
+{
+  GPBase n(p);
+  char *gn = (char*)&n;
+  *(GPEnabled**)gn = 0;
+  n.assign(0);
+}
+
+// Hack to decrement counter
+static void 
+unref(GPEnabled *p)
+{
+  GPBase n;
+  char *gn = (char*)&n;
+  *(GPEnabled**)gn = p;
+  n.assign(0);
+}
+
+// Allocate strings
+static char *
+xstr(const char *s)
+{
+  int l = strlen(s);
+  char *p = (char*)malloc(l + 1);
+  if (p) 
+    {
+      strcpy(p, s);
+      p[l] = 0;
+    }
+  return p;
+}
+
+// Allocate strings
+static char *
+xstr(const GNativeString &n)
+{
+  return xstr( (const char*) n );
+}
+
+// Allocate strings
+static char *
+xstr(const GUTF8String &u)
+{
+  GNativeString n(u);
+  return xstr( n );
+}
+
+// Fill a message head
+static ddjvu_message_any_t 
+xhead(ddjvu_message_tag_t tag,
+      ddjvu_context_t *context)
+{
+  ddjvu_message_any_t any;
+  any.tag = tag;
+  any.context = context;
+  any.document = 0;
+  any.page = 0;
+  any.job = 0;
+  return any;
+}
+static ddjvu_message_any_t 
+xhead(ddjvu_message_tag_t tag,
+      ddjvu_job_t *job)
+{
+  ddjvu_message_any_t any;
+  any.tag = tag;
+  any.context = job->myctx;
+  any.document = job->mydoc;
+  any.page = 0;
+  any.job = job;
+  return any;
+}
+static ddjvu_message_any_t 
+xhead(ddjvu_message_tag_t tag,
+      ddjvu_document_t *document)
+{
+  ddjvu_message_any_t any;
+  any.tag = tag;
+  any.context = document->myctx;
+  any.document = document;
+  any.page = 0;
+  any.job = document;
+  return any;
+}
+static ddjvu_message_any_t 
+xhead(ddjvu_message_tag_t tag,
+      ddjvu_page_t *page)
+{
+  ddjvu_message_any_t any;
+  any.tag = tag;
+  any.context = page->myctx;
+  any.document = page->mydoc;
+  any.page = page;
+  any.job = page->job;
+  return any;
+}
+
+
+// ----------------------------------------
+// Version
+
+const char*
+ddjvu_get_version_string(void)
+{
+#ifdef DJVULIBRE_VERSION
+  return "DjVuLibre-" DJVULIBRE_VERSION;
+#else
+  return "DjVuLibre";
+#endif
+}
+
+int
+ddjvu_code_get_version(void)
+{
+  return DJVUVERSION;
+}
+
+
+
+
+// ----------------------------------------
+// Context
+
+
+ddjvu_context_t *
+ddjvu_context_create(const char *programname)
+{
+  ddjvu_context_t *ctx = 0;
+  G_TRY
+    {
+#ifdef LC_ALL
+      setlocale(LC_ALL,"");
+# ifdef LC_NUMERIC
+      setlocale(LC_NUMERIC, "C");
+# endif
+#endif
+      if (programname)
+        djvu_programname(programname);
+      DjVuMessage::use_language();
+      DjVuMessageLite::create();
+      ctx = new ddjvu_context_s;
+      ref(ctx);
+      ctx->uniqueid = 0;
+      ctx->callbackfun = 0;
+      ctx->callbackarg = 0;
+      ctx->cache = DjVuFileCache::create();
+    }
+  G_CATCH_ALL
+    {
+      if (ctx)
+        unref(ctx);
+      ctx = 0;
+    }
+  G_ENDCATCH;
+  return ctx;
+}
+
+void 
+ddjvu_context_release(ddjvu_context_t *ctx)
+{
+  G_TRY
+    {
+      if (ctx)
+        unref(ctx);
+    }
+  G_CATCH_ALL
+    {
+    }
+  G_ENDCATCH;
+}
+
+
+// ----------------------------------------
+// Message helpers
+
+
+// post a new message
+static void
+msg_push(const ddjvu_message_any_t &head,
+         GP<ddjvu_message_p> msg = 0)
+{
+  ddjvu_context_t *ctx = head.context;
+  if (! msg) 
+    msg = new ddjvu_message_p;
+  msg->p.m_any = head; 
+  GMonitorLock lock(&ctx->monitor);
+  if ((head.document && head.document->released) ||
+      (head.page && head.page->released) ||
+      (head.job && head.job->released) )
+    return;
+  if (ctx->callbackfun) 
+    (*ctx->callbackfun)(ctx, ctx->callbackarg);
+  ctx->mlist.append(msg);
+  ctx->monitor.broadcast();
+}
+
+static void
+msg_push_nothrow(const ddjvu_message_any_t &head,
+                 GP<ddjvu_message_p> msg = 0)
+{
+  G_TRY
+    {
+      msg_push(head, msg);
+    }
+  G_CATCH_ALL
+    {
+    }
+  G_ENDCATCH;
+}
+
+// prepare error message from string
+static GP<ddjvu_message_p>
+msg_prep_error(GUTF8String message,
+               const char *function=0, 
+               const char *filename=0, 
+               int lineno=0)
+{
+  GP<ddjvu_message_p> p = new ddjvu_message_p;
+  p->p.m_error.message = 0;
+  p->p.m_error.function = function;
+  p->p.m_error.filename = filename;
+  p->p.m_error.lineno = lineno;
+  G_TRY 
+    { 
+      p->tmp1 = DjVuMessageLite::LookUpUTF8(message);
+      p->p.m_error.message = (const char*)(p->tmp1);
+    }
+  G_CATCH_ALL 
+    {
+    } 
+  G_ENDCATCH;
+  return p;
+}
+
+// prepare error message from exception
+static GP<ddjvu_message_p>
+msg_prep_error(const GException &ex,
+               const char *function=0, 
+               const char *filename=0, 
+               int lineno=0)
+{
+  GP<ddjvu_message_p> p = new ddjvu_message_p;
+  p->p.m_error.message = 0;
+  p->p.m_error.function = function;
+  p->p.m_error.filename = filename;
+  p->p.m_error.lineno = lineno;
+  G_TRY 
+    { 
+      p->tmp1 = DjVuMessageLite::LookUpUTF8(ex.get_cause());
+      p->p.m_error.message = (const char*)(p->tmp1);
+      p->p.m_error.function = ex.get_function();
+      p->p.m_error.filename = ex.get_file();
+      p->p.m_error.lineno = ex.get_line();
+    }
+  G_CATCH_ALL 
+    {
+    } 
+  G_ENDCATCH;
+  return p;
+}
+
+// prepare status message
+static GP<ddjvu_message_p>
+msg_prep_info(GUTF8String message)
+{
+  GP<ddjvu_message_p> p = new ddjvu_message_p;
+  p->tmp1 = DjVuMessageLite::LookUpUTF8(message); // i18n nonsense!
+  p->p.m_info.message = (const char*)(p->tmp1);
+  return p;
+}
+
+// ----------------------------------------
+
+
+#ifdef __GNUG__
+# define ERROR1(x, m) \
+    msg_push_nothrow(xhead(DDJVU_ERROR,x),\
+                     msg_prep_error(m,__func__,__FILE__,__LINE__))
+#else
+# define ERROR1(x, m) \
+    msg_push_nothrow(xhead(DDJVU_ERROR,x),\
+                     msg_prep_error(m,0,__FILE__,__LINE__))
+#endif
+
+
+// ----------------------------------------
+// Cache
+
+void
+ddjvu_cache_set_size(ddjvu_context_t *ctx,
+                     unsigned long cachesize)
+{
+  G_TRY
+    {
+      GMonitorLock lock(&ctx->monitor);
+      if (ctx->cache && cachesize>0)
+        ctx->cache->set_max_size(cachesize);
+    }
+  G_CATCH(ex) 
+    {
+      ERROR1(ctx, ex);
+    }
+  G_ENDCATCH;
+}
+
+DDJVUAPI unsigned long
+ddjvu_cache_get_size(ddjvu_context_t *ctx)
+{
+  G_TRY
+    {
+      GMonitorLock lock(&ctx->monitor);
+      if (ctx->cache)
+        return ctx->cache->get_max_size();
+    }
+  G_CATCH(ex) 
+    { 
+      ERROR1(ctx, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+void
+ddjvu_cache_clear(ddjvu_context_t *ctx)
+{
+  G_TRY
+    {
+      GMonitorLock lock(&ctx->monitor);
+      DataPool::close_all();
+      if (ctx->cache)
+      {
+        ctx->cache->clear();
+        return;
+      }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(ctx, ex);
+    }
+  G_ENDCATCH;
+ }
+
+
+// ----------------------------------------
+// Jobs
+
+ddjvu_job_s::ddjvu_job_s()
+  : userdata(0), released(false)
+{
+}
+
+bool
+ddjvu_job_s::inherits(const GUTF8String &classname) const
+{
+  return (classname == "ddjvu_job_s") 
+    || DjVuPort::inherits(classname);
+}
+
+bool 
+ddjvu_job_s::notify_error(const DjVuPort *, const GUTF8String &m)
+{
+  msg_push(xhead(DDJVU_ERROR, this), msg_prep_error(m));
+  return true;
+}
+
+bool 
+ddjvu_job_s::notify_status(const DjVuPort *p, const GUTF8String &m)
+{
+  msg_push(xhead(DDJVU_INFO, this), msg_prep_info(m));
+  return true;
+}
+
+void
+ddjvu_job_release(ddjvu_job_t *job)
+{
+  G_TRY
+    {
+      if (!job)
+        return;
+      job->release();
+      job->userdata = 0;
+      job->released = true;
+      // clean all messages
+      ddjvu_context_t *ctx = job->myctx;
+      if (ctx)
+        {
+          GMonitorLock lock(&ctx->monitor);
+          GPosition p = ctx->mlist;
+          while (p) 
+            {
+              GPosition s = p; ++p;
+              if (ctx->mlist[s]->p.m_any.job == job ||
+                  ctx->mlist[s]->p.m_any.document == job ||
+                  ctx->mlist[s]->p.m_any.page == job )
+                ctx->mlist.del(s);
+            }
+          // cleanup pointers in current message as well.
+          if (ctx->mpeeked)
+            {
+              ddjvu_message_t *m = &ctx->mpeeked->p;
+              if (m->m_any.job == job)       
+                m->m_any.job = 0;
+              if (m->m_any.document == job)
+                m->m_any.document = 0;
+              if (m->m_any.page == job)
+                m->m_any.page = 0;
+            }
+        }
+      // decrement reference counter
+      unref(job);
+    }
+  G_CATCH_ALL
+    {
+    }
+  G_ENDCATCH;
+}
+
+ddjvu_status_t
+ddjvu_job_status(ddjvu_job_t *job)
+{
+  G_TRY
+    {
+      if (! job)
+        return DDJVU_JOB_NOTSTARTED;
+      return job->status();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(job, ex);
+    }
+  G_ENDCATCH;
+  return DDJVU_JOB_FAILED;
+}
+
+void
+ddjvu_job_stop(ddjvu_job_t *job)
+{
+  G_TRY
+    {
+      if (job)
+        job->stop();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(job, ex);
+    }
+  G_ENDCATCH;
+}
+
+void
+ddjvu_job_set_user_data(ddjvu_job_t *job, void *userdata)
+{
+  if (job)
+    job->userdata = userdata;
+}
+
+void *
+ddjvu_job_get_user_data(ddjvu_job_t *job)
+{
+  if (job)
+    return job->userdata;
+  return 0;
+}
+
+
+// ----------------------------------------
+// Message queue
+
+
+ddjvu_message_t *
+ddjvu_message_peek(ddjvu_context_t *ctx)
+{
+  G_TRY
+    {
+      GMonitorLock lock(&ctx->monitor);
+      if (ctx->mpeeked)
+        return &ctx->mpeeked->p;        
+      if (! ctx->mlist.size())
+        ctx->monitor.wait(0);
+      GPosition p = ctx->mlist;
+      if (! p)
+        return 0;
+      ctx->mpeeked = ctx->mlist[p];
+      ctx->mlist.del(p);
+      return &ctx->mpeeked->p;
+    }
+  G_CATCH_ALL
+    {
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+ddjvu_message_t *
+ddjvu_message_wait(ddjvu_context_t *ctx)
+{
+  G_TRY
+    {
+      GMonitorLock lock(&ctx->monitor);
+      if (ctx->mpeeked)
+        return &ctx->mpeeked->p;        
+      while (! ctx->mlist.size())
+        ctx->monitor.wait();
+      GPosition p = ctx->mlist;
+      if (! p)
+        return 0;
+      ctx->mpeeked = ctx->mlist[p];
+      ctx->mlist.del(p);
+      return &ctx->mpeeked->p;        
+    }
+  G_CATCH_ALL
+    {
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+void
+ddjvu_message_pop(ddjvu_context_t *ctx)
+{
+  G_TRY
+    {
+      GMonitorLock lock(&ctx->monitor);
+      ctx->mpeeked = 0;
+    }
+  G_CATCH_ALL
+    {
+    }
+  G_ENDCATCH;
+}
+
+void
+ddjvu_message_set_callback(ddjvu_context_t *ctx,
+                           ddjvu_message_callback_t callback,
+                           void *closure)
+{
+  GMonitorLock lock(&ctx->monitor);
+  ctx->callbackfun = callback;
+  ctx->callbackarg = closure;
+}
+
+
+// ----------------------------------------
+// Document callbacks
+
+
+void
+ddjvu_document_s::release()
+{
+  GPosition p;
+  GMonitorLock lock(&monitor);
+  doc = 0;
+  for (p=thumbnails; p; ++p)
+    {
+      ddjvu_thumbnail_p *thumb = thumbnails[p];
+      if (thumb->pool)
+        thumb->pool->del_trigger(ddjvu_thumbnail_p::callback, (void*)thumb);
+    }
+  for (p = streams; p; ++p)
+    {
+      GP<DataPool> pool = streams[p];
+      if (pool)
+        pool->del_trigger(callback, (void*)this);
+      if (pool && !pool->is_eof())
+        pool->stop();
+    }
+}
+
+ddjvu_status_t
+ddjvu_document_s::status()
+{
+  if (!doc)
+    return DDJVU_JOB_NOTSTARTED;
+  long flags = doc->get_doc_flags();
+  if (flags & DjVuDocument::DOC_INIT_OK)
+    return DDJVU_JOB_OK;
+  else if (flags & DjVuDocument::DOC_INIT_FAILED)
+    return DDJVU_JOB_FAILED;
+  return DDJVU_JOB_STARTED;
+}
+
+bool
+ddjvu_document_s::inherits(const GUTF8String &classname) const
+{
+  return (classname == "ddjvu_document_s")
+    || ddjvu_job_s::inherits(classname);
+}
+
+bool 
+ddjvu_document_s::notify_error(const DjVuPort *, const GUTF8String &m)
+{
+  if (!doc) return false;
+  msg_push(xhead(DDJVU_ERROR, this), msg_prep_error(m));
+  return true;
+}
+ 
+bool 
+ddjvu_document_s::notify_status(const DjVuPort *p, const GUTF8String &m)
+{
+  if (!doc) return false;
+  msg_push(xhead(DDJVU_INFO, this), msg_prep_info(m));
+  return true;
+}
+
+void 
+ddjvu_document_s::notify_doc_flags_changed(const DjVuDocument *, long, long)
+{
+  GMonitorLock lock(&monitor);
+  if (docinfoflag || !doc) return;
+  long flags = doc->get_doc_flags();
+  if ((flags & DjVuDocument::DOC_INIT_OK) ||
+      (flags & DjVuDocument::DOC_INIT_FAILED) )
+  {
+    msg_push(xhead(DDJVU_DOCINFO, this));
+    docinfoflag = true;
+  }
+}
+
+
+void 
+ddjvu_document_s::callback(void *arg)
+{
+  ddjvu_document_t *doc = (ddjvu_document_t *)arg;
+  if (doc && doc->pageinfoflag && !doc->fileflag) 
+    msg_push(xhead(DDJVU_PAGEINFO, doc));
+}
+
+
+GP<DataPool> 
+ddjvu_document_s::request_data(const DjVuPort *p, const GURL &url)
+{
+  // Note: the following line try to restore
+  //       the bytes stored in the djvu file
+  //       despite LT's i18n and gurl classes.
+  GUTF8String name = (const char*)url.fname(); 
+  GMonitorLock lock(&monitor);
+  GP<DataPool> pool;
+  if (names.contains(name))
+    {
+      int streamid = names[name];
+      return streams[streamid];
+    }
+  else if (fileflag)
+    {
+      if (doc && url.is_local_file_url())
+        return DataPool::create(url);
+    }
+  else if (doc)
+    {
+      // prepare pool
+      if (++streamid > 0)
+        streams[streamid] = pool = DataPool::create();
+      else
+        pool = streams[(streamid = 0)];
+      names[name] = streamid;
+      pool->add_trigger(-1, callback, (void*)this);
+      // build message
+      GP<ddjvu_message_p> p = new ddjvu_message_p;
+      p->p.m_newstream.streamid = streamid;
+      p->tmp1 = name;
+      p->p.m_newstream.name = (const char*)(p->tmp1);
+      p->p.m_newstream.url = 0;
+      if (urlflag)
+        {
+          // Should be urlencoded.
+          p->tmp2 = (const char*)url.get_string();
+          p->p.m_newstream.url = (const char*)(p->tmp2);
+        }
+      msg_push(xhead(DDJVU_NEWSTREAM, this), p);
+    }
+  return pool;
+}
+
+
+bool
+ddjvu_document_s::want_pageinfo()
+{
+  if (doc && docinfoflag && !pageinfoflag)
+    {
+      pageinfoflag = true;
+      int doctype = doc->get_doc_type();
+      if (doctype == DjVuDocument::BUNDLED ||
+          doctype == DjVuDocument::OLD_BUNDLED )
+        {
+          GP<DataPool> pool;
+          {
+            GMonitorLock lock(&monitor);
+            if (streams.contains(0))
+              pool = streams[0];
+          }
+          if (pool && doctype == DjVuDocument::BUNDLED)
+            {
+              GP<DjVmDir> dir = doc->get_djvm_dir();
+              if (dir)
+                for (int i=0; i<dir->get_files_num(); i++)
+                  {
+                    GP<DjVmDir::File> f = dir->pos_to_file(i);
+                    if (! pool->has_data(f->offset, f->size))
+                      pool->add_trigger(f->offset, f->size, callback, (void*)this );
+                  }
+            }
+          else if (pool && doctype == DjVuDocument::OLD_BUNDLED)
+            {
+              GP<DjVmDir0> dir = doc->get_djvm_dir0();
+              if (dir)
+                for (int i=0; i<dir->get_files_num(); i++)
+                  {
+                    GP<DjVmDir0::FileRec> f = dir->get_file(i);
+                    if (! pool->has_data(f->offset, f->size))
+                      pool->add_trigger(f->offset, f->size, callback, (void*)this );
+                  }
+            }
+        }
+    }
+  return pageinfoflag;
+}
+
+
+// ----------------------------------------
+// Documents
+
+
+ddjvu_document_t *
+ddjvu_document_create(ddjvu_context_t *ctx,
+                      const char *url,
+                      int cache)
+{
+  ddjvu_document_t *d = 0;
+  G_TRY
+    {
+      DjVuFileCache *xcache = ctx->cache;
+      if (! cache) xcache = 0;
+      d = new ddjvu_document_s;
+      ref(d);
+      GMonitorLock lock(&d->monitor);
+      d->streams[0] = DataPool::create();
+      d->streamid = -1;
+      d->fileflag = false;
+      d->docinfoflag = false;
+      d->pageinfoflag = false;
+      d->myctx = ctx;
+      d->mydoc = 0;
+      d->doc = DjVuDocument::create_noinit();
+      if (url)
+        {
+          GURL gurl = GUTF8String(url);
+          gurl.clear_djvu_cgi_arguments();
+          d->urlflag = true;
+          d->doc->start_init(gurl, d, xcache);
+        }
+      else
+        {
+          GUTF8String s;
+          s.format("ddjvu:///doc%d/index.djvu", ++(ctx->uniqueid));;
+          GURL gurl = s;
+          d->urlflag = false;
+          d->doc->start_init(gurl, d, xcache);
+        }
+    }
+  G_CATCH(ex)
+    {
+      if (d) 
+        unref(d);
+      d = 0;
+      ERROR1(ctx, ex);
+    }
+  G_ENDCATCH;
+  return d;
+}
+
+static ddjvu_document_t *
+ddjvu_document_create_by_filename_imp(ddjvu_context_t *ctx,
+                                      const char *filename,
+                                      int cache, int utf8)
+{
+  ddjvu_document_t *d = 0;
+  G_TRY
+    {
+      DjVuFileCache *xcache = ctx->cache;
+      if (! cache) xcache = 0;
+      GURL gurl;
+      if (utf8) 
+        gurl = GURL::Filename::UTF8(filename);
+      else
+        gurl = GURL::Filename::Native(filename);
+      d = new ddjvu_document_s;
+      ref(d);
+      GMonitorLock lock(&d->monitor);
+      d->streamid = -1;
+      d->fileflag = true;
+      d->pageinfoflag = false;
+      d->urlflag = false;
+      d->docinfoflag = false;
+      d->myctx = ctx;
+      d->mydoc = 0;
+      d->doc = DjVuDocument::create_noinit();
+      d->doc->start_init(gurl, d, xcache);
+    }
+  G_CATCH(ex)
+    {
+      if (d)
+        unref(d);
+      d = 0;
+      ERROR1(ctx, ex);
+    }
+  G_ENDCATCH;
+  return d;
+}
+
+ddjvu_document_t *
+ddjvu_document_create_by_filename(ddjvu_context_t *ctx,
+                                  const char *filename,
+                                  int cache)
+{
+  return ddjvu_document_create_by_filename_imp(ctx,filename,cache,0);
+}
+
+ddjvu_document_t *
+ddjvu_document_create_by_filename_utf8(ddjvu_context_t *ctx,
+                                       const char *filename,
+                                       int cache)
+{
+  return ddjvu_document_create_by_filename_imp(ctx,filename,cache,1);
+}
+
+ddjvu_job_t *
+ddjvu_document_job(ddjvu_document_t *document)
+{
+  return document;
+}
+
+
+// ----------------------------------------
+// Streams
+
+
+void
+ddjvu_stream_write(ddjvu_document_t *doc,
+                   int streamid,
+                   const char *data,
+                   unsigned long datalen )
+{
+  G_TRY
+    {
+      GP<DataPool> pool;
+      { 
+        GMonitorLock lock(&doc->monitor); 
+        GPosition p = doc->streams.contains(streamid);
+        if (p) pool = doc->streams[p];
+      }
+      if (! pool)
+        G_THROW("Unknown stream ID");
+      if (datalen > 0)
+        pool->add_data(data, datalen);
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(doc,ex);
+    }
+  G_ENDCATCH;
+}
+
+void
+ddjvu_stream_close(ddjvu_document_t *doc,
+                   int streamid,
+                   int stop )
+{
+  G_TRY
+    {
+      GP<DataPool> pool;
+      { 
+        GMonitorLock lock(&doc->monitor); 
+        GPosition p = doc->streams.contains(streamid);
+        if (p) pool = doc->streams[p];
+      }
+      if (! pool)
+        G_THROW("Unknown stream ID");
+      if (stop)
+        pool->stop(true);
+      pool->set_eof();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(doc, ex);
+    }
+  G_ENDCATCH;
+}
+
+
+// ----------------------------------------
+// Document queries
+
+
+ddjvu_document_type_t
+ddjvu_document_get_type(ddjvu_document_t *document)
+{
+  G_TRY
+    {
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        {
+          switch (doc->get_doc_type())
+            {
+            case DjVuDocument::OLD_BUNDLED:
+              return DDJVU_DOCTYPE_OLD_BUNDLED;
+            case DjVuDocument::OLD_INDEXED:
+              return DDJVU_DOCTYPE_OLD_INDEXED;
+            case DjVuDocument::BUNDLED:
+              return DDJVU_DOCTYPE_BUNDLED;
+            case DjVuDocument::INDIRECT:
+              return DDJVU_DOCTYPE_INDIRECT;
+            case DjVuDocument::SINGLE_PAGE:
+              return DDJVU_DOCTYPE_SINGLEPAGE;
+            default:
+              break;
+            }
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document,ex);
+    }
+  G_ENDCATCH;
+  return DDJVU_DOCTYPE_UNKNOWN;
+}
+
+
+int
+ddjvu_document_get_pagenum(ddjvu_document_t *document)
+{
+  G_TRY
+    {
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        return doc->get_pages_num();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document,ex);
+    }
+  G_ENDCATCH;
+  return 1;
+}
+
+
+int
+ddjvu_document_get_filenum(ddjvu_document_t *document)
+{
+  G_TRY
+    {
+      DjVuDocument *doc = document->doc;
+      if (! (doc && doc->is_init_ok()))
+        return 0;
+      int doc_type = doc->get_doc_type();
+      if (doc_type == DjVuDocument::BUNDLED ||
+          doc_type == DjVuDocument::INDIRECT )
+        {
+          GP<DjVmDir> dir = doc->get_djvm_dir();
+          return dir->get_files_num();
+        }
+      else if (doc_type == DjVuDocument::OLD_BUNDLED)
+        {
+          GP<DjVmDir0> dir0 = doc->get_djvm_dir0();
+          return dir0->get_files_num();
+        }
+      else 
+        return doc->get_pages_num();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document,ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+
+#undef ddjvu_document_get_fileinfo
+
+extern "C" DDJVUAPI ddjvu_status_t
+ddjvu_document_get_fileinfo(ddjvu_document_t *d, int f, ddjvu_fileinfo_t *i);
+
+ddjvu_status_t
+ddjvu_document_get_fileinfo(ddjvu_document_t *d, int f, ddjvu_fileinfo_t *i)
+{
+  // for binary backward compatibility with ddjvuapi=17
+  struct info17_s { char t; int p,s; const char *d, *n, *l; };
+  return ddjvu_document_get_fileinfo_imp(d,f,i,sizeof(info17_s));
+}
+
+ddjvu_status_t
+ddjvu_document_get_fileinfo_imp(ddjvu_document_t *document, int fileno, 
+                                ddjvu_fileinfo_t *info, 
+                                unsigned int infosz )
+{
+  G_TRY
+    {
+      ddjvu_fileinfo_t myinfo;
+      memset(info, 0, infosz);
+      if (infosz > sizeof(myinfo))
+        return DDJVU_JOB_FAILED;
+      DjVuDocument *doc = document->doc;
+      if (! doc)
+        return DDJVU_JOB_NOTSTARTED;
+      if (! doc->is_init_ok())
+        return document->status();
+      int type = doc->get_doc_type();
+      if ( type == DjVuDocument::BUNDLED ||
+           type == DjVuDocument::INDIRECT )
+        {
+          GP<DjVmDir> dir = doc->get_djvm_dir();
+          GP<DjVmDir::File> file = dir->pos_to_file(fileno, &myinfo.pageno);
+          if (! file)
+            G_THROW("Illegal file number");
+          myinfo.type = 'I';
+          if (file->is_page())
+            myinfo.type = 'P';
+          else
+            myinfo.pageno = -1;
+          if (file->is_thumbnails())
+            myinfo.type = 'T';
+          if (file->is_shared_anno())
+            myinfo.type = 'S';
+          myinfo.size = file->size;
+          myinfo.id = file->get_load_name();
+          myinfo.name = file->get_save_name();
+          myinfo.title = file->get_title();
+          memcpy(info, &myinfo, infosz);
+          return DDJVU_JOB_OK;
+        }
+      else if (type == DjVuDocument::OLD_BUNDLED)
+        {
+          GP<DjVmDir0> dir0 = doc->get_djvm_dir0();
+          GP<DjVuNavDir> nav = doc->get_nav_dir();
+          GP<DjVmDir0::FileRec> frec = dir0->get_file(fileno);
+          if (! frec)
+            G_THROW("Illegal file number");
+          myinfo.size = frec->size;
+          myinfo.id = (const char*) frec->name;
+          myinfo.name = myinfo.title = myinfo.id;
+          if (! nav)
+            return DDJVU_JOB_STARTED;
+          else if (nav->name_to_page(frec->name) >= 0)
+            myinfo.type = 'P';
+          else
+            myinfo.type = 'I';
+          memcpy(info, &myinfo, infosz);
+          return DDJVU_JOB_OK;
+        }
+      else 
+        {
+          if (fileno<0 || fileno>=doc->get_pages_num())
+            G_THROW("Illegal file number");
+          myinfo.type = 'P';
+          myinfo.pageno = fileno;
+          myinfo.size = -1;
+          GP<DjVuNavDir> nav = doc->get_nav_dir();
+          myinfo.id = (nav) ? (const char *) nav->page_to_name(fileno) : 0;
+          myinfo.name = myinfo.title = myinfo.id;
+          GP<DjVuFile> file = doc->get_djvu_file(fileno, true);
+          GP<DataPool> pool; 
+          if (file) 
+            pool = file->get_init_data_pool();
+          if (pool)
+            myinfo.size = pool->get_length();
+          memcpy(info, &myinfo, infosz);
+          return DDJVU_JOB_OK;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document,ex);
+    }
+  G_ENDCATCH;
+  return DDJVU_JOB_FAILED;
+}
+
+
+int
+ddjvu_document_search_pageno(ddjvu_document_t *document, const char *name)
+{
+  G_TRY
+    {
+      DjVuDocument *doc = document->doc;
+      if (! (doc && doc->is_init_ok()))
+        return -1;
+      GP<DjVmDir> dir = doc->get_djvm_dir();
+      if (! dir)
+        return 0;
+      GP<DjVmDir::File> file;
+      if (! (file = dir->id_to_file(GUTF8String(name))))
+        if (! (file = dir->name_to_file(GUTF8String(name))))
+          if (! (file = dir->title_to_file(GUTF8String(name))))
+            {
+              char *edata=0;
+              long int p = strtol(name, &edata, 10);
+              if (edata!=name && !*edata && p>=1)
+                file = dir->page_to_file(p-1);
+            }
+      if (file)
+        {
+          int pageno = -1;
+          int fileno = dir->get_file_pos(file);
+          if (dir->pos_to_file(fileno, &pageno))
+            return pageno;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document,ex);
+    }
+  G_ENDCATCH;
+  return -1;
+}
+
+
+
+int 
+ddjvu_document_check_pagedata(ddjvu_document_t *document, int pageno)
+{
+  G_TRY
+    {
+      document->want_pageinfo();
+      DjVuDocument *doc = document->doc;
+      if (doc && doc->is_init_ok())
+        {
+          bool dontcreate = false;
+          if (doc->get_doc_type() == DjVuDocument::INDIRECT ||
+              doc->get_doc_type() == DjVuDocument::OLD_INDEXED )
+            {
+              dontcreate = true;
+              GURL url = doc->page_to_url(pageno);
+              if (! url.is_empty())
+                {
+                  GUTF8String name = (const char*)url.fname();
+                  GMonitorLock lock(&document->monitor);
+                  if (document->names.contains(name))
+                    dontcreate = false;
+                }
+            }
+          GP<DjVuFile> file = doc->get_djvu_file(pageno, dontcreate);
+          if (file && file->is_data_present())
+            return 1;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document,ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+
+#undef ddjvu_document_get_pageinfo
+
+extern "C" DDJVUAPI ddjvu_status_t
+ddjvu_document_get_pageinfo(ddjvu_document_t *d, int p, ddjvu_pageinfo_t *i);
+
+ddjvu_status_t
+ddjvu_document_get_pageinfo(ddjvu_document_t *d, int p, ddjvu_pageinfo_t *i)
+{
+  // for binary backward compatibility with ddjvuapi<=17
+  struct info17_s { int w; int h; int d; };
+  return ddjvu_document_get_pageinfo_imp(d,p,i,sizeof(struct info17_s));
+}
+
+ddjvu_status_t
+ddjvu_document_get_pageinfo_imp(ddjvu_document_t *document, int pageno, 
+                                ddjvu_pageinfo_t *pageinfo, 
+                                unsigned int infosz)
+{
+  G_TRY
+    {
+      ddjvu_pageinfo_t myinfo;
+      memset(pageinfo, 0, infosz);
+      if (infosz > sizeof(myinfo))
+        return DDJVU_JOB_FAILED;
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        {
+          document->want_pageinfo();
+          GP<DjVuFile> file = doc->get_djvu_file(pageno);
+          if (! file || ! file->is_data_present() )
+            return DDJVU_JOB_STARTED;
+          const GP<ByteStream> pbs(file->get_djvu_bytestream(false, false));
+          const GP<IFFByteStream> iff(IFFByteStream::create(pbs));
+          GUTF8String chkid;
+          if (iff->get_chunk(chkid))
+            {
+              if (chkid == "FORM:DJVU")
+                {
+                  while (iff->get_chunk(chkid) && chkid!="INFO")
+                    iff->close_chunk();
+                  if (chkid == "INFO")
+                    {
+                      GP<ByteStream> gbs = iff->get_bytestream();
+                      GP<DjVuInfo> info=DjVuInfo::create();
+                      info->decode(*gbs);
+                      int rot = info->orientation;
+                      myinfo.rotation = rot;
+                      myinfo.width = (rot&1) ? info->height : info->width;
+                      myinfo.height = (rot&1) ? info->width : info->height;
+                      myinfo.dpi = info->dpi;
+                      myinfo.version = info->version;
+                      memcpy(pageinfo, &myinfo, infosz);
+                      return DDJVU_JOB_OK;
+                    }
+                }
+              else if (chkid == "FORM:BM44" || chkid == "FORM:PM44")
+                {
+                  while (iff->get_chunk(chkid) && 
+                         chkid!="BM44" && chkid!="PM44")
+                    iff->close_chunk();
+                  if (chkid=="BM44" || chkid=="PM44")
+                    {
+                      GP<ByteStream> gbs = iff->get_bytestream();
+                      if (gbs->read8() == 0)
+                        {
+                          gbs->read8();
+                          unsigned char vhi = gbs->read8();
+                          unsigned char vlo = gbs->read8();
+                          unsigned char xhi = gbs->read8();
+                          unsigned char xlo = gbs->read8();
+                          unsigned char yhi = gbs->read8();
+                          unsigned char ylo = gbs->read8();
+                          myinfo.width = (xhi<<8)+xlo;
+                          myinfo.height = (yhi<<8)+ylo;
+                          myinfo.dpi = 100;
+                          myinfo.rotation = 0;
+                          myinfo.version = (vhi<<8)+vlo;
+                          memcpy(pageinfo, &myinfo, infosz);
+                        }
+                    }
+                }
+            }
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return DDJVU_JOB_FAILED;
+}
+
+
+static char *
+get_file_dump(DjVuFile *file)
+{
+  DjVuDumpHelper dumper;
+  GP<DataPool> pool = file->get_init_data_pool();
+  GP<ByteStream> str = dumper.dump(pool);
+  int size = str->size();
+  char *buffer;
+  if ((size = str->size()) > 0 && (buffer = (char*)malloc(size+1)))
+    {
+      str->seek(0);
+      int len = str->readall(buffer, size);
+      buffer[len] = 0;
+      return buffer;
+    }
+  return 0;
+}
+
+
+char *
+ddjvu_document_get_pagedump(ddjvu_document_t *document, int pageno)
+{
+  G_TRY
+    {
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        {
+          document->want_pageinfo();
+          GP<DjVuFile> file = doc->get_djvu_file(pageno);
+          if (file && file->is_data_present())
+            return get_file_dump(file);
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+
+char *
+ddjvu_document_get_filedump(ddjvu_document_t *document, int fileno)
+{
+  G_TRY
+    {
+      DjVuDocument *doc = document->doc;
+      document->want_pageinfo();
+      if (doc)
+        {
+          GP<DjVuFile> file;
+          int type = doc->get_doc_type();
+          if ( type != DjVuDocument::BUNDLED &&
+               type != DjVuDocument::INDIRECT )
+            file = doc->get_djvu_file(fileno);
+          else
+            {
+              GP<DjVmDir> dir = doc->get_djvm_dir();
+              GP<DjVmDir::File> fdesc = dir->pos_to_file(fileno);
+              if (fdesc)
+                file = doc->get_djvu_file(fdesc->get_load_name());
+            }
+          if (file && file->is_data_present())
+            return get_file_dump(file);
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+
+
+// ----------------------------------------
+// Page
+
+static ddjvu_page_t *
+ddjvu_page_create(ddjvu_document_t *document, ddjvu_job_t *job,
+                  const char *pageid, int pageno)
+{
+  ddjvu_page_t *p = 0;
+  G_TRY
+    {
+      DjVuDocument *doc = document->doc;
+      if (! doc) return 0;
+      p = new ddjvu_page_s;
+      ref(p);
+      GMonitorLock lock(&p->monitor);
+      p->myctx = document->myctx;
+      p->mydoc = document;
+      p->pageinfoflag = false;
+      p->pagedoneflag = false;
+      if (! job)
+        job = p;
+      p->job = job;
+      if (pageid)
+        p->img = doc->get_page(GNativeString(pageid), false, job);
+      else
+        p->img = doc->get_page(pageno, false, job);
+    }
+  G_CATCH(ex)
+    {
+      if (p)
+        unref(p);
+      p = 0;
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return p;
+}
+
+ddjvu_page_t *
+ddjvu_page_create_by_pageno(ddjvu_document_t *document, int pageno)
+{
+  return ddjvu_page_create(document, 0, 0, pageno);
+}
+
+ddjvu_page_t *
+ddjvu_page_create_by_pageid(ddjvu_document_t *document, const char *pageid)
+{
+  return ddjvu_page_create(document, 0, pageid, 0);
+}
+
+ddjvu_job_t *
+ddjvu_page_job(ddjvu_page_t *page)
+{
+  return page;
+}
+
+
+// ----------------------------------------
+// Page callbacks
+
+void
+ddjvu_page_s::release()
+{
+  img = 0;
+}
+
+ddjvu_status_t
+ddjvu_page_s::status()
+{
+  if (! img)
+    return DDJVU_JOB_NOTSTARTED;        
+  DjVuFile *file = img->get_djvu_file();
+  DjVuInfo *info = img->get_info();
+  if (! file)
+    return DDJVU_JOB_NOTSTARTED;
+  else if (file->is_decode_stopped())
+    return DDJVU_JOB_STOPPED;
+  else if (file->is_decode_failed())
+    return DDJVU_JOB_FAILED;
+  else if (file->is_decode_ok())
+    return (info) ? DDJVU_JOB_OK : DDJVU_JOB_FAILED;
+  else if (file->is_decoding())
+    return DDJVU_JOB_STARTED;
+  return DDJVU_JOB_NOTSTARTED;
+}
+
+bool
+ddjvu_page_s::inherits(const GUTF8String &classname) const
+{
+  return (classname == "ddjvu_page_s")
+    || ddjvu_job_s::inherits(classname);
+}
+
+bool 
+ddjvu_page_s::notify_error(const DjVuPort *, const GUTF8String &m)
+{
+  if (!img) return false;
+  msg_push(xhead(DDJVU_ERROR, this), msg_prep_error(m));
+  return true;
+}
+ 
+bool 
+ddjvu_page_s::notify_status(const DjVuPort *p, const GUTF8String &m)
+{
+  if (!img) return false;
+  msg_push(xhead(DDJVU_INFO, this), msg_prep_info(m));
+  return true;
+}
+
+void 
+ddjvu_page_s::notify_file_flags_changed(const DjVuFile *sender, long, long)
+{
+  GMonitorLock lock(&monitor);
+  if (!img) return;
+  DjVuFile *file = img->get_djvu_file();
+  if (file==0 || file!=sender) return;
+  long flags = file->get_flags();
+  if ((flags & DjVuFile::DECODE_OK) ||
+      (flags & DjVuFile::DECODE_FAILED) ||
+      (flags & DjVuFile::DECODE_STOPPED) )
+    {
+      if (pagedoneflag) return;
+      msg_push(xhead(DDJVU_PAGEINFO, this));
+      pageinfoflag = pagedoneflag = true;
+    }
+}
+
+void 
+ddjvu_page_s::notify_relayout(const DjVuImage *dimg)
+{
+  GMonitorLock lock(&monitor);
+  if (img && !pageinfoflag)
+    {
+      msg_push(xhead(DDJVU_PAGEINFO, this));
+      msg_push(xhead(DDJVU_RELAYOUT, this));
+      pageinfoflag = true;
+    }
+}
+
+void 
+ddjvu_page_s::notify_redisplay(const DjVuImage *dimg)
+{
+  GMonitorLock lock(&monitor);
+  if (img && !pageinfoflag)
+    {
+      msg_push(xhead(DDJVU_PAGEINFO, this));
+      msg_push(xhead(DDJVU_RELAYOUT, this));
+      pageinfoflag = true;
+    }
+  if (img && pageinfoflag)
+    msg_push(xhead(DDJVU_REDISPLAY, this));
+}
+
+void 
+ddjvu_page_s::notify_chunk_done(const DjVuPort*, const GUTF8String &name)
+{
+  GMonitorLock lock(&monitor);
+  if (! img) return;
+  GP<ddjvu_message_p> p = new ddjvu_message_p;
+  p->tmp1 = name;
+  p->p.m_chunk.chunkid = (const char*)(p->tmp1);
+  msg_push(xhead(DDJVU_CHUNK,this), p);
+}
+
+
+// ----------------------------------------
+// Page queries
+
+int
+ddjvu_page_get_width(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (page && page->img)
+        return page->img->get_width();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+int
+ddjvu_page_get_height(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (page && page->img)
+        return page->img->get_height();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+int
+ddjvu_page_get_resolution(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (page && page->img)
+        return page->img->get_dpi();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+double
+ddjvu_page_get_gamma(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (page && page->img)
+        return page->img->get_gamma();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return 2.2;
+}
+
+int
+ddjvu_page_get_version(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (page && page->img)
+        return page->img->get_version();
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return DJVUVERSION;
+}
+
+ddjvu_page_type_t
+ddjvu_page_get_type(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (! (page && page->img))
+        return DDJVU_PAGETYPE_UNKNOWN;
+      else if (page->img->is_legal_bilevel())
+        return DDJVU_PAGETYPE_BITONAL;
+      else if (page->img->is_legal_photo())
+        return DDJVU_PAGETYPE_PHOTO;
+      else if (page->img->is_legal_compound())
+        return DDJVU_PAGETYPE_COMPOUND;
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return DDJVU_PAGETYPE_UNKNOWN;
+}
+
+char *
+ddjvu_page_get_short_description(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (page && page->img)
+        {
+          const char *desc = page->img->get_short_description();
+          return xstr(DjVuMessageLite::LookUpUTF8(desc));
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+char *
+ddjvu_page_get_long_description(ddjvu_page_t *page)
+{
+  G_TRY
+    {
+      if (page && page->img)
+        {
+          const char *desc = page->img->get_long_description();
+          return xstr(DjVuMessageLite::LookUpUTF8(desc));
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+
+// ----------------------------------------
+// Rotations
+
+void
+ddjvu_page_set_rotation(ddjvu_page_t *page,
+                        ddjvu_page_rotation_t rot)
+{
+  G_TRY
+    {
+      switch(rot)
+        {
+        case DDJVU_ROTATE_0:
+        case DDJVU_ROTATE_90:
+        case DDJVU_ROTATE_180:
+        case DDJVU_ROTATE_270:
+          if (page && page->img && page->img->get_info())
+            page->img->set_rotate((int)rot);
+          break;
+        default:
+          G_THROW("Illegal ddjvu rotation code");
+          break;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+}
+
+ddjvu_page_rotation_t
+ddjvu_page_get_rotation(ddjvu_page_t *page)
+{
+  ddjvu_page_rotation_t rot = DDJVU_ROTATE_0;
+  G_TRY
+    {
+      if (page && page->img)
+        rot = (ddjvu_page_rotation_t)(page->img->get_rotate() & 3);
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return rot;
+}
+
+ddjvu_page_rotation_t
+ddjvu_page_get_initial_rotation(ddjvu_page_t *page)
+{
+  ddjvu_page_rotation_t rot = DDJVU_ROTATE_0;
+  G_TRY
+    {
+      GP<DjVuInfo> info;
+      if (page && page->img)
+        info = page->img->get_info();
+      if (info)
+        rot = (ddjvu_page_rotation_t)(info->orientation & 3);
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return rot;
+}
+
+
+// ----------------------------------------
+// Rectangles
+
+static void
+rect2grect(const ddjvu_rect_t *r, GRect &g)
+{
+  g.xmin = r->x;
+  g.ymin = r->y;
+  g.xmax = r->x + r->w;
+  g.ymax = r->y + r->h;
+}
+
+static void
+grect2rect(const GRect &g, ddjvu_rect_t *r)
+{
+  if (g.isempty())
+    {
+      r->x = r->y = 0;
+      r->w = r->h = 0;
+    }
+  else
+    {
+      r->x = g.xmin;
+      r->y = g.ymin;
+      r->w = g.width();
+      r->h = g.height();
+    }
+}
+
+ddjvu_rectmapper_t *
+ddjvu_rectmapper_create(ddjvu_rect_t *input, ddjvu_rect_t *output)
+{
+  GRect ginput, goutput;
+  rect2grect(input, ginput);
+  rect2grect(output, goutput);
+  GRectMapper *mapper = new GRectMapper;
+  if (!ginput.isempty())
+    mapper->set_input(ginput);
+  if (!goutput.isempty())
+    mapper->set_output(goutput);
+  return (ddjvu_rectmapper_t*)mapper;
+}
+
+void
+ddjvu_rectmapper_modify(ddjvu_rectmapper_t *mapper,
+                        int rotation, int mirrorx, int mirrory)
+{
+  GRectMapper *gmapper = (GRectMapper*)mapper;
+  if (! gmapper) return;
+  gmapper->rotate(rotation);
+  if (mirrorx & 1)
+    gmapper->mirrorx();
+  if (mirrory & 1)
+    gmapper->mirrory();
+}
+
+void 
+ddjvu_rectmapper_release(ddjvu_rectmapper_t *mapper)
+{
+  GRectMapper *gmapper = (GRectMapper*)mapper;
+  if (! gmapper) return;
+  delete gmapper;
+}
+
+void 
+ddjvu_map_point(ddjvu_rectmapper_t *mapper, int *x, int *y)
+{
+  GRectMapper *gmapper = (GRectMapper*)mapper;
+  if (! gmapper) return;
+  gmapper->map(*x,*y);
+}
+
+void 
+ddjvu_map_rect(ddjvu_rectmapper_t *mapper, ddjvu_rect_t *rect)
+{
+  GRectMapper *gmapper = (GRectMapper*)mapper;
+  if (! gmapper) return;
+  GRect grect;
+  rect2grect(rect,grect);
+  gmapper->map(grect);
+  grect2rect(grect,rect);
+}
+
+void 
+ddjvu_unmap_point(ddjvu_rectmapper_t *mapper, int *x, int *y)
+{
+  GRectMapper *gmapper = (GRectMapper*)mapper;
+  if (! gmapper) return;
+  gmapper->unmap(*x,*y);
+}
+
+void 
+ddjvu_unmap_rect(ddjvu_rectmapper_t *mapper, ddjvu_rect_t *rect)
+{
+  GRectMapper *gmapper = (GRectMapper*)mapper;
+  if (! gmapper) return;
+  GRect grect;
+  rect2grect(rect,grect);
+  gmapper->unmap(grect);
+  grect2rect(grect,rect);
+}
+
+
+// ----------------------------------------
+// Render
+
+struct DJVUNS ddjvu_format_s
+{
+  ddjvu_format_style_t style;
+  uint32_t rgb[3][256];
+  uint32_t palette[6*6*6];
+  uint32_t xorval;
+  double gamma;
+  GPixel white;
+  char ditherbits;
+  bool rtoptobottom;
+  bool ytoptobottom;
+};
+
+static ddjvu_format_t *
+fmt_error(ddjvu_format_t *fmt)
+{
+  delete fmt;
+  return 0;
+}
+
+ddjvu_format_t *
+ddjvu_format_create(ddjvu_format_style_t style,
+                    int nargs, unsigned int *args)
+{
+  ddjvu_format_t *fmt = new ddjvu_format_s;
+  memset(fmt, 0, sizeof(ddjvu_format_t));
+  fmt->style = style;  
+  fmt->rtoptobottom = false;
+  fmt->ytoptobottom = false;
+  fmt->gamma = 2.2;
+  fmt->white = GPixel::WHITE;
+  // Ditherbits
+  fmt->ditherbits = 32;
+  if (style==DDJVU_FORMAT_RGBMASK16)
+    fmt->ditherbits = 16;
+  else if (style==DDJVU_FORMAT_PALETTE8)
+    fmt->ditherbits = 8;
+  else if (style==DDJVU_FORMAT_MSBTOLSB || style==DDJVU_FORMAT_LSBTOMSB)
+    fmt->ditherbits = 1;
+  // Args
+  switch(style)
+    {
+    case DDJVU_FORMAT_RGBMASK16:
+    case DDJVU_FORMAT_RGBMASK32: 
+      {
+        if (sizeof(uint16_t)!=2 || sizeof(uint32_t)!=4)
+          return fmt_error(fmt);
+        if (!args || nargs<3 || nargs>4)
+          return fmt_error(fmt);
+        { // extra nesting for windows
+          for (int j=0; j<3; j++)
+          {
+            int shift = 0;
+            uint32_t mask = args[j];
+            for (shift=0; shift<32 && !(mask & 1); shift++)
+              mask >>= 1;
+            if ((shift>=32) || (mask&(mask+1)))
+              return fmt_error(fmt);
+            for (int i=0; i<256; i++)
+              fmt->rgb[j][i] = (mask & ((int)((i*mask+127.0)/255.0)))<<shift;
+          }
+        }
+        if (nargs >= 4)
+          fmt->xorval = args[3];
+        break;
+      }
+    case DDJVU_FORMAT_PALETTE8:
+      {
+        if (nargs!=6*6*6 || !args)
+          return fmt_error(fmt);
+        { // extra nesting for windows
+          for (int k=0; k<6*6*6; k++)
+            fmt->palette[k] = args[k];
+        }
+        { // extra nesting for windows
+          int j=0;
+          for(int i=0; i<6; i++)
+            for(; j < (i+1)*0x33 - 0x19 && j<256; j++)
+            {
+              fmt->rgb[0][j] = i * 6 * 6;
+              fmt->rgb[1][j] = i * 6;
+              fmt->rgb[2][j] = i;
+            }
+        }
+        break;
+      }
+    case DDJVU_FORMAT_RGB24:
+    case DDJVU_FORMAT_BGR24:
+    case DDJVU_FORMAT_GREY8:
+    case DDJVU_FORMAT_LSBTOMSB:
+    case DDJVU_FORMAT_MSBTOLSB:
+      if (!nargs) 
+        break;
+    default:
+      return fmt_error(fmt);
+    }
+  return fmt;
+}
+
+void
+ddjvu_format_set_row_order(ddjvu_format_t *format, int top_to_bottom)
+{
+  format->rtoptobottom = !! top_to_bottom;
+}
+
+void
+ddjvu_format_set_y_direction(ddjvu_format_t *format, int top_to_bottom)
+{
+  format->ytoptobottom = !! top_to_bottom;
+}
+
+void
+ddjvu_format_set_ditherbits(ddjvu_format_t *format, int bits)
+{
+  if (bits>0 && bits<=64)
+    format->ditherbits = bits;
+}
+
+void
+ddjvu_format_set_gamma(ddjvu_format_t *format, double gamma)
+{
+  if (gamma>=0.5 && gamma<=5.0)
+    format->gamma = gamma;
+}
+
+void
+ddjvu_format_set_white(ddjvu_format_t *format, 
+                       unsigned char b, unsigned char g, unsigned char r)
+{
+  format->white.b = b;
+  format->white.g = g;
+  format->white.r = r;
+}
+
+void
+ddjvu_format_release(ddjvu_format_t *format)
+{
+  delete format;
+}
+
+static void
+fmt_convert_row(const GPixel *p, int w, 
+                const ddjvu_format_t *fmt, char *buf)
+{
+  const uint32_t (*r)[256] = fmt->rgb;
+  const uint32_t xorval = fmt->xorval;
+  switch(fmt->style)
+    {
+    case DDJVU_FORMAT_BGR24:    /* truecolor 24 bits in BGR order */
+      {
+        memcpy(buf, (const char*)p, 3*w);
+        break;
+      }
+    case DDJVU_FORMAT_RGB24:    /* truecolor 24 bits in RGB order */
+      { 
+        while (--w >= 0) { 
+          buf[0]=p->r; buf[1]=p->g; buf[2]=p->b; 
+          buf+=3; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_RGBMASK16: /* truecolor 16 bits with masks */
+      {
+        uint16_t *b = (uint16_t*)buf;
+        while (--w >= 0) {
+          b[0]=(r[0][p->r]|r[1][p->g]|r[2][p->b])^xorval; 
+          b+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_RGBMASK32: /* truecolor 32 bits with masks */
+      {
+        uint32_t *b = (uint32_t*)buf;
+        while (--w >= 0) {
+          b[0]=(r[0][p->r]|r[1][p->g]|r[2][p->b])^xorval; 
+          b+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_GREY8:    /* greylevel 8 bits */
+      {
+        while (--w >= 0) { 
+          buf[0]=(5*p->r + 9*p->g + 2*p->b)>>4; 
+          buf+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_PALETTE8: /* paletized 8 bits (6x6x6 color cube) */
+      {
+        const uint32_t *u = fmt->palette;
+        while (--w >= 0) {
+          buf[0] = u[r[0][p->r]+r[1][p->g]+r[2][p->b]]; 
+          buf+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_MSBTOLSB: /* packed bits, msb on the left */
+      {
+        int t = (5*fmt->white.r + 9*fmt->white.g + 2*fmt->white.b + 16);
+        t = t * 0xc / 0x10;
+        unsigned char s=0, m=0x80;
+        while (--w >= 0) {
+          if ( 5*p->r + 9*p->g + 2*p->b < t ) { s |= m; }
+          if (! (m >>= 1)) { *buf++ = s; s=0; m=0x80; }
+          p += 1;
+        }
+        if (m < 0x80) { *buf++ = s; }
+        break;
+      }
+    case DDJVU_FORMAT_LSBTOMSB: /* packed bits, lsb on the left */
+      {
+        int t = 5*fmt->white.r + 9*fmt->white.g + 2*fmt->white.b + 16;
+        t = t * 0xc / 0x10;
+        unsigned char s=0, m=0x1;
+        while (--w >= 0) {
+          if ( 5*p->r + 9*p->g + 2*p->b < t ) { s |= m; }
+          if (! (m <<= 1)) { *buf++ = s; s=0; m=0x1; }
+          p += 1;
+        }
+        if (m > 0x1) { *buf++ = s; }
+        break;
+      }
+    }
+}
+
+static void
+fmt_convert(GPixmap *pm, const ddjvu_format_t *fmt, char *buffer, int rowsize)
+{
+  int w = pm->columns();
+  int h = pm->rows();
+  // Loop on rows
+  if (fmt->rtoptobottom)
+    {
+      for(int r=h-1; r>=0; r--, buffer+=rowsize)
+        fmt_convert_row((*pm)[r], w, fmt, buffer);
+    }
+  else
+    {
+      for(int r=0; r<h; r++, buffer+=rowsize)
+        fmt_convert_row((*pm)[r], w, fmt, buffer);
+    }
+}
+
+static void
+fmt_convert_row(unsigned char *p, unsigned char g[256][4], int w, 
+                const ddjvu_format_t *fmt, char *buf)
+{
+  const uint32_t (*r)[256] = fmt->rgb;
+  const uint32_t xorval = fmt->xorval;
+  switch(fmt->style)
+    {
+    case DDJVU_FORMAT_BGR24:    /* truecolor 24 bits in BGR order */
+      { 
+        while (--w >= 0) { 
+          buf[0]=g[*p][0];
+          buf[1]=g[*p][1];
+          buf[2]=g[*p][2];
+          buf+=3; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_RGB24:    /* truecolor 24 bits in RGB order */
+      { 
+        while (--w >= 0) { 
+          buf[0]=g[*p][2];
+          buf[1]=g[*p][1];
+          buf[2]=g[*p][0];
+          buf+=3; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_RGBMASK16: /* truecolor 16 bits with masks */
+      {
+        uint16_t *b = (uint16_t*)buf;
+        while (--w >= 0) {
+          unsigned char x = *p;
+          b[0]=(r[0][g[x][2]]|r[1][g[x][1]]|r[2][g[x][0]])^xorval; 
+          b+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_RGBMASK32: /* truecolor 32 bits with masks */
+      {
+        uint32_t *b = (uint32_t*)buf;
+        while (--w >= 0) {
+          unsigned char x = *p;
+          b[0]=(r[0][g[x][2]]|r[1][g[x][1]]|r[2][g[x][0]])^xorval; 
+          b+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_GREY8:    /* greylevel 8 bits */
+      {
+        while (--w >= 0) { 
+          buf[0]=g[*p][3];
+          buf+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_PALETTE8: /* paletized 8 bits (6x6x6 color cube) */
+      {
+        const uint32_t *u = fmt->palette;
+        while (--w >= 0) {
+          unsigned char x = *p;
+          buf[0] = u[r[0][g[x][0]]+r[1][g[x][1]]+r[2][g[x][2]]]; 
+          buf+=1; p+=1; 
+        }
+        break;
+      }
+    case DDJVU_FORMAT_MSBTOLSB: /* packed bits, msb on the left */
+      {
+        int t = 5*fmt->white.r + 9*fmt->white.g + 2*fmt->white.b + 16;
+        t = t * 0xc / 0x100;
+        unsigned char s=0, m=0x80;
+        while (--w >= 0) {
+          unsigned char x = *p;
+          if ( g[x][3] < t ) { s |= m; }
+          if (! (m >>= 1)) { *buf++ = s; s=0; m=0x80; }
+          p += 1;
+        }
+        if (m < 0x80) { *buf++ = s; }
+        break;
+      }
+    case DDJVU_FORMAT_LSBTOMSB: /* packed bits, lsb on the left */
+      {
+        int t = 5*fmt->white.r + 9*fmt->white.g + 2*fmt->white.b + 16;
+        t = t * 0xc / 0x100;
+        unsigned char s=0, m=0x1;
+        while (--w >= 0) {
+          unsigned char x = *p;
+          if ( g[x][3] < t ) { s |= m; }
+          if (! (m <<= 1)) { *buf++ = s; s=0; m=0x1; }
+          p += 1;
+        }
+        if (m > 0x1) { *buf++ = s; }
+        break;
+      }
+    }
+}
+
+static void
+fmt_convert(GBitmap *bm, const ddjvu_format_t *fmt, char *buffer, int rowsize)
+{
+  int w = bm->columns();
+  int h = bm->rows();
+  int m = bm->get_grays();
+  // Gray levels
+  int i;
+  unsigned char g[256][4];
+  const GPixel &wh = fmt->white;
+  for (i=0; i<m; i++)
+    {
+      g[i][0] = wh.b - ( i * wh.b + (m - 1)/2 ) / (m - 1);
+      g[i][1] = wh.g - ( i * wh.g + (m - 1)/2 ) / (m - 1);
+      g[i][2] = wh.r - ( i * wh.r + (m - 1)/2 ) / (m - 1);
+      g[i][3] = (5*g[i][2] + 9*g[i][1] + 2*g[i][0])>>4; 
+    }
+  for (i=m; i<256; i++)
+    g[i][0] = g[i][1] = g[i][2] = g[i][3] = 0;
+  
+  // Loop on rows
+  if (fmt->rtoptobottom)
+    {
+      for(int r=h-1; r>=0; r--, buffer+=rowsize)
+        fmt_convert_row((*bm)[r], g, w, fmt, buffer);
+    }
+  else
+    {
+      for(int r=0; r<h; r++, buffer+=rowsize)
+        fmt_convert_row((*bm)[r], g, w, fmt, buffer);
+    }
+}
+
+static void
+fmt_dither(GPixmap *pm, const ddjvu_format_t *fmt, int x, int y)
+{
+  if (fmt->ditherbits < 8)
+    return;
+  else if (fmt->ditherbits < 15)
+    pm->ordered_666_dither(x, y);
+  else if (fmt->ditherbits < 24)
+    pm->ordered_32k_dither(x, y);
+}
+
+
+// ----------------------------------------
+
+int
+ddjvu_page_render(ddjvu_page_t *page,
+                  const ddjvu_render_mode_t mode,
+                  const ddjvu_rect_t *pagerect,
+                  const ddjvu_rect_t *renderrect,
+                  const ddjvu_format_t *format,
+                  unsigned long rowsize,
+                  char *imagebuffer )
+{
+  G_TRY
+    {
+      GP<GPixmap> pm;
+      GP<GBitmap> bm;
+      GRect prect, rrect;
+      rect2grect(pagerect, prect);
+      rect2grect(renderrect, rrect);
+      if (format && format->ytoptobottom)
+        {
+          prect.ymin = renderrect->y + renderrect->h;
+          prect.ymax = prect.ymin + pagerect->h;
+          rrect.ymin = pagerect->y + pagerect->h;
+          rrect.ymax = rrect.ymin + renderrect->h;
+        }
+
+      DjVuImage *img = page->img;
+      if (img) 
+        {
+          switch (mode)
+            {
+            case DDJVU_RENDER_COLOR:
+              pm = img->get_pixmap(rrect,prect, format->gamma,format->white);
+              if (! pm) 
+                bm = img->get_bitmap(rrect,prect);
+              break;
+            case DDJVU_RENDER_BLACK:
+              bm = img->get_bitmap(rrect,prect);
+              if (! bm)
+                pm = img->get_pixmap(rrect,prect, format->gamma,format->white);
+              break;
+            case DDJVU_RENDER_MASKONLY:
+              bm = img->get_bitmap(rrect,prect);
+              break;
+            case DDJVU_RENDER_COLORONLY:
+              pm = img->get_pixmap(rrect,prect, format->gamma,format->white);
+              break;
+            case DDJVU_RENDER_BACKGROUND:
+              pm = img->get_bg_pixmap(rrect,prect, format->gamma,format->white);
+              break;
+            case DDJVU_RENDER_FOREGROUND:
+              pm = img->get_fg_pixmap(rrect,prect, format->gamma,format->white);
+              if (! pm) 
+                bm = img->get_bitmap(rrect,prect);
+              break;
+            }
+        }
+      if (pm)
+        {
+          int dx = rrect.xmin - prect.xmin;
+          int dy = rrect.ymin - prect.xmin;
+          fmt_dither(pm, format, dx, dy);
+          fmt_convert(pm, format, imagebuffer, rowsize);
+          return 2;
+        }
+      else if (bm)
+        {
+          fmt_convert(bm, format, imagebuffer, rowsize);
+          return 1;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(page, ex);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+
+// ----------------------------------------
+// Thumbnails
+
+void
+ddjvu_thumbnail_p::callback(void *cldata)
+{
+  ddjvu_thumbnail_p *thumb = (ddjvu_thumbnail_p*)cldata;
+  if (thumb->document)
+    {
+      GMonitorLock lock(&thumb->document->monitor);
+      if (thumb->pool && thumb->pool->is_eof())
+        {
+          GP<DataPool> pool = thumb->pool;
+          int size = pool->get_size();
+          thumb->pool = 0;
+          G_TRY
+            {
+              thumb->data.resize(0,size-1);
+              pool->get_data( (void*)(char*)thumb->data, 0, size);
+            }
+          G_CATCH_ALL
+            {
+              thumb->data.empty();
+            }
+          G_ENDCATCH;
+          if (thumb->document->doc)
+            {
+              GP<ddjvu_message_p> p = new ddjvu_message_p;
+              p->p.m_thumbnail.pagenum = thumb->pagenum;
+              msg_push(xhead(DDJVU_THUMBNAIL, thumb->document), p);
+            } 
+        }
+    }
+}
+
+ddjvu_status_t
+ddjvu_thumbnail_status(ddjvu_document_t *document, int pagenum, int start)
+{
+  G_TRY
+    {
+      GP<ddjvu_thumbnail_p> thumb;
+      DjVuDocument* doc = document->doc;
+      if (doc)
+        {
+          GMonitorLock lock(&document->monitor);
+          GPosition p = document->thumbnails.contains(pagenum);
+          if (p)
+            thumb = document->thumbnails[p];
+        }
+      if (!thumb && doc)
+        {
+          GP<DataPool> pool = doc->get_thumbnail(pagenum, !start);
+          if (pool)
+            {
+              GMonitorLock lock(&document->monitor);
+              thumb = new ddjvu_thumbnail_p;
+              thumb->document = document;
+              thumb->pagenum = pagenum;
+              thumb->pool = pool;
+              document->thumbnails[pagenum] = thumb;
+            }
+          if (thumb)
+            pool->add_trigger(-1, ddjvu_thumbnail_p::callback, 
+                              (void*)(ddjvu_thumbnail_p*)thumb);
+        } 
+      if (! thumb)
+        return DDJVU_JOB_NOTSTARTED;        
+      else if (thumb->pool)
+        return DDJVU_JOB_STARTED;
+      else if (thumb->data.size() > 0)
+        return DDJVU_JOB_OK;
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return DDJVU_JOB_FAILED;
+}
+ 
+int
+ddjvu_thumbnail_render(ddjvu_document_t *document, int pagenum, 
+                       int *wptr, int *hptr,
+                       const ddjvu_format_t *format,
+                       unsigned long rowsize,
+                       char *imagebuffer)
+{
+  G_TRY
+    {
+      GP<ddjvu_thumbnail_p> thumb;
+      ddjvu_status_t status = ddjvu_thumbnail_status(document,pagenum,FALSE);
+      if (status == DDJVU_JOB_OK)
+        {
+          GMonitorLock lock(&document->monitor);
+          thumb = document->thumbnails[pagenum];
+        }
+      if (! (thumb && wptr && hptr))
+        return FALSE;
+      if (! (thumb->data.size() > 0))
+        return FALSE;
+      /* Decode wavelet data */
+      int size = thumb->data.size();
+      char *data = (char*)thumb->data;
+      GP<IW44Image> iw = IW44Image::create_decode();
+      iw->decode_chunk(ByteStream::create_static((void*)data, size));
+      int w = iw->get_width();
+      int h = iw->get_height();
+      /* Restore aspect ratio */
+      double dw = (double)w / *wptr;
+      double dh = (double)h / *hptr;
+      if (dw > dh) 
+        *hptr = (int)(h / dw);
+      else
+        *wptr = (int)(w / dh);
+      if (! imagebuffer)
+        return TRUE;
+      /* Render and scale image */
+      GP<GPixmap> pm = iw->get_pixmap();
+      double thumbgamma = document->doc->get_thumbnails_gamma();
+      pm->color_correct(format->gamma/thumbgamma, format->white);
+      GP<GPixmapScaler> scaler = GPixmapScaler::create(w, h, *wptr, *hptr);
+      GP<GPixmap> scaledpm = GPixmap::create();
+      GRect scaledrect(0, 0, *wptr, *hptr);
+      scaler->scale(GRect(0, 0, w, h), *pm, scaledrect, *scaledpm);
+      /* Convert */
+      fmt_dither(scaledpm, format, 0, 0);
+      fmt_convert(scaledpm, format, imagebuffer, rowsize);
+      return TRUE;
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return FALSE;
+}
+
+
+// ----------------------------------------
+// Threaded jobs
+
+struct DJVUNS ddjvu_runnablejob_s : public ddjvu_job_s
+{
+  bool mystop;
+  int  myprogress;
+  ddjvu_status_t mystatus;
+  // methods
+  ddjvu_runnablejob_s();
+  ddjvu_status_t start();
+  void progress(int p);
+  // thread function
+  virtual ddjvu_status_t run() = 0;
+  // virtual port functions:
+  virtual bool inherits(const GUTF8String&) const;
+  virtual ddjvu_status_t status();
+  virtual void stop();
+private:
+  static void cbstart(void*);
+};
+
+ddjvu_runnablejob_s::ddjvu_runnablejob_s()
+  : mystop(false), myprogress(-1),
+    mystatus(DDJVU_JOB_NOTSTARTED) 
+{
+}
+
+void 
+ddjvu_runnablejob_s::progress(int x)
+{
+  if ((mystatus>=DDJVU_JOB_OK) || (x>myprogress && x<100))
+    {
+      GMonitorLock lock(&monitor);
+      GP<ddjvu_message_p> p = new ddjvu_message_p;
+      p->p.m_progress.status = mystatus;
+      p->p.m_progress.percent = myprogress = x;
+      msg_push(xhead(DDJVU_PROGRESS,this),p);
+    }
+}
+
+ddjvu_status_t
+ddjvu_runnablejob_s::start()
+{
+  GMonitorLock lock(&monitor);
+  if (mystatus==DDJVU_JOB_NOTSTARTED && myctx)
+    {
+      GThread thr;
+      thr.create(cbstart, (void*)this);
+      monitor.wait();
+    }
+  return mystatus;
+}
+
+void
+ddjvu_runnablejob_s::cbstart(void *arg)
+{
+  GP<ddjvu_runnablejob_s> self = (ddjvu_runnablejob_s*)arg;
+  {
+    GMonitorLock lock(&self->monitor);
+    self->mystatus = DDJVU_JOB_STARTED;
+    self->monitor.signal();
+  }
+  ddjvu_status_t r;
+  G_TRY
+    {
+      G_TRY
+        {
+          self->progress(0);
+          r = self->run();
+        }
+      G_CATCH(ex)
+        {
+          ERROR1(self, ex);
+          G_RETHROW;
+        }
+      G_ENDCATCH;
+    }
+  G_CATCH_ALL
+    {
+      r = DDJVU_JOB_FAILED;
+      if (self && self->mystop)
+        r = DDJVU_JOB_STOPPED;
+    }
+  G_ENDCATCH;
+  {
+    GMonitorLock lock(&self->monitor);
+    self->mystatus = r;
+  }
+  if (self && self->mystatus> DDJVU_JOB_OK)
+    self->progress(self->myprogress);
+  else
+    self->progress(100);
+}
+
+bool 
+ddjvu_runnablejob_s::inherits(const GUTF8String &classname) const
+{
+  return (classname == "ddjvu_runnablejob_s") 
+    || ddjvu_job_s::inherits(classname);
+}
+
+ddjvu_status_t 
+ddjvu_runnablejob_s::status()
+{
+  return mystatus;
+}
+
+void
+ddjvu_runnablejob_s::stop()
+{
+  mystop = true;
+}
+
+
+// ----------------------------------------
+// Printing
+
+struct DJVUNS ddjvu_printjob_s : public ddjvu_runnablejob_s
+{
+  DjVuToPS printer;
+  GUTF8String pages;
+  GP<ByteStream> obs;
+  virtual ddjvu_status_t run();
+  // virtual port functions:
+  virtual bool inherits(const GUTF8String&) const;
+  // progress
+  static void cbrefresh(void*);
+  static void cbprogress(double, void*);
+  static void cbinfo(int, int, int, DjVuToPS::Stage, void*);
+  double progress_low;
+  double progress_high;
+};
+
+bool 
+ddjvu_printjob_s::inherits(const GUTF8String &classname) const
+{
+  return (classname == "ddjvu_printjob_s") 
+    || ddjvu_runnablejob_s::inherits(classname);
+}
+
+ddjvu_status_t 
+ddjvu_printjob_s::run()
+{
+  mydoc->doc->wait_for_complete_init();
+  progress_low = 0;
+  progress_high = 1;
+  printer.set_refresh_cb(cbrefresh, (void*)this);
+  printer.set_dec_progress_cb(cbprogress, (void*)this);
+  printer.set_prn_progress_cb(cbprogress, (void*)this);
+  printer.set_info_cb(cbinfo, (void*)this);
+  printer.print(*obs, mydoc->doc, pages);
+  return DDJVU_JOB_OK;
+}
+
+void
+ddjvu_printjob_s::cbrefresh(void *data)
+{
+  ddjvu_printjob_s *self = (ddjvu_printjob_s*)data;
+  if (self->mystop)
+    {
+      msg_push(xhead(DDJVU_INFO,self), msg_prep_info("Print job stopped"));
+      G_THROW(DataPool::Stop);
+    }
+}
+
+void
+ddjvu_printjob_s::cbprogress(double done, void *data)
+{
+  ddjvu_printjob_s *self = (ddjvu_printjob_s*)data;
+  double &low = self->progress_low;
+  double &high = self->progress_high;
+  double progress = low;
+  if (done >= 1)
+    progress = high;
+  else if (done >= 0)
+    progress = low + done * (high-low);
+  self->progress((int)(progress * 100));
+  ddjvu_printjob_s::cbrefresh(data);
+}
+
+void
+ddjvu_printjob_s::cbinfo(int pnum, int pcnt, int ptot,
+                         DjVuToPS::Stage stage, void *data)
+{
+  ddjvu_printjob_s *self = (ddjvu_printjob_s*)data;
+  double &low = self->progress_low;
+  double &high = self->progress_high;
+  low = 0;
+  high = 1;
+  if (ptot > 0) 
+    {
+      double step = 1.0 / (double)ptot;
+      low = (double)pcnt * step;
+      if (stage != DjVuToPS::DECODING) 
+	low += step / 2.0;
+      high = low  + step / 2.0;
+    }
+  if (low < 0)
+    low = 0;
+  if (low > 1) 
+    low = 1;
+  if (high < low) 
+    high = low;
+  if (high > 1)
+    high = 1;
+  self->progress((int)(low * 100));
+  ddjvu_printjob_s::cbrefresh(data);
+}
+
+static void
+complain(GUTF8String opt, const char *msg)
+{
+  GUTF8String message;
+  if (opt.length() > 0)
+    message = "Parsing \"" + opt + "\": " + msg;
+  else
+    message = msg;
+  G_RETHROW(GException((const char*)message));
+}
+
+ddjvu_job_t *
+ddjvu_document_print(ddjvu_document_t *document, FILE *output,
+                     int optc, const char * const * optv)
+{
+  ddjvu_printjob_s *job = 0;
+  G_TRY
+    {
+      job = new ddjvu_printjob_s;
+      ref(job);
+      job->myctx = document->myctx;
+      job->mydoc = document;
+      // parse options (see djvups(1))
+      DjVuToPS::Options &options = job->printer.options;
+      GUTF8String &pages = job->pages;
+      while (optc>0)
+        {
+          // normalize
+          GNativeString narg(optv[0]);
+          GUTF8String uarg = narg;
+          const char *s1 = (const char*)narg;
+          if (s1[0] == '-') s1++;
+          if (s1[0] == '-') s1++;
+          // separate arguments
+          const char *s2 = s1;
+          while (*s2 && *s2 != '=') s2++;
+          GUTF8String s( s1, s2-s1 );
+          GUTF8String arg( s2[0] && s2[1] ? s2+1 : "" );
+          // rumble!
+          if (s == "page" || s == "pages")
+            {
+              if (pages.length())
+                pages = pages + ",";
+              pages = pages + arg;
+            }
+          else if (s == "format")
+            {
+              if (arg == "ps")
+                options.set_format(DjVuToPS::Options::PS);
+              else if (arg == "eps")
+                options.set_format(DjVuToPS::Options::EPS);
+              else
+                complain(uarg,"Invalid format. Use \"ps\" or \"eps\".");
+            }
+          else if (s == "level")
+            {
+              int endpos;
+              int lvl = arg.toLong(0, endpos);
+              if (endpos != (int)arg.length() || lvl < 1 || lvl > 4)
+                complain(uarg,"Invalid Postscript language level.");
+              options.set_level(lvl);
+            }
+          else if (s == "orient" || s == "orientation")
+            {
+              if (arg == "a" || arg == "auto" )
+                options.set_orientation(DjVuToPS::Options::AUTO);
+              else if (arg == "l" || arg == "landscape" )
+                options.set_orientation(DjVuToPS::Options::LANDSCAPE);
+              else if (arg == "p" || arg == "portrait" )
+                options.set_orientation(DjVuToPS::Options::PORTRAIT);
+              else
+                complain(uarg,"Invalid orientation. Use \"auto\", "
+                         "\"landscape\" or \"portrait\".");
+            }
+          else if (s == "mode")
+            {
+              if (arg == "c" || arg == "color" )
+                options.set_mode(DjVuToPS::Options::COLOR);
+              else if (arg == "black" || arg == "bw")
+                options.set_mode(DjVuToPS::Options::BW);
+              else if (arg == "fore" || arg == "foreground")
+                options.set_mode(DjVuToPS::Options::FORE);
+              else if (arg == "back" || arg == "background" )
+                options.set_mode(DjVuToPS::Options::BACK);
+              else
+                complain(uarg,"Invalid mode. Use \"color\", \"bw\", "
+                         "\"foreground\", or \"background\".");
+            }
+          else if (s == "zoom")
+            {
+              if (arg == "auto" || arg == "fit" || arg == "fit_page")
+                options.set_zoom(0);
+              else if (arg == "1to1" || arg == "onetoone")
+                options.set_zoom(100);                
+              else 
+                {
+                  int endpos;
+                  int z = arg.toLong(0,endpos);
+                  if (endpos != (int)arg.length() || z < 25 || z > 2400)
+                    complain(uarg,"Invalid zoom factor.");
+                  options.set_zoom(z);
+                }
+            }
+          else if (s == "color")
+            {
+              if (arg == "yes" || arg == "")
+                options.set_color(true);
+              else if (arg == "no")
+                options.set_color(false);
+              else
+                complain(uarg,"Invalid argument. Use \"yes\" or \"no\".");
+            }
+          else if (s == "gray" || s == "grayscale")
+            {
+              if (arg.length())
+                complain(uarg,"No argument was expected.");
+              options.set_color(false);
+            }
+          else if (s == "srgb" || s == "colormatch")
+            {
+              if (arg == "yes" || arg == "")
+                options.set_sRGB(true);
+              else if (arg == "no")
+                options.set_sRGB(false);
+              else
+                complain(uarg,"Invalid argument. Use \"yes\" or \"no\".");
+            }
+          else if (s == "gamma")
+            {
+              int endpos;
+              double g = arg.toDouble(0,endpos);
+              if (endpos != (int)arg.length() || g < 0.3 || g > 5.0)
+                complain(uarg,"Invalid gamma factor. "
+                              "Use a number in range 0.3 ... 5.0.");
+              options.set_gamma(g);
+            }
+          else if (s == "copies")
+            {
+              int endpos;
+              int n = arg.toLong(0, endpos);
+              if (endpos != (int)arg.length() || n < 1 || n > 999999)
+                complain(uarg,"Invalid number of copies.");
+              options.set_copies(n);
+            }
+          else if (s == "frame")
+            {
+              if (arg == "yes" || arg == "")
+                options.set_frame(true);
+              else if (arg == "no")
+                options.set_frame(false);
+              else
+                complain(uarg,"Invalid argument. Use \"yes\" or \"no\".");
+            }
+          else if (s == "cropmarks")
+            {
+              if (arg == "yes" || arg == "")
+                options.set_cropmarks(true);
+              else if (arg == "no")
+                options.set_cropmarks(false);
+              else
+                complain(uarg,"Invalid argument. Use \"yes\" or \"no\".");
+            }
+          else if (s == "text")
+            {
+              if (arg == "yes" || arg == "")
+                options.set_text(true);
+              else if (arg == "no")
+                options.set_text(false);
+              else
+                complain(uarg,"Invalid argument. Use \"yes\" or \"no\".");
+            }
+          else if (s == "booklet")
+            {
+              if (arg == "no")
+                options.set_bookletmode(DjVuToPS::Options::OFF);
+              else if (arg == "recto")
+                options.set_bookletmode(DjVuToPS::Options::RECTO);
+              else if (arg == "verso")
+                options.set_bookletmode(DjVuToPS::Options::VERSO);
+              else if (arg == "rectoverso" || arg=="yes" || arg=="")
+                options.set_bookletmode(DjVuToPS::Options::RECTOVERSO);
+              else 
+                complain(uarg,"Invalid argument."
+                         "Use \"no\", \"yes\", \"recto\", or \"verso\".");
+            }
+          else if (s == "bookletmax")
+            {
+              int endpos;
+              int n = arg.toLong(0, endpos);
+              if (endpos != (int)arg.length() || n < 0 || n > 999999)
+                complain(uarg,"Invalid argument.");
+              options.set_bookletmax(n);
+            }
+          else if (s == "bookletalign")
+            {
+              int endpos;
+              int n = arg.toLong(0, endpos);
+              if (endpos != (int)arg.length() || n < -720 || n > +720)
+                complain(uarg,"Invalid argument.");
+              options.set_bookletalign(n);
+            }
+          else if (s == "bookletfold")
+            {
+              int endpos = 0;
+              int m = 250;
+              int n = arg.toLong(0, endpos);
+              if (endpos>0 && endpos<(int)arg.length() && arg[endpos]=='+')
+                m = arg.toLong(endpos+1, endpos);
+              if (endpos != (int)arg.length() || m<0 || m>720 || n<0 || n>9999 )
+                complain(uarg,"Invalid argument.");
+              options.set_bookletfold(n,m);
+            }
+          else
+            {
+              complain(uarg, "Unrecognized option.");
+            }
+          // Next option
+          optc -= 1;
+          optv += 1;
+        }
+      // go
+      job->obs = ByteStream::create(output, "wb", false);
+      job->start();
+    }
+  G_CATCH(ex)
+    {
+      if (job) 
+        unref(job);
+      job = 0;
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return job;
+}
+
+
+
+// ----------------------------------------
+// Saving
+
+struct DJVUNS ddjvu_savejob_s : public ddjvu_runnablejob_s
+{
+  GP<ByteStream> obs;
+  GURL           odir;  
+  GUTF8String    oname;
+  GUTF8String    pages;
+  GTArray<char>       comp_flags;
+  GArray<GUTF8String> comp_ids;
+  GPArray<DjVuFile>   comp_files;
+  GMonitor monitor;
+  // thread routine
+  virtual ddjvu_status_t run();
+  // virtual port functions:
+  virtual bool inherits(const GUTF8String&) const;
+  virtual void notify_file_flags_changed(const DjVuFile*, long, long);
+  // helpers
+  bool parse_pagespec(const char *s, int npages, bool *flags);
+  void mark_included_files(DjVuFile *file);
+};
+
+bool 
+ddjvu_savejob_s::inherits(const GUTF8String &classname) const
+{
+  return (classname == "ddjvu_savejob_s") 
+    || ddjvu_runnablejob_s::inherits(classname);
+}
+
+void
+ddjvu_savejob_s::notify_file_flags_changed(const DjVuFile *file, 
+                                           long mask, long)
+{
+  if (mask & (DjVuFile::ALL_DATA_PRESENT | DjVuFile::DATA_PRESENT |
+              DjVuFile::DECODE_FAILED | DjVuFile::DECODE_STOPPED | 
+              DjVuFile::STOPPED ))
+    {
+      GMonitorLock lock(&monitor);
+      monitor.signal();
+    }
+}
+
+bool
+ddjvu_savejob_s::parse_pagespec(const char *s, int npages, bool *flags)
+{
+  int spec = 0;
+  int both = 1;
+  int start_page = 1;
+  int end_page = npages;
+  int pageno;
+  char *p = (char*)s;
+  while (*p)
+    {
+      spec = 0;
+      while (*p==' ')
+        p += 1;
+      if (! *p)
+        break;
+      if (*p>='0' && *p<='9') {
+        end_page = strtol(p, &p, 10);
+        spec = 1;
+      } else if (*p=='$') {
+        spec = 1;
+        end_page = npages;
+        p += 1;
+      } else if (both) {
+        end_page = 1;
+      } else {
+        end_page = npages;
+      }
+      while (*p==' ')
+        p += 1;
+      if (both) {
+        start_page = end_page;
+        if (*p == '-') {
+          p += 1;
+          both = 0;
+          continue;
+        }
+      }
+      both = 1;
+      while (*p==' ')
+        p += 1;
+      if (*p && *p != ',')
+        return false;
+      if (*p == ',')
+        p += 1;
+      if (! spec)
+        return false;
+      if (end_page <= 0)
+        end_page = 1;
+      if (start_page <= 0)
+        start_page = 1;
+      if (end_page > npages)
+        end_page = npages;
+      if (start_page > npages)
+        start_page = npages;
+      if (start_page <= end_page)
+        for(pageno=start_page; pageno<=end_page; pageno++)
+          flags[pageno-1] = true;
+      else
+        for(pageno=start_page; pageno>=end_page; pageno--)
+          flags[pageno-1] = true;
+    }
+  if (!spec)
+    return false;
+  return true;
+}
+
+void 
+ddjvu_savejob_s::mark_included_files(DjVuFile *file)
+{
+  GP<DataPool> pool = file->get_init_data_pool();
+  GP<ByteStream> str(pool->get_stream());
+  GP<IFFByteStream> iff(IFFByteStream::create(str));
+  GUTF8String chkid;
+  if (!iff->get_chunk(chkid)) 
+    return;
+  while (iff->get_chunk(chkid))
+    {
+      if (chkid == "INCL")
+        {
+          GP<ByteStream> incl = iff->get_bytestream();
+          GUTF8String fileid;
+          char buffer[1024];
+          int length;
+          while((length=incl->read(buffer, 1024)))
+            fileid += GUTF8String(buffer, length);
+          for (int i=0; i<comp_ids.size(); i++)
+            if (fileid == comp_ids[i] && !comp_flags[i])
+              comp_flags[i] = 1;
+        }
+      iff->close_chunk();
+    }
+  iff->close_chunk();
+  pool->clear_stream();
+}
+
+ddjvu_status_t 
+ddjvu_savejob_s::run()
+{
+  DjVuDocument *doc = mydoc->doc;
+  doc->wait_for_complete_init();
+
+  // Determine which pages to save
+  int npages = doc->get_pages_num();
+  GTArray<bool> page_flags(0, npages-1);
+  if (!pages)
+    {
+      for (int pageno=0; pageno<npages; pageno++)
+        page_flags[pageno] = true;
+    }
+  else
+    {
+      const char *s = pages;
+      while (*s && *s!='=')
+        s += 1;
+      for (int pageno=0; pageno<npages; pageno++)
+        page_flags[pageno] = false;
+      if ((*s != '=') || !parse_pagespec(s+1, npages, (bool*)page_flags))
+        complain(pages,"Illegal page specification");
+      if (doc->get_doc_type()==DjVuDocument::OLD_BUNDLED ||
+          doc->get_doc_type()==DjVuDocument::OLD_INDEXED )
+        complain(pages,"Saving subsets of obsolete formats is not supported");
+    }
+  
+  // Determine which component files to save
+  int ncomps;
+  if (doc->get_doc_type()==DjVuDocument::BUNDLED ||
+      doc->get_doc_type()==DjVuDocument::INDIRECT)
+    {
+      GP<DjVmDir> dir = doc->get_djvm_dir();
+      ncomps = dir->get_files_num();
+      comp_ids.resize(ncomps - 1);
+      comp_flags.resize(ncomps - 1);
+      comp_files.resize(ncomps - 1);
+      int pageno = 0;
+      GPList<DjVmDir::File> flist = dir->get_files_list();
+      GPosition pos=flist;
+      for (int comp=0; comp<ncomps; ++pos, ++comp)
+        {
+          DjVmDir::File *file = flist[pos];
+          comp_ids[comp] = file->get_load_name();
+          comp_flags[comp] = 0;
+          if (file->is_page() && page_flags[pageno++])
+            comp_flags[comp] = 1;
+        }
+    }
+  else
+    {
+      ncomps = npages;
+      comp_flags.resize(ncomps - 1);
+      comp_files.resize(ncomps - 1);
+      for (int comp=0; comp<ncomps; ++comp)
+        comp_flags[comp] = page_flags[comp];
+    }
+  
+  // Download
+  get_portcaster()->add_route(doc, this);
+  while (!mystop)
+    {
+      int comp;
+      int wanted = 0;
+      int loaded = 0;
+      int asked = 0;
+      for (comp=0; comp<ncomps; comp++)
+        {
+          int flags = comp_flags[comp];
+          if (flags > 2)
+            loaded += 1;
+          else if (flags < 2)
+            continue;
+          else if (!comp_files[comp]->is_data_present())
+            asked += 1;
+          else 
+            {
+              comp_flags[comp] += 1;
+              mark_included_files(comp_files[comp]);
+            } 
+        }
+      for (comp=0; comp<ncomps; comp++)
+        if (comp_flags[comp] > 0)
+          wanted += 1;
+      progress(loaded * 100 / wanted);
+      if (wanted == loaded)
+        break;
+      for (comp=0; comp<ncomps && asked < 2; comp++)
+        if (comp_flags[comp] == 1)
+          {
+            if (comp_ids.size() > 0)
+              comp_files[comp] = doc->get_djvu_file(comp_ids[comp]);
+            else
+              comp_files[comp] = doc->get_djvu_file(comp);
+            comp_flags[comp] += 1;
+            if (!comp_files[comp]->is_data_present())
+              asked += 1;
+          }
+      GMonitorLock lock(&monitor);
+      for (comp=0; comp<ncomps; comp++)
+        if (comp_flags[comp] == 2)
+          if (! comp_files[comp]->is_data_present())
+            {
+              monitor.wait();
+              break;
+            }
+    }
+  if (mystop)
+    G_THROW(DataPool::Stop);
+  // Saving!
+  GP<DjVmDoc> djvm;
+  if (! pages)
+    {
+      djvm = doc->get_djvm_doc();
+    }
+  else
+    {
+      djvm = DjVmDoc::create();
+      GP<DjVmDir> dir = doc->get_djvm_dir();
+      GPList<DjVmDir::File> flist = dir->get_files_list();
+      GPosition pos=flist;
+      int pageno = 0;
+      for (int comp=0; comp<ncomps; ++pos, ++comp)
+        {
+          if (flist[pos]->is_page())
+            pageno += 1;
+          if (comp_flags[comp])
+            {
+              GP<DjVmDir::File> f = new DjVmDir::File(*flist[pos]);
+              if (f->is_page() && f->get_save_name()==f->get_title())
+                f->set_title(GUTF8String(pageno));
+              GP<DjVuFile> file = comp_files[comp];
+              GP<DataPool> data = file->get_init_data_pool();
+              djvm->insert_file(f, data);
+            }
+        }
+    }
+  if (obs)
+    djvm->write(obs);
+  else if (odir.is_valid() && oname.length() > 0)
+    djvm->expand(odir, oname);
+  return DDJVU_JOB_OK;
+}
+
+
+ddjvu_job_t *
+ddjvu_document_save(ddjvu_document_t *document, FILE *output, 
+                    int optc, const char * const * optv)
+{
+  ddjvu_savejob_s *job = 0;
+  G_TRY
+    {
+      job = new ddjvu_savejob_s;
+      ref(job);
+      job->myctx = document->myctx;
+      job->mydoc = document;
+      bool indirect = false;
+      // parse options
+      while (optc>0)
+        {
+          GNativeString narg(optv[0]);
+          GUTF8String uarg = narg;
+          const char *s1 = (const char*)narg;
+          if (s1[0] == '-') s1++;
+          if (s1[0] == '-') s1++;
+          // separate arguments
+          if (!strncmp(s1, "page=", 5) ||
+              !strncmp(s1, "pages=", 6) )
+            {
+              if (job->pages.length())
+                complain(uarg,"multiple page specifications");
+              job->pages = uarg;
+            }
+          else if (!strncmp(s1, "indirect=", 9))
+            {
+              GURL oname = GURL::Filename::UTF8(s1 + 9);
+              job->odir = oname.base();
+              job->oname = oname.fname();
+              indirect = true;
+            }
+          else
+            {
+              complain(uarg, "Unrecognized option.");
+            }
+          // next option
+          optc -= 1;
+          optv += 1;
+        }
+      // go
+      if (!indirect)
+        job->obs = ByteStream::create(output, "wb", false);
+      else 
+        job->obs = 0;
+      job->start();
+    }
+  G_CATCH(ex)
+    {
+      if (job) 
+        unref(job);
+      job = 0;
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return job;
+}
+
+
+
+
+// ----------------------------------------
+// S-Expressions (generic)
+
+static miniexp_t
+miniexp_status(ddjvu_status_t status)
+{
+  if (status < DDJVU_JOB_OK)
+    return miniexp_dummy;
+  else if (status == DDJVU_JOB_STOPPED)
+    return miniexp_symbol("stopped");
+  else if (status > DDJVU_JOB_OK)
+    return miniexp_symbol("failed");    
+  return miniexp_nil;
+}
+
+static void
+miniexp_protect(ddjvu_document_t *document, miniexp_t expr)
+{
+  GMonitorLock lock(&document->myctx->monitor);
+  for(miniexp_t p=document->protect; miniexp_consp(p); p=miniexp_cdr(p))
+    if (miniexp_car(p) == expr)
+      return;
+  if (miniexp_consp(expr) || miniexp_objectp(expr))
+    document->protect = miniexp_cons(expr, document->protect);
+}
+
+void
+ddjvu_miniexp_release(ddjvu_document_t *document, miniexp_t expr)
+{
+  GMonitorLock lock(&document->myctx->monitor);
+  miniexp_t q = miniexp_nil;
+  miniexp_t p = document->protect;
+  while (miniexp_consp(p))
+    {
+      if (miniexp_car(p) != expr)
+        q = p;
+      else if (q)
+        miniexp_rplacd(q, miniexp_cdr(p));
+      else
+        document->protect = miniexp_cdr(p);
+      p = miniexp_cdr(p);
+    }
+}
+
+
+
+// ----------------------------------------
+// S-Expressions (outline)
+
+static miniexp_t
+outline_sub(const GP<DjVmNav> &nav, int &pos, int count)
+{
+  GP<DjVmNav::DjVuBookMark> entry;
+  minivar_t p,q,s;
+  while (count > 0 && pos < nav->getBookMarkCount())
+    {
+      nav->getBookMark(entry, pos++);
+      q = outline_sub(nav, pos, entry->count);
+      s = miniexp_string((const char*)(entry->url));
+      q = miniexp_cons(s, q);
+      s = miniexp_string((const char*)(entry->displayname));
+      q = miniexp_cons(s, q);
+      p = miniexp_cons(q, p);
+      count--;
+    }
+  return miniexp_reverse(p);
+}
+
+miniexp_t
+ddjvu_document_get_outline(ddjvu_document_t *document)
+{
+  G_TRY
+    {
+      ddjvu_status_t status = document->status();
+      if (status != DDJVU_JOB_OK)
+        return miniexp_status(status);
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        {
+          GP<DjVmNav> nav = doc->get_djvm_nav();
+          if (! nav) 
+            return miniexp_nil;
+          minivar_t result;
+          int pos = 0;
+          result = outline_sub(nav, pos, nav->getBookMarkCount());
+          result = miniexp_cons(miniexp_symbol("bookmarks"), result);
+          miniexp_protect(document, result);
+          return result;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return miniexp_status(DDJVU_JOB_FAILED);
+}
+
+
+
+
+// ----------------------------------------
+// S-Expressions (text)
+
+static struct zone_names_s {
+  const char *name;
+  DjVuTXT::ZoneType ztype;
+  char separator;
+} zone_names[] = {
+  { "page",   DjVuTXT::PAGE,      0 },
+  { "column", DjVuTXT::COLUMN,    DjVuTXT::end_of_column },
+  { "region", DjVuTXT::REGION,    DjVuTXT::end_of_region },
+  { "para",   DjVuTXT::PARAGRAPH, DjVuTXT::end_of_paragraph },
+  { "line",   DjVuTXT::LINE,      DjVuTXT::end_of_line },
+  { "word",   DjVuTXT::WORD,      ' ' },
+  { "char",   DjVuTXT::CHARACTER, 0 },
+  { 0, (DjVuTXT::ZoneType)0 ,0 }
+};
+
+static miniexp_t
+pagetext_sub(const GP<DjVuTXT> &txt, DjVuTXT::Zone &zone, 
+             DjVuTXT::ZoneType detail)
+{
+  int zinfo;
+  for (zinfo=0; zone_names[zinfo].name; zinfo++)
+    if (zone.ztype == zone_names[zinfo].ztype)
+      break;
+  minivar_t p;
+  minivar_t a;
+  bool gather = zone.children.isempty();
+  { // extra nesting for windows
+    for (GPosition pos=zone.children; pos; ++pos)
+      if (zone.children[pos].ztype > detail)
+        gather = true;
+  }
+  if (gather)
+    {
+      const char *data = (const char*)(txt->textUTF8) + zone.text_start;
+      int length = zone.text_length;
+      if (length>0 && data[length-1]==zone_names[zinfo].separator)
+        length -= 1;
+      a = miniexp_substring(data, length);
+      p = miniexp_cons(a, p);
+    }
+  else
+    {
+      for (GPosition pos=zone.children; pos; ++pos)
+        {
+          a = pagetext_sub(txt, zone.children[pos], detail);
+          p = miniexp_cons(a, p);
+        }
+    }
+  p = miniexp_reverse(p);
+  const char *s = zone_names[zinfo].name;
+  if (s)
+    {
+      p = miniexp_cons(miniexp_number(zone.rect.ymax), p);
+      p = miniexp_cons(miniexp_number(zone.rect.xmax), p);
+      p = miniexp_cons(miniexp_number(zone.rect.ymin), p);
+      p = miniexp_cons(miniexp_number(zone.rect.xmin), p);
+      p = miniexp_cons(miniexp_symbol(s), p);
+      return p;
+    }
+  return miniexp_nil;
+}
+
+miniexp_t
+ddjvu_document_get_pagetext(ddjvu_document_t *document, int pageno,
+                            const char *maxdetail)
+{
+  G_TRY
+    {
+      ddjvu_status_t status = document->status();
+      if (status != DDJVU_JOB_OK)
+        return miniexp_status(status);
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        {
+          document->pageinfoflag = true;
+          GP<DjVuFile> file = doc->get_djvu_file(pageno);
+          if (! file || ! file->is_data_present() )
+            return miniexp_dummy;
+          GP<ByteStream> bs = file->get_text();
+          if (! bs)
+            return miniexp_nil;
+          GP<DjVuText> text = DjVuText::create();
+          text->decode(bs);
+          GP<DjVuTXT> txt = text->txt;
+          if (! txt)
+            return miniexp_nil;
+          minivar_t result;
+          DjVuTXT::ZoneType detail = DjVuTXT::CHARACTER;
+          { // extra nesting for windows
+            for (int i=0; zone_names[i].name; i++)
+              if (maxdetail && !strcmp(maxdetail, zone_names[i].name))
+                detail = zone_names[i].ztype;
+          }
+          result = pagetext_sub(txt, txt->page_zone, detail);
+          miniexp_protect(document, result);
+          return result;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return miniexp_status(DDJVU_JOB_FAILED);
+}
+
+
+// ----------------------------------------
+// S-Expressions (annotations)
+
+// The difficulty here lies with the syntax of strings in annotation chunks.
+// - Early versions of djvu only had one possible escape 
+//   sequence (\") in annotation strings. All other characters
+//   are accepted literally until reaching the closing double quote.
+// - Current versions of djvu understand the usual backslash escapes.
+//   All non printable ascii characters must however be escaped.
+//   This is a subset of the miniexp syntax.
+// We first check if strings in the annotation chunk obey the modern syntax.
+// The compatibility mode is turned on if they contain non printable ascii 
+// characters or illegal backslash sequences. Function <anno_getc()> then 
+// creates the proper escapes on the fly.
+
+
+struct anno_dat_s {
+  const char *s;
+  char buf[8];
+  int  blen;
+  int  state;
+  bool compat;
+  bool eof;
+};
+
+
+static bool
+anno_compat(const char *s)
+{
+  int state = 0;
+  bool compat = false;
+  while (s && *s && !compat)
+    {
+      int i = (int)(unsigned char)*s++;
+      switch(state)
+        {
+        case 0:
+          if (i == '\"')
+            state = '\"';
+          break;
+        case '\"':
+          if (i == '\"')
+            state = 0;
+          else if (i == '\\')
+            state = '\\';
+          else if (isascii(i) && !isprint(i))
+            compat = true;
+          break;
+        case '\\':
+          if (!strchr("01234567abtnvfr\"\\",i))
+            compat = true;
+          state = '\"';
+          break;
+        }
+    }
+  return compat;
+}
+
+
+static int
+anno_fgetc(miniexp_io_t *io)
+{
+  struct anno_dat_s *anno_dat_p = (struct anno_dat_s*)(io->data[0]);
+  struct anno_dat_s &anno_dat = *anno_dat_p;
+  if (anno_dat.blen>0)
+    {
+      anno_dat.blen--;
+      char c = anno_dat.buf[0];
+      for (int i=0; i<anno_dat.blen; i++)
+        anno_dat.buf[i] = anno_dat.buf[i+1];
+      return c;
+    }
+  if (! *anno_dat.s)
+    return EOF;
+  int c = (int)(unsigned char)*anno_dat.s++;
+  if (anno_dat.compat)
+    {
+      switch (anno_dat.state)
+        {
+        case 0:
+          if (c == '\"') 
+            anno_dat.state = '\"';
+          break;
+        case '\"':
+          if (c == '\"') 
+            anno_dat.state = 0;
+          else if (c == '\\')
+            anno_dat.state = '\\';
+          else if (isascii(c) && !isprint(c))
+            {
+              sprintf(anno_dat.buf,"%03o", c);
+              anno_dat.blen = strlen(anno_dat.buf);
+              c = '\\';
+            }
+          break;
+        case '\\':
+          anno_dat.state = '\"';
+          if (c != '\"')
+            {
+              sprintf(anno_dat.buf,"\\%03o", c);
+              anno_dat.blen = strlen(anno_dat.buf);
+              c = '\\';
+            }
+          break;
+        }
+    }
+  return c;
+}
+
+
+static int
+anno_ungetc(miniexp_io_t *io, int c)
+{
+  if (c == EOF)
+    return EOF;
+  struct anno_dat_s *anno_dat_p = (struct anno_dat_s*)(io->data[0]);
+  struct anno_dat_s &anno_dat = *anno_dat_p;
+  if (anno_dat.blen>=(int)sizeof(anno_dat.buf))
+    return EOF;
+  for (int i=anno_dat.blen; i>0; i--)
+    anno_dat.buf[i] = anno_dat.buf[i-1];
+  anno_dat.blen += 1;
+  anno_dat.buf[0] = c;
+  return c;
+}
+
+
+static void
+anno_sub(ByteStream *bs, miniexp_t &result)
+{
+  // Read bs
+  GUTF8String raw;
+  char buffer[1024];
+  int length;
+  while ((length=bs->read(buffer, sizeof(buffer))))
+    raw += GUTF8String(buffer, length);
+  // Prepare 
+  miniexp_t a;
+  struct anno_dat_s anno_dat;
+  anno_dat.s = (const char*)raw;
+  anno_dat.compat = anno_compat(anno_dat.s);
+  anno_dat.blen = 0;
+  anno_dat.state = 0;
+  anno_dat.eof = false;
+  miniexp_io_t io;
+  miniexp_io_init(&io);
+  io.data[0] = (void*)&anno_dat;
+  io.fgetc = anno_fgetc;
+  io.ungetc = anno_ungetc;
+  io.p_macrochar = 0;
+  io.p_diezechar = 0;
+  io.p_macroqueue = 0;
+  // Read
+  while (* anno_dat.s )
+    if ((a = miniexp_read_r(&io)) != miniexp_dummy)
+      result = miniexp_cons(a, result);
+}
+
+
+static miniexp_t
+get_bytestream_anno(GP<ByteStream> annobs)
+{
+  if (! (annobs && annobs->size()))
+    return miniexp_nil;
+  GP<IFFByteStream> iff = IFFByteStream::create(annobs);
+  GUTF8String chkid;
+  minivar_t result;
+  while (iff->get_chunk(chkid))
+    {
+      GP<ByteStream> bs;
+      if (chkid == "ANTa") 
+        bs = iff->get_bytestream();
+      else if (chkid == "ANTz")
+        bs = BSByteStream::create(iff->get_bytestream());
+      if (bs)
+        anno_sub(bs, result);
+      iff->close_chunk();
+    }
+  return miniexp_reverse(result);
+}
+
+
+static miniexp_t
+get_file_anno(GP<DjVuFile> file)
+{
+  // Make sure all data is present
+  if (! file || ! file->is_all_data_present())
+    {
+      if (file && file->is_data_present())
+        {
+          if (! file->are_incl_files_created())
+            file->process_incl_chunks();
+          if (! file->are_incl_files_created())
+            {
+              if (file->get_flags() & DjVuFile::STOPPED)
+                return miniexp_status(DDJVU_JOB_STOPPED);
+              return miniexp_status(DDJVU_JOB_FAILED);
+            }
+        }
+      return miniexp_dummy;
+    }
+  // Access annotation data
+  return get_bytestream_anno(file->get_merged_anno());
+}
+
+
+miniexp_t
+ddjvu_document_get_pageanno(ddjvu_document_t *document, int pageno)
+{
+  G_TRY
+    {
+      ddjvu_status_t status = document->status();
+      if (status != DDJVU_JOB_OK)
+        return miniexp_status(status);
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        {
+          document->pageinfoflag = true;
+          minivar_t result = get_file_anno( doc->get_djvu_file(pageno) );
+          if (miniexp_consp(result))
+            miniexp_protect(document, result);
+          return result;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return miniexp_status(DDJVU_JOB_FAILED);
+}
+
+
+miniexp_t
+ddjvu_document_get_anno(ddjvu_document_t *document, int compat)
+{
+  G_TRY
+    {
+      ddjvu_status_t status = document->status();
+      if (status != DDJVU_JOB_OK)
+        return miniexp_status(status);
+      DjVuDocument *doc = document->doc;
+      if (doc)
+        {
+#if EXPERIMENTAL_DOCUMENT_ANNOTATIONS
+          // not yet implemented
+          GP<ByteStream> anno = doc->get_document_anno();
+          if (anno)
+            return get_bytestream_anno(anno);
+#endif
+          if (compat)
+            {
+              // look for shared annotations
+              int doc_type = doc->get_doc_type();
+              if (doc_type != DjVuDocument::BUNDLED &&
+                  doc_type != DjVuDocument::INDIRECT )
+                return miniexp_nil;
+              GP<DjVmDir> dir = doc->get_djvm_dir();
+              int filenum = dir->get_files_num();
+              GP<DjVmDir::File> fdesc;
+              for (int i=0; i<filenum; i++)
+                {
+                  GP<DjVmDir::File> f = dir->pos_to_file(i);
+                  if (!f->is_shared_anno())
+                    continue;
+                  if (fdesc)
+                    return miniexp_nil;
+                  fdesc = f;
+                }
+              if (fdesc)
+                {
+                  GUTF8String id = fdesc->get_load_name();
+                  return get_file_anno(doc->get_djvu_file(id));
+                }
+            }
+          return miniexp_nil;
+        }
+    }
+  G_CATCH(ex)
+    {
+      ERROR1(document, ex);
+    }
+  G_ENDCATCH;
+  return miniexp_status(DDJVU_JOB_FAILED);
+}
+
+
+
+
+/* ------ helpers for annotations ---- */
+
+static const char *
+simple_anno_sub(miniexp_t p, miniexp_t s, int i)
+{
+  const char *result = 0;
+  while (miniexp_consp(p))
+    {
+      miniexp_t a = miniexp_car(p);
+      p = miniexp_cdr(p);
+      if (miniexp_car(a) == s)
+        {
+          miniexp_t q = miniexp_nth(i, a);
+          if (miniexp_symbolp(q))
+            result = miniexp_to_name(q);
+        }
+    }
+  return result;
+}
+
+const char *
+ddjvu_anno_get_bgcolor(miniexp_t p)
+{
+  return simple_anno_sub(p, miniexp_symbol("background"), 1);
+}
+
+const char *
+ddjvu_anno_get_zoom(miniexp_t p)
+{
+  return simple_anno_sub(p, miniexp_symbol("zoom"), 1);
+}
+
+const char *
+ddjvu_anno_get_mode(miniexp_t p)
+{
+  return simple_anno_sub(p, miniexp_symbol("mode"), 1);
+}
+
+const char *
+ddjvu_anno_get_horizalign(miniexp_t p)
+{
+  return simple_anno_sub(p, miniexp_symbol("align"), 1);
+}
+
+const char *
+ddjvu_anno_get_vertalign(miniexp_t p)
+{
+  return simple_anno_sub(p, miniexp_symbol("align"), 2);
+}
+
+miniexp_t *
+ddjvu_anno_get_hyperlinks(miniexp_t annotations)
+{
+  miniexp_t p;
+  miniexp_t s_maparea = miniexp_symbol("maparea");
+  int i = 0;
+  for (p = annotations; miniexp_consp(p); p = miniexp_cdr(p))
+    if (miniexp_caar(p) == s_maparea)
+      i += 1;
+  miniexp_t *k = (miniexp_t*)malloc((1+i)*sizeof(miniexp_t));
+  if (! k) return 0;
+  i = 0;
+  for (p = annotations; miniexp_consp(p); p = miniexp_cdr(p))
+    if (miniexp_caar(p) == s_maparea)
+      k[i++] = miniexp_car(p);
+  k[i] = 0;
+  return k;
+}
+
+static void
+metadata_sub(miniexp_t p, GMap<miniexp_t,miniexp_t> &m)
+{
+  miniexp_t s_metadata = miniexp_symbol("metadata");
+  while (miniexp_consp(p))
+    {
+      if (miniexp_caar(p) == s_metadata)
+        {
+          miniexp_t q = miniexp_cdar(p);
+          while (miniexp_consp(q))
+            {
+              miniexp_t a = miniexp_car(q);
+              q = miniexp_cdr(q);
+              if (miniexp_consp(a) && 
+                  miniexp_symbolp(miniexp_car(a)) &&
+                  miniexp_stringp(miniexp_cadr(a)) )
+                {
+                  m[miniexp_car(a)] = miniexp_cadr(a);
+                }
+            }
+        }
+      p = miniexp_cdr(p);
+    }
+}
+
+miniexp_t *
+ddjvu_anno_get_metadata_keys(miniexp_t p)
+{
+  minivar_t l;
+  GMap<miniexp_t,miniexp_t> m;
+  metadata_sub(p, m);
+  int i = m.size();
+  miniexp_t *k = (miniexp_t*)malloc((1+i)*sizeof(miniexp_t));
+  if (! k) return 0;
+  i = 0;
+  for (GPosition p=m; p; ++p)
+    k[i++] = m.key(p);
+  k[i] = 0;
+  return k;
+}
+
+const char *
+ddjvu_anno_get_metadata(miniexp_t p, miniexp_t key)
+{
+  GMap<miniexp_t,miniexp_t> m;
+  metadata_sub(p, m);
+  if (m.contains(key))
+    return miniexp_to_str(m[key]);
+  return 0;
+}
+
+const char *
+ddjvu_anno_get_xmp(miniexp_t p)
+{
+  miniexp_t s = miniexp_symbol("xmp");
+  while (miniexp_consp(p))
+    {
+      miniexp_t a = miniexp_car(p);
+      p = miniexp_cdr(p);
+      if (miniexp_car(a) == s)
+        {
+          miniexp_t q = miniexp_nth(1, a);
+          if (miniexp_stringp(q))
+            return miniexp_to_str(q);
+        }
+    }
+  return 0;
+}
+
+
+// ----------------------------------------
+// Backdoors
+
+GP<DjVuImage>
+ddjvu_get_DjVuImage(ddjvu_page_t *page)
+{
+  return page->img;
+}
+
+
+GP<DjVuDocument>
+ddjvu_get_DjVuDocument(ddjvu_document_t *document)
+{
+  return document->doc;
+}
+
+
diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h
new file mode 100644
index 0000000..4f9ed56
--- /dev/null
+++ b/libdjvu/ddjvuapi.h
@@ -0,0 +1,1685 @@
+/* 
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+*/
+
+#ifndef DDJVUAPI_H
+#define DDJVUAPI_H
+
+#ifdef __cplusplus
+extern "C" { 
+#endif
+#if 0
+}
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifndef DDJVUAPI
+# ifdef _WIN32
+#  ifdef DDJVUAPI_EXPORT
+#   define DDJVUAPI __declspec(dllexport)
+#  else
+#   define DDJVUAPI __declspec(dllimport)
+#  endif
+# endif
+#endif
+#ifndef DDJVUAPI
+# define DDJVUAPI /**/
+#endif
+
+#ifndef TRUE
+# define TRUE  (1)
+#endif
+
+#ifndef FALSE
+# define FALSE (0)
+#endif
+
+
+
+/* -------------------------------------------------- */
+/* DDJVU API                                          */
+/* -------------------------------------------------- */
+
+/* The DDJVU API provides for efficiently decoding and
+   displaying DjVu documents.  It provides for displaying
+   images without waiting for the complete DjVu data. Images
+   can be displayed as soon as sufficient data is
+   available. A higher quality image might later be
+   displayed when further data is available.  The DjVu
+   library achieves this using a complicated scheme
+   involving multiple threads. The DDJVU API hides this
+   complexity with a familiar event model.
+*/
+
+/* Compiler symbol DDJVUAPI_VERSION tracks 
+   backward compatible additions to the DDJVU API.
+
+   Version   Change
+   -----------------------------
+     23    Added:
+              miniexp_mutate()
+     22    Changed
+              miniexp strings accept unicode escapes
+              deprecated miniexp_io_t::p_print7bits
+              added miniexp_io_t::p_flags
+     21    Added:
+              reentrant version of miniexp input/output
+     20    Added:
+              ddjvu_get_version_string()
+              ddjvu_format_set_white()
+              ddjvu_anno_get_xmp()
+     19    Added:
+              ddjvu_document_create_by_filename_utf8()
+     18    Added:
+              ddjvu_document_get_{anno,pagedump,filedump}()
+           Modifed (binary compatible):
+              ddjvu_document_get_{fileinfo,pageinfo}()   
+              ddjvu_document_save() [--pages, --indirect=]
+           Deprecated:
+              ddjvu_document_search_pageno()
+              ddjvu_page_get_{short,long}_description()
+     17    Added:
+              ddjvu_page_get_initial_rotation(), ddjvu_code_get_version()
+              ddjvu_document_{get_filenum,get_fileinfo}}()
+              ddjvu_document_{search_pageno,check_pagedata}()
+              ddjvu_rectmapper_t and related functions.
+     16    Added:
+              miniexp.h and related functions.
+     15    Added:
+              ddjvu_document_get_pageinfo()
+              ddjvu_document_print()
+     14    Initial version.
+*/
+
+#define DDJVUAPI_VERSION 23
+
+typedef struct ddjvu_context_s    ddjvu_context_t;
+typedef union  ddjvu_message_s    ddjvu_message_t;
+typedef struct ddjvu_job_s        ddjvu_job_t;
+typedef struct ddjvu_document_s   ddjvu_document_t;
+typedef struct ddjvu_page_s       ddjvu_page_t;
+typedef struct ddjvu_format_s     ddjvu_format_t;
+typedef struct ddjvu_rect_s       ddjvu_rect_t;
+typedef struct ddjvu_rectmapper_s ddjvu_rectmapper_t;
+
+
+/* GENERAL CONVENTIONS:
+
+   - all strings use locale encoding (unless specified otherwise).
+   - all filenames are unencoded byte strings,
+   - all errors are signaled with error event messages,
+   - all functions returning a pointer might return a null pointer.
+
+   HEADER:
+   Always use the following idiom to include this file.
+
+     #include <libdjvu/ddjvuapi.h>
+     #include <libdjvu/miniexp.h>
+
+   This file does not declare functions ddjvu_get_DjVuImage() 
+   and djvu_get_DjVuDocument() unless you include files 
+   "DjVuImage.h" and "DjVuDocument.h" before this file.
+
+   PREREQUISITES:
+   - Please read the djvu man page: <"tools/djvu.1">.
+   - Please browse the file format specifications 
+     <"doc/djvu3changes.txt"> and <"doc/djvu3spec.djvu">.
+*/
+
+  
+
+/* -------------------------------------------------- */
+/* DDJVU_CONTEXT_T                                    */
+/* -------------------------------------------------- */
+
+/* There is usually only one <ddjvu_context_t> object.  
+   This object holds global data structures such as the 
+   cache of decoded pages, or the list of pending 
+   event messages.
+ */
+
+
+
+/* ddjvu_get_version_string() ---
+   Returns a string that described the underlying code. */
+
+DDJVUAPI const char*
+ddjvu_get_version_string(void);
+
+
+/* ddjvu_context_create ---
+   Creates a <ddjvu_context_t> object.
+   Argument <programname> is the name of the calling executable. */
+
+DDJVUAPI ddjvu_context_t *
+ddjvu_context_create(const char *programname);
+
+
+/* ddjvu_context_release ---
+   Release a reference to a <ddjvu_context_t> object.
+   The calling program should no longer reference this object.
+   The object itself will be destroyed as soon as no other object
+   or thread needs it. */
+
+DDJVUAPI void 
+ddjvu_context_release(ddjvu_context_t *context);
+
+
+
+
+
+/* ------- CACHE ------- */
+
+/* ddjvu_cache_set_size ---
+   Sets the maximum size of the cache of decoded page data.
+   The argument is expressed in bytes. */
+
+DDJVUAPI void
+ddjvu_cache_set_size(ddjvu_context_t *context,
+                     unsigned long cachesize);
+
+
+/* ddjvu_cache_get_size ---
+   Returns the maximum size of the cache. */
+
+DDJVUAPI unsigned long
+ddjvu_cache_get_size(ddjvu_context_t *context);
+
+
+/* ddjvu_cache_clear ---
+   Clears all cached data. */
+
+DDJVUAPI void
+ddjvu_cache_clear(ddjvu_context_t *context);
+
+
+
+/* ------- MESSAGE QUEUE ------- */
+
+/* Messages produced by the ddjvu api accumulate into
+   the message queue. Processing messages is not optional!
+   A typical message handling routine looks like this:
+   
+   void handle_ddjvu_messages(ddjvu_context_t *ctx, int wait)
+   {
+     const ddjvu_message_t *msg;
+     if (wait)
+       ddjvu_message_wait(ctx);
+     while ((msg = ddjvu_message_peek(ctx)))
+     {
+       switch(msg->m_any.tag)
+       { 
+       case DDJVU_ERROR:      .... ; break;
+       case DDJVU_INFO:       .... ; break;
+       case DDJVU_NEWSTREAM:  .... ; break;
+       ....
+       default: break;
+       }
+       ddjvu_message_pop(ctx);
+     }
+   }
+*/
+
+
+/* ddjvu_message_peek ---
+   Returns a pointer to the next DDJVU message.
+   This function returns 0 if no message is available.
+   It does not remove the message from the queue. */
+
+DDJVUAPI ddjvu_message_t *
+ddjvu_message_peek(ddjvu_context_t *context);
+
+
+/* ddjvu_message_wait ---
+   Returns a pointer to the next DDJVU message.
+   This function waits until a message is available.
+   It does not remove the message from the queue. */
+
+DDJVUAPI ddjvu_message_t *
+ddjvu_message_wait(ddjvu_context_t *context);
+
+
+/* ddjvu_message_pop ---
+   Removes one message from the queue.
+   This function must be called after processing the message.
+   Pointers returned by previous calls to <ddjvu_message_peek> 
+   or <ddjvu_message_wait> are no longer valid after 
+   calling <ddjvu_message_pop>. */
+
+DDJVUAPI void
+ddjvu_message_pop(ddjvu_context_t *context);
+
+
+/* ddjvu_message_set_callback ---
+   Defines a callback function invoked whenever
+   a new message is posted to the ddjvuapi message queue,
+   and returns a pointer to the previous callback function.
+   This callback function can be called at any time
+   while other code is executing. Do not call ddjvuapi
+   functions from this callback. It should simply signal
+   the main application event loop that new ddjvuapi messages
+   are available.  Under WIN32, this is usually achieved
+   by posting a user window message.  Under UNIX, this is
+   usually achieved using a pipe: the callback writes 
+   a single byte into the pipe; the main application loop
+   monitors the reading end of the pipe and detects
+   the presence of data. */
+
+typedef void 
+(*ddjvu_message_callback_t)(ddjvu_context_t *context, void *closure);
+
+DDJVUAPI void
+ddjvu_message_set_callback(ddjvu_context_t *context,
+                           ddjvu_message_callback_t callback,
+                           void *closure);
+
+
+
+/* -------------------------------------------------- */
+/* DDJVU_JOB_T                                        */
+/* -------------------------------------------------- */
+
+
+/* Many essential ddjvuapi functions initiate asynchronous operations. 
+   These "jobs" run in seperate threads and report their
+   progress by posting messages into the ddjvu context event queue. 
+   Jobs are sometimes represented by a ddjvu_job_t object. */
+
+/* ddjvu_job_status ---
+   Returns the status of the specified job. */
+
+typedef enum {
+  DDJVU_JOB_NOTSTARTED, /* operation was not even started */
+  DDJVU_JOB_STARTED,    /* operation is in progress */
+  DDJVU_JOB_OK,         /* operation terminated successfully */
+  DDJVU_JOB_FAILED,     /* operation failed because of an error */
+  DDJVU_JOB_STOPPED     /* operation was interrupted by user */
+} ddjvu_status_t;
+
+DDJVUAPI ddjvu_status_t
+ddjvu_job_status(ddjvu_job_t *job);
+
+#define ddjvu_job_done(job) \
+    (ddjvu_job_status(job) >= DDJVU_JOB_OK)
+#define ddjvu_job_error(job) \
+    (ddjvu_job_status(job) >= DDJVU_JOB_FAILED)
+
+
+/* ddjvu_job_stop ---
+   Attempts to cancel the specified job.
+   This is a best effort function. 
+   There no guarantee that the job will 
+   actually stop.
+ */
+
+DDJVUAPI void
+ddjvu_job_stop(ddjvu_job_t *job);
+
+
+/* ddjvu_job_set_user_data ---
+   ddjvu_job_get_user_data ---
+   Each job can store an arbitrary pointer
+   that callers can use for any purpose. These two 
+   functions provide for accessing or setting this pointer. 
+   This pointer is cleared when the job is released */
+
+DDJVUAPI void
+ddjvu_job_set_user_data(ddjvu_job_t *job, void *userdata);
+
+DDJVUAPI void *
+ddjvu_job_get_user_data(ddjvu_job_t *job);
+
+
+/* ddjvu_job_release ---
+   Releases a reference to a job object and clears its user 
+   data field.  This does not cause the job to stop executing.
+   The calling program should no longer reference this object.
+   The object itself will be destroyed as soon as no 
+   other object or thread needs it. 
+*/
+
+DDJVUAPI void
+ddjvu_job_release(ddjvu_job_t *job);
+
+
+
+/* -------------------------------------------------- */
+/* DDJVU_MESSAGE_T                                    */
+/* -------------------------------------------------- */
+
+
+/* ddjvu_message_t ---
+   This union type represents messages delivered by the
+   DDJVU API. Each member of the union pertains to a
+   specific kind of message.  Member <m_any> represents the
+   information common to all kinds of messages.  Given a
+   pointer <p> to a <djvu_message_t>, the message kind can
+   be accessed as <"p->m_any.tag">. */
+
+
+/* ddjvu_message_tag_t ---
+   This enumerated type identifies each kind of 
+   message delivered by the DDJVU API.  */
+
+typedef enum {
+  DDJVU_ERROR,
+  DDJVU_INFO,
+  DDJVU_NEWSTREAM,
+  DDJVU_DOCINFO,
+  DDJVU_PAGEINFO,
+  DDJVU_RELAYOUT,
+  DDJVU_REDISPLAY,
+  DDJVU_CHUNK,
+  DDJVU_THUMBNAIL,
+  DDJVU_PROGRESS,
+} ddjvu_message_tag_t;
+
+
+/* ddjvu_message_t::m_any ---
+   This structure is a member of the union <djvu_message_t>.
+   It represents the information common to all kinds of
+   messages.  Member <tag> indicates the kind of message.
+   Members <context>, <document>, <page>, and <job> indicate 
+   the origin of the message.  These fields contain null
+   pointers when they are not relevant.
+   These fields are also cleared when the corresponding
+   object is released with <ddjvu_{job,page,document}_release>.
+   If the message has not yet been passed to the user 
+   with <ddjvu_message_{peek,wait}>, it is silently 
+   removed from the message queue. */
+
+typedef struct ddjvu_message_any_s {
+  ddjvu_message_tag_t   tag;
+  ddjvu_context_t      *context;
+  ddjvu_document_t     *document;
+  ddjvu_page_t         *page;
+  ddjvu_job_t          *job;
+} ddjvu_message_any_t; 
+
+
+/* ddjvu_message_t::m_error ---
+   Error messages are generated whenever the decoder or the
+   DDJVU API encounters an error condition.  All errors are
+   reported as error messages because they can occur
+   asynchronously.  Member <message> is the error message.
+   Members <function>, <filename> and <lineno>
+   indicates the place where the error was detected. */
+
+struct ddjvu_message_error_s {  /* ddjvu_message_t::m_error */
+  ddjvu_message_any_t   any;
+  const char           *message;
+  const char           *function;
+  const char           *filename;
+  int                   lineno;
+}; 
+
+
+/* ddjvu_message_t::m_info ---
+   This messages provides informational text indicating
+   the progress of the decoding process. This might
+   be displayed in the browser status bar. */
+
+struct ddjvu_message_info_s {   /* ddjvu_message_t::m_info */
+  ddjvu_message_any_t  any;
+  const char          *message;
+}; 
+
+
+
+
+/* -------------------------------------------------- */
+/* DDJVU_DOCUMENT_T                                    */
+/* -------------------------------------------------- */
+
+
+/* ddjvu_document_create ---
+   Creates a decoder for a DjVu document and starts
+   decoding.  This function returns immediately.  The
+   decoding job then generates messages to request the raw
+   data and to indicate the state of the decoding process.
+
+   Argument <url> specifies an optional URL for the document.  
+   The URL follows the usual syntax (<"protocol://machine/path">). 
+   It should not end with a slash. It only serves two purposes:
+   - The URL is used as a key for the cache of decoded pages.
+   - The URL is used to document <m_newstream> messages.
+
+   Setting argument <cache> to <TRUE> indicates that decoded pages
+   should be cached when possible.  This only works when
+   argument <url> is not the null pointer.
+
+   It is important to understand that the URL is not used to
+   access the data.  The document generates <m_newstream>
+   messages to indicate which data is needed.  The caller must 
+   then provide the raw data using <ddjvu_stream_write> 
+   and <ddjvu_stream_close>.
+
+   Localized characters in argument <url> should be in 
+   urlencoded UTF-8 (like "%2A"). What is happening for non 
+   ascii characters is unclear (probably UTF-8). */
+
+DDJVUAPI ddjvu_document_t *
+ddjvu_document_create(ddjvu_context_t *context,
+                      const char *url,
+                      int cache);
+
+
+/* ddjvu_document_create_by_filename ---
+   Creates a document for a DjVu document stored in a file.
+   The document will directly access the specified DjVu file 
+   or related files without generating <m_newstream> messages.
+   The standard function expects the filename in locale encoding. 
+   The utf8 variant expects an utf8 encoded filename. */
+
+DDJVUAPI ddjvu_document_t *
+ddjvu_document_create_by_filename(ddjvu_context_t *context,
+                                  const char *filename,
+                                  int cache);
+
+DDJVUAPI ddjvu_document_t *
+ddjvu_document_create_by_filename_utf8(ddjvu_context_t *context,
+                                       const char *filename,
+                                       int cache);
+
+/* ddjvu_document_job ---
+   Access the job object in charge of decoding the document header. 
+   In fact <ddjvu_document_t> is a subclass of <ddjvu_job_t>
+   and this function is a type cast. */
+
+DDJVUAPI ddjvu_job_t *
+ddjvu_document_job(ddjvu_document_t *document);
+
+
+/* ddjvu_document_release ---
+   Release a reference to a <ddjvu_document_t> object.
+   The calling program should no longer reference this object.  
+   The object itself will be destroyed as soon as no other object
+   or thread needs it. */
+ 
+#define ddjvu_document_release(document) \
+   ddjvu_job_release(ddjvu_document_job(document))
+
+
+/* ddjvu_document_set_user_data ---
+   ddjvu_document_get_user_data ---
+   Each <ddjvu_document_t> object can store an arbitray pointer
+   that callers can use for any purpose. These two functions
+   provide for accessing or setting this pointer. */
+
+#define ddjvu_document_set_user_data(document,userdata) \
+   ddjvu_job_set_user_data(ddjvu_document_job(document),userdata)
+#define ddjvu_document_get_user_data(document) \
+   ddjvu_job_get_user_data(ddjvu_document_job(document))
+
+/* ddjvu_document_decoding_status ---
+   ddjvu_document_decoding_done, ddjvu_document_decoding_error ---
+   This function returns the status of the document header decoding job */
+   
+#define ddjvu_document_decoding_status(document) \
+   ddjvu_job_status(ddjvu_document_job(document))
+#define ddjvu_document_decoding_done(document) \
+   (ddjvu_document_decoding_status(document) >= DDJVU_JOB_OK)
+#define ddjvu_document_decoding_error(document) \
+   (ddjvu_document_decoding_status(document) >= DDJVU_JOB_FAILED)
+
+
+/* ------- STREAMS ------- */
+
+
+/* ddjvu_message_t::m_newstream --- 
+   Newstream messages are generated whenever the decoder
+   needs to access raw DjVu data.  The caller must then
+   provide the requested data using <ddjvu_stream_write> 
+   and <ddjvu_stream_close>. 
+
+   In the case of indirect documents, a single decoder 
+   might simultaneously request several streams of data.  
+   Each stream is identified by a small integer <streamid>.
+
+   The first <m_newstream> message always has member
+   <streamid> set to zero and member <name> set to the null
+   pointer.  It indicates that the decoder needs to access
+   the data in the main DjVu file.  In fact, data can be
+   written to stream <0> as soon as the <ddjvu_document_t>
+   object is created.
+
+   Further <m_newstream> messages are generated to access
+   the auxiliary files of indirect or indexed DjVu
+   documents.  Member <name> then provides the basename of
+   the auxiliary file.
+
+   Member <url> is set according to the url argument
+   provided to function <ddjvu_document_create>.  The first
+   newstream message always contain the url passed to
+   <ddjvu_document_create>.  Subsequent newstream messages
+   contain the url of the auxiliary files for indirect or
+   indexed DjVu documents. */
+   
+struct ddjvu_message_newstream_s { /* ddjvu_message_t::m_newstream */
+  ddjvu_message_any_t  any;
+  int                  streamid;
+  const char          *name;
+  const char          *url;
+}; 
+
+
+/* ddjvu_stream_write ---
+   Provide raw data to the DjVu decoder.
+   This function should be called as soon as the data is available,
+   for instance when receiving DjVu data from a network connection.
+ */
+
+DDJVUAPI void
+ddjvu_stream_write(ddjvu_document_t *document,
+                   int streamid,
+                   const char *data,
+                   unsigned long datalen );
+
+
+/* ddjvu_stream_close ---
+   Indicates that no more data will be provided on a
+   particular stream.  Argument <stop> most likely should be
+   set to <FALSE>. Setting argument <stop> to <TRUE>
+   indicates that the user has interrupted the data transfer
+   (for instance by pressing the stop button of a browser)
+   and that the decoding threads should be stopped as 
+   soon as feasible. */
+
+DDJVUAPI void
+ddjvu_stream_close(ddjvu_document_t *document,
+                   int streamid,
+                   int stop );
+
+
+
+/* ------- QUERIES ------- */
+
+
+/* ddjvu_message_t::m_docinfo ---
+   The <m_docinfo> message indicates that basic information
+   about the document has been obtained and decoded.
+   Not much can be done before this happens.
+   Call <ddjvu_document_decoding_status> to determine
+   whether the operation was successful. */
+
+struct ddjvu_message_docinfo_s {
+  ddjvu_message_any_t  any;
+};
+
+
+/* ddjvu_document_get_type ---
+   Returns the type of a DjVu document.
+   This function might return <DDJVU_DOCTYPE_UNKNOWN>
+   when called before receiving a <m_docinfo> message. */
+
+typedef enum {
+  DDJVU_DOCTYPE_UNKNOWN=0,
+  DDJVU_DOCTYPE_SINGLEPAGE,
+  DDJVU_DOCTYPE_BUNDLED, 
+  DDJVU_DOCTYPE_INDIRECT,
+  DDJVU_DOCTYPE_OLD_BUNDLED, /* obsolete */
+  DDJVU_DOCTYPE_OLD_INDEXED, /* obsolete */
+} ddjvu_document_type_t;
+
+DDJVUAPI ddjvu_document_type_t
+ddjvu_document_get_type(ddjvu_document_t *document);
+
+
+/* ddjvu_document_get_pagenum ---
+   Returns the number of pages in a DjVu document.
+   This function might return 1 when called 
+   before receiving a <m_docinfo> message */
+   
+DDJVUAPI int
+ddjvu_document_get_pagenum(ddjvu_document_t *document);
+
+
+
+/* ------- ADVANCED ------- */
+
+
+/* ddjvu_document_get_filenum --
+   Returns the number of component files.
+   This function might return 0 when called
+   before receiving a <m_docinfo> message */
+   
+DDJVUAPI int
+ddjvu_document_get_filenum(ddjvu_document_t *document);
+
+
+/* ddjvu_document_get_fileinfo --
+   Returns information about component file <fileno>.
+   This function might return <DDJVU_JOB_STARTED> when
+   called before receiving a <m_docinfo> message.
+   String pointers in the returned data structure 
+   might be null. Strings are UTF8 encoded and remain 
+   allocated as long as the ddjvu_document_t object exists.
+
+   Changes for ddjvuapi=18
+   - Redefined as a macro passing the structure size.
+*/
+
+typedef struct ddjvu_fileinfo_s {
+  char  type;                   /* [P]age, [T]humbnails, [I]nclude. */
+  int   pageno;                 /* Negative when not applicable. */
+  int   size;                   /* Negative when unknown. */
+  const char *id;               /* File identifier. */
+  const char *name;             /* Name for indirect documents. */
+  const char *title;            /* Page title. */
+} ddjvu_fileinfo_t;
+
+#define ddjvu_document_get_fileinfo(d,f,i) \
+   ddjvu_document_get_fileinfo_imp(d,f,i,sizeof(ddjvu_fileinfo_t))
+
+DDJVUAPI ddjvu_status_t
+ddjvu_document_get_fileinfo_imp(ddjvu_document_t *document, int fileno, 
+                                ddjvu_fileinfo_t *info, unsigned int infosz);
+
+
+/* ddjvu_document_search_pageno --- DEPRECATED. */
+
+DDJVUAPI int ddjvu_document_search_pageno(ddjvu_document_t*, const char*);
+
+
+/* ddjvu_document_check_pagedata ---
+   Returns a non zero result if the data for page <pageno>
+   is already in memory. When this is the case, functions 
+   <ddjvu_document_get_pageinfo> and <ddjvu_document_get_pagetext> 
+   return the information immediately.
+   This function causes the emission of <m_pageinfo> messages 
+   with zero in the <m_any.page> field whenever a new file
+   is completely downloaded. */
+
+DDJVUAPI int 
+ddjvu_document_check_pagedata(ddjvu_document_t *document, int pageno);
+
+
+/* ddjvu_document_get_pageinfo ---
+   Attempts to obtain information about page <pageno>
+   without decoding the page. If the information is available,
+   the function returns <DDJVU_JOB_OK> and fills the <info> structure. 
+   Otherwise it starts fetching page data and returns <DDJVU_JOB_STARTED>. 
+   This function causes the emission of <m_pageinfo> messages 
+   with zero in the <m_any.page> field.
+   Typical synchronous usage:
+
+   ddjvu_status_t r;
+   ddjvu_pageinfo_t info;
+   while ((r=ddjvu_document_get_pageinfo(doc,pageno,&info))<DDJVU_JOB_OK)
+     handle_ddjvu_messages(ctx, TRUE);
+   if (r>=DDJVU_JOB_FAILED)
+     signal_error();
+
+   Changes for ddjvuapi=18
+   - Redefined as a macro passing the structure size.
+   - Added fields 'rotation' and 'version'.
+*/      
+
+typedef struct ddjvu_pageinfo_s {
+  int width;                    /* page width (in pixels) */
+  int height;                   /* page height (in pixels) */
+  int dpi;                      /* page resolution (in dots per inche) */
+  int rotation;                 /* initial page orientation */
+  int version;                  /* page version */
+} ddjvu_pageinfo_t;
+
+#define ddjvu_document_get_pageinfo(d,p,i) \
+   ddjvu_document_get_pageinfo_imp(d,p,i,sizeof(ddjvu_pageinfo_t))
+
+DDJVUAPI ddjvu_status_t
+ddjvu_document_get_pageinfo_imp(ddjvu_document_t *document, int pageno, 
+                                ddjvu_pageinfo_t *info, unsigned int infosz );
+
+
+
+
+/* ddjvu_document_get_pagedump --
+   This function returns a UTF8 encoded text describing the contents 
+   of page <pageno> using the same format as command <djvudump>. 
+   The returned string must be deallocated using <free()>.
+   It returns <0> when the information is not yet available. 
+   It may then cause then the emission of <m_pageinfo> 
+   messages with null <m_any.page>.
+*/   
+
+DDJVUAPI char *
+ddjvu_document_get_pagedump(ddjvu_document_t *document, int pageno);
+
+
+/* ddjvu_document_get_filedump --
+   This function returns a UTF8 encoded text describing the contents 
+   of file <fileno> using the same format as command <djvudump>. 
+   The returned string must be deallocated using <free()>.
+   It returns <0> when the information is not yet available. 
+   It may then cause then the emission of <m_pageinfo> 
+   messages with null <m_any.page>.
+*/   
+
+DDJVUAPI char *
+ddjvu_document_get_filedump(ddjvu_document_t *document, int fileno);
+
+
+
+
+/* -------------------------------------------------- */
+/* DJVU_PAGE_T                                        */
+/* -------------------------------------------------- */
+
+
+/* ddjvu_page_create_by_pageno ---
+   Each page of a document can be accessed by creating a
+   <ddjvu_page_t> object with this function.  Argument
+   <pageno> indicates the page number, starting with page
+   <0> to <pagenum-1>. This function may return NULL
+   when called before receiving the <m_docinfo> message.
+   Calling this function also initiates the data transfer 
+   and the decoding threads for the specified page.  
+   Various messages will document the progress of these 
+   operations. Error messages will be generated if 
+   the page does not exists. */
+
+DDJVUAPI ddjvu_page_t *
+ddjvu_page_create_by_pageno(ddjvu_document_t *document,
+                            int pageno);
+
+/* ddjvu_page_create_by_pageid ---
+   This function is similar to <ddjvu_page_create_by_pageno>
+   but identifies the desired page by name instead of page
+   number. */
+
+DDJVUAPI ddjvu_page_t *
+ddjvu_page_create_by_pageid(ddjvu_document_t *document,
+                            const char *pageid);
+
+
+/* ddjvu_page_job ---
+   Access the job object in charge of decoding the document header. 
+   In fact <ddjvu_page_t> is a subclass of <ddjvu_job_t>
+   and this function is a type cast. */
+
+DDJVUAPI ddjvu_job_t *
+ddjvu_page_job(ddjvu_page_t *page);
+
+
+/* ddjvu_page_release ---
+   Release a reference to a <ddjvu_page_t> object.
+   The calling program should no longer reference this object.
+   The object itself will be destroyed as soon as no other object
+   or thread needs it. */
+
+#define ddjvu_page_release(page) \
+  ddjvu_job_release(ddjvu_page_job(page))
+
+
+/* ddjvu_page_set_user_data ---
+   ddjvu_page_get_user_data ---
+   Each <ddjvu_paqge_t> object can store an arbitray pointer
+   that callers can use for any purpose. These two functions
+   provide for accessing or setting this pointer. */
+
+#define ddjvu_page_set_user_data(page,userdata) \
+   ddjvu_job_set_user_data(ddjvu_page_job(page),userdata)
+#define ddjvu_page_get_user_data(page) \
+   ddjvu_job_get_user_data(ddjvu_page_job(page))
+
+/* ddjvu_page_decoding_status ---
+   ddjvu_page_decoding_done ---
+   ddjvu_page_decoding_error ---
+   These calls return the status of the page decoding job. */
+   
+#define ddjvu_page_decoding_status(page) \
+   ddjvu_job_status(ddjvu_page_job(page))
+#define ddjvu_page_decoding_done(page) \
+    (ddjvu_page_decoding_status(page) >= DDJVU_JOB_OK)
+#define ddjvu_page_decoding_error(page) \
+    (ddjvu_page_decoding_status(page) >= DDJVU_JOB_FAILED)
+
+
+/* ------- MESSAGES ------- */
+
+
+/* ddjvu_message_t::m_pageinfo ---
+   The page decoding process generates this message
+   - when basic page information is available and 
+     before any <m_relayout> or <m_redisplay> message,
+   - when the page decoding thread terminates.
+   You can distinguish both cases using 
+   function ddjvu_page_decoding_status().
+   Messages <m_pageinfo> are also generated as a consequence of 
+   functions such as <ddjvu_document_get_pageinfo>. 
+   The field <m_any.page> of such message is null.
+*/
+
+struct ddjvu_message_pageinfo_s {  /* ddjvu_message_t::m_pageinfo */
+  ddjvu_message_any_t  any;
+}; 
+
+
+/* ddjvu_message_t::m_relayout ---
+   This message is generated when a DjVu viewer
+   should recompute the layout of the page viewer
+   because the page size and resolution information has
+   been updated. */
+
+struct ddjvu_message_relayout_s {  /* ddjvu_message_t::m_relayout */
+  ddjvu_message_any_t  any;
+}; 
+
+
+/* ddjvu_message_t::m_redisplay ---
+   This message is generated when a DjVu viewer
+   should call <ddjvu_page_render> and redisplay
+   the page. This happens, for instance, when newly 
+   decoded DjVu data provides a better image. */
+
+struct ddjvu_message_redisplay_s { /* ddjvu_message_t::m_redisplay */
+  ddjvu_message_any_t  any;
+}; 
+
+
+/* ddjvu_message_t::m_chunk ---
+   This message indicates that an additional chunk
+   of DjVu data has been decoded.  Member <chunkid>
+   indicates the type of the DjVu chunk. */
+
+struct ddjvu_message_chunk_s {     /* ddjvu_message_t::m_chunk */
+  ddjvu_message_any_t  any;
+  const char *chunkid;
+}; 
+
+/* About page messages --
+   Both the <m_relayout> and <m_redisplay> messages are derived from the
+   <m_chunk> message.  They are intended for driving a djvu image viewer. 
+   When receiving <m_relayout>, the viewer should get the image size, decide
+   zoom factors, and place the image area, scrollbars, toolbars, and other gui
+   objects.  When receiving <m_redisplay>, the viewer should invalidate the
+   image area so that the gui toolkit calls the repaint event handler. This
+   handler should call ddjvu_page_render() and paint the part of the
+   image that needs repainting. */
+
+
+
+/* ------- QUERIES ------- */
+
+/* ddjvu_page_get_width ---
+   Returns the page width in pixels. Calling this function 
+   before receiving a <m_pageinfo> message always yields <0>. */
+
+DDJVUAPI int
+ddjvu_page_get_width(ddjvu_page_t *page);
+
+
+/* ddjvu_page_get_height---
+   Returns the page height in pixels. Calling this function 
+   before receiving a <m_pageinfo> message always yields <0>. */
+
+DDJVUAPI int
+ddjvu_page_get_height(ddjvu_page_t *page);
+
+/* ddjvu_page_get_resolution ---
+   Returns the page resolution in pixels per inch  (dpi).
+   Calling this function before receiving a <m_pageinfo>
+   message yields a meaningless but plausible value. */
+
+DDJVUAPI int
+ddjvu_page_get_resolution(ddjvu_page_t *page);
+
+
+/* ddjvu_page_get_gamma ---
+   Returns the gamma of the display for which this page was designed.
+   Calling this function before receiving a <m_pageinfo>
+   message yields a meaningless but plausible value. */
+
+DDJVUAPI double
+ddjvu_page_get_gamma(ddjvu_page_t *page);
+
+
+/* ddjvu_page_get_version ---
+   Returns the version of the djvu file format.
+   Calling this function before receiving a <m_pageinfo>
+   message yields a meaningless but plausible value. */
+
+DDJVUAPI int
+ddjvu_page_get_version(ddjvu_page_t *page);
+
+/* ddjvu_code_get_version ---
+   Returns the version of the djvu file format
+   implemented by this library. More or less graceful 
+   degradation might arise if this is smaller than
+   the number returned by <ddjvu_page_get_version>. */
+
+DDJVUAPI int
+ddjvu_code_get_version(void);
+
+
+/* ddjvu_page_get_type ---
+   Returns the type of the page data.
+   Calling this function before the termination of the
+   decoding process might returns <DDJVU_PAGETYPE_UNKNOWN>. */
+
+typedef enum {
+  DDJVU_PAGETYPE_UNKNOWN,
+  DDJVU_PAGETYPE_BITONAL,
+  DDJVU_PAGETYPE_PHOTO,
+  DDJVU_PAGETYPE_COMPOUND,
+} ddjvu_page_type_t;
+
+DDJVUAPI ddjvu_page_type_t
+ddjvu_page_get_type(ddjvu_page_t *page);
+
+
+/* ddjvu_page_get_{short,long}_description --- DEPRECATED */
+
+DDJVUAPI char *ddjvu_page_get_short_description(ddjvu_page_t *);
+DDJVUAPI char *ddjvu_page_get_long_description(ddjvu_page_t *);
+
+
+/* ddjvu_page_set_rotation ---
+   Changes the counter-clockwise rotation angle for a DjVu page.
+   Calling this function before receiving a <m_pageinfo>
+   message has no good effect. */
+
+typedef enum {
+  DDJVU_ROTATE_0   = 0,
+  DDJVU_ROTATE_90  = 1,
+  DDJVU_ROTATE_180 = 2,
+  DDJVU_ROTATE_270 = 3,
+} ddjvu_page_rotation_t;
+
+DDJVUAPI void
+ddjvu_page_set_rotation(ddjvu_page_t *page,
+                        ddjvu_page_rotation_t rot);
+
+
+/* ddjvu_page_get_rotation ---
+   Returns the counter-clockwise rotation angle for the DjVu page.
+   The rotation is automatically taken into account
+   by <ddjvu_page_render>, <ddjvu_page_get_width>
+   and <ddjvu_page_get_height>. */
+
+DDJVUAPI ddjvu_page_rotation_t
+ddjvu_page_get_rotation(ddjvu_page_t *page);
+
+
+/* ddjvu_page_get_initial_rotation ---
+   Returns the page rotation specified by the 
+   orientation flags in the DjVu file. 
+   [brain damage warning] This is useful because
+   maparea coordinates in the annotation chunks
+   are expressed relative to the rotated coordinates
+   whereas text coordinates in the hidden text data
+   are expressed relative to the unrotated coordinates. */
+
+DDJVUAPI ddjvu_page_rotation_t
+ddjvu_page_get_initial_rotation(ddjvu_page_t *page);
+
+
+
+/* ------- RENDER ------- */
+
+
+/* ddjvu_render_mode_t ---
+   Various ways to render a page. */
+
+typedef enum {
+  DDJVU_RENDER_COLOR = 0,       /* color page or stencil */
+  DDJVU_RENDER_BLACK,           /* stencil or color page */
+  DDJVU_RENDER_COLORONLY,       /* color page or fail */
+  DDJVU_RENDER_MASKONLY,        /* stencil or fail */
+  DDJVU_RENDER_BACKGROUND,      /* color background layer */
+  DDJVU_RENDER_FOREGROUND,      /* color foreground layer */
+} ddjvu_render_mode_t;
+
+
+/* ddjvu_rect_t ---
+   This structure specifies the location of a rectangle.
+   Coordinates are usually expressed in pixels relative to 
+   the BOTTOM LEFT CORNER (but see ddjvu_format_set_y_direction).
+   Members <x> and <y> indicate the position of the bottom left 
+   corner of the rectangle Members <w> and <h> indicate the 
+   width and height of the rectangle. */
+
+struct ddjvu_rect_s {
+  int x, y;
+  unsigned int w, h;
+};
+
+
+/* ddjvu_page_render --
+   Renders a segment of a page with arbitrary scale.
+   Argument <mode> indicates what image layers 
+   should be rendered. 
+
+   Conceptually this function renders the full page
+   into a rectangle <pagerect> and copies the
+   pixels specified by rectangle <renderrect>
+   into the buffer starting at position <imagebuffer>.
+   The actual code is much more efficient than that.
+
+   The final image is written into buffer <imagebuffer>.  
+   Argument <pixelformat> specifies the expected pixel format.  
+   Argument <rowsize> specifies the number of BYTES from 
+   one row to the next in the buffer. The buffer must be 
+   large enough to accomodate the desired image.
+
+   This function makes a best effort to compute an image
+   that reflects the most recently decoded data.  It might
+   return <FALSE> to indicate that no image could be
+   computed at this point, and that nothing was written into
+   the buffer. */
+
+DDJVUAPI int
+ddjvu_page_render(ddjvu_page_t *page,
+                  const ddjvu_render_mode_t mode,
+                  const ddjvu_rect_t *pagerect,
+                  const ddjvu_rect_t *renderrect,
+                  const ddjvu_format_t *pixelformat,
+                  unsigned long rowsize,
+                  char *imagebuffer );
+
+
+
+
+/* -------------------------------------------------- */
+/* COORDINATE TRANSFORMS                              */
+/* -------------------------------------------------- */
+
+/* ddjvu_rectmapper_create --
+   Creates a <ddjvu_rectmapper_t> data structure 
+   representing an affine coordinate transformation that
+   maps points from rectangle <input> to rectangle <output>.
+   The transformation maintains the positions relative 
+   to the coordinates of the rectangle corners. */
+
+DDJVUAPI ddjvu_rectmapper_t *
+ddjvu_rectmapper_create(ddjvu_rect_t *input, ddjvu_rect_t *output);
+
+
+/* ddjvu_rectmapper_modify ---
+   Modifies the coordinate transform <mapper> by redefining
+   which corners of the output rectangle match those of the 
+   input rectangle. This function first applies a counter-clockwise 
+   rotation of <rotation> quarter-turns, and then reverses the X 
+   (resp. Y) coordinates when <mirrorx> (resp. <mirrory>) is non zero. */
+
+DDJVUAPI void
+ddjvu_rectmapper_modify(ddjvu_rectmapper_t *mapper,
+                        int rotation, int mirrorx, int mirrory);
+
+
+/* ddjvu_rectmapper_release ---
+   Destroys the <ddjvu_rect_mapper_t> structure
+   returned by <ddjvu_rect_mapper_create>. */
+
+DDJVUAPI void 
+ddjvu_rectmapper_release(ddjvu_rectmapper_t *mapper);
+
+/* ddjvu_map_point, ddjvu_map_rect ---
+   Applies the coordinate transform 
+   to a point or a rectangle */
+
+DDJVUAPI void 
+ddjvu_map_point(ddjvu_rectmapper_t *mapper, int *x, int *y);
+
+DDJVUAPI void 
+ddjvu_map_rect(ddjvu_rectmapper_t *mapper, ddjvu_rect_t *rect);
+
+
+/* ddjvu_unmap_point, ddjvu_unmap_rect ---
+   Applies the inverse coordinate transform 
+   to a point or a rectangle */
+
+DDJVUAPI void 
+ddjvu_unmap_point(ddjvu_rectmapper_t *mapper, int *x, int *y);
+
+DDJVUAPI void 
+ddjvu_unmap_rect(ddjvu_rectmapper_t *mapper, ddjvu_rect_t *rect);
+
+
+
+
+/* -------------------------------------------------- */
+/* DJVU_FORMAT_T                                      */
+/* -------------------------------------------------- */
+
+
+/* ddjvu_format_style_t ---
+   Enumerated type for pixel formats. */
+
+typedef enum {
+  DDJVU_FORMAT_BGR24,           /* truecolor 24 bits in BGR order */
+  DDJVU_FORMAT_RGB24,           /* truecolor 24 bits in RGB order */
+  DDJVU_FORMAT_RGBMASK16,       /* truecolor 16 bits with masks */
+  DDJVU_FORMAT_RGBMASK32,       /* truecolor 32 bits with masks */
+  DDJVU_FORMAT_GREY8,           /* greylevel 8 bits */
+  DDJVU_FORMAT_PALETTE8,        /* paletized 8 bits (6x6x6 color cube) */
+  DDJVU_FORMAT_MSBTOLSB,        /* packed bits, msb on the left */
+  DDJVU_FORMAT_LSBTOMSB,        /* packed bits, lsb on the left */
+} ddjvu_format_style_t;
+   
+
+/* ddjvu_format_create ---
+   Creates a <ddjvu_format_t> object describing a pixel format.
+   Argument <style> describes the generic pixel format.
+   Argument <args> is an array of <nargs> unsigned ints
+   providing additionnal information:
+   - When style is <RGBMASK*>, argument <nargs> must be <3> or <4>.
+     The three first entries of array <args> are three contiguous 
+     bit masks for the red, green, and blue components of each pixel.
+     The resulting color is then xored with the optional fourth entry.
+   - When style is <PALETTE*>, argument <nargs> must be <216>
+     and array <args> contains the 6*6*6 entries of a web
+     color cube.
+   - Otherwise <nargs> must be <0>. */
+
+DDJVUAPI ddjvu_format_t *
+ddjvu_format_create(ddjvu_format_style_t style, 
+                    int nargs, unsigned int *args);
+
+
+/* ddjvu_format_set_row_order ---
+   Sets a flag indicating whether the rows in the pixel buffer
+   are stored starting from the top or the bottom of the image.
+   Default ordering starts from the bottom of the image.
+   This is the opposite of the X11 convention. */
+
+DDJVUAPI void
+ddjvu_format_set_row_order(ddjvu_format_t *format, int top_to_bottom);
+
+
+/* ddjvu_format_set_y_direction ---
+   Sets a flag indicating whether the y coordinates in the drawing 
+   area are oriented from bottom to top, or from top to botttom.  
+   The default is bottom to top, similar to PostScript.
+   This is the opposite of the X11 convention. */
+
+DDJVUAPI void
+ddjvu_format_set_y_direction(ddjvu_format_t *format, int top_to_bottom);
+
+
+/* ddjvu_format_set_ditherbits ---
+   Specifies the final depth of the image on the screen.
+   This is used to decide which dithering algorithm should be used.
+   The default is usually appropriate. */
+
+DDJVUAPI void
+ddjvu_format_set_ditherbits(ddjvu_format_t *format, int bits);
+
+
+/* ddjvu_format_set_gamma ---
+   Sets the gamma of the display for which the pixels are
+   intended.  This will be combined with the gamma stored in
+   DjVu documents in order to compute a suitable color
+   correction.  The default value is 2.2. */
+
+DDJVUAPI void
+ddjvu_format_set_gamma(ddjvu_format_t *format, double gamma);
+
+
+/* ddjvu_format_set_white ---
+   Sets the whitepoint of the display for which the pixels are
+   intended.  This will be combined with the gamma stored in
+   DjVu documents in order to compute a suitable color
+   correction.  The default value is 0xff,0xff,0xff. */
+
+DDJVUAPI void
+ddjvu_format_set_white(ddjvu_format_t *format, 
+                       unsigned char b, unsigned char g, unsigned char r);
+
+/* ddjvu_format_release ---
+   Release a reference to a <ddjvu_format_t> object.
+   The calling program should no longer reference this object. */
+
+DDJVUAPI void
+ddjvu_format_release(ddjvu_format_t *format);
+
+
+
+
+/* -------------------------------------------------- */
+/* THUMBNAILS                                         */
+/* -------------------------------------------------- */
+
+
+/* ddjvu_thumbnail_status ---
+   Determine whether a thumbnail is available for page <pagenum>.
+   Calling this function with non zero argument <start> initiates
+   a thumbnail calculation job. Regardless of its success,
+   the completion of the job is signalled by a subsequent 
+   <m_thumbnail> message. */
+
+DDJVUAPI ddjvu_status_t
+ddjvu_thumbnail_status(ddjvu_document_t *document, int pagenum, int start);
+
+
+/* ddjvu_message_t::m_thumbnail ---
+   This message is sent when additional thumbnails are available. */
+
+struct ddjvu_message_thumbnail_s { /* ddjvu_message_t::m_thumbnail */
+  ddjvu_message_any_t  any;
+  int pagenum;
+}; 
+
+
+/* ddjvu_thumbnail_render ---
+   Renders a thumbnail for page <pagenum>.
+   Argument <imagebuffer> must be large enough to contain
+   an image of size <*wptr> by <*hptr> using pixel format
+   <pixelformat>. Argument <rowsize> specifies the number 
+   of BYTES from one row to the next in the buffer.
+   This function returns <FALSE> when no thumbnail is available.
+   Otherwise it returns <TRUE>, adjusts <*wptr> and <*hptr> to 
+   reflect the thumbnail size, and, if the pointer <imagebuffer>
+   is non zero, writes the pixel data into the image buffer. */
+
+DDJVUAPI int
+ddjvu_thumbnail_render(ddjvu_document_t *document, int pagenum, 
+                       int *wptr, int *hptr,
+                       const ddjvu_format_t *pixelformat,
+                       unsigned long rowsize,
+                       char *imagebuffer);
+
+
+
+/* -------------------------------------------------- */
+/* SAVE AND PRINT JOBS                                */
+/* -------------------------------------------------- */
+
+
+/* ddjvu_message_t::m_progress ---
+   These messages are generated to indicate progress 
+   towards the completion of a print or save job. */
+
+struct ddjvu_message_progress_s {
+  ddjvu_message_any_t any;
+  ddjvu_status_t status;
+  int percent;
+};
+
+/* ddjvu_document_print ---
+   Converts specified pages of a djvu document into postscript.  
+   This function works asynchronously in a separate thread.
+   You can use the following idiom for synchronous operation:
+
+     ddjvu_job_t *job = ddjvu_document_print(....);
+     while (! ddjvu_job_done(job) )
+       handle_ddjvu_messages(context, TRUE);
+       
+   The postscript data is written to stdio file <output>.
+   Arguments <optc> and <optv> specify printing options.
+   All options described on the <djvups> man page are 
+   recognized, except <"-help"> and <"-verbose">.
+*/
+
+DDJVUAPI ddjvu_job_t *
+ddjvu_document_print(ddjvu_document_t *document, FILE *output,
+                     int optc, const char * const * optv);
+
+
+/* ddjvu_document_save ---
+   Saves the djvu document as a bundled djvu file.
+   This function works asynchronously in a separate thread.
+   You can use the following idiom for synchronous operation:
+
+     ddjvu_job_t *job = ddjvu_document_save(....);
+     while (! ddjvu_job_done(job) )
+       handle_ddjvu_messages(context, TRUE);
+     
+   The bundled djvu data is written to file <output>
+   which must be seekable. Arguments <optc> and <optv>
+   can be used to pass the following options:
+   * Option "-pages=<pagespec>" specify a subset of pages
+     using the same syntax as program <ddjvu>.
+     Reordering or duplicating pages is prohibited. 
+   * Option "-indirect=<filename>" causes the creation
+     of an indirect document with index file <filename>
+     and auxiliary files in the same directory.
+     The file name is UTF-8 encoded.
+     When this option is specified, the argument <output>
+     is ignored and should be NULL.
+*/
+DDJVUAPI ddjvu_job_t *
+ddjvu_document_save(ddjvu_document_t *document, FILE *output, 
+                    int optc, const char * const * optv);
+
+
+
+
+/* -------------------------------------------------- */
+/* S-EXPRESSIONS                                      */
+/* -------------------------------------------------- */
+
+
+/* DjVu files can contain ancillary information such as
+   document outline, hidden text, hyperlinks, and metadata.
+   Program <djvused> provides for manipulating such
+   information.  Like <djvused>, the DDJVU API represents
+   this information using a lisp s-expressions.  See file
+   <"libdjvu/miniexp.h"> for the s-expression documentation
+   and manipulation functions.  See the <djvused> man page
+   for the specification of the s-expressions representing
+   outlines, hidden text and annotations. It often help 
+   to print s-expressions using function <miniexp_pprint>.
+
+   WARNING: All strings in s-expression are UTF-8 encoded.  
+   Strings returned by miniexp_to_str might have to be 
+   converted to the locale encoding. */
+
+
+/* miniexp_t --
+   Opaque type representing s-expressions.
+   The same definition also appears in 
+   file <"libdjvu/miniexp.h">. */
+
+#ifndef MINIEXP_H
+typedef struct miniexp_s* miniexp_t;
+#endif
+
+/* ddjvu_miniexp_release -- 
+   This function controls the allocation of the
+   s-expressions returned by functions from the DDJVU
+   API. It indicates that the s-expression <expr> is no
+   longer needed and can be deallocated as soon as
+   necessary. Otherwise the s-expression remains allocated
+   as long as the document object exists. */
+
+DDJVUAPI void
+ddjvu_miniexp_release(ddjvu_document_t *document, miniexp_t expr);
+
+
+/* ddjvu_document_get_outline -- 
+   This function tries to obtain the document outline.  
+   If this information is available, it returns a
+   s-expression with the same syntax as function
+   <print-outline> of program <djvused>.  
+   Otherwise it returns <miniexp_dummy> until 
+   the document header gets fully decoded.
+   Typical synchronous usage:
+
+    miniexp_t r;
+    while ((r=ddjvu_document_get_outline(doc))==miniexp_dummy)
+      handle_ddjvu_messages(ctx, TRUE); 
+
+   This function returns the empty list <miniexp_nil> when
+   the document contains no outline information. It can also
+   return symbols <failed> or <stopped> when an error occurs
+   while accessing the desired information. */
+
+DDJVUAPI miniexp_t
+ddjvu_document_get_outline(ddjvu_document_t *document);
+
+
+/* ddjvu_document_get_anno --
+   This function returns the document-wide annotations.
+   This corresponds to a proposed change in the djvu format.
+   When no new-style document-wide annotations are available
+   and <compat> is true, this function searches a shared 
+   annotation chunk and returns its contents.
+
+   This function returns <miniexp_dummy> if the information
+   is not yet available. It may then cause the emission 
+   of <m_pageinfo> messages with null <m_any.page>.
+
+   This function returns the empty list <miniexp_nil> when
+   the document does not contain page annotations. It can also
+   return symbols <failed> or <stopped> when an error occurs
+   while accessing the desired information. */
+
+DDJVUAPI miniexp_t
+ddjvu_document_get_anno(ddjvu_document_t *document, int compat);
+
+
+/* ddjvu_document_get_pagetext -- 
+   This function tries to obtain the text information for
+   page <pageno>. If this information is available, it
+   returns a s-expression with the same syntax as function
+   <print-txt> of program <djvused>.  Otherwise it starts
+   fetching the page data and returns <miniexp_dummy>.
+   This function causes the emission of <m_pageinfo> messages 
+   with zero in the <m_any.page> field.
+   Typical synchronous usage:
+
+    miniexp_t r;
+    while ((r=ddjvu_document_get_pagetext(doc,pageno,0))==miniexp_dummy)
+      handle_ddjvu_messages(ctx, TRUE); 
+
+   This function returns the empty list <miniexp_nil> when
+   the page contains no text information. It can also return
+   symbols <failed> or <stopped> when an error occurs while
+   accessing the desired information. 
+
+   Argument <maxdetail> controls the level of detail in the
+   returned s-expression. Values "page", "column", "region", "para", 
+   "line", and "word" restrict the output to the specified granularity.
+   All other values produce a s-expression that represents
+   the hidden text data as finely as possible. */
+
+DDJVUAPI miniexp_t
+ddjvu_document_get_pagetext(ddjvu_document_t *document, int pageno, 
+                            const char *maxdetail);
+
+
+/* ddjvu_document_get_pageanno -- 
+   This function tries to obtain the annotations for
+   page <pageno>. If this information is available, it
+   returns a s-expression with the same syntax as function
+   <print-ant> of program <djvused>.  Otherwise it starts
+   fetching the page data and returns <miniexp_dummy>.
+   This function causes the emission of <m_pageinfo> messages 
+   with zero in the <m_any.page> field.
+   Typical synchronous usage:
+
+     miniexp_t r;
+     while ((r = ddjvu_document_get_pageanno(doc,pageno))==miniexp_dummy)
+       handle_ddjvu_messages(ctx, TRUE); 
+
+   This function returns the empty list <miniexp_nil> when
+   the page contains no annotations. It can also return
+   symbols <failed> or <stopped> when an error occurs while
+   accessing the desired information. */
+
+DDJVUAPI miniexp_t
+ddjvu_document_get_pageanno(ddjvu_document_t *document, int pageno);
+
+
+/* --- Helper functions to parse annotations --- */
+
+/* ddjvu_anno_get_bgcolor --
+   Parse the annotations and extracts the desired 
+   background color as a color string ("#FFFFFF"). 
+   See <(background ...)> in the djvused man page.
+   Returns zero if this information is not specified. */
+
+DDJVUAPI const char *
+ddjvu_anno_get_bgcolor(miniexp_t annotations);
+
+
+/* ddjvu_anno_get_zoom --
+   Parse the annotations and extracts the desired zoom factor.
+   See <(zoom ...)> in the djvused man page.
+   Returns zero if this information is not specified. */
+
+DDJVUAPI const char *
+ddjvu_anno_get_zoom(miniexp_t annotations);
+
+
+/* ddjvu_anno_get_mode --
+   Parse the annotations and extracts the desired display mode.
+   See <(mode ...)> in the djvused man page.
+   Returns zero if this information is not specified. */
+
+DDJVUAPI const char *
+ddjvu_anno_get_mode(miniexp_t annotations);
+
+
+/* ddjvu_anno_get_horizalign --
+   Parse the annotations and extracts how the page
+   image should be aligned horizontally.
+   See <(align ...)> in the djvused man page.
+   Returns zero if this information is not specified. */
+
+DDJVUAPI const char *
+ddjvu_anno_get_horizalign(miniexp_t annotations);
+
+
+/* ddjvu_anno_get_vertalign --
+   Parse the annotations and extracts how the page
+   image should be aligned vertically.
+   See <(align ...)> in the djvused man page.
+   Returns zero if this information is not specified. */
+
+DDJVUAPI const char *
+ddjvu_anno_get_vertalign(miniexp_t annotations);
+
+
+/* ddjvu_anno_get_hyperlinks --
+   Parse the annotations and returns a zero terminated 
+   array of <(maparea ...)> s-expressions.
+   The caller should free this array with function <free>.
+   These s-expressions remain allocated as long
+   as the annotations remain allocated.
+   See also <(maparea ...)> in the djvused man page. */
+
+DDJVUAPI miniexp_t *
+ddjvu_anno_get_hyperlinks(miniexp_t annotations);
+
+
+/* ddjvu_anno_get_metadata_keys --
+   Parse the annotations and returns a zero terminated 
+   array of key symbols for the page metadata.
+   The caller should free this array with function <free>.
+   See also <(metadata ...)> in the djvused man page. */
+
+DDJVUAPI miniexp_t *
+ddjvu_anno_get_metadata_keys(miniexp_t annotations);
+
+
+/* ddjvu_anno_get_metadata --
+   Parse the annotations and returns the metadata string
+   corresponding to the metadata key symbol <key>.
+   The string remains allocated as long as the 
+   annotations s-expression remain allocated.
+   Returns zero if no such key is present. */
+
+DDJVUAPI const char *
+ddjvu_anno_get_metadata(miniexp_t annotations, miniexp_t key);
+
+
+/* ddjvu_anno_get_xmp --
+   Parse the annotations and returns the xmp metadata string.
+   The string remains allocated as long as the 
+   annotations s-expression remain allocated.
+   Returns zero if no such key is present. */
+
+DDJVUAPI const char *
+ddjvu_anno_get_xmp(miniexp_t annotations);
+
+
+/* -------------------------------------------------- */
+/* DJVU_MESSAGE_T                                     */
+/* -------------------------------------------------- */
+
+
+/* We can now define the djvu_message_t union */
+
+union ddjvu_message_s {
+  struct ddjvu_message_any_s        m_any;
+  struct ddjvu_message_error_s      m_error;
+  struct ddjvu_message_info_s       m_info;
+  struct ddjvu_message_newstream_s  m_newstream;
+  struct ddjvu_message_docinfo_s    m_docinfo;
+  struct ddjvu_message_pageinfo_s   m_pageinfo;
+  struct ddjvu_message_chunk_s      m_chunk;
+  struct ddjvu_message_relayout_s   m_relayout;
+  struct ddjvu_message_redisplay_s  m_redisplay;
+  struct ddjvu_message_thumbnail_s  m_thumbnail;
+  struct ddjvu_message_progress_s   m_progress;
+};
+
+
+/* -------------------------------------------------- */
+/* BACKDOORS                                          */
+/* -------------------------------------------------- */
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+/* ddjvu_get_DjVuImage ---
+   ddjvu_get_DjVuDocument ---
+   These functions provide an access to the libdjvu objects 
+   associated with the ddjvuapi objects.  These backdoors can
+   be useful for advanced manipulations.  These two functions 
+   are declared in C++ when file <"ddjvuapi.h"> is included 
+   after the libdjvu header files <"DjVuImage.h"> and
+   <"DjVuDocument.h">. */
+
+#ifdef __cplusplus
+# ifndef NOT_USING_DJVU_NAMESPACE
+#  ifdef _DJVUIMAGE_H
+DDJVUAPI GP<DjVuImage>
+ddjvu_get_DjVuImage(ddjvu_page_t *page);
+#  endif
+#  ifdef _DJVUDOCUMENT_H
+DDJVUAPI GP<DjVuDocument>
+ddjvu_get_DjVuDocument(ddjvu_document_t *document);
+#  endif
+# endif
+#endif
+
+#endif /* DDJVUAPI_H */
diff --git a/libdjvu/ddjvuapi.pc.in b/libdjvu/ddjvuapi.pc.in
new file mode 100644
index 0000000..57c74e7
--- /dev/null
+++ b/libdjvu/ddjvuapi.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir = @libdir@
+includedir = @includedir@
+
+Name: ddjvuapi
+Description: DjVu Decoding API
+Version: @PACKAGE_VERSION@
+Requires:
+Conflicts:
+Libs: @Libs@
+Libs.private: @Libsprivate@
+Cflags: @Cflags@
diff --git a/libdjvu/debug.cpp b/libdjvu/debug.cpp
new file mode 100644
index 0000000..0b12088
--- /dev/null
+++ b/libdjvu/debug.cpp
@@ -0,0 +1,292 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "debug.h"
+
+#if ( DEBUGLVL > 0 )
+
+#include "GThreads.h"
+#include "GContainer.h"
+#include "GString.h"
+#include "GString.h"
+#include "ByteStream.h"
+#include "GURL.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <errno.h>
+
+#ifdef _WIN32
+# include <windows.h>  // OutputDebugString
+#endif 
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+#endif
+#endif
+
+
+#ifndef UNIX
+#ifndef _WIN32
+#ifndef macintosh
+#define UNIX
+#endif
+#endif
+#endif
+
+static GCriticalSection debug_lock;
+#ifdef RUNTIME_DEBUG_ONLY
+static int              debug_level = 0;
+#else
+static int              debug_level = DEBUGLVL;
+#endif
+static int              debug_id;
+static FILE            *debug_file;
+static int              debug_file_count;
+
+static GMap<long, DjVuDebug> &
+debug_map(void)
+{
+  static GMap<long, DjVuDebug> xmap;
+  return xmap;
+}
+
+DjVuDebug::DjVuDebug()
+  : block(0), indent(0)
+{
+  id = debug_id++;
+#ifdef UNIX
+  if (debug_file_count++ == 0 && !debug_file)
+    set_debug_file(stderr);
+#endif
+}
+
+DjVuDebug::~DjVuDebug()
+{
+#ifdef UNIX
+  if (--debug_file_count == 0)
+    {
+      if (debug_file && (debug_file != stderr))
+        fclose(debug_file);
+      debug_file = 0;
+    }
+#endif
+}
+
+void   
+DjVuDebug::format(const char *fmt, ... )
+{
+  if (! block)
+    {
+      va_list ap;
+      va_start(ap, fmt);
+      GUTF8String buffer(fmt,ap);
+      va_end(ap);
+      GCriticalSectionLock glock(&debug_lock);
+      if (debug_file)
+        {
+          fprintf(debug_file,"%s", (const char*)buffer);
+          fflush(debug_file);
+        }
+#ifdef _WIN32
+      else
+        {
+          OutputDebugStringA((const char *)buffer);
+        }
+#endif
+    }
+}
+
+void   
+DjVuDebug::set_debug_level(int lvl)
+{
+  debug_level = lvl;
+}
+
+void
+DjVuDebug::set_debug_file(FILE * file)
+{
+  GCriticalSectionLock glock(&debug_lock);
+  if (debug_file && (debug_file != stderr))
+    fclose(debug_file);
+  debug_file = file;
+}
+
+void
+DjVuDebug::modify_indent(int rindent)
+{
+  indent += rindent;
+}
+
+DjVuDebug& 
+DjVuDebug::lock(int lvl, int noindent)
+{
+  int threads_num=1;
+  debug_lock.lock();
+  // Get per-thread debug object
+  long threadid = (long) GThread::current();
+  DjVuDebug &dbg = debug_map()[threadid];
+  threads_num=debug_map().size();
+  // Check level
+  dbg.block = (lvl > debug_level);
+  // Output thread id and indentation
+  if (! noindent)
+    {
+      if (threads_num>1)
+        dbg.format("[T%d] ", dbg.id);
+      int ind = dbg.indent;
+      char buffer[257];
+      memset(buffer,' ', sizeof(buffer)-1);
+      buffer[sizeof(buffer)-1] = 0;
+      while (ind > (int)sizeof(buffer)-1)
+        {
+          dbg.format("%s", buffer);
+          ind -= sizeof(buffer)-1;
+        }
+      if (ind > 0)
+        {
+          buffer[ind] = 0;
+          dbg.format("%s", buffer);
+        }
+    }
+  // Return
+  return dbg;
+}
+
+void
+DjVuDebug::unlock()
+{
+  debug_lock.unlock();
+}
+
+#define OP(type, fmt) \
+DjVuDebug& DjVuDebug::operator<<(type arg)\
+{ format(fmt, arg); return *this; }
+
+DjVuDebug& DjVuDebug::operator<<(bool arg)
+{
+   format("%s", arg ? "TRUE" : "FALSE"); return *this;
+}
+
+OP(char, "%c")
+OP(unsigned char, "%c")
+OP(int, "%d")
+OP(unsigned int, "%u")
+OP(short int, "%hd")
+OP(unsigned short int, "%hu")
+OP(long, "%ld")
+OP(unsigned long, "%lu")
+OP(float, "%g")
+OP(double, "%g")
+OP(const void * const, "0x%08x")
+
+DjVuDebug& DjVuDebug::operator<<(const char * const ptr) 
+{
+  GUTF8String buffer(ptr?ptr:"(null)");
+  if(buffer.length() > 255)
+  {
+    buffer=buffer.substr(0,252)+"...";
+  }
+  format("%s", (const char *)buffer);
+  return *this; 
+}
+
+DjVuDebug& DjVuDebug::operator<<(const unsigned char * const ptr) 
+{ 
+  return operator<<( (const char *) ptr );
+}
+
+DjVuDebug& DjVuDebug::operator<<(const GUTF8String &ptr)
+{
+  GUTF8String buffer(ptr);
+  if(buffer.length() > 255)
+    buffer=buffer.substr(0,252)+"...";
+  format("%s", (const char *)buffer);
+  return *this; 
+}
+
+DjVuDebugIndent::DjVuDebugIndent(int inc)
+  : inc(inc)
+{
+  DjVuDebug &dbg = DjVuDebug::lock(0,1);
+  dbg.modify_indent(inc);
+  dbg.unlock();
+}
+
+DjVuDebugIndent::~DjVuDebugIndent()
+{
+  DjVuDebug &dbg = DjVuDebug::lock(0,1);
+  dbg.modify_indent(-inc);
+  dbg.unlock();
+}
+
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+#endif
diff --git a/libdjvu/debug.h b/libdjvu/debug.h
new file mode 100644
index 0000000..d325a17
--- /dev/null
+++ b/libdjvu/debug.h
@@ -0,0 +1,297 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _DEBUG_H_
+#define _DEBUG_H_
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#include <stdio.h>
+
+
+#ifdef HAVE_NAMESPACES
+namespace DJVU {
+# ifdef NOT_DEFINED // Just to fool emacs c++ mode
+}
+# endif
+#endif
+
+/** @name debug.h
+
+    Files #"debug.h"# and #"debug.cpp"# implement means to print debug
+    messages in a multithread safe way.  Message are also marked with a thread
+    identifier.  Under Windows, debug messages are directly sent to the
+    debugger using the Win32 function #OutputDebugString#.  Under Unix, debug
+    messages are printed on the controlling terminal, preferably using device
+    #/dev/tty#.
+
+    The preprocessor variable #DEBUGLVL# defines which debug code is going to
+    be compiled.  Selecting #-DDEBUGLVL=0# (the default) disables all
+    debugging code.  Selecting a positive values (e.g. #-DDEBUGLVL=4#) enables
+    more and more debugging code.
+
+    Message output is controlled by the current debugging level (an integer
+    between #0# and #DEBUGLVL#). Greater values enable more messages.  The
+    initial debugging level is set to the maximum value.  The debugging level
+    can be changed using macro \Ref{DEBUG_SET_LEVEL}.
+
+    Message indentation can be modified using macro \Ref{DEBUG_MAKE_INDENT}.
+    Messages are generated by macro \Ref{DEBUG_MSG} or its variants.  The
+    argument of the macro can contain several components separated by operator
+    #<<#, as demonstrated in the example below:
+    \begin{verbatim}
+    DEBUG_MSG("The value of a[" << n << "] is " << a[n] << '\n');
+    \end{verbatim}
+
+    One more preprocessor variable #RUNTIME_DEBUG_ONLY# enables compilation
+    of debug code, but does not enable the debug messages automatically.
+    In order to see them the program should use \Ref{DEBUG_SET_LEVEL} to
+    change the level to anything greater than 0. Normally this happens when
+    user specifies option #-debug# in the command line. Usage of
+    #RUNTIME_DEBUG_ONLY# implies #DEBUGLVL=1# if not specified otherwise.
+
+    Finally, #-DNO_DEBUG# or #-DNDEBUG# can be used instead of #-DDEBUGLVL=0#,
+    and #-D_DEBUG# can be used instead of #-DDEBUGLVL=0#.
+
+    {\bf Historical Comment} --- Debug macros are rarely used in the reference
+    DjVu library because Leon thinks that debugging messages unnecessarily
+    clutter the code.  Debug macros are used everywhere in the plugin code
+    because Andrew thinks that code without debugging messages is close to
+    useless.  No agreement could be reached. Neither could they agree on
+    if cluttering header files with huge documentation chunks helps to
+    improve code readability.
+
+    @memo 
+    Macros for printing debug messages.
+    @author
+    Andrew Erofeev <eaf@geocities.com> -- initial implementation \\
+    Leon Bottou <leonb@research.att.com> -- cleanups */
+//@{
+
+#ifndef DEBUGLVL
+# ifdef NDEBUG
+#  define DEBUGLVL 0
+# endif 
+#endif
+#ifndef DEBUGLVL
+# ifdef NO_DEBUG
+#  define DEBUGLVL 0
+# endif 
+#endif
+#ifndef DEBUGLVL
+# ifdef RUNTIME_DEBUG_ONLY
+#  define DEBUGLVL 1
+# endif 
+#endif
+#ifndef DEBUGLVL
+# ifdef _DEBUG
+#  define DEBUGLVL 1
+# endif 
+#endif
+#ifndef DEBUGLVL
+#  define DEBUGLVL 0
+#endif
+
+#if DEBUGLVL <= 0
+
+# ifndef NO_DEBUG
+#  define NO_DEBUG
+# endif
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+# ifdef _DEBUG
+#  undef _DEBUG
+# endif
+
+# define DEBUG_MAKE_INDENT(x)
+# define DEBUG_SET_LEVEL(level)
+# define DEBUG_MSG_LVL(level,x)
+# define DEBUG_MSGN_LVL(level,x)
+
+#else
+
+# ifdef NO_DEBUG
+#  undef NO_DEBUG
+# endif
+# ifdef NDEBUG
+#  undef NDEBUG
+# endif
+# ifndef _DEBUG
+#  define _DEBUG
+# endif
+
+class GUTF8String;
+
+// ------------ SUPPORT
+
+class DjVuDebug // DJVU_CLASS
+{
+private:
+  int    id;
+  int    block;
+  int    indent;
+  void   format(const char *fmt, ... );
+public:
+  // construction
+  DjVuDebug();
+  ~DjVuDebug();
+  // access
+  static void   set_debug_level(int lvl);
+  static void	set_debug_file(FILE * file);
+  void          modify_indent(int rindent);
+  static DjVuDebug& lock(int lvl, int noindent);
+  void          unlock();
+  // printing
+  DjVuDebug &	operator<<(bool b);
+  DjVuDebug &	operator<<(char c);
+  DjVuDebug &	operator<<(unsigned char c);
+  DjVuDebug &	operator<<(int i);
+  DjVuDebug &	operator<<(unsigned int i);
+  DjVuDebug &	operator<<(short int i);
+  DjVuDebug &	operator<<(unsigned short int i);
+  DjVuDebug &	operator<<(long i);
+  DjVuDebug &	operator<<(unsigned long i);
+  DjVuDebug &	operator<<(const char * const ptr);
+  DjVuDebug &	operator<<(const unsigned char * const ptr);
+  DjVuDebug&    operator<<(const GUTF8String &ptr);
+  DjVuDebug &	operator<<(float f);
+  DjVuDebug &	operator<<(double d);
+  DjVuDebug &	operator<<(const void * const p);
+};
+
+class DjVuDebugIndent // DJVU_CLASS
+{
+private:
+  int inc;
+public:
+  DjVuDebugIndent(int inc=2);
+  ~DjVuDebugIndent();
+//#define DEBUG_MAKE_INDENT_2(x, y) DjVuDebugIndent debug_indent ## y (x)
+//#define DEBUG_MAKE_INDENT_1(x, y) DEBUG_MAKE_INDENT_2(x, y)
+#define DEBUG_MAKE_INDENT_1(x, y) DjVuDebugIndent debug_indent ## y (x)
+};
+
+// ------------ MAIN MACROS
+
+# define DEBUG_MAKE_INDENT(x)     DEBUG_MAKE_INDENT_1(x, __LINE__)
+# define DEBUG_SET_LEVEL(level)   DjVuDebug::set_debug_level(level)
+# define DEBUG_MSG_LVL(level,x)   { ( DjVuDebug::lock(level,0) << x ).unlock(); }
+# define DEBUG_MSGN_LVL(level,x)  { ( DjVuDebug::lock(level,1) << x ).unlock(); }
+# define DEBUG_MSGF_LVL(level,x)  { ( DjVuDebug::lock(level,1) << x ).unlock(); }
+
+#endif
+
+
+// ------------ EAF MACROS
+
+#if ( DEBUGLVL >= 1 )
+/** Generates a level 1 message */
+# define DEBUG1_MSG(x)  DEBUG_MSG_LVL(1,x)
+# define DEBUG1_MSGF(x) DEBUG_MSGF_LVL(1,x)
+#else
+# define DEBUG1_MSG(x)
+# define DEBUG1_MSGF(x)
+#endif
+#if ( DEBUGLVL >= 2 )
+/** Generates a level 2 message */
+# define DEBUG2_MSG(x)  DEBUG_MSG_LVL(2,x)
+# define DEBUG2_MSGF(x) DEBUG_MSGF_LVL(2,x)
+#else
+# define DEBUG2_MSG(x)
+# define DEBUG2_MSGF(x)
+#endif
+#if ( DEBUGLVL >= 3 )
+/** Generates a level 3 message */
+# define DEBUG3_MSG(x)  DEBUG_MSG_LVL(3,x)
+# define DEBUG3_MSGF(x) DEBUG_MSGF_LVL(3,x)
+#else
+# define DEBUG3_MSG(x)
+# define DEBUG3_MSGF(x)
+#endif
+#if ( DEBUGLVL >= 4 )
+/** Generates a level 4 message */
+# define DEBUG4_MSG(x)  DEBUG_MSG_LVL(4,x)
+# define DEBUG4_MSGF(x) DEBUG_MSGF_LVL(4,x)
+#else
+# define DEBUG4_MSG(x)
+# define DEBUG4_MSGF(x)
+#endif
+
+#define DEBUG_RUNTIME_SET_LEVEL(level) DEBUG_SET_LEVEL(level)
+/** Generates a level 1 message. */
+#define DEBUG_MSG(x)  DEBUG1_MSG(x)
+/** Generates a level 1 message without indentation. */
+#define DEBUG_MSGF(x) DEBUG1_MSGF(x)
+/** Generates a level 1 message terminated with a newline. */
+#define DEBUG_MSGN(x) DEBUG_MSG(x<<'\n')
+
+//@}
+
+// ------------ THE END
+
+#ifdef HAVE_NAMESPACES
+}
+# ifndef NOT_USING_DJVU_NAMESPACE
+using namespace DJVU;
+# endif
+#endif
+
+#endif // DEBUG_H
diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
new file mode 100644
index 0000000..80ef640
--- /dev/null
+++ b/libdjvu/miniexp.cpp
@@ -0,0 +1,2088 @@
+/* -*- C++ -*-
+// -------------------------------------------------------------------
+// MiniExp - Library for handling lisp expressions
+// Copyright (c) 2005  Leon Bottou
+//
+// This software is subject to, and may be distributed under, the
+// GNU General Public License, either version 2 of the license
+// or (at your option) any later version. The license should have
+// accompanied the software or you may obtain a copy of the license
+// from the Free Software Foundation at http://www.fsf.org .
+//
+// 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.
+// -------------------------------------------------------------------
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation "miniexp.h"
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <time.h>
+#include <stdarg.h>
+
+#define MINIEXP_IMPLEMENTATION
+
+#include "miniexp.h"
+
+#ifdef HAVE_NAMESPACES
+# define BEGIN_ANONYMOUS_NAMESPACE namespace {
+# define END_ANONYMOUS_NAMESPACE }
+#else
+# define BEGIN_ANONYMOUS_NAMESPACE 
+# define END_ANONYMOUS_NAMESPACE
+#endif
+
+
+/* -------------------------------------------------- */
+/* ASSERT                                            */
+/* -------------------------------------------------- */
+
+#if defined(__GNUC__)
+static void 
+assertfail(const char *fn, int ln) 
+  __attribute__((noreturn));
+#endif
+
+static void
+assertfail(const char *fn, int ln)
+{
+  fprintf(stderr,"Assertion failed: %s:%d\n",fn,ln);
+  abort();
+}
+
+#define ASSERT(x) \
+  do { if (!(x)) assertfail(__FILE__,__LINE__); } while(0)
+
+
+/* -------------------------------------------------- */
+/* GLOBAL MUTEX                                       */
+/* -------------------------------------------------- */
+
+#ifndef WITHOUT_THREADS
+# ifdef _WIN32
+#  include <windows.h>
+#  define USE_WINTHREADS 1
+# elif defined(HAVE_PTHREAD)
+#  include <pthread.h>
+#  define USE_PTHREADS 1 
+# endif
+#endif
+
+#if defined(USE_WINTHREADS)
+// Windows critical section
+# define CSLOCK(name) CSLocker name
+BEGIN_ANONYMOUS_NAMESPACE
+struct CS { 
+  CRITICAL_SECTION cs; 
+  CS() { InitializeCriticalSection(&cs); }
+  ~CS() { DeleteCriticalSection(&cs); } };
+static CS globalCS;
+struct CSLocker {
+  CSLocker() { EnterCriticalSection(&globalCS.cs); }
+  ~CSLocker() { LeaveCriticalSection(&globalCS.cs); } };
+END_ANONYMOUS_NAMESPACE
+
+#elif defined (USE_PTHREADS)
+// Pthread critical section
+# define CSLOCK(name) CSLocker name
+BEGIN_ANONYMOUS_NAMESPACE
+static pthread_mutex_t globalCS = PTHREAD_MUTEX_INITIALIZER;
+struct CSLocker {
+  CSLocker() { pthread_mutex_lock(&globalCS); }
+  ~CSLocker() { pthread_mutex_unlock(&globalCS); } };
+END_ANONYMOUS_NAMESPACE
+  
+#else
+// No critical sections
+# define CSLOCK(name) /**/
+#endif
+
+
+/* -------------------------------------------------- */
+/* SYMBOLS                                            */
+/* -------------------------------------------------- */
+
+static unsigned int 
+hashcode(const char *s)
+{
+  long h = 0x1013;
+  while (*s)
+    {
+      h = (h<<6) | ((h&0xfc000000)>>26);
+      h ^= (*s);
+      s++;
+    }
+  return h;
+}
+
+BEGIN_ANONYMOUS_NAMESPACE
+
+class symtable_t 
+{
+public:
+  int nelems;
+  int nbuckets;
+  struct sym { unsigned int h; struct sym *l; char *n; };
+  struct sym **buckets;
+  symtable_t();
+  ~symtable_t();
+  struct sym *lookup(const char *n, bool create=false);
+  void resize(int); 
+private:
+  symtable_t(const symtable_t&);
+  symtable_t& operator=(const symtable_t&);
+};
+
+symtable_t::symtable_t()
+  : nelems(0), nbuckets(0), buckets(0)
+{
+  resize(7);
+}
+
+symtable_t::~symtable_t()
+{
+  int i=0;
+  for (; i<nbuckets; i++)
+    while (buckets[i])
+      {
+        struct sym *r = buckets[i];
+        buckets[i] = r->l;
+        delete [] r->n;
+        delete r;
+      }
+  delete [] buckets;
+}
+
+void
+symtable_t::resize(int nb)
+{
+  struct sym **b = new sym*[nb];
+  memset(b, 0, nb*sizeof(sym*));
+  int i=0;
+  for (; i<nbuckets; i++)
+    while (buckets[i])
+      {
+        struct sym *s = buckets[i];
+        int j = s->h % nb;
+        buckets[i] = s->l;
+        s->l = b[j];
+        b[j] = s;
+      }
+  delete [] buckets;
+  buckets = b;
+  nbuckets = nb;
+}
+
+struct symtable_t::sym *
+symtable_t::lookup(const char *n, bool create)
+{
+  unsigned int h = hashcode(n);
+  int i = h % nbuckets;
+  struct sym *r = buckets[i];
+  while (r && strcmp(n,r->n))
+    r = r->l;
+  if (!r && create)
+    {
+      CSLOCK(lock);
+      nelems += 1;
+      r = new sym;
+      r->h = h;
+      r->l = buckets[i];
+      r->n = new char [1+strlen(n)];
+      strcpy(r->n, n);
+      buckets[i] = r;
+      if ( 2 * nelems > 3 * nbuckets)
+        resize(2*nbuckets-1);
+    }
+  return r;
+}
+  
+END_ANONYMOUS_NAMESPACE
+
+static symtable_t *symbols;
+ 
+const char *
+miniexp_to_name(miniexp_t p)
+{
+  if (miniexp_symbolp(p))
+    {
+      struct symtable_t::sym *r;
+      r = ((symtable_t::sym*)(((size_t)p)&~((size_t)3)));
+      return (r) ? r->n : "##(dummy)";
+    }
+  return 0;
+}
+
+miniexp_t 
+miniexp_symbol(const char *name)
+{
+  struct symtable_t::sym *r;
+  if (! symbols)
+    {
+      CSLOCK(lock);
+      if (! symbols)
+        symbols = new symtable_t;
+    }
+  r = symbols->lookup(name, true);
+  return (miniexp_t)(((size_t)r)|((size_t)2));
+}
+
+
+/* -------------------------------------------------- */
+/* MEMORY AND GARBAGE COLLECTION                      */
+/* -------------------------------------------------- */
+
+// A simple mark-and-sweep garbage collector.
+//
+// Memory is managed in chunks of nptrs_chunk pointers.
+// The first two pointers are used to hold mark bytes for the rest.
+// Chunks are carved from blocks of nptrs_block pointers.
+//
+// Dirty hack: The sixteen most recently created pairs are 
+// not destroyed by automatic garbage collection, in order
+// to preserve transient objects created in the course 
+// of evaluating complicated expressions.
+
+#define nptrs_chunk  (4*sizeof(void*))
+#define sizeof_chunk (nptrs_chunk*sizeof(void*))
+#define nptrs_block  (16384-8)
+#define recentlog    (4)
+#define recentsize   (1<<recentlog)
+
+BEGIN_ANONYMOUS_NAMESPACE
+
+struct gctls_t {
+  gctls_t  *next;
+  gctls_t **pprev;
+  void    **recent[recentsize];
+  int       recentindex;
+  gctls_t();
+  ~gctls_t();
+};
+
+struct block_t 
+{
+  block_t *next;
+  void **lo;
+  void **hi;
+  void *ptrs[nptrs_block];
+};
+
+static struct {
+  int lock;
+  int request;
+  int debug;
+  int      pairs_total;
+  int      pairs_free;
+  void   **pairs_freelist;
+  block_t *pairs_blocks;
+  int      objs_total;
+  int      objs_free;
+  void   **objs_freelist;
+  block_t *objs_blocks;
+  gctls_t *tls;
+} gc;
+
+gctls_t::gctls_t()
+{
+  // CSLOCK(locker); [already locked]
+  recentindex = 0;
+  for (int i=0; i<recentsize; i++)
+    recent[i] = 0;
+  if ((next = gc.tls))
+    next->pprev = &next;
+  pprev = &gc.tls;
+  gc.tls = this;
+  //fprintf(stderr,"Created gctls %p\n", this);
+}
+
+gctls_t::~gctls_t()
+{
+  //CSLOCK(locker); [already locked]
+  //fprintf(stderr,"Deleting gctls %p\n", this);
+  if  ((*pprev = next))
+    next->pprev = pprev;
+}
+
+END_ANONYMOUS_NAMESPACE
+
+#if USE_PTHREADS
+// Manage thread specific data with pthreads
+static pthread_key_t gctls_key;
+static pthread_once_t gctls_once;
+static void gctls_destroy(void* arg) {
+  CSLOCK(locker); delete (gctls_t*)arg;
+}
+static void gctls_key_alloc() {
+  pthread_key_create(&gctls_key, gctls_destroy);
+}
+# if HAVE_GCCTLS
+static __thread gctls_t *gctls_tv = 0;
+static void gctls_alloc() {
+  pthread_once(&gctls_once, gctls_key_alloc);
+  gctls_tv = new gctls_t();
+  pthread_setspecific(gctls_key, (void*)gctls_tv);
+}
+static gctls_t *gctls() {
+  if (! gctls_tv) gctls_alloc();
+  return gctls_tv;
+}
+# else
+static  gctls_t *gctls_alloc() {
+  gctls_t *res = new gctls_t();
+  pthread_setspecific(gctls_key, (void*)res);
+  return res;
+}
+static gctls_t *gctls() {
+  pthread_once(&gctls_once, gctls_key_alloc);
+  void *arg = pthread_getspecific(gctls_key);
+  return (arg) ? (gctls_t*)(arg) : gctls_alloc();
+}
+# endif
+
+#elif USE_WINTHREADS 
+// Manage thread specific data with win32
+#if defined(_MSC_VER) && defined(USE_MSVC_TLS)
+// -- Pre-vista os sometimes crashes on this.
+static __declspec(thread) gctls_t *gctls_tv = 0;
+static gctls_t *gctls() {
+  if (! gctls_tv)  gctls_tv = new gctls_t();
+  return gctls_tv;
+}
+static void NTAPI gctls_cb(PVOID, DWORD dwReason, PVOID) {
+  if (dwReason == DLL_THREAD_DETACH && gctls_tv) 
+    { CSLOCK(locker); delete gctls_tv; gctls_tv=0; } }
+# else
+// -- Using Tls{Alloc,SetValue,GetValue,Free} instead.
+static DWORD tlsIndex = TLS_OUT_OF_INDEXES;
+static gctls_t *gctls() {
+  if (tlsIndex == TLS_OUT_OF_INDEXES) tlsIndex = TlsAlloc();
+  ASSERT(tlsIndex != TLS_OUT_OF_INDEXES);
+  gctls_t *addr = (gctls_t*)TlsGetValue(tlsIndex);
+  if (! addr) TlsSetValue(tlsIndex, (LPVOID)(addr = new gctls_t()));
+  ASSERT(addr != 0);
+  return addr;
+}
+static void NTAPI gctls_cb(PVOID, DWORD dwReason, PVOID) {
+  if (dwReason == DLL_THREAD_DETACH && tlsIndex != TLS_OUT_OF_INDEXES)
+    {CSLOCK(r);delete(gctls_t*)TlsGetValue(tlsIndex);TlsSetValue(tlsIndex,0);}
+  if (dwReason == DLL_PROCESS_DETACH && tlsIndex != TLS_OUT_OF_INDEXES)
+    {CSLOCK(r);TlsFree(tlsIndex);tlsIndex=TLS_OUT_OF_INDEXES;}
+}
+# endif
+// -- Very black magic to clean tls variables.
+# ifdef _M_IX86
+#  pragma comment (linker, "/INCLUDE:_tlscb")
+# else
+#  pragma comment (linker, "/INCLUDE:tlscb")
+# endif
+# pragma const_seg(".CRT$XLB")
+extern "C" PIMAGE_TLS_CALLBACK tlscb = gctls_cb;
+# pragma const_seg()
+
+#else
+// No threads
+static gctls_t *gctls() {
+  static gctls_t g;
+  return &g;
+}
+
+#endif
+
+static inline char *
+markbase(void **p)
+{
+  return (char*)(((size_t)p) & ~(sizeof_chunk-1));
+}
+
+static inline char *
+markbyte(void **p)
+{
+  char *base = markbase(p);
+  return base + ((p - (void**)base)>>1);
+}
+
+static block_t *
+new_block(void)
+{
+  block_t *b = new block_t;
+  memset(b, 0, sizeof(block_t));
+  b->lo = (void**)markbase(b->ptrs+nptrs_chunk-1);
+  b->hi = (void**)markbase(b->ptrs+nptrs_block);
+  return b;
+}
+
+static void
+clear_marks(block_t *b)
+{
+  for (void** m=b->lo; m<b->hi; m+=nptrs_chunk)
+    m[0] = m[1] = 0;
+}
+
+static void
+collect_free(block_t *b, void **&freelist, int &count, bool destroy)
+{
+  for (void **m=b->lo; m<b->hi; m+=nptrs_chunk)
+    {
+      char *c = (char*)m;
+      for (unsigned int i=1; i<nptrs_chunk/2; i++)
+        if (! c[i])
+          {
+            miniobj_t *obj = (miniobj_t*)m[i+i];
+            if (destroy && obj && m[i+i]==m[i+i+1]) 
+              obj->destroy();
+            m[i+i] = (void*)freelist;
+            m[i+i+1] = 0;
+            freelist = &m[i+i];
+            count += 1;
+          }
+    }
+}
+
+static void
+new_pair_block(void)
+{
+  int count = 0;
+  block_t *b = new_block();
+  b->next = gc.pairs_blocks;
+  gc.pairs_blocks = b;
+  clear_marks(b);
+  collect_free(b, gc.pairs_freelist, count, false);
+  gc.pairs_total += count;
+  gc.pairs_free += count;
+}
+
+static void
+new_obj_block(void)
+{
+  int count = 0;
+  block_t *b = new_block();
+  b->next = gc.objs_blocks;
+  gc.objs_blocks = b;
+  clear_marks(b);
+  collect_free(b, gc.objs_freelist, count, false);
+  gc.objs_total += count;
+  gc.objs_free += count;
+}
+
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+static void gc_mark_object(void **v) __attribute__((noinline));
+#else
+static void gc_mark_object(void **v);
+#endif
+
+static bool
+gc_mark_check(void *p)
+{
+  if (((size_t)p) & 2)
+    return false;
+  void **v = (void**)(((size_t)p) & ~(size_t)3); 
+  if (! v)
+    return false;
+  char *m = markbyte(v);
+  if (*m)
+    return false;
+  *m = 1;
+  if (! (((size_t)p) & 1))
+    return true;
+  gc_mark_object((void**)v);
+  return false;
+}
+
+static void
+gc_mark_pair(void **v)
+{
+  // This is a simple recursive code.
+  // Despite the tail recursion for the cdrs,
+  // it consume a stack space that grows like
+  // the longest chain of cars.
+  for(;;)
+    {
+      if (gc_mark_check(v[0]))
+        gc_mark_pair((void**)v[0]);
+      if (! gc_mark_check(v[1]))
+        break;
+      v = (void**)v[1];
+    }
+}
+
+static void
+gc_mark(miniexp_t *pp)
+{
+  void **v = (void**)*pp;
+  if (gc_mark_check((void**)*pp))
+    gc_mark_pair(v);
+}
+
+static void
+gc_mark_object(void **v)
+{
+  ASSERT(v[0] == v[1]);
+  miniobj_t *obj = (miniobj_t*)v[0];
+  if (obj) 
+    obj->mark(gc_mark);
+}
+
+static void
+gc_run(void)
+{
+  gc.request++;
+  if (gc.lock == 0)
+    {
+      block_t *b;
+      gc.request = 0;
+      // clear marks
+      for (b=gc.objs_blocks; b; b=b->next)
+        clear_marks(b);
+      for (b=gc.pairs_blocks; b; b=b->next)
+        clear_marks(b);
+      // mark recents
+      for (gctls_t *tls = gc.tls; tls; tls=tls->next)
+        for (int i=0; i<recentsize; i++)
+          gc_mark((miniexp_t*)(char*)&(tls->recent[i]));
+      // mark roots
+      minivar_t::mark(gc_mark);
+      // sweep
+      gc.objs_free = gc.pairs_free = 0;
+      gc.objs_freelist = gc.pairs_freelist = 0;
+      for (b=gc.objs_blocks; b; b=b->next)
+        collect_free(b, gc.objs_freelist, gc.objs_free, true);
+      for (b=gc.pairs_blocks; b; b=b->next)
+        collect_free(b, gc.pairs_freelist, gc.pairs_free, false);
+      // alloc 33% extra space
+      while (gc.objs_free*4 < gc.objs_total)
+        new_obj_block();
+      while (gc.pairs_free*4 < gc.pairs_total)
+        new_pair_block();
+    }
+}
+
+static void **
+gc_alloc_pair(void *a, void *d)
+{
+  if (!gc.pairs_freelist)
+    {
+      gc_run();
+      if (!gc.pairs_freelist)
+        new_pair_block();
+    }
+  else if (gc.debug)
+    gc_run();
+  void **p = gc.pairs_freelist;
+  gc.pairs_freelist = (void**)p[0];
+  gc.pairs_free -= 1;
+  p[0] = a;
+  p[1] = d;
+  return p;
+}
+
+static void **
+gc_alloc_object(void *obj)
+{
+  if (!gc.objs_freelist)
+    {
+      gc_run();
+      if (!gc.objs_freelist)
+        new_obj_block();
+    }
+  else if (gc.debug)
+    gc_run();
+  void **p = gc.objs_freelist;
+  gc.objs_freelist = (void**)p[0];
+  gc.objs_free -= 1;
+  p[0] = p[1] = obj;
+  return p;
+}
+
+
+
+
+
+/* ---- USER FUNCTIONS --- */
+
+miniexp_t
+minilisp_acquire_gc_lock(miniexp_t x)
+{
+  CSLOCK(locker);
+  gc.lock++;
+  return x;
+}
+
+miniexp_t
+minilisp_release_gc_lock(miniexp_t x)
+{
+  minivar_t v = x;
+  {
+    CSLOCK(locker);
+    if (gc.lock > 0)
+      if (--gc.lock == 0)
+        if (gc.request > 0)
+          gc_run();
+  }
+  return x;
+}
+
+void 
+minilisp_gc(void)
+{
+  CSLOCK(locker);
+  for (gctls_t *tls = gc.tls; tls; tls=tls->next)
+    for (int i=0; i<recentsize; i++)
+      tls->recent[i] = 0;
+  gc_run();
+}
+
+void 
+minilisp_debug(int debug)
+{
+  gc.debug = debug;
+}
+
+void 
+minilisp_info(void)
+{
+  CSLOCK(locker);
+  time_t tim = time(0);
+  const char *dat = ctime(&tim);
+  printf("--- begin info -- %s", dat);
+  printf("symbols: %d symbols in %d buckets\n", 
+         symbols->nelems, symbols->nbuckets);
+  if (gc.debug)
+    printf("gc.debug: true\n");
+  if (gc.lock)
+    printf("gc.locked: true, %d requests\n", gc.request);
+  printf("gc.pairs: %d free, %d total\n", gc.pairs_free, gc.pairs_total);
+  printf("gc.objects: %d free, %d total\n", gc.objs_free, gc.objs_total);
+  printf("--- end info -- %s", dat);
+}
+
+miniexp_t
+miniexp_mutate(miniexp_t, miniexp_t *var, miniexp_t val)
+{
+  CSLOCK(locker);
+  *var = val;
+  return val;
+}
+
+
+/* -------------------------------------------------- */
+/* MINIVARS                                           */
+/* -------------------------------------------------- */
+
+minivar_t::minivar_t()
+  : data(0)
+{
+  CSLOCK(locker);
+  if ((next = vars))
+    next->pprev = &next;
+  pprev = &vars;
+  vars = this;
+}
+
+minivar_t::minivar_t(miniexp_t p)
+  : data(p)
+{
+  CSLOCK(locker);
+  if ((next = vars))
+    next->pprev = &next;
+  pprev = &vars;
+  vars = this;
+}
+
+minivar_t::minivar_t(const minivar_t &v)
+  : data(v.data)
+{
+  CSLOCK(locker);
+  if ((next = vars))
+    next->pprev = &next;
+  pprev = &vars;
+  vars = this;
+}
+
+minivar_t::~minivar_t()
+{ 
+  CSLOCK(locker);
+  if ((*pprev = next)) 
+    next->pprev = pprev; 
+}
+
+minivar_t *minivar_t::vars = 0;
+
+void
+minivar_t::mark(minilisp_mark_t *f)
+{
+  for (minivar_t *v = vars; v; v=v->next)
+    (*f)(&v->data);
+}
+
+minivar_t *
+minivar_alloc(void)
+{
+  return new minivar_t;
+}
+
+void 
+minivar_free(minivar_t *v)
+{
+  delete v;
+}
+
+miniexp_t *
+minivar_pointer(minivar_t *v)
+{
+  return &(*v);
+}
+
+
+/* -------------------------------------------------- */
+/* LISTS                                              */
+/* -------------------------------------------------- */
+
+static inline miniexp_t &
+car(miniexp_t p) {
+  return ((miniexp_t*)p)[0];
+}
+
+static inline miniexp_t &
+cdr(miniexp_t p) {
+  return ((miniexp_t*)p)[1];
+}
+
+int 
+miniexp_length(miniexp_t p)
+{
+  int n = 0;
+  bool toggle = false;
+  miniexp_t q = p;
+  while (miniexp_consp(p))
+    {
+      p = cdr(p);
+      if (p == q)
+        return -1;
+      if ((toggle = !toggle))
+        q = cdr(q);
+      n += 1;
+    }
+  return n;
+}
+
+miniexp_t 
+miniexp_caar(miniexp_t p)
+{
+  return miniexp_car(miniexp_car(p)); 
+}
+
+miniexp_t 
+miniexp_cadr(miniexp_t p)
+{
+  return miniexp_car(miniexp_cdr(p)); 
+}
+
+miniexp_t 
+miniexp_cdar(miniexp_t p)
+{
+  return miniexp_cdr(miniexp_car(p)); 
+}
+
+miniexp_t 
+miniexp_cddr(miniexp_t p)
+{
+  return miniexp_cdr(miniexp_cdr(p)); 
+}
+
+miniexp_t 
+miniexp_caddr(miniexp_t p)
+{
+  return miniexp_car(miniexp_cdr(miniexp_cdr(p)));
+}
+
+miniexp_t 
+miniexp_cdddr(miniexp_t p)
+{
+  return miniexp_cdr(miniexp_cdr(miniexp_cdr(p)));
+}
+
+miniexp_t 
+miniexp_nth(int n, miniexp_t l)
+{
+  while (--n>=0 && miniexp_consp(l)) 
+    l = cdr(l);
+  return miniexp_car(l);
+}
+
+miniexp_t 
+miniexp_cons(miniexp_t a, miniexp_t d)
+{
+  CSLOCK(locker);
+  miniexp_t r = (miniexp_t)gc_alloc_pair((void*)a, (void*)d); 
+  gctls_t *tls = gctls();
+  tls->recent[(++(tls->recentindex)) & (recentsize-1)] = (void**)r;
+  return r;
+}
+
+miniexp_t 
+miniexp_rplaca(miniexp_t pair, miniexp_t newcar)
+{
+  if (miniexp_consp(pair))
+    return miniexp_mutate(pair, &car(pair), newcar);
+  return 0;
+}
+
+miniexp_t 
+miniexp_rplacd(miniexp_t pair, miniexp_t newcdr)
+{
+  if (miniexp_consp(pair))
+    return miniexp_mutate(pair, &cdr(pair), newcdr);
+  return 0;
+}
+
+miniexp_t 
+miniexp_reverse(miniexp_t p)
+{
+  miniexp_t l = 0;
+  while (miniexp_consp(p))
+    {
+      miniexp_t q = cdr(p);
+      miniexp_mutate(p, &cdr(p), l);
+      l = p;
+      p = q;
+    }
+  return l;
+}
+
+
+/* -------------------------------------------------- */
+/* MINIOBJ                                            */
+/* -------------------------------------------------- */
+
+miniobj_t::~miniobj_t()
+{
+}
+
+const miniexp_t miniobj_t::classname = 0;
+
+bool
+miniobj_t::isa(miniexp_t) const
+{
+  return false;
+}
+
+void 
+miniobj_t::mark(minilisp_mark_t*)
+{
+}
+
+void 
+miniobj_t::destroy()
+{
+  delete this;
+}
+
+char *
+miniobj_t::pname() const
+{
+  const char *cname = miniexp_to_name(classof());
+  char *res = new char[strlen(cname)+24];
+  sprintf(res,"#%s:<%p>",cname,this);
+  return res;
+}
+
+miniexp_t 
+miniexp_object(miniobj_t *obj)
+{
+  CSLOCK(locker);
+  void **v = gc_alloc_object((void*)obj);
+  v = (void**)(((size_t)v)|((size_t)1));
+  gctls_t *tls = gctls();
+  tls->recent[(++(tls->recentindex)) & (recentsize-1)] = (void**)v;
+  return (miniexp_t)(v);
+}
+
+miniexp_t 
+miniexp_classof(miniexp_t p) 
+{
+  miniobj_t *obj = miniexp_to_obj(p);
+  if (obj) return obj->classof();
+  return miniexp_nil;
+}
+
+miniexp_t 
+miniexp_isa(miniexp_t p, miniexp_t c)
+{
+  miniobj_t *obj = miniexp_to_obj(p);
+  if (obj && obj->isa(c))
+    return obj->classof();
+  return miniexp_nil;
+}
+
+
+/* -------------------------------------------------- */
+/* STRINGS                                            */
+/* -------------------------------------------------- */
+
+BEGIN_ANONYMOUS_NAMESPACE
+
+class ministring_t : public miniobj_t 
+{
+  MINIOBJ_DECLARE(ministring_t,miniobj_t,"string");
+public:
+  ~ministring_t();
+  ministring_t(const char *s);
+  ministring_t(char *s, bool steal);
+  operator const char*() const { return s; }
+  virtual char *pname() const;
+private:
+  char *s;
+private:
+  ministring_t(const ministring_t &);
+  ministring_t& operator=(const ministring_t &);
+};
+
+MINIOBJ_IMPLEMENT(ministring_t,miniobj_t,"string");
+
+ministring_t::~ministring_t()
+{
+  delete [] s;
+}
+
+ministring_t::ministring_t(const char *str) 
+  : s(new char[strlen(str)+1])
+{
+  strcpy(s,str);
+}
+
+ministring_t::ministring_t(char *str, bool steal) 
+  : s(str)
+{
+  ASSERT(steal);
+}
+
+END_ANONYMOUS_NAMESPACE
+
+static bool
+char_quoted(int c, int flags)
+{
+  bool print7bits = (flags & miniexp_io_print7bits);
+  if (c>=0x80 && !print7bits)
+    return false;
+  if (c==0x7f || c=='\"' || c=='\\')
+    return true;
+  if (c>=0x20 && c<0x7f)
+    return false;
+  return true;
+}
+
+static bool
+char_utf8(int &c, const char* &s)
+{
+  if (c < 0xc0)
+    return (c < 0x80);
+  if (c >= 0xf8)
+    return false;
+  int n = (c < 0xe0) ? 1 : (c < 0xf0) ? 2 : 3;
+  int x = c & (0x3f >> n);
+  for (int i=0; i<n; i++)
+    if ((s[i] & 0xc0) == 0x80)
+      x = (x << 6) + (s[i] & 0x3f);
+    else
+      return false;
+  static int lim[] = {0, 0x80, 0x800, 0x10000};
+  if (x < lim[n])
+    return false;
+  if (x > 0x10ffff)
+    return false;
+  if (x >= 0xd800 && x <= 0xdfff)
+    return false;
+  s += n;
+  c = x;
+  return true;
+}
+
+static void
+char_out(int c, char* &d, int &n)
+{
+  n++;
+  if (d) 
+    *d++ = c;
+}
+
+static int
+print_c_string(const char *s, char *d, int flags = 0)
+{
+  int c;
+  int n = 0;
+  char_out('\"', d, n);
+  while ((c = (unsigned char)(*s++)))
+    {
+      if (char_quoted(c, flags))
+        {
+          char buffer[10];
+          static const char *tr1 = "\"\\tnrbf";
+          static const char *tr2 = "\"\\\t\n\r\b\f";
+          buffer[0] = buffer[1] = 0;
+          char_out('\\', d, n);
+          for (int i=0; tr2[i]; i++)
+            if (c == tr2[i])
+              buffer[0] = tr1[i];
+          if (buffer[0] == 0 && c >= 0x80 
+              && (flags & (miniexp_io_u4escape | miniexp_io_u6escape))
+              && char_utf8(c, s) )
+            {
+              if (c <= 0xffff && (flags & miniexp_io_u4escape))
+                sprintf(buffer,"u%04X", c);
+              else if (flags & miniexp_io_u6escape) // c# style
+                sprintf(buffer,"U%06X", c);
+              else if (flags & miniexp_io_u4escape) // json style
+                sprintf(buffer,"u%04X\\u%04X", 
+                        0xd800+(((c-0x10000)>>10)&0x3ff), 
+                        0xdc00+(c&0x3ff));
+            }
+          if (buffer[0] == 0)
+            sprintf(buffer, "%03o", c);
+          for (int i=0; buffer[i]; i++)
+            char_out(buffer[i], d, n);
+          continue;
+        }
+      char_out(c, d, n);
+    }
+  char_out('\"', d, n);
+  char_out(0, d, n);
+  return n;
+}
+
+char *
+ministring_t::pname() const
+{
+  int n = print_c_string(s, 0);
+  char *d = new char[n];
+  if (d) print_c_string(s, d);
+  return d;
+}
+
+int 
+miniexp_stringp(miniexp_t p)
+{
+  return miniexp_isa(p, ministring_t::classname) ? 1 : 0;
+}
+
+const char *
+miniexp_to_str(miniexp_t p)
+{
+  miniobj_t *obj = miniexp_to_obj(p);
+  if (miniexp_stringp(p))
+    return (const char*) * (ministring_t*) obj;
+  return 0;
+}
+
+miniexp_t 
+miniexp_string(const char *s)
+{
+  ministring_t *obj = new ministring_t(s);
+  return miniexp_object(obj);
+}
+
+miniexp_t 
+miniexp_substring(const char *s, int n)
+{
+  int l = strlen(s);
+  n = (n < l) ? n : l;
+  char *b = new char[n+1];
+  strncpy(b, s, n);
+  b[n] = 0;
+  ministring_t *obj = new ministring_t(b, true);
+  return miniexp_object(obj);
+}
+
+miniexp_t 
+miniexp_concat(miniexp_t p)
+{
+  miniexp_t l = p;
+  const char *s;
+  int n = 0;
+  if (miniexp_length(l) < 0)
+    return miniexp_nil;
+  for (p=l; miniexp_consp(p); p=cdr(p))
+    if ((s = miniexp_to_str(car(p))))
+      n += strlen(s);
+  char *b = new char[n+1];
+  char *d = b;
+  for (p=l; miniexp_consp(p); p=cdr(p))
+    if ((s = miniexp_to_str(car(p)))) {
+      strcpy(d, s);
+      d += strlen(d);
+    }
+  ministring_t *obj = new ministring_t(b, true);
+  return miniexp_object(obj);
+}
+
+
+/* -------------------------------------------------- */
+/* FLOATNUMS                                          */
+/* -------------------------------------------------- */
+
+
+BEGIN_ANONYMOUS_NAMESPACE
+
+class minifloat_t : public miniobj_t 
+{
+  MINIOBJ_DECLARE(minifloat_t,miniobj_t,"floatnum");
+public:
+  minifloat_t(double x) : val(x) {}
+  operator double() const { return val; }
+  virtual char *pname() const;
+private:
+  double val;
+};
+
+
+MINIOBJ_IMPLEMENT(minifloat_t,miniobj_t,"floatnum");
+
+END_ANONYMOUS_NAMESPACE
+
+int 
+miniexp_floatnump(miniexp_t p)
+{
+  return miniexp_isa(p, minifloat_t::classname) ? 1 : 0;
+}
+
+miniexp_t 
+miniexp_floatnum(double x)
+{
+  minifloat_t *obj = new minifloat_t(x);
+  return miniexp_object(obj);
+}
+
+double 
+miniexp_to_double(miniexp_t p)
+{
+  if (miniexp_numberp(p))
+    return (double) miniexp_to_int(p);
+  else if (miniexp_floatnump(p))
+    return (double) * (minifloat_t*) miniexp_to_obj(p);
+  return 0.0;
+}
+
+miniexp_t 
+miniexp_double(double x)
+{
+  miniexp_t exp = miniexp_number((int)(x));
+  if (x != (double)miniexp_to_int(exp))
+    exp = miniexp_floatnum(x);
+  return exp;
+}
+
+static bool
+str_looks_like_double(const char *s)
+{
+  if (isdigit(s[0]))
+    return true;
+  if ((s[0] == '+' || s[0] == '-') && s[1])
+    return true;
+  return false;
+}
+
+char *
+minifloat_t::pname() const
+{
+  char *r = new char[64];
+  sprintf(r,"%f",val);
+  if (! str_looks_like_double(r))
+    sprintf(r,"+%f",val);
+  return r;
+}
+
+static bool
+str_is_double(const char *s, double &x)
+{
+  if (str_looks_like_double(s))
+    {
+      char *end;
+      errno = 0;
+      x = (double) strtol(s, &end, 0);
+      if (*end == 0 && errno == 0) 
+        return true;
+      x = (double) strtod(s, &end);
+      if (*end == 0 && errno == 0) 
+        return true;
+    }
+  return false;
+}
+
+
+
+/* -------------------------------------------------- */
+/* INPUT/OUTPUT                                       */
+/* -------------------------------------------------- */
+
+static int true_stdio_fputs(miniexp_io_t *io, const char *s) {
+  FILE *f = (io->data[1]) ? (FILE*)(io->data[1]) : stdout;
+  return ::fputs(s, f);
+}
+static int compat_puts(const char *s) { 
+  return true_stdio_fputs(&miniexp_io, s); 
+}
+static int stdio_fputs(miniexp_io_t *io, const char *s) {
+  if (io == &miniexp_io) 
+    return (*minilisp_puts)(s);
+  return true_stdio_fputs(io, s);
+}
+
+static int true_stdio_fgetc(miniexp_io_t *io) {
+  FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin;
+  return ::getc(f);
+}
+static int compat_getc() { 
+  return true_stdio_fgetc(&miniexp_io); 
+}
+static int stdio_fgetc(miniexp_io_t *io)
+{
+  if (io == &miniexp_io) 
+    return (*minilisp_getc)();
+  return true_stdio_fgetc(io);
+}
+
+static int true_stdio_ungetc(miniexp_io_t *io, int c) {
+  FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin;
+  return ::ungetc(c, f);
+}
+static int compat_ungetc(int c) { 
+  return true_stdio_ungetc(&miniexp_io, c); 
+}
+static int stdio_ungetc(miniexp_io_t *io, int c) {
+  if (io == &miniexp_io) 
+    return (*minilisp_ungetc)(c);
+  return true_stdio_ungetc(io, c);
+}
+
+extern "C" 
+{ 
+  // SunCC needs this to be defined inside extern "C" { ... }
+  // Beware the difference between extern "C" {...} and extern "C".
+  miniexp_t (*minilisp_macrochar_parser[128])(void);
+  miniexp_t (*minilisp_diezechar_parser[128])(void);
+  minivar_t minilisp_macroqueue;
+  int minilisp_print_7bits;
+}
+
+miniexp_io_t miniexp_io = { 
+  stdio_fputs, stdio_fgetc, stdio_ungetc, { 0, 0, 0, 0 },
+  (int*)&minilisp_print_7bits,
+  (miniexp_macrochar_t*)minilisp_macrochar_parser, 
+  (miniexp_macrochar_t*)minilisp_diezechar_parser, 
+  (minivar_t*)&minilisp_macroqueue,
+  0
+};  
+
+int (*minilisp_puts)(const char *) = compat_puts;
+int (*minilisp_getc)(void) = compat_getc;
+int (*minilisp_ungetc)(int) = compat_ungetc;
+
+void 
+miniexp_io_init(miniexp_io_t *io)
+{
+  io->fputs = stdio_fputs;
+  io->fgetc = stdio_fgetc;
+  io->ungetc = stdio_ungetc;
+  io->data[0] = io->data[1] = io->data[2] = io->data[3] = 0;
+  io->p_flags = (int*)&minilisp_print_7bits;;
+  io->p_macrochar = (miniexp_macrochar_t*)minilisp_macrochar_parser;
+  io->p_diezechar = (miniexp_macrochar_t*)minilisp_diezechar_parser;
+  io->p_macroqueue = (minivar_t*)&minilisp_macroqueue;
+  io->p_reserved = 0;
+}
+
+void 
+miniexp_io_set_output(miniexp_io_t* io, FILE *f)
+{
+  io->fputs = stdio_fputs;
+  io->data[1] = f;
+}
+
+void 
+miniexp_io_set_input(miniexp_io_t* io, FILE *f)
+{
+  io->fgetc = stdio_fgetc;
+  io->ungetc = stdio_ungetc;
+  io->data[0] = f;
+}
+
+
+/* ---- OUTPUT */
+
+BEGIN_ANONYMOUS_NAMESPACE
+
+struct printer_t 
+{
+  int tab;
+  bool dryrun;
+  miniexp_io_t *io;
+  printer_t(miniexp_io_t *io) : tab(0), dryrun(false), io(io) {}
+  void mlput(const char *s);
+  void mltab(int n);
+  void print(miniexp_t p);
+  bool must_quote_symbol(const char *s, int flags);
+  void mlput_quoted_symbol(const char *s);
+  virtual miniexp_t begin() { return miniexp_nil; }
+  virtual bool newline() { return false; }
+  virtual void end(miniexp_t) { }
+  virtual ~printer_t() {};
+};
+
+void
+printer_t::mlput(const char *s)
+{
+  if (! dryrun)
+    io->fputs(io, s);
+  while (*s)
+    if (*s++ == '\n')
+      tab = 0;
+    else
+      tab += 1;
+}
+
+void
+printer_t::mltab(int n)
+{
+  while (tab+8 <= n)
+    mlput("        ");
+  while (tab+1 <= n)
+    mlput(" ");
+}
+
+bool
+printer_t::must_quote_symbol(const char *s, int flags)
+{
+  int c;
+  const char *r = s;
+  while ((c = *r++))
+    if (c=='(' || c==')' || c=='\"' || c=='|' || 
+        isspace(c) || !isascii(c) || !isprint(c) ||
+        (c >= 0 && c < 128 && io->p_macrochar && io->p_macrochar[c]) )
+      return true;
+  double x;
+  if (flags & miniexp_io_quotemoresymbols)
+    return str_looks_like_double(s);
+  return str_is_double(s, x);
+}
+
+void
+printer_t::mlput_quoted_symbol(const char *s)
+{
+  int l = strlen(s);
+  char *r = new char[l+l+3];
+  char *z = r;
+  *z++ = '|';
+  while (*s)
+    if ((*z++ = *s++) == '|')
+      *z++ = '|';
+  *z++ = '|';
+  *z++ = 0;
+  mlput(r);
+  delete [] r;
+}
+
+void
+printer_t::print(miniexp_t p)
+{
+  int flags = (io->p_flags) ? *io->p_flags : 0;
+  static char buffer[32];
+  miniexp_t b = begin();
+  if (p == miniexp_nil)
+    {
+      mlput("()");
+    }
+  else if (miniexp_numberp(p))
+    {
+      sprintf(buffer, "%d", miniexp_to_int(p));
+      mlput(buffer);
+    }
+  else if (miniexp_symbolp(p))
+    {
+      const char *s = miniexp_to_name(p);
+      if (must_quote_symbol(s, flags))
+        mlput_quoted_symbol(s);
+      else
+        mlput(s);
+    }
+  else if (miniexp_stringp(p))
+    {
+      const char *s = miniexp_to_str(p);
+      int n = print_c_string(s, 0, flags);
+      char *d = new char[n];
+      if (d) 
+        print_c_string(s, d, flags);
+      mlput(d);
+      delete [] d;
+    }
+  else if (miniexp_objectp(p))
+    {
+      miniobj_t *obj = miniexp_to_obj(p);
+      char *s = obj->pname();
+      mlput(s);
+      delete [] s;
+    }
+  else if (miniexp_listp(p))
+    {
+      // TODO - detect more circular structures
+      int skip = 1;
+      int indent = tab + 1;
+      bool multiline = false;
+      bool toggle = true;
+      miniexp_t q = p;
+      mlput("(");
+      if (miniexp_consp(p) && miniexp_symbolp(car(p)))
+        {
+          skip++;
+          indent++;
+        }
+      while (miniexp_consp(p))
+        {
+          skip -= 1;
+	  if (multiline || (newline() && skip<0 && tab>indent))
+            {
+              mlput("\n"); 
+              mltab(indent); 
+              multiline=true; 
+            }
+          print(car(p));
+          if ((p = cdr(p)))
+            mlput(" ");
+          if ((toggle = !toggle))
+            q = cdr(q);
+          if (p == q)
+            {
+              mlput("...");
+              p = 0;
+            }
+        }
+      if (p)
+        {
+          skip -= 1;
+	  if (multiline || (newline() && skip<0 && tab>indent))
+            {
+              mlput("\n"); 
+              mltab(indent); 
+              multiline=true; 
+            }
+          mlput(". ");
+          print(p);
+        }
+      if (multiline)
+        mlput(" )");
+      else
+        mlput(")");
+    }
+  end(b);
+}
+
+struct pprinter_t : public printer_t 
+{
+  int width;
+  minivar_t l;
+  pprinter_t(miniexp_io_t *io) : printer_t(io) {}
+  virtual miniexp_t begin();
+  virtual bool newline();
+  virtual void end(miniexp_t);
+};
+
+miniexp_t 
+pprinter_t::begin()
+{
+  if (dryrun)
+    {
+      l = miniexp_cons(miniexp_number(tab), l);
+      return l;
+    }
+  else
+    {
+      ASSERT(miniexp_consp(l));
+      ASSERT(miniexp_numberp(car(l)));
+      l = cdr(l);
+      return miniexp_nil;
+    }
+}
+
+bool 
+pprinter_t::newline()
+{
+  if (! dryrun)
+    {
+      ASSERT(miniexp_consp(l));
+      ASSERT(miniexp_numberp(car(l)));
+      int len = miniexp_to_int(car(l));
+      if (tab + len >= width)
+        return true;
+    }
+  return false;
+}
+
+void 
+pprinter_t::end(miniexp_t p)
+{
+  if (dryrun)
+    {
+      ASSERT(miniexp_consp(p));
+      ASSERT(miniexp_numberp(car(p)));
+      int pos = miniexp_to_int(car(p));
+      ASSERT(tab >= pos);
+      miniexp_rplaca(p, miniexp_number(tab - pos));
+    }
+}
+
+END_ANONYMOUS_NAMESPACE
+
+miniexp_t 
+miniexp_prin_r(miniexp_io_t *io, miniexp_t p)
+{
+  minivar_t xp = p;
+  printer_t printer(io);
+  printer.print(p);
+  return p;
+}
+
+miniexp_t 
+miniexp_print_r(miniexp_io_t *io, miniexp_t p)
+{
+  minivar_t xp = p;
+  miniexp_prin_r(io, p);
+  io->fputs(io, "\n");
+  return p;
+}
+
+miniexp_t 
+miniexp_pprin_r(miniexp_io_t *io, miniexp_t p, int width)
+{  
+  minivar_t xp = p;
+  pprinter_t printer(io);
+  printer.width = width;
+  // step1 - measure lengths into list <l>
+  printer.tab = 0;
+  printer.dryrun = true;
+  printer.print(p);
+  // step2 - print
+  printer.tab = 0;
+  printer.dryrun = false;
+  printer.l = miniexp_reverse(printer.l);
+  printer.print(p);
+  // check
+  ASSERT(printer.l == 0);
+  return p;
+}
+
+miniexp_t 
+miniexp_pprint_r(miniexp_io_t *io, miniexp_t p, int width)
+{
+  miniexp_pprin_r(io, p, width);
+  io->fputs(io, "\n");
+  return p;
+}
+
+
+/* ---- PNAME */
+
+static int
+pname_fputs(miniexp_io_t *io, const char *s)
+{
+  char *b = (char*)(io->data[0]);
+  size_t l = (size_t)(io->data[2]);
+  size_t m = (size_t)(io->data[3]);
+  size_t x = strlen(s);
+  if (l + x >= m)
+    {
+      size_t nm = l + x + 256;
+      char *nb = new char[nm+1];
+      memcpy(nb, b, l);
+      delete [] b;
+      b = nb;
+      m = nm;
+    }
+  strcpy(b + l, s);
+  io->data[0] = (void*)(b);
+  io->data[2] = (void*)(l + x);
+  io->data[3] = (void*)(m);
+  return x;
+}
+
+miniexp_t 
+miniexp_pname(miniexp_t p, int width)
+{
+  minivar_t r;
+  miniexp_io_t io;
+  miniexp_io_init(&io);
+  io.fputs = pname_fputs;
+  io.data[0] = io.data[2] = io.data[3] = 0;
+  try
+    {
+      if (width > 0)
+        miniexp_pprin_r(&io, p, width);
+      else
+        miniexp_prin_r(&io, p);
+      if (io.data[0])
+        r = miniexp_string((const char*)io.data[0]);
+      delete [] (char*)(io.data[0]);
+    }
+  catch(...)
+    {
+      delete [] (char*)(io.data[0]);
+    }
+  return r;
+}
+
+
+/* ---- INPUT */
+
+static void
+grow(char* &s, int &l, int &m)
+{
+  int nm = ((m<256)?256:m) + ((m>32000)?32000:m);
+  char *ns = new char[nm+1];
+  memcpy(ns, s, l);
+  delete [] s;
+  m = nm;
+  s = ns;
+}
+
+static void
+append(int c, char* &s, int &l, int &m)
+{
+  if (l >= m)
+    grow(s, l, m);
+  s[l++] = c;
+  s[l] = 0;
+}
+
+static void
+append_utf8(int x, char *&s, int &l, int &m)
+{
+  if (x >= 0 && x <= 0x10ffff)
+    { 
+      if (l + 4 >= m)
+        grow(s, l, m);
+      if (x <= 0x7f) {
+        s[l++] = (char)x;
+      } else if (x <= 0x7ff) {
+        s[l++] = (char)((x>>6)|0xc0);
+        s[l++] = (char)((x|0x80)&0xbf);
+      } else if (x <= 0xffff) {
+        s[l++] = (char)((x>>12)|0xe0);
+        s[l++] = (char)(((x>>6)|0x80)&0xbf);
+        s[l++] = (char)((x|0x80)&0xbf);
+      } else {
+        s[l++] = (char)((x>>18)|0xf0);
+        s[l++] = (char)(((x>>12)|0x80)&0xbf);
+        s[l++] = (char)(((x>>6)|0x80)&0xbf);
+        s[l++] = (char)((x|0x80)&0xbf);
+      }
+      s[l] = 0;
+    }
+}
+
+static void
+skip_blank(miniexp_io_t *io, int &c)
+{
+  while (isspace(c))
+    c = io->fgetc(io);
+}
+
+static void
+skip_newline(miniexp_io_t *io, int &c)
+{
+  int d = c;
+  if (c == '\n' || c == '\r')
+    c = io->fgetc(io);
+  if ((c == '\n' || c == '\r') && (c != d))
+    c = io->fgetc(io);
+}
+
+static int
+skip_octal(miniexp_io_t *io, int &c, int maxlen=3)
+{
+  int n = 0;
+  int x = 0;
+  while (c >= '0' && c < '8' && n++ < maxlen)
+    {
+      x = (x<<3) + c - '0';
+      c = io->fgetc(io);
+    }
+  return x;
+}
+
+static int
+skip_hexadecimal(miniexp_io_t *io, int &c, int maxlen=2)
+{
+  int n = 0;
+  int x = 0;
+  while (isxdigit(c) && n++ < maxlen && x <= 0x10fff) // unicode range only
+    {
+      x = (x<<4) + (isdigit(c) ? c-'0' : toupper(c)-'A'+10);
+      c = io->fgetc(io);
+    }
+  return x;
+}
+
+static miniexp_t
+read_error(miniexp_io_t *io, int &c)
+{
+  while (c!=EOF && c!='\n')
+    c = io->fgetc(io);
+  return miniexp_dummy;
+}
+
+static miniexp_t
+read_c_string(miniexp_io_t *io, int &c)
+{
+  miniexp_t r;
+  char *s = 0;
+  int l = 0;
+  int m = 0;
+  ASSERT(c == '\"');
+  c = io->fgetc(io);
+  for(;;)
+    {
+      if (c==EOF || (isascii(c) && !isprint(c)))
+        return read_error(io, c);
+      else if (c=='\"')
+        break;
+      else if (c=='\\')
+        {
+          c = io->fgetc(io);
+          if (c == '\n' || c == '\r')
+            {
+              skip_newline(io, c);
+              continue;
+            }
+          else if (c>='0' && c<='7')
+            {
+              int x = skip_octal(io, c, 3);
+              append((char)x, s, l, m);
+              continue;
+            }
+          else if (c=='x' || c=='X')
+            {
+              int d = c;
+              c = io->fgetc(io);
+              if (isxdigit(c))
+                {
+                  int x = skip_hexadecimal(io, c, 2);
+                  append((char)x, s, l, m);
+                  continue;
+                }
+              io->ungetc(io, c);
+              c = d;
+            }
+          else if (c == 'u' || c == 'U')
+            {
+              int x = -1;
+              int d = c;
+              c = io->fgetc(io);
+              if (isxdigit(c))
+                x = skip_hexadecimal(io, c, isupper(d) ? 6 : 4);
+              while (x >= 0xd800 && x <= 0xdbff && c == '\\')
+                {
+                  c = io->fgetc(io);
+                  if (c != 'u' && c != 'U') 
+                    {
+                      io->ungetc(io, c);
+                      c = '\\';
+                      break;
+                    }
+                  d = c;
+                  c = io->fgetc(io);
+                  int z = -1;
+                  if (isxdigit(c))
+                    z = skip_hexadecimal(io, c, isupper(d) ? 6 : 4);
+                  if (z >= 0xdc00 && z <= 0xdfff)
+                    {
+                      x = 0x10000 + ((x & 0x3ff) << 10) + (z & 0x3ff);
+                      break;
+                    }
+                  append_utf8(x, s, l, m);
+                  x = z;
+                }
+              if (x >= 0)
+                {
+                  append_utf8(x, s, l, m);
+                  continue;
+                }
+              io->ungetc(io, c);
+              c = d;
+            }
+          static const char *tr1 = "tnrbfva";
+          static const char *tr2 = "\t\n\r\b\f\013\007";
+          for (int i=0; tr1[i]; i++)
+            if (c == tr1[i])
+              c = tr2[i];
+        }
+      append(c,s,l,m);
+      c = io->fgetc(io);
+    }
+  c = io->fgetc(io);
+  r = miniexp_string(s ? s : "");
+  delete [] s;
+  return r;
+}
+
+static miniexp_t
+read_quoted_symbol(miniexp_io_t *io, int &c)
+{
+  miniexp_t r;
+  char *s = 0;
+  int l = 0;
+  int m = 0;
+  ASSERT(c == '|');
+  for(;;)
+    {
+      c = io->fgetc(io);
+      if (c==EOF || (isascii(c) && !isprint(c)))
+        return read_error(io, c);
+      if (c=='|')
+        if ((c = io->fgetc(io)) != '|')
+          break;
+      append(c,s,l,m);
+    }
+  r = miniexp_symbol(s ? s : "");
+  delete [] s;
+  return r;
+}
+
+static miniexp_t
+read_symbol_or_number(miniexp_io_t *io, int &c)
+{
+  miniexp_t r;
+  char *s = 0;
+  int l = 0;
+  int m = 0;
+  for(;;)
+    {
+      if (c==EOF || c=='(' || c==')' || c=='|' || c=='\"'  
+          || isspace(c) || !isascii(c) || !isprint(c) 
+          || (io->p_macrochar && io->p_macroqueue  
+              && c < 128 && c >= 0 && io->p_macrochar[c] ) )
+        break;
+      append(c,s,l,m);
+      c = io->fgetc(io);
+    }
+  if (l <= 0)
+    return read_error(io, c);
+  double x;
+  if (str_is_double(s, x))
+    r = miniexp_double(x);
+  else
+    r = miniexp_symbol(s);
+  delete [] s;
+  return r;
+}
+
+static miniexp_t
+read_miniexp(miniexp_io_t *io, int &c)
+{
+  for(;;)
+    {
+      if (io->p_macroqueue && miniexp_consp(*io->p_macroqueue))
+        {
+          miniexp_t p = car(*io->p_macroqueue);
+          *io->p_macroqueue = cdr(*io->p_macroqueue);
+          return p;
+        }
+      skip_blank(io, c);
+      if (c == EOF)
+        {
+          // clean end-of-file.
+          return miniexp_dummy;
+        }
+      else if (c == ')')
+        {
+          c = io->fgetc(io);
+          continue;
+        }
+      else if (c == '(')
+        {
+          minivar_t l = miniexp_cons(miniexp_nil, miniexp_nil);
+          miniexp_t tail = l;
+          minivar_t p;
+          c = io->fgetc(io);
+          for(;;)
+            {
+              skip_blank(io, c);
+              if (c == ')')
+                break;
+              if (c == '.')
+                {
+                  int d = io->fgetc(io);
+                  io->ungetc(io, d);
+                  if (isspace(d)) 
+                    break;
+                }
+              p = read_miniexp(io, c);
+              if ((miniexp_t)p == miniexp_dummy)
+                return read_error(io, c);
+              p = miniexp_cons(p, miniexp_nil);
+              miniexp_rplacd(tail, p);
+              tail = p;
+            }
+          if (c == '.')
+            {
+              c = io->fgetc(io);
+              skip_blank(io, c);
+              if (c != ')')
+                miniexp_rplacd(tail, read_miniexp(io, c));
+            }
+          skip_blank(io, c);
+          if (c != ')')
+            return read_error(io, c);
+          c = io->fgetc(io);
+          return cdr(l);
+        }
+      else if (c == '"')
+        {
+          return read_c_string(io, c);
+        }
+      else if (c == '|')
+        {
+          return read_quoted_symbol(io, c);
+        }
+      else if (io->p_macrochar && io->p_macroqueue 
+               && c >= 0 && c < 128 && io->p_macrochar[c])
+        {
+          miniexp_t p = io->p_macrochar[c](io);
+          if (miniexp_length(p) > 0)
+            *io->p_macroqueue = p;
+          else if (p)
+            return read_error(io, c);
+          c = io->fgetc(io);
+          continue;
+        }
+      else if (c == '#')
+        {
+          int nc = io->fgetc(io);
+          if (io->p_diezechar && io->p_macroqueue
+              && nc >= 0 && nc < 128 && io->p_diezechar[nc])
+            {
+              miniexp_t p = io->p_macrochar[nc](io);
+              if (miniexp_length(p) > 0)
+                *io->p_macroqueue = p;
+              else if (p)
+                return read_error(io, c);
+              c = io->fgetc(io);
+              continue;
+            }
+          else if (nc == '#')
+            return read_error(io, c);
+          io->ungetc(io, nc);
+          // fall thru
+        }
+      // default
+      return read_symbol_or_number(io, c);
+    }
+}
+
+miniexp_t 
+miniexp_read_r(miniexp_io_t *io)
+{
+  int c = io->fgetc(io);
+  miniexp_t p = read_miniexp(io, c);
+  if (c != EOF)
+    io->ungetc(io, c);
+  return p;
+}
+
+
+/* ---- COMPAT */
+
+miniexp_t miniexp_read(void)
+{
+  return miniexp_read_r(&miniexp_io);
+}
+
+miniexp_t miniexp_prin(miniexp_t p)
+{
+  return miniexp_prin_r(&miniexp_io, p);
+}
+
+miniexp_t miniexp_print(miniexp_t p)
+{
+  return miniexp_print_r(&miniexp_io, p);
+}
+
+miniexp_t miniexp_pprin(miniexp_t p, int w)
+{
+  return miniexp_pprin_r(&miniexp_io, p, w);
+}
+
+miniexp_t miniexp_pprint(miniexp_t p, int w)
+{
+  return miniexp_pprint_r(&miniexp_io, p, w);
+}
+
+void 
+minilisp_set_output(FILE *f)
+{
+  minilisp_puts = compat_puts;
+  miniexp_io_set_output(&miniexp_io, f);
+}
+
+void 
+minilisp_set_input(FILE *f)
+{
+  minilisp_getc = compat_getc;
+  minilisp_ungetc = compat_ungetc;
+  miniexp_io_set_input(&miniexp_io, f);
+}
+
+
+
+
+/* -------------------------------------------------- */
+/* CLEANUP (SEE GC ABOVE)                             */
+/* -------------------------------------------------- */
+
+static void
+gc_clear(miniexp_t *pp)
+{
+  *pp = 0;
+}
+
+void
+minilisp_finish(void)
+{
+  CSLOCK(locker);
+  ASSERT(!gc.lock);
+  // clear minivars
+  minivar_t::mark(gc_clear);
+  for (gctls_t *tls = gc.tls; tls; tls=tls->next)
+    for (int i=0; i<recentsize; i++)
+      tls->recent[i] = 0;
+  // collect everything
+  gc_run();
+  // deallocate everything
+  ASSERT(gc.pairs_free == gc.pairs_total);
+  while (gc.pairs_blocks)
+    {
+      block_t *b = gc.pairs_blocks;
+      gc.pairs_blocks = b->next;
+      delete b;
+    }
+  ASSERT(gc.objs_free == gc.objs_total);
+  while (gc.objs_blocks)
+    {
+      block_t *b = gc.objs_blocks;
+      gc.objs_blocks = b->next;
+      delete b;
+    }
+  delete symbols;
+  symbols = 0;
+}
+
+
diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h
new file mode 100644
index 0000000..d22ce92
--- /dev/null
+++ b/libdjvu/miniexp.h
@@ -0,0 +1,788 @@
+/* -*- C -*-
+// -------------------------------------------------------------------
+// MiniExp - Library for handling lisp expressions
+// Copyright (c) 2005  Leon Bottou
+//
+// This software is subject to, and may be distributed under, the
+// GNU General Public License, either Version 2 of the license,
+// or (at your option) any later version. The license should have
+// accompanied the software or you may obtain a copy of the license
+// from the Free Software Foundation at http://www.fsf.org .
+//
+// 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.
+// -------------------------------------------------------------------
+*/
+
+#ifndef MINIEXP_H
+#define MINIEXP_H
+
+#ifdef __cplusplus
+extern "C" { 
+# ifndef __cplusplus
+}
+# endif
+#endif
+
+#ifndef MINILISPAPI
+# ifdef _WIN32
+#  ifdef MINILISPAPI_EXPORT
+#   define MINILISPAPI __declspec(dllexport)
+#  else
+#   define MINILISPAPI __declspec(dllimport)
+#  endif
+# endif
+#endif
+#ifndef MINILISPAPI
+# define MINILISPAPI /**/
+#endif
+
+#ifndef __cplusplus
+# ifndef inline
+#  if defined(__GNUC__)
+#   define inline __inline__
+#  elif defined(_MSC_VER)
+#   define inline __inline
+#  else
+#   define inline /**/
+#  endif
+# endif
+#endif
+
+#include <stddef.h>  
+
+/* -------------------------------------------------- */
+/* LISP EXPRESSIONS                                   */
+/* -------------------------------------------------- */
+
+/* miniexp_t -- 
+   Opaque pointer type representing a lisp expression,
+   also known as s-expression. 
+   S-expressions can be viewed as a simple and powerful 
+   alternative to XML.  DjVu uses s-expressions to handle
+   annotations. Both the decoding api <ddjvuapi.h> and 
+   program <djvused> use s-expressions to describe the 
+   hidden text information and the navigation 
+   information */
+
+
+typedef struct miniexp_s* miniexp_t;
+
+
+/* There are four basic types of lisp expressions,
+   numbers, symbols, pairs, and objects.
+   The latter category can represent any c++ object
+   that inherits class <miniobj_t> defined later in this file.
+   Strings and floating point numbers are implemented this way.*/
+
+
+/* -------- NUMBERS -------- */
+
+/* Minilisp numbers represent integers 
+   covering at least range [-2^29...2^29-1] */
+
+
+/* miniexp_numberp --
+   Tests if an expression is a number. */
+
+static inline int miniexp_numberp(miniexp_t p) {
+  return (((size_t)(p)&3)==3);
+}
+
+/* miniexp_to_int --
+   Returns the integer corresponding to a lisp expression.
+   Assume that the expression is indeed a number. */
+
+static inline int miniexp_to_int(miniexp_t p) {
+  return (((int)(size_t)(p))>>2);
+}
+
+/* miniexp_number --
+   Constructs the expression corresponding to an integer. */
+
+static inline miniexp_t miniexp_number(int x) {
+  return (miniexp_t) (size_t) ((x<<2)|3);
+}
+   
+
+
+/* -------- SYMBOLS -------- */
+
+/* The textual representation of a minilisp symbol is a 
+   sequence of printable characters forming an identifier. 
+   Each symbol has a unique representation and remain 
+   permanently allocated. To compare two symbols, 
+   simply compare the <miniexp_t> pointers. */
+
+
+/* miniexp_symbolp --
+   Tests if an expression is a symbol. */
+
+static inline int miniexp_symbolp(miniexp_t p) {
+  return ((((size_t)p)&3)==2);
+}
+
+/* miniexp_to_name --
+   Returns the symbol name as a string.
+   Returns NULL if the expression is not a symbol. */
+   
+MINILISPAPI const char* miniexp_to_name(miniexp_t p);
+
+/* miniexp_symbol --
+   Returns the unique symbol expression with the specified name. */
+
+MINILISPAPI miniexp_t miniexp_symbol(const char *name);
+
+
+
+/* -------- PAIRS -------- */
+
+/* Pairs (also named "cons") are the basic building blocks for 
+   minilisp lists. Each pair contains two expression:
+   - the <car> represents the first element of a list.
+   - the <cdr> usually is a pair representing the rest of the list.
+   The empty list is represented by a null pointer. */
+
+
+/* miniexp_nil --
+   The empty list. */
+
+#define miniexp_nil ((miniexp_t)(size_t)0)
+
+/* miniexp_dummy --
+   An invalid expression used to represent
+   various exceptional conditions. */
+
+#define miniexp_dummy ((miniexp_t)(size_t)2)
+
+/* miniexp_listp --
+   Tests if an expression is either a pair or the empty list. */   
+
+static inline int miniexp_listp(miniexp_t p) {
+  return ((((size_t)p)&3)==0);
+}
+
+/* miniexp_consp --
+   Tests if an expression is a pair. */
+
+static inline int miniexp_consp(miniexp_t p) {
+  return p && miniexp_listp(p);
+}
+
+/* miniexp_length --
+   Returns the length of a list.
+   Returns 0 for non lists, -1 for circular lists. */
+
+MINILISPAPI int miniexp_length(miniexp_t p);
+
+/* miniexp_car --
+   miniexp_cdr --
+   Returns the car or cdr of a pair. */
+
+static inline miniexp_t miniexp_car(miniexp_t p) {
+  if (miniexp_consp(p))
+    return ((miniexp_t*)p)[0];
+  return miniexp_nil;
+}
+
+static inline miniexp_t miniexp_cdr(miniexp_t p) {
+  if (miniexp_consp(p))
+    return ((miniexp_t*)p)[1];
+  return miniexp_nil;
+}
+
+/* miniexp_cXXr --
+   Represent common combinations of car and cdr. */
+
+MINILISPAPI miniexp_t miniexp_caar (miniexp_t p);
+MINILISPAPI miniexp_t miniexp_cadr (miniexp_t p);
+MINILISPAPI miniexp_t miniexp_cdar (miniexp_t p);
+MINILISPAPI miniexp_t miniexp_cddr (miniexp_t p);
+MINILISPAPI miniexp_t miniexp_caddr(miniexp_t p);
+MINILISPAPI miniexp_t miniexp_cdddr(miniexp_t p);
+
+/* miniexp_nth --
+   Returns the n-th element of a list. */
+
+MINILISPAPI miniexp_t miniexp_nth(int n, miniexp_t l);
+
+/* miniexp_cons --
+   Constructs a pair. */
+
+MINILISPAPI miniexp_t miniexp_cons(miniexp_t car, miniexp_t cdr);
+
+/* miniexp_rplaca --
+   miniexp_rplacd --
+   Changes the car or the cdr of a pair. */
+
+MINILISPAPI miniexp_t miniexp_rplaca(miniexp_t pair, miniexp_t newcar);
+MINILISPAPI miniexp_t miniexp_rplacd(miniexp_t pair, miniexp_t newcdr);
+
+/* miniexp_reverse --
+   Reverses a list in place. */
+
+MINILISPAPI miniexp_t miniexp_reverse(miniexp_t p);
+
+
+/* -------- OBJECTS (GENERIC) -------- */
+
+/* Object expressions represent a c++ object
+   that inherits class <miniobj_t> defined later.
+   Each object expression has a symbolic class name
+   and a pointer to the c++ object. */
+
+/* miniexp_objectp --
+   Tests if an expression is an object. */
+
+static inline int miniexp_objectp(miniexp_t p) {
+  return ((((size_t)p)&3)==1);
+}
+
+/* miniexp_classof --
+   Returns the symbolic class of an expression.
+   Returns nil if the expression is not an object. */
+
+MINILISPAPI miniexp_t miniexp_classof(miniexp_t p);
+
+/* miniexp_isa --
+   If <p> is an instance of class named <c> or one of
+   its subclasses, returns the actual class name.
+   Otherwise returns miniexp_nil. */
+
+MINILISPAPI miniexp_t miniexp_isa(miniexp_t p, miniexp_t c);
+
+
+/* -------- OBJECTS (STRINGS) -------- */
+
+/* miniexp_stringp --
+   Tests if an expression is a string. */
+
+MINILISPAPI int miniexp_stringp(miniexp_t p);
+
+/* miniexp_to_str --
+   Returns the c string represented by the expression.
+   Returns NULL if the expression is not a string.
+   The c string remains valid as long as the
+   corresponding lisp object exists. */
+
+MINILISPAPI const char *miniexp_to_str(miniexp_t p);
+
+/* miniexp_string --
+   Constructs a string expression by copying string s. */
+
+MINILISPAPI miniexp_t miniexp_string(const char *s);
+
+/* miniexp_substring --
+   Constructs a string expression by copying 
+   at most n character from string s. */
+
+MINILISPAPI miniexp_t miniexp_substring(const char *s, int n);
+
+/* miniexp_concat --
+   Concat all the string expressions in list <l>. */
+
+MINILISPAPI miniexp_t miniexp_concat(miniexp_t l);
+
+
+
+/* -------- OBJECTS (FLOATNUM) -------- */
+
+/* miniexp_floatnump --
+   Tests if an expression is an object
+   representing a floating point number. */
+
+MINILISPAPI int miniexp_floatnump(miniexp_t p);
+
+/* miniexp_floatnum --
+   Returns a new floating point number object. */
+
+MINILISPAPI miniexp_t miniexp_floatnum(double x);
+
+/* miniexp_doublep --
+   Tests if an expression can be converted
+   to a double precision number. */
+
+static inline int miniexp_doublep(miniexp_t p) {
+  return miniexp_numberp(p) || miniexp_floatnump(p);
+}
+
+/* miniexp_to_double --
+   Returns a double precision number corresponding to 
+   a lisp expression (a number or a floatnum.) */
+
+MINILISPAPI double miniexp_to_double(miniexp_t p);
+
+/* miniexp_double --
+   Returns a lisp expression representing a double
+   precision number. This will be a number if it fits
+   and a floatnum otherwise.
+ */
+
+MINILISPAPI miniexp_t miniexp_double(double x);
+
+
+/* -------------------------------------------------- */
+/* GARBAGE COLLECTION                                 */
+/* -------------------------------------------------- */
+
+
+/* The garbage collector reclaims the memory allocated for
+   lisp expressions no longer in use.  It is automatically
+   invoked by the pair and object allocation functions when
+   the available memory runs low.  It is however possible to
+   temporarily disable it.
+
+   The trick is to determine which lisp expressions are in
+   use at a given moment. This package takes a simplistic
+   approach. All objects of type <minivar_t> are chained and
+   can reference an arbitrary lisp expression.  Garbage
+   collection preserves all lisp expressions referenced by a
+   minivar, as well as all lisp expressions that can be
+   accessed from these. When called automatically, 
+   garbage collection also preserves the sixteen most recently 
+   created miniexps in order to make sure that temporaries do 
+   not vanish in the middle of complicated C expressions.
+     
+   The minivar class is designed such that C++ program can
+   directly use instances of <minivar_t> as normal
+   <miniexp_t> variables.  There is almost no overhead
+   accessing or changing the lisp expression referenced by a
+   minivar. However, the minivar chain must be updated
+   whenever the minivar object is constructed or destructed.
+   
+   Example (in C++ only):
+     miniexp_t copy_in_reverse(miniexp_t p) {
+        minivar_t l = miniexp_nil;
+        while (miniexp_consp(p)) {
+          l = miniexp_cons(miniexp_car(p), l); 
+          p = miniexp_cdr(p); 
+        }
+        return l;
+     }
+
+   When to use minivar_t instead of miniexp_t?
+
+   * A function that only navigates properly secured
+     s-expressions without modifying them does not need to
+     bother about minivars.
+
+   * Only the following miniexp functions can cause a
+     garbage collection: miniexp_cons(), miniexp_object(),
+     miniexp_string(), miniexp_substring(), miniexp_pname(),
+     miniexp_concat(), miniexp_pprin(), miniexp_pprint(),
+     miniexp_gc(), and minilisp_release_gc_lock().  A
+     function that does not cause calls to these functions
+     does not need to bother about minivars.
+
+   * Other functions should make sure that all useful
+     s-expression are directly or indirectly secured by a
+     minivar_t object. In case of doubt, use minivars
+     everywhere.
+
+   * Function arguments should remain <miniexp_t> in order
+     to allow interoperability with the C language. 
+     It is assumed that these arguments have been properly
+     secured by the caller and cannot disappear if a 
+     garbage collection occurs.
+
+   C programs cannot use minivars as easily as C++ programs.
+   Wrappers are provided to allocate minivars and to access
+   their value. This is somehow inconvenient.  It might be
+   more practical to control the garbage collector
+   invocations with <minilisp_acquire_gc_lock()> and
+   <minilisp_release_gc_lock()>...  */
+   
+
+/* minilisp_gc --
+   Invokes the garbage collector now. */
+
+MINILISPAPI void minilisp_gc(void);
+
+/* minilisp_info --
+   Prints garbage collector statistics. */
+
+MINILISPAPI void minilisp_info(void);
+
+/* minilisp_acquire_gc_lock --
+   minilisp_release_gc_lock --
+   Temporarily disables automatic garbage collection.
+   Acquire/release pairs may be nested. 
+   Both functions return their argument unmodified.
+   This is practical because <minilisp_release_gc_lock>
+   can invoke the garbage collector. Before doing
+   so it stores its argument in a minivar to 
+   preserve it. 
+
+   Example (in C):
+     miniexp_t copy_in_reverse(miniexp_t p) {
+        miniexp_t l = 0;
+        minilisp_acquire_gc_lock(0);
+        while (miniexp_consp(p)) {
+          l = miniexp_cons(miniexp_car(p), l); 
+          p = miniexp_cdr(p); 
+        }
+        return minilisp_release_gc_lock(l); 
+     }
+   
+   Disabling garbage collection for a long time 
+   increases the memory consumption. */
+
+MINILISPAPI miniexp_t minilisp_acquire_gc_lock(miniexp_t);
+MINILISPAPI miniexp_t minilisp_release_gc_lock(miniexp_t);
+
+/* minivar_t --
+   The minivar type. */
+#ifdef __cplusplus
+class minivar_t;
+#else
+typedef struct minivar_s minivar_t;
+#endif
+
+/* minivar_alloc --
+   minivar_free --
+   Wrappers for creating and destroying minivars in C. */
+
+MINILISPAPI minivar_t *minivar_alloc(void);
+MINILISPAPI void minivar_free(minivar_t *v);
+
+/* minivar_pointer --
+   Wrappers to access the lisp expression referenced
+   by a minivar. This function returns a pointer
+   to the actual miniexp_t variable. */
+
+MINILISPAPI miniexp_t *minivar_pointer(minivar_t *v);
+
+/* minilisp_debug -- 
+   Setting the debug flag runs the garbage collector 
+   very often. This is extremely slow, but can be
+   useful to debug memory allocation problems. */
+
+MINILISPAPI void minilisp_debug(int debugflag);
+
+/* minilisp_finish --
+   Deallocates everything.  This is only useful when using
+   development tools designed to check for memory leaks.  
+   No miniexp function can be used after calling this. */
+
+MINILISPAPI void minilisp_finish(void);
+
+
+/* -------------------------------------------------- */
+/* INPUT/OUTPUT                                       */
+/* -------------------------------------------------- */
+
+/* Notes about the textual representation of miniexps.
+
+   - Special characters are:
+     * the parenthesis <(> and <)>,
+     * the double quote <">,
+     * the vertical bar <|>,
+     * any other ascii character with a non zero entry 
+       in the macro character array.
+     * the dieze character <#>, when followed by another
+       dieze or by an ascii character with a non zero entry 
+       in the dieze character array.
+
+   - Symbols are represented by their name.
+     Symbols whose name contains blanks, special characters, 
+     non printable characters, non ascii characters, 
+     or can be confused for a number are delimited
+     by vertical bars <|> and can contain two consecutive
+     vertical bars to represent a single vertical bar character.
+     
+   - Numbers follow the syntax specified by the C
+     function strtol() with base=0, but are required
+     to start with a digit or with a sign character
+     followed by another character.
+
+   - Floating point follow the syntax specified by the C
+     function strtod() with base=0, but are required
+     to start with a digit or with a sign character
+     followed by another character.
+
+   - Strings are delimited by double quotes. 
+     All non printable ASCII characters must be escaped. 
+     Besides all the usual C string escape sequences,
+     UTF8-encoded Unicode characters in range 0..0x10ffff
+     can be represented by escape sequence <\u> followed
+     by four hexadecimal digits or escape sequence <\U>
+     followed by six hexadecimal digits. Surrogate pairs
+     are always recognized as a single Unicode character.
+     The effect of invalid escape sequences is unspecified.
+
+   - List are represented by an open parenthesis <(>
+     followed by the space separated list elements,
+     followed by a closing parenthesis <)>.
+     When the cdr of the last pair is non zero,
+     the closed parenthesis is preceded by 
+     a space, a dot <.>, a space, and the textual 
+     representation of the cdr.
+
+   - When the parser encounters an ascii character corresponding
+     to a non zero function pointer in the macro character array,
+     the function is invoked and must return a possibly empty
+     list of miniexps to be returned by subsequent 
+     invocations of the parser. The same process happens when
+     the parser encounters a dieze character followed by an 
+     ascii character corresponding to a non zero function pointer
+     int the dieze character array. */
+
+
+/* miniexp_pname --
+   Returns a string containing the textual representation
+   of a minilisp expression. Set argument <width> to zero
+   to output a single line, or to a positive value to
+   perform pretty line breaks for this intended number of columns.
+   This function can cause a garbage collection to occur. */
+
+MINILISPAPI miniexp_t miniexp_pname(miniexp_t p, int width);
+
+
+/* miniexp_io_t -- 
+   This structure is used to describe how to perform input/output
+   operations. Input/output operations are performed through function 
+   pointers <fputs>, <fgetc>, and <ungetc>, which are similar to their 
+   stdio counterparts. Variable <data> defines four pointers that can 
+   be used as a closure by the I/O functions.
+      Variable <p_flags> optionally points to a flag word that customize the
+   printing operation. All ASCII control characters present in strings are
+   displayed using C escapes sequences. Flag <miniexp_io_print7bits> causes
+   all other non ASCII characters to be escaped. Flag <miniexp_io_u6escape>
+   and <miniexp_io_u4escape> respectively authorize using the long and
+   short utf8 escape sequences "\U" and "\u". Their absence may force
+   using surrogate short escape sequences or only octal sequences.
+   Flag <miniexp_io_quotemoresyms> causes the output code to also quote
+   all symbols that start with a digit or with a sign character followed
+   by another character.
+      When both <p_macrochar> and <p_macroqueue> are non zero, a non zero 
+   entry in <p_macrochar[c]> defines a special parsing function that is called
+   when <miniexp_read_r> encounters the character <c> (in range 0 to 127.)
+   When both <p_diezechar> and <p_macroqueue> are non zero, a non zero entry
+   in <p_diezechar[c]> defines a special parsing function that is called when
+   <miniexp_read_r> encounters the character '#' followed by character <c> (in
+   range 0 to 127.)  These parsing functions return a list of <miniexp_t> that
+   function <miniexp_read_r> returns one-by-one before processing more
+   input. This list is stored in the variable pointed by <io.p_macroqueue>.  
+*/
+
+typedef struct miniexp_io_s miniexp_io_t;
+typedef miniexp_t (*miniexp_macrochar_t)(miniexp_io_t*);
+
+struct miniexp_io_s
+{
+  int (*fputs)(miniexp_io_t*, const char*);
+  int (*fgetc)(miniexp_io_t*);
+  int (*ungetc)(miniexp_io_t*, int);
+  void *data[4];
+  int *p_flags; /* previously named p_print7bits */
+  miniexp_macrochar_t *p_macrochar;
+  miniexp_macrochar_t *p_diezechar;
+  minivar_t *p_macroqueue;
+  minivar_t *p_reserved;
+};
+
+#define miniexp_io_print7bits          0x1
+#define miniexp_io_u4escape            0x2
+#define miniexp_io_u6escape            0x4
+#define miniexp_io_quotemoresymbols    0x20
+
+/* miniexp_io_init --
+   Initialize a default <miniexp_io_t> structure
+   that reads from stdin and prints to stdout. 
+   Field <data[0]> is used to hold the stdin file pointer.
+   Field <data[1]> is used to hold the stdout file pointer.
+   Fields <p_flags>, <p_macrochar>, <p_diezechar>
+   and <p_macroqueue> are set to point to zero-initialized
+   shared variables. */
+
+MINILISPAPI void miniexp_io_init(miniexp_io_t *io);
+
+/* miniexp_io_set_{input,output} --
+   Override the file descriptor used for input or output.
+   You must call <miniexp_io_init> before. */
+
+#if defined(stdin)
+MINILISPAPI void miniexp_io_set_output(miniexp_io_t *io, FILE *f);
+MINILISPAPI void miniexp_io_set_input(miniexp_io_t *io, FILE *f);
+#endif
+
+/* miniexp_read_r --
+   Reads an expression by repeatedly
+   invoking <minilisp_getc> and <minilisp_ungetc>.
+   Returns <miniexp_dummy> when an error occurs. */
+
+MINILISPAPI miniexp_t miniexp_read_r(miniexp_io_t *io);
+
+/* miniexp_prin_r, miniexp_print_r --
+   Prints a minilisp expression by repeatedly invoking <minilisp_puts>.
+   Only <minilisp_print> outputs a final newline character. 
+   These functions are safe to call anytime. */
+
+MINILISPAPI miniexp_t miniexp_prin_r(miniexp_io_t *io, miniexp_t p);
+MINILISPAPI miniexp_t miniexp_print_r(miniexp_io_t *io, miniexp_t p);
+
+/* miniexp_pprin_r, miniexp_pprint_r --
+   Prints a minilisp expression with reasonably pretty line breaks. 
+   Argument <width> is the intended number of columns. 
+   Only <minilisp_pprint> outputs a final newline character. 
+   These functions can cause a garbage collection to occur. */
+
+MINILISPAPI miniexp_t miniexp_pprin_r(miniexp_io_t *io, miniexp_t p, int w);
+MINILISPAPI miniexp_t miniexp_pprint_r(miniexp_io_t *io, miniexp_t p, int w);
+
+/* miniexp_io, miniexp_read, miniexp_{,p}prin{,t} --
+   Variable <miniexp_io> contains the pre-initialized input/output data
+   structure that is used by the non-reentrant input/output functions. */
+
+extern MINILISPAPI miniexp_io_t miniexp_io;
+MINILISPAPI miniexp_t miniexp_read(void);
+MINILISPAPI miniexp_t miniexp_prin(miniexp_t p);
+MINILISPAPI miniexp_t miniexp_print(miniexp_t p);
+MINILISPAPI miniexp_t miniexp_pprin(miniexp_t p, int width);
+MINILISPAPI miniexp_t miniexp_pprint(miniexp_t p, int width);
+
+
+/* Backward compatibility (will eventually disappear) */
+extern MINILISPAPI int (*minilisp_puts)(const char *);
+extern MINILISPAPI int (*minilisp_getc)(void);
+extern MINILISPAPI int (*minilisp_ungetc)(int);
+extern MINILISPAPI miniexp_t (*minilisp_macrochar_parser[128])(void);
+extern MINILISPAPI miniexp_t (*minilisp_diezechar_parser[128])(void);
+extern MINILISPAPI miniexp_macrochar_t miniexp_macrochar[128];
+extern MINILISPAPI minivar_t miniexp_macroqueue;
+extern MINILISPAPI int minilisp_print_7bits;
+#if defined(stdin)
+MINILISPAPI void minilisp_set_output(FILE *f);
+MINILISPAPI void minilisp_set_input(FILE *f);
+#endif
+
+/* -------------------------------------------------- */
+/* STUFF FOR C++ ONLY                                 */
+/* -------------------------------------------------- */
+
+#ifdef __cplusplus
+# ifndef __cplusplus
+{
+# endif
+} // extern "C"
+
+typedef void minilisp_mark_t(miniexp_t *pp);
+
+/* -------- MINIVARS -------- */
+
+/* minivar_t --
+   A class for protected garbage collector variables. */
+
+class MINILISPAPI 
+minivar_t 
+{
+  miniexp_t data;
+  minivar_t *next;
+  minivar_t **pprev;
+public:
+  minivar_t();
+  minivar_t(miniexp_t p);
+  minivar_t(const minivar_t &v);
+  operator miniexp_t&() { return data; }
+  miniexp_t* operator&() { return &data; }
+  minivar_t& operator=(miniexp_t p) { data = p; return *this; }
+  minivar_t& operator=(const minivar_t &v) { data = v.data; return *this; }
+  ~minivar_t();
+#ifdef MINIEXP_IMPLEMENTATION
+  static minivar_t *vars;
+  static void mark(minilisp_mark_t*);
+#endif
+};
+
+
+/* -------- MINIOBJ -------- */
+
+
+/* miniobj_t --
+   The base class for c++ objects 
+   represented by object expressions. */
+
+class MINILISPAPI 
+miniobj_t {
+ public:
+  virtual ~miniobj_t();
+
+  /* --- stuff defined by MINIOBJ_DECLARE --- */
+  /* classname: a symbol characterizing this class. */
+  static const miniexp_t classname;
+  /* classof: class name symbol for this object. */
+  virtual miniexp_t classof() const = 0;
+  /* isa -- tests if this is an instance of <classname>. */
+  virtual bool isa(miniexp_t classname) const;
+
+  /* --- optional stuff --- */
+  /* pname: returns a printable name for this object.
+     The caller must deallocate the result with delete[]. */
+  virtual char *pname() const;
+  /* mark: calls action() on all member miniexps of the object,
+     for garbage collecting purposes. */
+  virtual void mark(minilisp_mark_t *action);
+  /* destroy: called by the garbage collector to
+     deallocate the object. Defaults to 'delete this'. */
+  virtual void destroy();
+     
+};
+
+/* MINIOBJ_DECLARE --
+   MINIOBJ_IMPLEMENT --
+   Useful code fragments for implementing 
+   the mandatory part of miniobj subclasses. */
+
+#define MINIOBJ_DECLARE(cls, supercls, name) \
+  public: static const miniexp_t classname; \
+          virtual miniexp_t classof() const; \
+          virtual bool isa(miniexp_t) const; 
+
+#define MINIOBJ_IMPLEMENT(cls, supercls, name)\
+  const miniexp_t cls::classname = miniexp_symbol(name);\
+  miniexp_t cls::classof() const {\
+    return cls::classname; }\
+  bool cls::isa(miniexp_t n) const {\
+    return (cls::classname==n) || (supercls::isa(n)); }
+
+
+/* miniexp_to_obj --
+   Returns a pointer to the object represented by an lisp
+   expression. Returns NULL if the expression is not an
+   object expression.
+*/
+
+static inline miniobj_t *miniexp_to_obj(miniexp_t p) {
+  if (miniexp_objectp(p))
+    return ((miniobj_t**)(((size_t)p)&~((size_t)3)))[0];
+  return 0;
+}
+
+/* miniexp_object --
+   Create an object expression for a given object. */
+
+MINILISPAPI miniexp_t miniexp_object(miniobj_t *obj);
+
+
+/* miniexp_mutate -- 
+   Atomically modifies a member of a garbage collected object. 
+   The object implementation must call this function to change 
+   the contents of a member variable <v> of object <obj>.
+   Returns <p>*/
+
+MINILISPAPI miniexp_t miniexp_mutate(miniexp_t obj, miniexp_t *v, miniexp_t p);
+
+
+#endif /* __cplusplus */
+
+
+
+
+
+/* -------------------------------------------------- */
+/* THE END                                            */
+/* -------------------------------------------------- */
+
+#endif /* MINIEXP_H */
diff --git a/macosx/README b/macosx/README
new file mode 100644
index 0000000..c90a939
--- /dev/null
+++ b/macosx/README
@@ -0,0 +1,2 @@
+This directory contains macintosh specific utilities.
+This has not been compiled in a while.
diff --git a/macosx/mdimporter/English.lproj/InfoPlist.strings b/macosx/mdimporter/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000..65590f1
--- /dev/null
+++ b/macosx/mdimporter/English.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+/* Localized versions of Info.plist keys */
+
+NSHumanReadableCopyright = "Copyright (c) 2006-2007 Corpus Callosum Corporation.";
diff --git a/macosx/mdimporter/English.lproj/schema.strings b/macosx/mdimporter/English.lproj/schema.strings
new file mode 100644
index 0000000..f8a6603
--- /dev/null
+++ b/macosx/mdimporter/English.lproj/schema.strings
@@ -0,0 +1,12 @@
+	/* Localized DisplayNames for your custom metadata attributes */
+	/* The form is:  "myMetadataKey" = "My Metadata Key";    */
+	/* The name on the left is the name defined in schema.xml */
+	/* The name on the right is what the user will see */
+"com_Foo_YourAttrName" = "Your Localized Attr Name";
+
+
+	/* Localized Description of you custom metadata attributes */
+	/* The form is: "myMetadataKey.Description" = "stuff";
+	/* com_Foo_YourAttrName should be definded in the schema.xml file  */
+	 /* The value on the right will be displayed by the Finder etc.. */
+"com_Foo_YourAttrName.Description" = "Localized description of your attribute";
\ No newline at end of file
diff --git a/macosx/mdimporter/GetMetadataForFile.m b/macosx/mdimporter/GetMetadataForFile.m
new file mode 100644
index 0000000..bd7f906
--- /dev/null
+++ b/macosx/mdimporter/GetMetadataForFile.m
@@ -0,0 +1,203 @@
+//
+//  GetMetadataForFile.m
+//  DjVu
+//
+//  Created by Jeff Sickel on 9/6/06.
+//  Copyright (c) 2006 Corpus Callosum Corporation. All rights reserved.
+//
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h> 
+
+#import <Foundation/Foundation.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "libdjvu/miniexp.h"
+#include "libdjvu/ddjvuapi.h"
+
+ddjvu_context_t *ctx;
+ddjvu_document_t *doc;
+
+#pragma mark -
+
+void
+handle(int wait)
+{
+    const ddjvu_message_t *msg;
+    if (!ctx)
+        return;
+    if (wait)
+        msg = ddjvu_message_wait(ctx);
+    while ((msg = ddjvu_message_peek(ctx)))
+    {
+        switch(msg->m_any.tag)
+        {
+            case DDJVU_ERROR:
+                NSLog(@"%s", msg->m_error.message);
+                if (msg->m_error.filename)
+                    NSLog(@"'%s:%d'",
+                            msg->m_error.filename, msg->m_error.lineno);
+                    return;
+                break; // never gets here
+            default:
+                break;
+        }
+        ddjvu_message_pop(ctx);
+    }
+}
+
+#pragma mark -
+void
+mdprint(NSMutableString *str, miniexp_t r)
+{
+    if (miniexp_consp(r)) {
+        while (miniexp_consp(r)) {
+            mdprint(str, miniexp_car(r));  
+            r = miniexp_cdr(r);
+        }
+    } else if (miniexp_stringp(r)) {
+        [str appendFormat:@" %s", miniexp_to_str(r)];
+    }
+}
+
+void
+mdfprint(FILE *str, miniexp_t r)
+{
+    if (miniexp_consp(r)) {
+        while (miniexp_consp(r)) {
+            mdfprint(str, miniexp_car(r));  
+            r = miniexp_cdr(r);
+        }
+    } else if (miniexp_stringp(r)) {
+        fprintf(str, " %s", miniexp_to_str(r));
+    }
+}
+
+#pragma mark -
+/* -----------------------------------------------------------------------------
+    Get metadata attributes from file
+   
+   This function's job is to extract useful information your file format supports
+   and return it as a dictionary
+   ----------------------------------------------------------------------------- */
+
+Boolean GetMetadataForFile(void* thisInterface, 
+			   CFMutableDictionaryRef attributes, 
+			   CFStringRef contentTypeUTI,
+			   CFStringRef pathToFile)
+{
+    Boolean result = NO;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSProcessInfo *pinfo = nil;
+	NSString *path = (NSString *)pathToFile;
+	NSMutableDictionary *dictionary = (NSMutableDictionary *)attributes;
+    int npages;
+    miniexp_t expr;
+	    
+	pinfo = [NSProcessInfo processInfo];
+    if (! (ctx = ddjvu_context_create([[pinfo processName] cStringUsingEncoding:NSASCIIStringEncoding]))) {
+        NSLog(@"Cannot create djvu conext for '%@'.", path);
+        goto pop;
+    }
+    if (! (doc = ddjvu_document_create_by_filename(ctx, [path fileSystemRepresentation], TRUE))) {
+        NSLog(@"Cannot open djvu document '%@'.", path);
+        goto pop;
+    }
+
+    while (! ddjvu_document_decoding_done(doc))
+        handle(TRUE);
+            
+    /* Pull any available metadata from the file at the specified path */
+    /* Return the attribute keys and attribute values in the dict */
+    /* Return TRUE if successful, FALSE if there was no data provided */
+    
+    npages = ddjvu_document_get_pagenum(doc);
+    if (npages) {
+        int i;
+        ddjvu_status_t r;
+        ddjvu_pageinfo_t info;
+        double f = 1.0;
+        NSMutableString *buf = [NSMutableString string];
+        
+        for (i=0; i<npages; i++) {
+            while ((expr=ddjvu_document_get_pagetext(doc,i,"page")) == miniexp_dummy)
+                handle(TRUE);
+            if (expr)
+                mdprint(buf, expr);
+        }
+        
+        if ([buf length]) {
+            // if it has searchable text content... it's really not just an image
+            // we really want these to show up as documents
+            NSMutableArray *typeTree = [dictionary objectForKey:@"kMDItemContentTypeTree"];
+            if (typeTree && [typeTree containsObject:@"public.image"]) {
+                [typeTree removeObject:@"public.image"];
+            }
+            
+            [dictionary setObject:buf forKey:(NSString *)kMDItemTextContent];            
+        }
+        
+        // this could be com.lizardtech.djvu or org.djvuzone.djvulibre.djvu
+        // either way still needs to pick up the files from com.lizardtech.djvu
+        // seems that public.djvu keeps getting picked up
+        /*
+        if (kCFCompareEqualTo != CFStringCompare(contentTypeUTI, CFSTR("com.lizardtech.djvu"), kCFCompareCaseInsensitive))
+            [dictionary setObject:@"org.djvuzone.djvulibre.djvu" forKey:(NSString *)kMDItemContentType];
+         
+        // this is cheat that would purge the 'public.djvu' but then we need to
+        // figure out what to do about the actual kMDItemContentType to use
+        NSString *contentType = [dictionary objectForKey:(NSString*)kMDItemContentType];
+        if (contentType && [contentType isEqualToString:@"public.djvu"]) {
+            [dictionary removeObjectForKey:(NSString*)kMDItemContentType];
+        }
+         */
+        
+        while ((r = ddjvu_document_get_pageinfo(doc, 0, &info)) < DDJVU_JOB_OK)
+            handle(TRUE);
+        if (r >= DDJVU_JOB_FAILED)
+            goto pop;
+        
+        f = 72.0 / (double)info.dpi;
+        
+#define DjAddIntKey(n,k) \
+        [dictionary setObject:[NSNumber numberWithInt:n] forKey:(NSString *)k]
+            
+        DjAddIntKey(npages, kMDItemNumberOfPages);
+        DjAddIntKey(info.height, kMDItemPixelHeight);
+        DjAddIntKey(info.width, kMDItemPixelWidth);
+        DjAddIntKey((int)(f * info.height), kMDItemPageHeight);
+        DjAddIntKey((int)(f * info.width), kMDItemPageWidth);
+        
+        [dictionary setObject:[NSString stringWithFormat:@"%d", info.version] 
+                       forKey:(NSString *)kMDItemVersion];
+        
+        /** Image orientation:
+            0: no rotation      1: 90 degrees counter-clockwise
+            2: 180 degrees      3: 270 degrees counter-clockwise
+            trying to map to kMDItemOrientation:
+            Values are 0 is "Landscape" or 1 is "Portrait"
+        */
+        DjAddIntKey(!(info.rotation), kMDItemOrientation);
+        
+        [dictionary setObject:@"DjVu File" forKey:(NSString *)kMDItemKind];
+                
+        // implement in next release ---
+        // kMDItemDescription
+        // kMDItemCodecs ??
+        
+        result = YES;
+    }
+    
+pop:
+    if (doc)
+        ddjvu_document_release(doc);
+    if (ctx)
+        ddjvu_context_release(ctx);
+        
+    [pool release];
+    
+    return result;
+}
diff --git a/macosx/mdimporter/MDImporterVersion b/macosx/mdimporter/MDImporterVersion
new file mode 100644
index 0000000..8c9b815
--- /dev/null
+++ b/macosx/mdimporter/MDImporterVersion
@@ -0,0 +1 @@
+MDIMPORTER_VERSION = 1.3
diff --git a/macosx/mdimporter/main.c b/macosx/mdimporter/main.c
new file mode 100644
index 0000000..57f61e9
--- /dev/null
+++ b/macosx/mdimporter/main.c
@@ -0,0 +1,225 @@
+//
+//  main.c
+//  DjVu
+//
+//  Created by Jeff Sickel on 9/6/06.
+//  Copyright (c) 2006 Corpus Callosum Corporation. All rights reserved.
+//
+
+
+
+
+
+//==============================================================================
+//
+//	DO NO MODIFY THE CONTENT OF THIS FILE
+//
+//	This file contains the generic CFPlug-in code necessary for your importer
+//	To complete your importer implement the function in GetMetadataForFile.c
+//
+//==============================================================================
+
+
+
+
+
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFPlugInCOM.h>
+#include <CoreServices/CoreServices.h>
+
+// -----------------------------------------------------------------------------
+//	constants
+// -----------------------------------------------------------------------------
+
+
+#define PLUGIN_ID "200A2D97-B602-4FAB-84DA-18DE40383D7C"
+
+//
+// Below is the generic glue code for all plug-ins.
+//
+// You should not have to modify this code aside from changing
+// names if you decide to change the names defined in the Info.plist
+//
+
+
+// -----------------------------------------------------------------------------
+//	typedefs
+// -----------------------------------------------------------------------------
+
+// The import function to be implemented in GetMetadataForFile.c
+Boolean GetMetadataForFile(void *thisInterface, 
+			   CFMutableDictionaryRef attributes, 
+			   CFStringRef contentTypeUTI,
+			   CFStringRef pathToFile);
+			   
+// The layout for an instance of MetaDataImporterPlugIn 
+typedef struct __MetadataImporterPluginType
+{
+    MDImporterInterfaceStruct *conduitInterface;
+    CFUUIDRef                 factoryID;
+    UInt32                    refCount;
+} MetadataImporterPluginType;
+
+// -----------------------------------------------------------------------------
+//	prototypes
+// -----------------------------------------------------------------------------
+//	Forward declaration for the IUnknown implementation.
+//
+
+MetadataImporterPluginType  *AllocMetadataImporterPluginType(CFUUIDRef inFactoryID);
+void                      DeallocMetadataImporterPluginType(MetadataImporterPluginType *thisInstance);
+HRESULT                   MetadataImporterQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv);
+void                     *MetadataImporterPluginFactory(CFAllocatorRef allocator,CFUUIDRef typeID);
+ULONG                     MetadataImporterPluginAddRef(void *thisInstance);
+ULONG                     MetadataImporterPluginRelease(void *thisInstance);
+// -----------------------------------------------------------------------------
+//	testInterfaceFtbl	definition
+// -----------------------------------------------------------------------------
+//	The TestInterface function table.
+//
+
+static MDImporterInterfaceStruct testInterfaceFtbl = {
+    NULL,
+    MetadataImporterQueryInterface,
+    MetadataImporterPluginAddRef,
+    MetadataImporterPluginRelease,
+    GetMetadataForFile
+};
+
+
+// -----------------------------------------------------------------------------
+//	AllocMetadataImporterPluginType
+// -----------------------------------------------------------------------------
+//	Utility function that allocates a new instance.
+//      You can do some initial setup for the importer here if you wish
+//      like allocating globals etc...
+//
+MetadataImporterPluginType *AllocMetadataImporterPluginType(CFUUIDRef inFactoryID)
+{
+    MetadataImporterPluginType *theNewInstance;
+
+    theNewInstance = (MetadataImporterPluginType *)malloc(sizeof(MetadataImporterPluginType));
+    memset(theNewInstance,0,sizeof(MetadataImporterPluginType));
+
+        /* Point to the function table */
+    theNewInstance->conduitInterface = &testInterfaceFtbl;
+
+        /*  Retain and keep an open instance refcount for each factory. */
+    theNewInstance->factoryID = CFRetain(inFactoryID);
+    CFPlugInAddInstanceForFactory(inFactoryID);
+
+        /* This function returns the IUnknown interface so set the refCount to one. */
+    theNewInstance->refCount = 1;
+    return theNewInstance;
+}
+
+// -----------------------------------------------------------------------------
+//	DeallocDjVuMDImporterPluginType
+// -----------------------------------------------------------------------------
+//	Utility function that deallocates the instance when
+//	the refCount goes to zero.
+//      In the current implementation importer interfaces are never deallocated
+//      but implement this as this might change in the future
+//
+void DeallocMetadataImporterPluginType(MetadataImporterPluginType *thisInstance)
+{
+    CFUUIDRef theFactoryID;
+
+    theFactoryID = thisInstance->factoryID;
+    free(thisInstance);
+    if (theFactoryID){
+        CFPlugInRemoveInstanceForFactory(theFactoryID);
+        CFRelease(theFactoryID);
+    }
+}
+
+// -----------------------------------------------------------------------------
+//	MetadataImporterQueryInterface
+// -----------------------------------------------------------------------------
+//	Implementation of the IUnknown QueryInterface function.
+//
+HRESULT MetadataImporterQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv)
+{
+    CFUUIDRef interfaceID;
+
+    interfaceID = CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault,iid);
+
+    if (CFEqual(interfaceID,kMDImporterInterfaceID)){
+            /* If the Right interface was requested, bump the ref count,
+             * set the ppv parameter equal to the instance, and
+             * return good status.
+             */
+        ((MetadataImporterPluginType*)thisInstance)->conduitInterface->AddRef(thisInstance);
+        *ppv = thisInstance;
+        CFRelease(interfaceID);
+        return S_OK;
+    }else{
+        if (CFEqual(interfaceID,IUnknownUUID)){
+                /* If the IUnknown interface was requested, same as above. */
+            ((MetadataImporterPluginType*)thisInstance )->conduitInterface->AddRef(thisInstance);
+            *ppv = thisInstance;
+            CFRelease(interfaceID);
+            return S_OK;
+        }else{
+                /* Requested interface unknown, bail with error. */
+            *ppv = NULL;
+            CFRelease(interfaceID);
+            return E_NOINTERFACE;
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+//	MetadataImporterPluginAddRef
+// -----------------------------------------------------------------------------
+//	Implementation of reference counting for this type. Whenever an interface
+//	is requested, bump the refCount for the instance. NOTE: returning the
+//	refcount is a convention but is not required so don't rely on it.
+//
+ULONG MetadataImporterPluginAddRef(void *thisInstance)
+{
+    ((MetadataImporterPluginType *)thisInstance )->refCount += 1;
+    return ((MetadataImporterPluginType*) thisInstance)->refCount;
+}
+
+// -----------------------------------------------------------------------------
+// SampleCMPluginRelease
+// -----------------------------------------------------------------------------
+//	When an interface is released, decrement the refCount.
+//	If the refCount goes to zero, deallocate the instance.
+//
+ULONG MetadataImporterPluginRelease(void *thisInstance)
+{
+    ((MetadataImporterPluginType*)thisInstance)->refCount -= 1;
+    if (((MetadataImporterPluginType*)thisInstance)->refCount == 0){
+        DeallocMetadataImporterPluginType((MetadataImporterPluginType*)thisInstance );
+        return 0;
+    }else{
+        return ((MetadataImporterPluginType*) thisInstance )->refCount;
+    }
+}
+
+// -----------------------------------------------------------------------------
+//	DjVuMDImporterPluginFactory
+// -----------------------------------------------------------------------------
+//	Implementation of the factory function for this type.
+//
+void *MetadataImporterPluginFactory(CFAllocatorRef allocator,CFUUIDRef typeID)
+{
+    MetadataImporterPluginType *result;
+    CFUUIDRef                 uuid;
+
+        /* If correct type is being requested, allocate an
+         * instance of TestType and return the IUnknown interface.
+         */
+    if (CFEqual(typeID,kMDImporterTypeID)){
+        uuid = CFUUIDCreateFromString(kCFAllocatorDefault,CFSTR(PLUGIN_ID));
+        result = AllocMetadataImporterPluginType(uuid);
+        CFRelease(uuid);
+        return result;
+    }
+        /* If the requested type is incorrect, return NULL. */
+    return NULL;
+}
+
diff --git a/macosx/mdimporter/make_importer_command_line.sh b/macosx/mdimporter/make_importer_command_line.sh
new file mode 100644
index 0000000..8960e2c
--- /dev/null
+++ b/macosx/mdimporter/make_importer_command_line.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+gcc -bundle -arch x86_64 -arch i386 -o DjVu main.c GetMetadataForFile.m -ldjvulibre -framework System -framework CoreFoundation -framework CoreServices -framework Foundation
+
diff --git a/macosx/mdimporter/schema.xml b/macosx/mdimporter/schema.xml
new file mode 100644
index 0000000..d7636c0
--- /dev/null
+++ b/macosx/mdimporter/schema.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<schema version="1.0" xmlns="http://www.apple.com/metadata"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                      xsi:schemaLocation="http://www.apple.com/metadata file:///System/Library/Frameworks/CoreServices.framework/Frameworks/Metadata.framework/Resources/MetadataSchema.xsd">
+    <note>
+        Custom attributes that this metadata importer supports.  Below
+	is an example of a multivalued string attribute.  Other types
+	are CFNumber, CFDate, CFBoolean and CFData.		      
+    </note>
+
+    <types>
+        <type name="org.djvu.DjView">
+            <note>
+                The keys that this metadata importer handles.
+            </note>
+            <allattrs>
+                kMDItemTextContent
+                kMDItemContentType
+                kMDItemNumberOfPages
+                kMDItemPixelHeight
+                kMDItemPixelWidth
+                kMDItemPageHeight
+                kMDItemPageWidth
+                kMDItemVersion
+                kMDItemOrientation
+                kMDItemKind
+            </allattrs>
+            <displayattrs>
+                kMDItemContentType
+                kMDItemNumberOfPages
+                kMDItemPageHeight
+                kMDItemPageWidth
+                kMDItemVersion
+            </displayattrs>
+        </type>
+		
+        <type name="org.djvuzone.djvulibre.djvu">
+            <note>
+                The keys that this metadata importer handles.
+            </note>
+            <allattrs>
+                kMDItemTextContent
+                kMDItemContentType
+                kMDItemNumberOfPages
+                kMDItemPixelHeight
+                kMDItemPixelWidth
+                kMDItemPageHeight
+                kMDItemPageWidth
+                kMDItemVersion
+                kMDItemOrientation
+                kMDItemKind
+            </allattrs>
+            <displayattrs>
+                kMDItemContentType
+                kMDItemNumberOfPages
+                kMDItemPageHeight
+                kMDItemPageWidth
+                kMDItemVersion
+            </displayattrs>
+        </type>
+
+        <type name="com.lizardtech.djvu">
+            <note>
+                The keys that this metadata importer handles.
+            </note>
+            <allattrs>
+                kMDItemTextContent
+                kMDItemContentType
+                kMDItemNumberOfPages
+                kMDItemPixelHeight
+                kMDItemPixelWidth
+                kMDItemPageHeight
+                kMDItemPageWidth
+                kMDItemVersion
+                kMDItemOrientation
+                kMDItemKind
+            </allattrs>
+            <displayattrs>
+                kMDItemContentType
+                kMDItemNumberOfPages
+                kMDItemPageHeight
+                kMDItemPageWidth
+                kMDItemVersion
+            </displayattrs>
+        </type>
+    </types>
+</schema>
+
diff --git a/macosx/quicklookdjvu/English.lproj/InfoPlist.strings b/macosx/quicklookdjvu/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000..0f2fc67
Binary files /dev/null and b/macosx/quicklookdjvu/English.lproj/InfoPlist.strings differ
diff --git a/macosx/quicklookdjvu/GeneratePreviewForURL.m b/macosx/quicklookdjvu/GeneratePreviewForURL.m
new file mode 100644
index 0000000..fcaaa22
--- /dev/null
+++ b/macosx/quicklookdjvu/GeneratePreviewForURL.m
@@ -0,0 +1,162 @@
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
+#include <QuickLook/QuickLook.h>
+#import <Cocoa/Cocoa.h>
+
+#include "ddjvuRef.h"
+
+/* -----------------------------------------------------------------------------
+   Generate a preview for file
+
+   This function's job is to create preview for designated file
+   ----------------------------------------------------------------------------- */
+
+OSStatus
+GeneratePreviewForURL(void *thisInterface,
+					  QLPreviewRequestRef preview,
+					  CFURLRef url,
+					  CFStringRef contentTypeUTI,
+					  CFDictionaryRef options)
+{
+	CFBundleRef bundle = QLPreviewRequestGetGeneratorBundle(preview);
+	char *ddjvu = ddjvuPath(bundle);
+	if (ddjvu != NULL) {
+		NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];		
+		NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+		NSDictionary *domain = [defaults persistentDomainForName:@"org.djvu.qlgenerator"];
+		CFUUIDRef uuid = NULL;
+		CFStringRef uuidString;
+		BOOL debug = FALSE;
+		NSString *tmpPath = nil;
+		
+		if (domain && [domain objectForKey:@"previewpages"])
+			if ([[domain objectForKey:@"previewpages"] intValue] == 0)
+				goto poppool;
+
+		if (domain && [domain objectForKey:@"debug"]) {
+			debug = [[domain objectForKey:@"debug"] boolValue];
+		}
+		
+		uuid = CFUUIDCreate(kCFAllocatorDefault);
+		if (uuid) {
+			uuidString = CFUUIDCreateString(kCFAllocatorDefault, uuid);
+			if (uuidString) {
+				tmpPath = [NSTemporaryDirectory() stringByAppendingPathComponent:
+						   [NSString stringWithFormat:@"djvuql-%@", uuidString]];
+				CFRelease(uuidString);
+			}
+			CFRelease(uuid);
+		}
+		if (tmpPath) {
+			const char *cmd = NULL;
+			CFStringRef cmdRef;
+			int page = 0;
+			int pages = 1;
+			int maxpages = 5;
+			int width = 612;	// default 8.5x11 in points
+			int height = 792;
+			CGSize size;
+			MDItemRef mditem = NULL;
+			NSString *source = (NSString *)CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
+			NSString *dest = nil;
+			NSFileManager *fmgr = [NSFileManager defaultManager];
+			[fmgr createDirectoryAtPath:tmpPath attributes:nil];
+			
+			mditem = MDItemCreate(kCFAllocatorDefault, (CFStringRef)source);
+			if (mditem) {
+				CFTypeRef ref = NULL;
+				ref = MDItemCopyAttribute(mditem, kMDItemNumberOfPages);
+				if (ref) {
+					CFNumberGetValue(ref, kCFNumberIntType, &pages);
+					CFRelease(ref);
+				}
+				ref = MDItemCopyAttribute(mditem, kMDItemPageWidth);
+				if (ref) {
+					CFNumberGetValue(ref, kCFNumberIntType, &width);
+					CFRelease(ref);
+				}
+				ref = MDItemCopyAttribute(mditem, kMDItemPageHeight);
+				if (ref) {
+					CFNumberGetValue(ref, kCFNumberIntType, &height);
+					CFRelease(ref);
+				}
+				CFRelease(mditem);				
+			}
+			
+			if (domain && [domain objectForKey:@"previewpages"])
+				maxpages = [[domain objectForKey:@"previewpages"] intValue];
+			
+			if (debug) {
+				NSLog(@"metadata: pages=%d, width=%d, height=%d", pages, width, height);
+				NSLog(@"maxpages=%d", maxpages);				
+			}
+						
+			CGRect rect = CGRectMake(0, 0, width, height);
+			CGContextRef c;
+			c = QLPreviewRequestCreatePDFContext(preview, &rect, NULL, NULL);
+			
+			page = 0;
+			do {
+				page++;
+				dest = [tmpPath stringByAppendingPathComponent:[[source lastPathComponent] stringByAppendingFormat:@"_t_p%04d.tiff", page]];
+				size = CGSizeMake(width, height);
+				cmdRef = CFStringCreateWithFormat(NULL, NULL, CFSTR("\"%s\" -format=tiff -page=%d -size=%dx%d \"%s\" \"%s\""), ddjvu, page, width, height, [source fileSystemRepresentation], [dest fileSystemRepresentation]);
+				cmd = CFStringGetCStringPtr(cmdRef, CFStringGetSystemEncoding());
+				if (cmd != NULL) {
+					if (debug)
+						NSLog(@"%s", cmd);
+					if ((system(cmd) == 0) && ([fmgr fileExistsAtPath:dest])) {
+						NSURL *durl = [NSURL fileURLWithPath:dest];
+						CGImageSourceRef  sourceRef;
+						
+						sourceRef = CGImageSourceCreateWithURL((CFURLRef)durl, NULL);
+						if(sourceRef) {
+							CGImageRef imageRef = NULL;
+							imageRef = CGImageSourceCreateImageAtIndex(sourceRef, 0, NULL);
+							if (imageRef) {
+								CGFloat offset = height * (page-1);
+								CGRectOffset(rect, 0.0, offset);
+								CGPDFContextBeginPage(c, NULL);
+								CGContextSaveGState(c);
+								CGContextDrawImage(c, rect, imageRef);
+								if (page == maxpages && maxpages < pages) {
+									CGAffineTransform m;
+									CFURLRef more = CFBundleCopyResourceURL(bundle, CFSTR("more_pages"), CFSTR("pdf"), NULL);
+									CGPDFDocumentRef doc = CGPDFDocumentCreateWithURL(more);
+									CGPDFPageRef pdf = CGPDFDocumentGetPage(doc, 1);
+									CGFloat offset = height * page;
+									CGRectOffset(rect, 0.0, offset);
+									CGContextSaveGState(c);
+									m = CGPDFPageGetDrawingTransform(pdf, kCGPDFMediaBox, rect, 0, true);
+									CGContextConcatCTM(c, m);
+									CGContextDrawPDFPage(c, pdf);
+									CGContextRestoreGState(c);
+									CFRelease(doc);
+								}
+								CGContextRestoreGState(c);
+								CGPDFContextEndPage(c);
+								CFRelease(imageRef);
+							}
+							CFRelease(sourceRef);
+						}
+					}
+				}
+				CFRelease(cmdRef);
+			} while (page < pages && page < maxpages);
+
+			CGPDFContextClose(c);
+			QLPreviewRequestFlushContext(preview, c);
+			CFRelease(c);
+			[fmgr removeFileAtPath:tmpPath handler:nil];
+			[source release];
+		}
+	poppool:
+		[pool release];
+	}
+    return noErr;
+}
+
+void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
+{
+    // implement only if supported
+}
diff --git a/macosx/quicklookdjvu/GenerateThumbnailForURL.m b/macosx/quicklookdjvu/GenerateThumbnailForURL.m
new file mode 100644
index 0000000..e6f233a
--- /dev/null
+++ b/macosx/quicklookdjvu/GenerateThumbnailForURL.m
@@ -0,0 +1,106 @@
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
+#include <QuickLook/QuickLook.h>
+#import <Cocoa/Cocoa.h>
+#include <ApplicationServices/ApplicationServices.h>
+
+#include "ddjvuRef.h"
+
+/* -----------------------------------------------------------------------------
+    Generate a thumbnail for file
+
+   This function's job is to create thumbnail for designated file as fast as possible
+   ----------------------------------------------------------------------------- */
+
+OSStatus
+GenerateThumbnailForURL(void *thisInterface,
+						QLThumbnailRequestRef thumbnail,
+						CFURLRef url,
+						CFStringRef contentTypeUTI,
+						CFDictionaryRef options,
+						CGSize maxSize)
+{
+	char *ddjvu = ddjvuPath(QLThumbnailRequestGetGeneratorBundle(thumbnail));
+	if (ddjvu != NULL) {
+		NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+		NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+		NSDictionary *domain = [defaults persistentDomainForName:@"org.djvu.qlgenerator"];
+		CFUUIDRef uuid;
+		CFStringRef uuidString;
+		NSString *tmpPath = nil;
+		BOOL debug = FALSE;
+		
+		if (domain && [domain objectForKey:@"debug"]) {
+			debug = [[domain objectForKey:@"debug"] boolValue];
+		}
+		if (domain && [domain objectForKey:@"thumbnail"] &&
+			([[domain objectForKey:@"thumbnail"] boolValue] == FALSE))
+		{
+			if (debug)
+				NSLog(@"skip thumbnail for %@", url);
+			CFStringRef ext = CFURLCopyPathExtension(url);
+			if (ext) {
+				NSImage *img = [[NSWorkspace sharedWorkspace] iconForFileType:(NSString*)ext];
+				if (img) {
+					NSData *data = [img TIFFRepresentation];
+					QLThumbnailRequestSetImageWithData(thumbnail, (CFDataRef)data, NULL);
+				}
+				CFRelease(ext);
+			}
+		} else {
+			if (debug) {
+				CFShow(contentTypeUTI);
+				CFShow(options);			
+			}
+			
+			uuid = CFUUIDCreate(kCFAllocatorDefault);
+			if (uuid) {
+				uuidString = CFUUIDCreateString(kCFAllocatorDefault, uuid);
+				if (uuidString) {
+					tmpPath = [NSTemporaryDirectory() stringByAppendingPathComponent:
+							   [NSString stringWithFormat:@"djvuql-%@", uuidString]];
+					CFRelease(uuidString);
+				}
+				CFRelease(uuid);
+			}
+			if (tmpPath) {
+				NSFileManager *fmgr = [NSFileManager defaultManager];
+				const char *cmd = NULL;
+				CFStringRef cmdRef;
+				int page = 1;
+				NSString *source = (NSString *)CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
+				NSString *dest = [tmpPath stringByAppendingPathComponent:[[source lastPathComponent] stringByAppendingFormat:@"_t_p%d.tiff", page]];
+				[fmgr createDirectoryAtPath:tmpPath attributes:nil];			
+				cmdRef = CFStringCreateWithFormat(NULL, NULL, CFSTR("\"%s\" -format=tiff -page=%d -size=%dx%d \"%s\" \"%s\""), ddjvu, page, (int)maxSize.width, (int)maxSize.height, [source fileSystemRepresentation], [dest fileSystemRepresentation]);
+				cmd = CFStringGetCStringPtr(cmdRef, CFStringGetSystemEncoding());
+				if (cmd != NULL) {
+					if (debug)
+						NSLog(@"ddjvu: %s", cmd);
+					if (system(cmd) == 0) {
+						NSURL *durl = [NSURL fileURLWithPath:dest];
+						CGImageRef imageRef = NULL;
+						CGImageSourceRef  sourceRef;
+						
+						sourceRef = CGImageSourceCreateWithURL((CFURLRef)durl, NULL);
+						if(sourceRef) {
+							imageRef = CGImageSourceCreateImageAtIndex(sourceRef, 0, NULL);
+							if (imageRef)
+								QLThumbnailRequestSetImage(thumbnail, imageRef, NULL);
+							CFRelease(sourceRef);
+						}
+					}
+				}
+				[fmgr removeFileAtPath:tmpPath handler:nil];
+				CFRelease(cmdRef);
+				[source release];
+			}
+		}
+		[pool release];
+	}
+    return noErr;
+}
+
+void CancelThumbnailGeneration(void* thisInterface, QLThumbnailRequestRef thumbnail)
+{
+    // implement only if supported
+}
diff --git a/macosx/quicklookdjvu/Info.plist b/macosx/quicklookdjvu/Info.plist
new file mode 100644
index 0000000..540d7b7
--- /dev/null
+++ b/macosx/quicklookdjvu/Info.plist
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>QLGenerator</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.djvu.DjView</string>
+				<string>org.djvuzone.djvulibre.djvu</string>
+				<string>com.lizardtech.djvu</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${QLGENERATOR_VERSION}, Copyright 2007, 2009 Corpus Callosum Corporation</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>org.djvu.qlgenerator</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${QLGENERATOR_VERSION}</string>
+	<key>CFBundleVersion</key>
+	<string>${QLGENERATOR_VERSION}</string>
+	<key>CFPlugInDynamicRegisterFunction</key>
+	<string></string>
+	<key>CFPlugInDynamicRegistration</key>
+	<string>NO</string>
+	<key>CFPlugInFactories</key>
+	<dict>
+		<key>C493E7CF-241D-40DF-91CD-04BC3F6A7F06</key>
+		<string>QuickLookGeneratorPluginFactory</string>
+	</dict>
+	<key>CFPlugInTypes</key>
+	<dict>
+		<key>5E2D9680-5022-40FA-B806-43349622E5B9</key>
+		<array>
+			<string>C493E7CF-241D-40DF-91CD-04BC3F6A7F06</string>
+		</array>
+	</dict>
+	<key>CFPlugInUnloadFunction</key>
+	<string></string>
+	<key>QLNeedsToBeRunInMainThread</key>
+	<false/>
+	<key>QLSupportsConcurrentRequests</key>
+	<true/>
+	<key>QLThumbnailMinimumSize</key>
+	<real>17</real>
+</dict>
+</plist>
diff --git a/macosx/quicklookdjvu/QuickLookDjVu.xcodeproj/project.pbxproj b/macosx/quicklookdjvu/QuickLookDjVu.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..e9f3929
--- /dev/null
+++ b/macosx/quicklookdjvu/QuickLookDjVu.xcodeproj/project.pbxproj
@@ -0,0 +1,409 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 44;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		41B576CB0D0E30730021A107 /* DMG */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 41B576D80D0E30BE0021A107 /* Build configuration list for PBXAggregateTarget "DMG" */;
+			buildPhases = (
+				41B576D10D0E30A70021A107 /* ShellScript */,
+			);
+			dependencies = (
+				41B576CF0D0E30830021A107 /* PBXTargetDependency */,
+			);
+			name = DMG;
+			productName = DMG;
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		2C05A19C06CAA52B00D84F6F /* GeneratePreviewForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */; };
+		41B575C70D0DAD2B0021A107 /* more_pages.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 41B575C60D0DAD2B0021A107 /* more_pages.pdf */; };
+		41BC78F60CFBEC4100887A1D /* ddjvuRef.c in Sources */ = {isa = PBXBuildFile; fileRef = 41BC78F40CFBEC4100887A1D /* ddjvuRef.c */; };
+		41BC7ABC0CFE435800887A1D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41BC7ABB0CFE435800887A1D /* Cocoa.framework */; };
+		61E3BCFB0870B4F2002186A0 /* GenerateThumbnailForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */; };
+		8D576312048677EA00EA77CD /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 08FB77B6FE84183AC02AAC07 /* main.c */; settings = {ATTRIBUTES = (); }; };
+		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
+		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
+		C86B05270671AA6E00DD9006 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C86B05260671AA6E00DD9006 /* CoreServices.framework */; };
+		F28CFBFD0A3EC0AF000ABFF5 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F28CFBFC0A3EC0AF000ABFF5 /* ApplicationServices.framework */; };
+		F28CFC030A3EC0C6000ABFF5 /* QuickLook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F28CFC020A3EC0C6000ABFF5 /* QuickLook.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		41B576CE0D0E30830021A107 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8D57630D048677EA00EA77CD;
+			remoteInfo = djvu;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		08FB77B6FE84183AC02AAC07 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
+		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+		2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratePreviewForURL.m; sourceTree = "<group>"; };
+		414B4D7C0F6D9803003645A9 /* QLGeneratorVersion */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = QLGeneratorVersion; sourceTree = "<group>"; };
+		414B4D7D0F6D9803003645A9 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
+		414B4D7E0F6D9803003645A9 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
+		41B573380D09969D0021A107 /* ddjvu */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = ddjvu; sourceTree = "<group>"; };
+		41B575C60D0DAD2B0021A107 /* more_pages.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = more_pages.pdf; sourceTree = "<group>"; };
+		41B576C90D0E2AC60021A107 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
+		41BC78F30CFBEC4100887A1D /* ddjvuRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ddjvuRef.h; sourceTree = "<group>"; };
+		41BC78F40CFBEC4100887A1D /* ddjvuRef.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ddjvuRef.c; sourceTree = "<group>"; };
+		41BC7ABB0CFE435800887A1D /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = GenerateThumbnailForURL.m; sourceTree = "<group>"; };
+		8D576316048677EA00EA77CD /* djvu.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = djvu.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		C86B05260671AA6E00DD9006 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
+		F28CFBFC0A3EC0AF000ABFF5 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
+		F28CFC020A3EC0C6000ABFF5 /* QuickLook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLook.framework; path = /System/Library/Frameworks/QuickLook.framework; sourceTree = "<absolute>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D576313048677EA00EA77CD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
+				C86B05270671AA6E00DD9006 /* CoreServices.framework in Frameworks */,
+				F28CFBFD0A3EC0AF000ABFF5 /* ApplicationServices.framework in Frameworks */,
+				F28CFC030A3EC0C6000ABFF5 /* QuickLook.framework in Frameworks */,
+				41BC7ABC0CFE435800887A1D /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		089C166AFE841209C02AAC07 /* QuickLookDjVu */ = {
+			isa = PBXGroup;
+			children = (
+				414B4D7B0F6D9803003645A9 /* config */,
+				08FB77AFFE84173DC02AAC07 /* Source */,
+				41B573370D0996380021A107 /* bin */,
+				089C167CFE841241C02AAC07 /* Resources */,
+				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+				19C28FB6FE9D52B211CA2CBB /* Products */,
+			);
+			name = QuickLookDjVu;
+			sourceTree = "<group>";
+		};
+		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				41BC7ABB0CFE435800887A1D /* Cocoa.framework */,
+				F28CFC020A3EC0C6000ABFF5 /* QuickLook.framework */,
+				F28CFBFC0A3EC0AF000ABFF5 /* ApplicationServices.framework */,
+				C86B05260671AA6E00DD9006 /* CoreServices.framework */,
+				0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		089C167CFE841241C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				41B575C60D0DAD2B0021A107 /* more_pages.pdf */,
+				8D576317048677EA00EA77CD /* Info.plist */,
+				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
+				41B576C90D0E2AC60021A107 /* README.txt */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77AFFE84173DC02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */,
+				2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */,
+				08FB77B6FE84183AC02AAC07 /* main.c */,
+				41BC78F30CFBEC4100887A1D /* ddjvuRef.h */,
+				41BC78F40CFBEC4100887A1D /* ddjvuRef.c */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		19C28FB6FE9D52B211CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D576316048677EA00EA77CD /* djvu.qlgenerator */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		414B4D7B0F6D9803003645A9 /* config */ = {
+			isa = PBXGroup;
+			children = (
+				414B4D7C0F6D9803003645A9 /* QLGeneratorVersion */,
+				414B4D7D0F6D9803003645A9 /* debug.xcconfig */,
+				414B4D7E0F6D9803003645A9 /* release.xcconfig */,
+			);
+			path = config;
+			sourceTree = "<group>";
+		};
+		41B573370D0996380021A107 /* bin */ = {
+			isa = PBXGroup;
+			children = (
+				41B573380D09969D0021A107 /* ddjvu */,
+			);
+			name = bin;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8D57630E048677EA00EA77CD /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		8D57630D048677EA00EA77CD /* djvu */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2CA3261E0896AD4900168862 /* Build configuration list for PBXNativeTarget "djvu" */;
+			buildPhases = (
+				8D57630E048677EA00EA77CD /* Headers */,
+				8D57630F048677EA00EA77CD /* Resources */,
+				8D576311048677EA00EA77CD /* Sources */,
+				8D576313048677EA00EA77CD /* Frameworks */,
+				8D576315048677EA00EA77CD /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = djvu;
+			productInstallPath = /Library/QuickLook;
+			productName = QuickLookDjVu;
+			productReference = 8D576316048677EA00EA77CD /* djvu.qlgenerator */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		089C1669FE841209C02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "QuickLookDjVu" */;
+			compatibilityVersion = "Xcode 3.0";
+			hasScannedForEncodings = 1;
+			mainGroup = 089C166AFE841209C02AAC07 /* QuickLookDjVu */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D57630D048677EA00EA77CD /* djvu */,
+				41B576CB0D0E30730021A107 /* DMG */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D57630F048677EA00EA77CD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
+				41B575C70D0DAD2B0021A107 /* more_pages.pdf in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		8D576315048677EA00EA77CD /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		41B576D10D0E30A70021A107 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(TARGET_BUILD_DIR)/djvu.qlgenerator",
+				"$(SRCROOT)/README.txt",
+			);
+			outputPaths = (
+				"$(SYMROOT)/QuickLookDjVu_$(QLGENERATOR_VERSION).dmg",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if [ $CONFIGURATION != \"Release\" ]; then\n\texit\nfi\n\n/usr/local/bin/buildDMG.pl -dmgName QuickLookDjVu_$QLGENERATOR_VERSION.dmg \\\n\t-buildDir $SYMROOT \\\n\t-volName QuickLookDjVu_$QLGENERATOR_VERSION \\\n\t-compressionLevel 9 \\\n\t$SYMROOT/$CONFIGURATION/djvu.qlgenerator \\\n\t$SRCROOT/README.txt \\\n\nhdiutil detach /Volumes/QuickLookDjVu_$QLGENERATOR_VERSION\nhdiutil resize -size min $SYMROOT/QuickLookDjVu_$QLGENERATOR_VERSION.dmg\n\nexit 0\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D576311048677EA00EA77CD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D576312048677EA00EA77CD /* main.c in Sources */,
+				2C05A19C06CAA52B00D84F6F /* GeneratePreviewForURL.m in Sources */,
+				61E3BCFB0870B4F2002186A0 /* GenerateThumbnailForURL.m in Sources */,
+				41BC78F60CFBEC4100887A1D /* ddjvuRef.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		41B576CF0D0E30830021A107 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8D57630D048677EA00EA77CD /* djvu */;
+			targetProxy = 41B576CE0D0E30830021A107 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C167EFE841241C02AAC07 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		2CA3261F0896AD4900168862 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 414B4D7D0F6D9803003645A9 /* debug.xcconfig */;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = /Library/QuickLook;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SYSTEM_APPS_DIR)/Apps/Utilities/DjView.app/Contents/lib\"",
+				);
+				PRODUCT_NAME = djvu;
+				VALID_ARCHS = "i386 ppc";
+				WRAPPER_EXTENSION = qlgenerator;
+				ZERO_LINK = YES;
+			};
+			name = Debug;
+		};
+		2CA326200896AD4900168862 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 414B4D7E0F6D9803003645A9 /* release.xcconfig */;
+			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = /Library/QuickLook;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SYSTEM_APPS_DIR)/Apps/Utilities/DjView.app/Contents/lib\"",
+				);
+				PRODUCT_NAME = djvu;
+				VALID_ARCHS = "i386 ppc";
+				WRAPPER_EXTENSION = qlgenerator;
+			};
+			name = Release;
+		};
+		2CA326230896AD4900168862 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+			};
+			name = Debug;
+		};
+		2CA326240896AD4900168862 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+			};
+			name = Release;
+		};
+		41B576CC0D0E30730021A107 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 414B4D7D0F6D9803003645A9 /* debug.xcconfig */;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = DMG;
+			};
+			name = Debug;
+		};
+		41B576CD0D0E30730021A107 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 414B4D7E0F6D9803003645A9 /* release.xcconfig */;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				PRODUCT_NAME = DMG;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		2CA3261E0896AD4900168862 /* Build configuration list for PBXNativeTarget "djvu" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2CA3261F0896AD4900168862 /* Debug */,
+				2CA326200896AD4900168862 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		2CA326220896AD4900168862 /* Build configuration list for PBXProject "QuickLookDjVu" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2CA326230896AD4900168862 /* Debug */,
+				2CA326240896AD4900168862 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		41B576D80D0E30BE0021A107 /* Build configuration list for PBXAggregateTarget "DMG" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				41B576CC0D0E30730021A107 /* Debug */,
+				41B576CD0D0E30730021A107 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}
diff --git a/macosx/quicklookdjvu/README.txt b/macosx/quicklookdjvu/README.txt
new file mode 100644
index 0000000..29b86fd
--- /dev/null
+++ b/macosx/quicklookdjvu/README.txt
@@ -0,0 +1,56 @@
+djvu.qlgenerator
+
+QuickLook generator for DjVu documents.
+
+To install, copy djvu.qlgenerator to:
+
+	DjView.app/Contents/Library/QuickLook  (version 1.0+)
+	/Library/QuickLook
+	~/Library/QuickLook
+
+QuickLook is a Leopard only feature.  The DjVu generator depends on the
+DjVu.mdimporter also being installed in order to properly render multi-page
+DjVu documents when using the Finder, Time Machine, or QuickLook previews.
+Multi-paged documents will default to previewing five pages with a "..->" image
+to indicate more pages are available when viewing the documents with DjView or
+other DjVu viewers.
+
+Additional settings can be modified trough the defaults system.  Settings are
+for defining the maximum number of pages to preview, enabling thumbnailing,
+and debugging messages to the console.  Settings can be modified as follows:
+
+	defaults write org.djvu.qlgenerator previewpages 2
+	defaults write org.djvu.qlgenerator debug YES
+	defaults write org.djvu.qlgenerator thumbnail NO
+
+Modifications or deleting the org.djvu.qlgenerator entry from defaults will
+reset the qlgenerator to default values built into the generator, e.g.:
+
+	defaults delete org.djvu.qlgenerator thumbnail
+	defaults delete org.djvu.qlgenerator
+
+
+Occasionally, prior DjVu viewers may have installed a default icon into the
+HFS+ resource fork of a .djvu file.  This will prevent the first page from being
+previewed in CoverFlow views and thumbnails in other Finder views.  Corrections
+can usually be made by resetting the "Open With" segment of the file's
+inspector view from the Finder.
+
+Further information about DjVu can be found at http://www.djvu.org/.
+
+djvu.qlgenerator is maintained by Jeff Sickel <jas@corpus-callosum.com>.
+
+
+History:
+
+15-Mar-2009 version 1.1
+    handle localized file names (UTF-8)
+    bug/patch submitted by Nicholas Kulikov
+    
+13-Dec-2007 version 1.0
+    able to be bundled inside DjView.app 
+    added defaults for org.djvu.qlgenerator previewpages settings
+
+10-Dec-2007 version 0.9
+    original release
+    and embedded statically linked version of ddjvu is included
diff --git a/macosx/quicklookdjvu/config/QLGeneratorVersion b/macosx/quicklookdjvu/config/QLGeneratorVersion
new file mode 100644
index 0000000..27fdc8a
--- /dev/null
+++ b/macosx/quicklookdjvu/config/QLGeneratorVersion
@@ -0,0 +1 @@
+QLGENERATOR_VERSION=1.1
diff --git a/macosx/quicklookdjvu/config/debug.xcconfig b/macosx/quicklookdjvu/config/debug.xcconfig
new file mode 100644
index 0000000..a96d0a7
--- /dev/null
+++ b/macosx/quicklookdjvu/config/debug.xcconfig
@@ -0,0 +1 @@
+#include "QLGeneratorVersion"
diff --git a/macosx/quicklookdjvu/config/release.xcconfig b/macosx/quicklookdjvu/config/release.xcconfig
new file mode 100644
index 0000000..a96d0a7
--- /dev/null
+++ b/macosx/quicklookdjvu/config/release.xcconfig
@@ -0,0 +1 @@
+#include "QLGeneratorVersion"
diff --git a/macosx/quicklookdjvu/ddjvuRef.c b/macosx/quicklookdjvu/ddjvuRef.c
new file mode 100644
index 0000000..865ae5b
--- /dev/null
+++ b/macosx/quicklookdjvu/ddjvuRef.c
@@ -0,0 +1,87 @@
+/*
+ *  ddjvuRef.c
+ *  QuickLookDjVu
+ *
+ *  Created by Jeff Sickel on 11/27/07.
+ *  Copyright 2007 Corpus Callosum Corporation. All rights reserved.
+ *
+ */
+
+#include "ddjvuRef.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <ApplicationServices/ApplicationServices.h>
+
+#include <sys/param.h> /* for MAXPATHLEN */
+#include <sys/types.h>
+#include <sys/stat.h>
+
+CFURLRef
+ddjvuURL(CFBundleRef bundle)
+{
+	CFURLRef ddjvuRef = NULL;
+	
+	if (bundle) {
+		ddjvuRef = CFBundleCopyResourceURL(bundle, CFSTR("ddjvu"), NULL, NULL);
+		if (ddjvuRef == NULL) {
+			CFURLRef url = CFBundleCopyBundleURL(bundle);
+			CFMutableStringRef path = NULL;
+			CFStringRef bpath = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
+			path = CFStringCreateMutableCopy(kCFAllocatorDefault, 1024, bpath);
+			CFStringTrim(path, CFSTR("Library/QuickLook/djvu.qlgenerator"));
+			CFStringAppend(path, CFSTR("bin/ddjvu"));
+			CFShow(path);
+			CFRelease(bpath);
+		}
+	}
+	if (ddjvuRef == NULL) {
+		CFBundleRef djviewBundle = NULL;
+		djviewBundle = CFBundleGetBundleWithIdentifier(CFSTR("org.djvu.DjView"));
+		if (djviewBundle == NULL) {
+			OSStatus stat;
+			FSRef djviewPath;
+			CFURLRef refURL;
+			stat = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR("org.djvu.DjView"), NULL, &djviewPath, &refURL);
+			if (stat == noErr) {
+				djviewBundle = CFBundleCreate(kCFAllocatorDefault, refURL);
+			}
+		}
+		
+		if (djviewBundle != NULL) {
+			CFURLRef url = CFBundleCopyBundleURL(djviewBundle);
+			ddjvuRef = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,
+															 url,
+															 CFSTR("Contents/bin/ddjvu"),
+															 false);
+			CFRelease(url);
+			CFRelease(djviewBundle);
+		}		
+	}
+	return ddjvuRef;
+}
+
+char *
+ddjvuPath(CFBundleRef bundle)
+{
+	static char *ddjvuRef = NULL;
+	if (ddjvuRef == NULL) {
+		CFURLRef url = ddjvuURL(bundle);
+		if (url != NULL) {
+			char buf[MAXPATHLEN];
+			if (CFURLGetFileSystemRepresentation(url, true, (UInt8 *)buf, MAXPATHLEN))
+			{
+				ddjvuRef = (char *)malloc(strlen(buf));
+				strcpy(ddjvuRef, buf);
+			}
+			CFRelease(url);
+		}
+	} else {
+		struct stat fstat;
+		if (stat(ddjvuRef, &fstat) != 0){
+			free(ddjvuRef);
+			ddjvuRef = NULL;
+			return ddjvuPath(bundle);
+		}
+	}
+	return ddjvuRef;
+}
diff --git a/macosx/quicklookdjvu/ddjvuRef.h b/macosx/quicklookdjvu/ddjvuRef.h
new file mode 100644
index 0000000..04466ab
--- /dev/null
+++ b/macosx/quicklookdjvu/ddjvuRef.h
@@ -0,0 +1,12 @@
+/*
+ *  ddjvuRef.h
+ *  QuickLookDjVu
+ *
+ *  Created by Jeff Sickel on 11/27/07.
+ *  Copyright 2007 Corpus Callosum Corporation. All rights reserved.
+ *
+ */
+
+#include <CoreFoundation/CFBundle.h>
+
+char *ddjvuPath(CFBundleRef bundle);
diff --git a/macosx/quicklookdjvu/main.c b/macosx/quicklookdjvu/main.c
new file mode 100644
index 0000000..7725b27
--- /dev/null
+++ b/macosx/quicklookdjvu/main.c
@@ -0,0 +1,218 @@
+//==============================================================================
+//
+//	DO NO MODIFY THE CONTENT OF THIS FILE
+//
+//	This file contains the generic CFPlug-in code necessary for your generator
+//	To complete your generator implement the function in GenerateThumbnailForURL/GeneratePreviewForURL.c
+//
+//==============================================================================
+
+
+
+
+
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFPlugInCOM.h>
+#include <CoreServices/CoreServices.h>
+#include <QuickLook/QuickLook.h>
+
+// -----------------------------------------------------------------------------
+//	constants
+// -----------------------------------------------------------------------------
+
+// Don't modify this line
+#define PLUGIN_ID "C493E7CF-241D-40DF-91CD-04BC3F6A7F06"
+
+//
+// Below is the generic glue code for all plug-ins.
+//
+// You should not have to modify this code aside from changing
+// names if you decide to change the names defined in the Info.plist
+//
+
+
+// -----------------------------------------------------------------------------
+//	typedefs
+// -----------------------------------------------------------------------------
+
+// The thumbnail generation function to be implemented in GenerateThumbnailForURL.c
+OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maxSize);
+void CancelThumbnailGeneration(void* thisInterface, QLThumbnailRequestRef thumbnail);
+
+// The preview generation function to be implemented in GeneratePreviewForURL.c
+OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options);
+void CancelPreviewGeneration(void *thisInterface, QLPreviewRequestRef preview);
+
+// The layout for an instance of QuickLookGeneratorPlugIn
+typedef struct __QuickLookGeneratorPluginType
+{
+    void        *conduitInterface;
+    CFUUIDRef    factoryID;
+    UInt32       refCount;
+} QuickLookGeneratorPluginType;
+
+// -----------------------------------------------------------------------------
+//	prototypes
+// -----------------------------------------------------------------------------
+//	Forward declaration for the IUnknown implementation.
+//
+
+QuickLookGeneratorPluginType  *AllocQuickLookGeneratorPluginType(CFUUIDRef inFactoryID);
+void                         DeallocQuickLookGeneratorPluginType(QuickLookGeneratorPluginType *thisInstance);
+HRESULT                      QuickLookGeneratorQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv);
+void                        *QuickLookGeneratorPluginFactory(CFAllocatorRef allocator,CFUUIDRef typeID);
+ULONG                        QuickLookGeneratorPluginAddRef(void *thisInstance);
+ULONG                        QuickLookGeneratorPluginRelease(void *thisInstance);
+
+// -----------------------------------------------------------------------------
+//	myInterfaceFtbl	definition
+// -----------------------------------------------------------------------------
+//	The QLGeneratorInterfaceStruct function table.
+//
+static QLGeneratorInterfaceStruct myInterfaceFtbl = {
+    NULL,
+    QuickLookGeneratorQueryInterface,
+    QuickLookGeneratorPluginAddRef,
+    QuickLookGeneratorPluginRelease,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
+
+
+// -----------------------------------------------------------------------------
+//	AllocQuickLookGeneratorPluginType
+// -----------------------------------------------------------------------------
+//	Utility function that allocates a new instance.
+//      You can do some initial setup for the generator here if you wish
+//      like allocating globals etc...
+//
+QuickLookGeneratorPluginType *AllocQuickLookGeneratorPluginType(CFUUIDRef inFactoryID)
+{
+    QuickLookGeneratorPluginType *theNewInstance;
+
+    theNewInstance = (QuickLookGeneratorPluginType *)malloc(sizeof(QuickLookGeneratorPluginType));
+    memset(theNewInstance,0,sizeof(QuickLookGeneratorPluginType));
+
+        /* Point to the function table Malloc enough to store the stuff and copy the filler from myInterfaceFtbl over */
+    theNewInstance->conduitInterface = malloc(sizeof(QLGeneratorInterfaceStruct));
+    memcpy(theNewInstance->conduitInterface,&myInterfaceFtbl,sizeof(QLGeneratorInterfaceStruct));
+
+        /*  Retain and keep an open instance refcount for each factory. */
+    theNewInstance->factoryID = CFRetain(inFactoryID);
+    CFPlugInAddInstanceForFactory(inFactoryID);
+
+        /* This function returns the IUnknown interface so set the refCount to one. */
+    theNewInstance->refCount = 1;
+    return theNewInstance;
+}
+
+// -----------------------------------------------------------------------------
+//	DeallocQuickLookGeneratorPluginType
+// -----------------------------------------------------------------------------
+//	Utility function that deallocates the instance when
+//	the refCount goes to zero.
+//      In the current implementation generator interfaces are never deallocated
+//      but implement this as this might change in the future
+//
+void DeallocQuickLookGeneratorPluginType(QuickLookGeneratorPluginType *thisInstance)
+{
+    CFUUIDRef theFactoryID;
+
+    theFactoryID = thisInstance->factoryID;
+        /* Free the conduitInterface table up */
+    free(thisInstance->conduitInterface);
+
+        /* Free the instance structure */
+    free(thisInstance);
+    if (theFactoryID){
+        CFPlugInRemoveInstanceForFactory(theFactoryID);
+        CFRelease(theFactoryID);
+    }
+}
+
+// -----------------------------------------------------------------------------
+//	QuickLookGeneratorQueryInterface
+// -----------------------------------------------------------------------------
+//	Implementation of the IUnknown QueryInterface function.
+//
+HRESULT QuickLookGeneratorQueryInterface(void *thisInstance,REFIID iid,LPVOID *ppv)
+{
+    CFUUIDRef interfaceID;
+
+    interfaceID = CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault,iid);
+
+    if (CFEqual(interfaceID,kQLGeneratorCallbacksInterfaceID)){
+            /* If the Right interface was requested, bump the ref count,
+             * set the ppv parameter equal to the instance, and
+             * return good status.
+             */
+        ((QLGeneratorInterfaceStruct *)((QuickLookGeneratorPluginType *)thisInstance)->conduitInterface)->GenerateThumbnailForURL = GenerateThumbnailForURL;
+        ((QLGeneratorInterfaceStruct *)((QuickLookGeneratorPluginType *)thisInstance)->conduitInterface)->CancelThumbnailGeneration = CancelThumbnailGeneration;
+        ((QLGeneratorInterfaceStruct *)((QuickLookGeneratorPluginType *)thisInstance)->conduitInterface)->GeneratePreviewForURL = GeneratePreviewForURL;
+        ((QLGeneratorInterfaceStruct *)((QuickLookGeneratorPluginType *)thisInstance)->conduitInterface)->CancelPreviewGeneration = CancelPreviewGeneration;
+        ((QLGeneratorInterfaceStruct *)((QuickLookGeneratorPluginType*)thisInstance)->conduitInterface)->AddRef(thisInstance);
+        *ppv = thisInstance;
+        CFRelease(interfaceID);
+        return S_OK;
+    }else{
+        /* Requested interface unknown, bail with error. */
+        *ppv = NULL;
+        CFRelease(interfaceID);
+        return E_NOINTERFACE;
+    }
+}
+
+// -----------------------------------------------------------------------------
+// QuickLookGeneratorPluginAddRef
+// -----------------------------------------------------------------------------
+//	Implementation of reference counting for this type. Whenever an interface
+//	is requested, bump the refCount for the instance. NOTE: returning the
+//	refcount is a convention but is not required so don't rely on it.
+//
+ULONG QuickLookGeneratorPluginAddRef(void *thisInstance)
+{
+    ((QuickLookGeneratorPluginType *)thisInstance )->refCount += 1;
+    return ((QuickLookGeneratorPluginType*) thisInstance)->refCount;
+}
+
+// -----------------------------------------------------------------------------
+// QuickLookGeneratorPluginRelease
+// -----------------------------------------------------------------------------
+//	When an interface is released, decrement the refCount.
+//	If the refCount goes to zero, deallocate the instance.
+//
+ULONG QuickLookGeneratorPluginRelease(void *thisInstance)
+{
+    ((QuickLookGeneratorPluginType*)thisInstance)->refCount -= 1;
+    if (((QuickLookGeneratorPluginType*)thisInstance)->refCount == 0){
+        DeallocQuickLookGeneratorPluginType((QuickLookGeneratorPluginType*)thisInstance );
+        return 0;
+    }else{
+        return ((QuickLookGeneratorPluginType*) thisInstance )->refCount;
+    }
+}
+
+// -----------------------------------------------------------------------------
+//  QuickLookGeneratorPluginFactory
+// -----------------------------------------------------------------------------
+void *QuickLookGeneratorPluginFactory(CFAllocatorRef allocator,CFUUIDRef typeID)
+{
+    QuickLookGeneratorPluginType *result;
+    CFUUIDRef                 uuid;
+
+        /* If correct type is being requested, allocate an
+         * instance of kQLGeneratorTypeID and return the IUnknown interface.
+         */
+    if (CFEqual(typeID,kQLGeneratorTypeID)){
+        uuid = CFUUIDCreateFromString(kCFAllocatorDefault,CFSTR(PLUGIN_ID));
+        result = AllocQuickLookGeneratorPluginType(uuid);
+        CFRelease(uuid);
+        return result;
+    }
+        /* If the requested type is incorrect, return NULL. */
+    return NULL;
+}
+
diff --git a/macosx/quicklookdjvu/more_pages.pdf b/macosx/quicklookdjvu/more_pages.pdf
new file mode 100644
index 0000000..b130490
Binary files /dev/null and b/macosx/quicklookdjvu/more_pages.pdf differ
diff --git a/share/Makefile.am b/share/Makefile.am
new file mode 100644
index 0000000..f50d856
--- /dev/null
+++ b/share/Makefile.am
@@ -0,0 +1,39 @@
+osi_langdir = $(datadir)/djvu/osi
+dist_osi_lang_DATA = \
+djvu/osi/languages.xml
+
+osi_csdir = $(datadir)/djvu/osi/cs
+dist_osi_cs_DATA = \
+djvu/osi/cs/messages.xml
+
+osi_dedir = $(datadir)/djvu/osi/de
+dist_osi_de_DATA = \
+djvu/osi/de/libdjvu++.xml \
+djvu/osi/de/messages.xml
+
+osi_endir = $(datadir)/djvu/osi/en
+dist_osi_en_DATA = \
+djvu/osi/en/djvutools-reference.xml \
+djvu/osi/en/libdjvu++.xml \
+djvu/osi/en/messages.xml
+
+osi_frdir = $(datadir)/djvu/osi/fr
+dist_osi_fr_DATA = \
+djvu/osi/fr/libdjvu++.xml \
+djvu/osi/fr/messages.xml
+
+osi_jadir = $(datadir)/djvu/osi/ja
+dist_osi_ja_DATA = \
+djvu/osi/ja/libdjvu++.xml \
+djvu/osi/ja/messages.xml
+
+osi_zhdir = $(datadir)/djvu/osi/zh
+dist_osi_zh_DATA = \
+djvu/osi/zh/libdjvu++.xml \
+djvu/osi/zh/messages.xml
+
+dtddir = $(datadir)/djvu/pubtext
+dist_dtd_DATA = \
+djvu/pubtext/DjVuMessages.dtd \
+djvu/pubtext/DjVuOCR.dtd \
+djvu/pubtext/DjVuXML-s.dtd
diff --git a/share/Makefile.in b/share/Makefile.in
new file mode 100644
index 0000000..7b762f4
--- /dev/null
+++ b/share/Makefile.in
@@ -0,0 +1,706 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = share
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_dtd_DATA) $(dist_osi_cs_DATA) $(dist_osi_de_DATA) \
+	$(dist_osi_en_DATA) $(dist_osi_fr_DATA) $(dist_osi_ja_DATA) \
+	$(dist_osi_lang_DATA) $(dist_osi_zh_DATA)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(osi_csdir)" \
+	"$(DESTDIR)$(osi_dedir)" "$(DESTDIR)$(osi_endir)" \
+	"$(DESTDIR)$(osi_frdir)" "$(DESTDIR)$(osi_jadir)" \
+	"$(DESTDIR)$(osi_langdir)" "$(DESTDIR)$(osi_zhdir)"
+DATA = $(dist_dtd_DATA) $(dist_osi_cs_DATA) $(dist_osi_de_DATA) \
+	$(dist_osi_en_DATA) $(dist_osi_fr_DATA) $(dist_osi_ja_DATA) \
+	$(dist_osi_lang_DATA) $(dist_osi_zh_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INKSCAPE = @INKSCAPE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JPEG_CFLAGS = @JPEG_CFLAGS@
+JPEG_LIBS = @JPEG_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RM = @RM@
+RSVG = @RSVG@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TIFF_CFLAGS = @TIFF_CFLAGS@
+TIFF_LIBS = @TIFF_LIBS@
+TOUCH = @TOUCH@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+version_info = @version_info@
+osi_langdir = $(datadir)/djvu/osi
+dist_osi_lang_DATA = \
+djvu/osi/languages.xml
+
+osi_csdir = $(datadir)/djvu/osi/cs
+dist_osi_cs_DATA = \
+djvu/osi/cs/messages.xml
+
+osi_dedir = $(datadir)/djvu/osi/de
+dist_osi_de_DATA = \
+djvu/osi/de/libdjvu++.xml \
+djvu/osi/de/messages.xml
+
+osi_endir = $(datadir)/djvu/osi/en
+dist_osi_en_DATA = \
+djvu/osi/en/djvutools-reference.xml \
+djvu/osi/en/libdjvu++.xml \
+djvu/osi/en/messages.xml
+
+osi_frdir = $(datadir)/djvu/osi/fr
+dist_osi_fr_DATA = \
+djvu/osi/fr/libdjvu++.xml \
+djvu/osi/fr/messages.xml
+
+osi_jadir = $(datadir)/djvu/osi/ja
+dist_osi_ja_DATA = \
+djvu/osi/ja/libdjvu++.xml \
+djvu/osi/ja/messages.xml
+
+osi_zhdir = $(datadir)/djvu/osi/zh
+dist_osi_zh_DATA = \
+djvu/osi/zh/libdjvu++.xml \
+djvu/osi/zh/messages.xml
+
+dtddir = $(datadir)/djvu/pubtext
+dist_dtd_DATA = \
+djvu/pubtext/DjVuMessages.dtd \
+djvu/pubtext/DjVuOCR.dtd \
+djvu/pubtext/DjVuXML-s.dtd
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu share/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_dtdDATA: $(dist_dtd_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_dtd_DATA)'; test -n "$(dtddir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dtddir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dtddir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dtddir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dtddir)" || exit $$?; \
+	done
+
+uninstall-dist_dtdDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_dtd_DATA)'; test -n "$(dtddir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(dtddir)'; $(am__uninstall_files_from_dir)
+install-dist_osi_csDATA: $(dist_osi_cs_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_osi_cs_DATA)'; test -n "$(osi_csdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(osi_csdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(osi_csdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(osi_csdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(osi_csdir)" || exit $$?; \
+	done
+
+uninstall-dist_osi_csDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_osi_cs_DATA)'; test -n "$(osi_csdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(osi_csdir)'; $(am__uninstall_files_from_dir)
+install-dist_osi_deDATA: $(dist_osi_de_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_osi_de_DATA)'; test -n "$(osi_dedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(osi_dedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(osi_dedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(osi_dedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(osi_dedir)" || exit $$?; \
+	done
+
+uninstall-dist_osi_deDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_osi_de_DATA)'; test -n "$(osi_dedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(osi_dedir)'; $(am__uninstall_files_from_dir)
+install-dist_osi_enDATA: $(dist_osi_en_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_osi_en_DATA)'; test -n "$(osi_endir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(osi_endir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(osi_endir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(osi_endir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(osi_endir)" || exit $$?; \
+	done
+
+uninstall-dist_osi_enDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_osi_en_DATA)'; test -n "$(osi_endir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(osi_endir)'; $(am__uninstall_files_from_dir)
+install-dist_osi_frDATA: $(dist_osi_fr_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_osi_fr_DATA)'; test -n "$(osi_frdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(osi_frdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(osi_frdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(osi_frdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(osi_frdir)" || exit $$?; \
+	done
+
+uninstall-dist_osi_frDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_osi_fr_DATA)'; test -n "$(osi_frdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(osi_frdir)'; $(am__uninstall_files_from_dir)
+install-dist_osi_jaDATA: $(dist_osi_ja_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_osi_ja_DATA)'; test -n "$(osi_jadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(osi_jadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(osi_jadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(osi_jadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(osi_jadir)" || exit $$?; \
+	done
+
+uninstall-dist_osi_jaDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_osi_ja_DATA)'; test -n "$(osi_jadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(osi_jadir)'; $(am__uninstall_files_from_dir)
+install-dist_osi_langDATA: $(dist_osi_lang_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_osi_lang_DATA)'; test -n "$(osi_langdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(osi_langdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(osi_langdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(osi_langdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(osi_langdir)" || exit $$?; \
+	done
+
+uninstall-dist_osi_langDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_osi_lang_DATA)'; test -n "$(osi_langdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(osi_langdir)'; $(am__uninstall_files_from_dir)
+install-dist_osi_zhDATA: $(dist_osi_zh_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_osi_zh_DATA)'; test -n "$(osi_zhdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(osi_zhdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(osi_zhdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(osi_zhdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(osi_zhdir)" || exit $$?; \
+	done
+
+uninstall-dist_osi_zhDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_osi_zh_DATA)'; test -n "$(osi_zhdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(osi_zhdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(osi_csdir)" "$(DESTDIR)$(osi_dedir)" "$(DESTDIR)$(osi_endir)" "$(DESTDIR)$(osi_frdir)" "$(DESTDIR)$(osi_jadir)" "$(DESTDIR)$(osi_langdir)" "$(DESTDIR)$(osi_zhdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_dtdDATA install-dist_osi_csDATA \
+	install-dist_osi_deDATA install-dist_osi_enDATA \
+	install-dist_osi_frDATA install-dist_osi_jaDATA \
+	install-dist_osi_langDATA install-dist_osi_zhDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_dtdDATA uninstall-dist_osi_csDATA \
+	uninstall-dist_osi_deDATA uninstall-dist_osi_enDATA \
+	uninstall-dist_osi_frDATA uninstall-dist_osi_jaDATA \
+	uninstall-dist_osi_langDATA uninstall-dist_osi_zhDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_dtdDATA install-dist_osi_csDATA \
+	install-dist_osi_deDATA install-dist_osi_enDATA \
+	install-dist_osi_frDATA install-dist_osi_jaDATA \
+	install-dist_osi_langDATA install-dist_osi_zhDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-dist_dtdDATA \
+	uninstall-dist_osi_csDATA uninstall-dist_osi_deDATA \
+	uninstall-dist_osi_enDATA uninstall-dist_osi_frDATA \
+	uninstall-dist_osi_jaDATA uninstall-dist_osi_langDATA \
+	uninstall-dist_osi_zhDATA
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/share/djvu/osi/cs/messages.xml b/share/djvu/osi/cs/messages.xml
new file mode 100644
index 0000000..2c278e7
--- /dev/null
+++ b/share/djvu/osi/cs/messages.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- List of files to include to get the entire list of messages -->
+<DjVuMessages>
+<HEAD>
+<!-- Message numbers 17000-19999 -->
+<INCLUDE name="../en/djvutools-reference.xml" />
+<!-- Message numbers 10000-16999 -->
+<INCLUDE name="../en/libdjvu++.xml" />
+</HEAD>
+<BODY>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/de/libdjvu++.xml b/share/djvu/osi/de/libdjvu++.xml
new file mode 100644
index 0000000..e5e1c3a
--- /dev/null
+++ b/share/djvu/osi/de/libdjvu++.xml
@@ -0,0 +1,1335 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- Messages from libdjvu++ -->
+<DjVuMessages>
+<BODY>
+<MESSAGE name="DjVuMessage.Unrecognized" number="10000">
+[1-%0!05u!] Unerkannte Fehlermeldung:
+	Meldung: %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuMessage.Parameter: " number="10001">
+&#09;Parameter: %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuMessage.failed_to_parse_XML" number="10002">
+[1-%0!05u!] Analyse der XML-Meldungsdatei fehlgeschlagen:
+	&apos;%1!s!&apos;.
+</MESSAGE>
+<MESSAGE name="DjVuText.corrupt_text" number="10100">
+[1-%0!05u!] Fehlerhafte Textebenenhierarchie"
+</MESSAGE>
+<MESSAGE name="DjVuText.no_text" number="10101">
+[1-%0!05u!] Erwarteter Text wurde nicht gefunden.
+</MESSAGE>
+<MESSAGE name="DjVuText.corrupt_chunk" number="10102">
+[1-%0!05u!] Fehlerhafter Dateiabschnitt: zu kurz.
+</MESSAGE>
+<MESSAGE name="DjVuText.bad_version" number="10103">
+[1-%0!05u!] Unerwartete Textversion: '%1!c!'
+</MESSAGE>
+<MESSAGE name="DjVuText.one_word" number="10104">
+[1-%0!05u!] Trennzeichen mitten in Wort gefunden
+</MESSAGE>
+<MESSAGE name="DjVuText.dupl_text" number="10105">
+[1-%0!05u!] Mehrere Textebenen gefunden
+</MESSAGE>
+<MESSAGE name="arrays.ill_arg" number="11500">
+[1-%0!05u!] Ungültige Argumente in DArray::del.
+</MESSAGE>
+<MESSAGE name="arrays.ill_sub" number="11501">
+[1-%0!05u!] Ungültiger Index in DArray
+</MESSAGE>
+<MESSAGE name="arrays.resize" number="11502">
+[1-%0!05u!] Ungültiger oberer und unterer Wert für DArray-Skalierung
+</MESSAGE>
+<MESSAGE name="bad_arg" number="11600">
+[1-%0!05u!] Ungültiges Argument in %1!s!.
+</MESSAGE>
+<MESSAGE name="ByteStream.backward" number="11700">
+[1-%0!05u!] Rückwärtssuche wird von diesem ByteStream nicht unterstützt.
+</MESSAGE>
+<MESSAGE name="ByteStream.bad_arg" number="11701">
+[1-%0!05u!] Ungültiges Argument in ByteStream::seek.
+</MESSAGE>
+<MESSAGE name="ByteStream.bad_mode" number="11703">
+[1-%0!05u!] Ungültiger Modus in StdioByteStream
+</MESSAGE>
+<MESSAGE name="ByteStream.cant_write" number="11704">
+[1-%0!05u!] Schreiben in BSByteStream zur Decodierung nicht möglich
+</MESSAGE>
+<MESSAGE name="ByteStream.corrupt" number="11705">
+[1-%0!05u!] Fehlerhafte Decodereingabe
+</MESSAGE>
+<MESSAGE name="ByteStream.flush_error" number="11707">
+[1-%0!05u!] StdioByteStream::flush, Fehler beim Leeren
+</MESSAGE>
+<MESSAGE name="ByteStream.no_read" number="11708">
+[1-%0!05u!] StdioByteStream wurde nicht zum Lesen geöffnet
+</MESSAGE>
+<MESSAGE name="ByteStream.no_write" number="11709">
+[1-%0!05u!] StdioByteStream wurde nicht zum Schreiben geöffnet.
+</MESSAGE>
+<MESSAGE name="ByteStream.open_fail2" number="11710">
+[1-%0!05u!] StdioByteStream::StdioByteStream, kann Datei nicht öffnen.
+</MESSAGE>
+<MESSAGE name="ByteStream.open_fail" number="11711">
+[1-%0!05u!] Fehler beim Öffnen von &apos;%1!s!&apos;: %2!s!.
+</MESSAGE>
+<MESSAGE name="ByteStream.read_error2" number="11712">
+[1-%0!05u!] StdioByteStream::read, Lesefehler
+</MESSAGE>
+<MESSAGE name="ByteStream.read_error" number="11713">
+[1-%0!05u!] ByteStream::readall, Schreibfehler
+</MESSAGE>
+<MESSAGE name="ByteStream.seek_error2" number="11714">
+[1-%0!05u!] Suchvorgang irrtümlich vor Dateianfang gestartet
+</MESSAGE>
+<MESSAGE name="ByteStream.seek_error" number="11715">
+[1-%0!05u!] StdioByteStream::seek, Suchfehler
+</MESSAGE>
+<MESSAGE name="ByteStream.seek" number="11716">
+[1-%0!05u!] Unerwartetes Suchverhalten in ByteStream (ftell() merkwürdig).
+</MESSAGE>
+<MESSAGE name="ByteStream.write" number="11717">
+[1-%0!05u!] ByteStream::write%1!s!, Schreibfehler
+</MESSAGE>
+<MESSAGE name="ByteStream.write_error2" number="11718">
+[1-%0!05u!] StdioByteStream::write, Schreibfehler
+</MESSAGE>
+<MESSAGE name="ByteStream.write_error" number="11720">
+[1-%0!05u!] Unbekannter Fehler in ByteStream::write.
+</MESSAGE>
+<MESSAGE name="ByteStream.not_implemented" number="11721">
+[1-%0!05u!] ByteStream::scanf nicht aktiviert
+</MESSAGE>
+<MESSAGE name="DataPool.add_data" number="11800">
+[1-%0!05u!] Funktion des DataPool::add_data() kann nicht gewählt oder verbunden werden
+DataPools.
+</MESSAGE>
+<MESSAGE name="DataPool.bad_length" number="11801">
+[1-%0!05u!] Längenwert muss positiv sein.
+</MESSAGE>
+<MESSAGE name="DataPool.bad_size" number="11802">
+[1-%0!05u!] Größe kann nicht negativ sein.
+</MESSAGE>
+<MESSAGE name="DataPool.connected1" number="11803">
+[1-%0!05u!] Bereits mit anderem DataPool verbunden
+</MESSAGE>
+<MESSAGE name="DataPool.connected2" number="11804">
+[1-%0!05u!] Bereits mit einer Datei verbunden
+</MESSAGE>
+<MESSAGE name="DataPool.neg_start" number="11805">
+[1-%0!05u!] Der Anfangswert des Bereichs darf nicht negativ sein.
+</MESSAGE>
+<MESSAGE name="DataPool.no_threadless" number="11806">
+[1-%0!05u!] Interner Fehler. Diese Funktion ist im threadlosen Modus
+nicht verfügbar.
+</MESSAGE>
+<MESSAGE name="DataPool.reenter" number="11807">
+[1-%0!05u!] DATA_POOL_REENTER.
+</MESSAGE>
+<MESSAGE name="DataPool.seek_backward" number="11808">
+[1-%0!05u!] Rückwärtssuche vom Dateiende aus wird von diesem ByteStream nicht unterstützt.
+</MESSAGE>
+<MESSAGE name="DataPool.zero_DataPool" number="11809">
+[1-%0!05u!] Interner Fehler: LEERER DataPool als Ausgabe.
+</MESSAGE>
+<MESSAGE name="DjVmDir0.no_slash" number="11900">
+[1-%0!05u!] Dateiname darf keine Querstriche enthalten.
+</MESSAGE>
+<MESSAGE name="DjVmDir.bad_dir" number="12000">
+[1-%0!05u!] Das Verzeichnis enthält indireke und gebündelte Datensätze.
+</MESSAGE>
+<MESSAGE name="DjVmDir.bad_file" number="12001">
+[1-%0!05u!] DjVm-Datei-ID &apos;%1!s!&apos; enthält ungültige(s) Zeichen
+</MESSAGE>
+<MESSAGE name="DjVmDir.corrupt" number="12002">
+[1-%0!05u!] DjVu-Dokument ist fehlerhaft. In mehrseitigen Dokumenten
+darf nur eine einzige Datei mit Anmerkungen versehen werden.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_id2" number="12003">
+[1-%0!05u!] Es ist bereits eine Datei mit der ID &apos;%1!s!&apos; im
+DJVM-Verzeichnis vorhanden.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_id" number="12004">
+[1-%0!05u!] Fehler im Abschnitt &apos;DIRM&apos;: Zwei Datensätzer mit gleicher ID
+&apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_name2" number="12005">
+[1-%0!05u!] Es ist bereits eine Datei mit dem NAMEN &apos;%1!s!&apos; im DJVM-
+Verzeichnis vorhanden.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_name" number="12006">
+[1-%0!05u!] Fehler im Abschnitt &apos;DIRM&apos;: zwei Datensätze mit gleichem NAMEN
+&apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_title2" number="12007">
+[1-%0!05u!] Es ist bereits eine Datei mit dem TITEL &apos;%1!s!&apos; im DJVM-
+Verzeichnis vorhanden.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_title" number="12008">
+[1-%0!05u!] Fehler im Abschnitt &apos;DIRM&apos;: zwei Datensätze mit gleichem TITEL
+&apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.get_str_type" number="12009">
+[1-%0!05u!] Interner Fehler: Konfigurieren Sie DjVmDir::File::get_str_type()
+zur Aufnahme aller möglichen Dateitypen.
+</MESSAGE>
+<MESSAGE name="DjVmDir.multi_save2" number="12010">
+[1-%0!05u!] Aktuelles DjVu-Format für mehrseitige Dokumente
+unterstützt höchstens 1 Datei mit Anmerkungen.
+</MESSAGE>
+<MESSAGE name="DjVmDir.multi_save" number="12011">
+[1-%0!05u!] Speichern von mehrseitigem Dokument, das mehr als 1 Datei mit
+Anmerkungen enthält, nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVmDir.name_in_use" number="12012">
+[1-%0!05u!] Name &apos;%1!s!&apos; bereits vorhanden
+</MESSAGE>
+<MESSAGE name="DjVmDir.no_indirect" number="12013">
+[1-%0!05u!] Verzeichnisfehler: Indirekte Einträge sind in gebündelten Dokumenten nicht zulässig.
+</MESSAGE>
+<MESSAGE name="DjVmDir.no_info" number="12014">
+[1-%0!05u!] Keine Informationen über Datei mit der ID &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.title_in_use" number="12015">
+[1-%0!05u!] Titel &apos;%1!s!&apos; bereits vorhanden
+</MESSAGE>
+<MESSAGE name="DjVmDir.version_error" number="12016">
+[1-%0!05u!] DJVM-Verzeichnisse einer höheren Version als %1!s! nicht möglich.
+Vorliegende Datenversion: %2!s!.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_delete" number="12100">
+[1-%0!05u!] Keine Datei mit ID &apos;%1!s!&apos; vorhanden; Löschen nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_find" number="12101">
+[1-%0!05u!] Datei mit ID &apos;%1!s!&apos; wurde nicht gefunden.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_read_indr" number="12102">
+[1-%0!05u!] Indirekte DjVm-Dokumente können nicht in DataPools oder
+ByteStreams gelesen werden.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_data" number="12103">
+[1-%0!05u!] Komisch: Keine Daten für Datei &apos;%1!s!&apos; vorhanden
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_dirm_chunk" number="12104">
+[1-%0!05u!] Erster Abschnitt eines DJVM-Dokuments muss DIRM sein: wahrscheinlich
+altes Format.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_duplicate" number="12105">
+[1-%0!05u!] Versuch, die gleiche Datei zweimal einzufügen
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_form_djvm2" number="12106">
+[1-%0!05u!] DJVM-Form wurde nicht gefunden. Das Dokument hat kein mehrseitiges
+Format.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_form_djvm" number="12107">
+[1-%0!05u!] DJVM-Form wurde nicht in Eingabedaten gefunden.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.not_IFF" number="12108">
+[1-%0!05u!] Datei &apos;%1!s!&apos; hat nicht das Format IFF.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_zero_file" number="12109">
+[1-%0!05u!] Einfügen von NULL-Dateien nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.zero_file" number="12110">
+[1-%0!05u!] Komisch: Dateigröße ist null.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_type" number="12200">
+[1-%0!05u!] GLObject(): Falscher Objekttyp. Objekt muss STRING oder
+SYMBOL sein.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_url" number="12201">
+[1-%0!05u!] Ungültige URL-Angabe
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_zoom" number="12203">
+[1-%0!05u!] Ungültiger Zoomfaktor
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2list" number="12207">
+[1-%0!05u!] Ungültiger Objekttyp. Konvertieren in Liste nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2number" number="12208">
+[1-%0!05u!] Ungültiger Objekttyp. Konvertieren in Zahl nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2string" number="12209">
+[1-%0!05u!] Ungültiger Objekttyp. Konvertieren in String nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2symbol" number="12210">
+[1-%0!05u!] Ungültiger Objekttyp. Konvertieren in Symbol nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2number" number="12211">
+[1-%0!05u!] Ungültiger Objekttyp. Zusammengesetztes Objekt
+&apos;%1!s!&apos; kann nicht in Zahl konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2string" number="12212">
+[1-%0!05u!] Ungültiger Objekttyp. Zusammengesetztes Objekt
+&apos;%1!s!&apos; kann nicht in String konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2symbol" number="12213">
+[1-%0!05u!] Ungültiger Objekttyp. Zusammengesetztes Objekt
+&apos;%1!s!&apos; kann nicht in Symbol konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_number" number="12214">
+[1-%0!05u!] Fehler bei Inhaltsanalyse des Objekts &apos;%1!s!&apos;:
+Nach &apos;(&apos; muss Objektname folgen, jedoch keine Zahl.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_paren" number="12215">
+[1-%0!05u!] Fehler bei Inhaltsanalyse des Objekts &apos;%1!s!&apos;:
+Nach &apos;(&apos; muss Objektname folgen, jedoch keine Klammern.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_string" number="12216">
+[1-%0!05u!] Fehler bei Inhaltsanalyse des Objekts &apos;%1!s!&apos;:
+Nach &apos;(&apos; muss Objektname folgen, jedoch kein String.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2list" number="12218">
+[1-%0!05u!] Ungültiger Objekttyp. Zahl &apos;%1!d!&apos; kann nicht in
+zusammengesetztes Objekt konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2string" number="12219">
+[1-%0!05u!] Ungültiger Objekttyp. Zahl &apos;%1!d!&apos; kann nicht in
+String konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2symbol" number="12220">
+[1-%0!05u!] Ungültiger Objekttyp. Zahl &apos;%1!d!&apos; kann nicht in
+Symbol konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.paren" number="12222">
+[1-%0!05u!] Fehler bei Inhaltsanalyse des Objekts
+&apos;%1!s!&apos;:
+Objektname muss UNMITTELBAR nach &apos;(&apos; stehen.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2list" number="12223">
+[1-%0!05u!] Ungültiger Objekttyp. String
+&apos;%1!s!&apos; kann nicht in zusammengesetztes Objekt konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2number" number="12224">
+[1-%0!05u!] Ungültiger Objekttyp. String
+&apos;%1!s!&apos; kann nicht in Zahl konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2symbol" number="12225">
+[1-%0!05u!] Ungültiger Objekttyp. String
+&apos;%1!s!&apos; kann nicht in Symbol konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2list" number="12226">
+[1-%0!05u!] Ungültiger Objekttyp. Symbol
+&apos;%1!s!&apos; kann nicht in zusammengesetztes Objekt konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2number" number="12227">
+[1-%0!05u!] Ungültiger Objekttyp. Symbol
+&apos;%1!s!&apos; kann nicht in Zahl konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2string" number="12228">
+[1-%0!05u!] Ungültiger Objekttyp. Symbol
+&apos;%1!s!&apos; kann nicht in String konvertiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.too_few" number="12229">
+[1-%0!05u!] Zu wenig Elemente in &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.bad_page" number="12300">
+[1-%0!05u!] %1!d! ist keine gültige Seitenzahl.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.cant_save2" number="12301">
+[1-%0!05u!] Das Dokument kann nicht im gewünschten Format gespeichert
+werden. Verwenden Sie &apos;Speichern unter&apos;.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.cant_save" number="12302">
+[1-%0!05u!] Das Dokument kann nicht gespeichert werden. Verwenden Sie
+&apos;Speichern unter&apos;.</MESSAGE>
+<MESSAGE name="DjVuDocEditor.create_fail" number="12303">
+[1-%0!05u!] Die Datei mit der ID &apos;%1!s!&apos; konnte nicht erstellt werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.dir_fail" number="12304">
+[1-%0!05u!] Das Verzeichnis &apos;%1!s!&apos; konnte nicht erstellt werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.init" number="12305">
+[1-%0!05u!] DjVuDocEditor wurde bereits gestartet.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_codec" number="12306">
+[1-%0!05u!] Codec für Komprimierung konnte nicht geladen werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_file" number="12307">
+[1-%0!05u!] Dieses Dokument enthält keine Datei mit der ID &apos;%1!s!&apos;.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.not_1_page" number="12308">
+[1-%0!05u!] Die Datei &apos;%1!s!&apos; ist keine einseitige DjVu-Datei.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_thumb" number="12309">
+[1-%0!05u!] Interner Feher: Miniaturansicht für Seite %1!d! wurde nicht gefunden.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.not_init" number="12310">
+[1-%0!05u!] DjVuDocEditor hätte vor der Verwendung initialisiert werden müssen.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.open_fail" number="12311">
+[1-%0!05u!] Das Dokument &apos;%1!s!&apos; konnte nicht geöffnet werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.page_fail" number="12312">
+[1-%0!05u!] Interner Fehler: Zugriff auf Seite %1!d! nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.page_num" number="12313">
+[1-%0!05u!] %1!d! ist keine gültige Seitenzahl.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.render" number="12314">
+[1-%0!05u!] Bild auf Seite %1!d! kann nicht wiedergegeben werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.share_fail" number="12315">
+[1-%0!05u!] Der Versuch, eine weitere Seite mit Kommentaren zu erstellen, ist gescheitert.
+In einem mehrseitigen Dokument ist nur eine Datei mit Kommentaren zulässig.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.2nd_init" number="12400">
+[1-%0!05u!] DjVuDocument kann nicht zweimal initialsiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.bad_format" number="12401">
+[1-%0!05u!] Unbekanntes Dokumentformat. Decodierung nicht möglich.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.bad_thumb" number="12402">
+[1-%0!05u!] Miniaturansichten beschädigt
+</MESSAGE>
+<MESSAGE name="DjVuDocument.big_num" number="12403">
+[1-%0!05u!] Die Seitenzahl ist zu hoch.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.cant_extract" number="12405">
+[1-%0!05u!] Vordecodierte Miniaturansichten konnten nicht extrahiert werden:.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.cant_render" number="12406">
+[1-%0!05u!] Seite %1!d! kann nicht wiedergegeben werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.comp_codec" number="12407">
+[1-%0!05u!] Codec für Komprimierung wurde nicht geladen.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.empty_url" number="12408">
+[1-%0!05u!] Leere URL an DjVuDocument.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.exclude_page" number="12409">
+[1-%0!05u!] Seite %1!d! wird wegen Fehlern aus der Dateiliste ausgeschlossen.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.fail_URL" number="12411">
+[1-%0!05u!] Daten von URL &apos;%1!s!&apos; konnten nicht erfaßt werden.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.file_outside" number="12412">
+[1-%0!05u!] Die Datei &apos;%1!s!&apos; ist nicht in diesem Bündel.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.init_eof" number="12413">
+[1-%0!05u!] Beim Initialisieren des Dokuments wurde ein unerwartetes Dateiende gefunden.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.init_not_done" number="12414">
+[1-%0!05u!] Das Dokument wurde nicht vollständig initialisiert.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.miss_page_name" number="12415">
+[1-%0!05u!] Die Seite &apos;%1!s!&apos; ist nicht in diesem Dokument.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.miss_page_num" number="12416">
+[1-%0!05u!] Die Seite &apos;%1!d!&apos; ist nicht in diesem Dokument vorhanden.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_dir" number="12417">
+[1-%0!05u!] Einseitige Dokumente haben kein DjVm-Verzeichnis.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_file" number="12418">
+[1-%0!05u!] Die gewünschte Datei ist nicht vorhanden.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_page" number="12419">
+[1-%0!05u!] Es wurden keine Seiten in diesem Dokument gefunden.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_DjVu" number="12420">
+[1-%0!05u!] Die gewünschte Eingabe ist keine DjVu-Datei.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_init" number="12421">
+[1-%0!05u!] DjVuDocument wurde nicht initialisiert.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_secure" number="12422">
+[1-%0!05u!] DjVuDocument ist nicht durch GP&lt;DjVuDocument&gt; geschützt.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.obsolete" number="12423">
+[1-%0!05u!] Das Format des Dokuments ist veraltet.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.old_bundle" number="12424">
+[1-%0!05u!] Verzeichnisse des Typs DjVm v.0 werden nur von OLD_BUNDLED-Dokumenten verwendet.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.stopped" number="12425">
+[1-%0!05u!] DjVuDocument init thread geSTOPpt.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.unk_type" number="12426">
+[1-%0!05u!] Unbekannter Dokumenttyp
+</MESSAGE>
+<MESSAGE name="DjVuDocument.URL_outside2" number="12427">
+[1-%0!05u!] Der URL &apos;%1!s!&apos; verweist auf ein Ziel außerhalb des INDIREKTEN Dokuments.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.URL_outside" number="12428">
+[1-%0!05u!] Der URL &apos;%1!s!&apos; verweist auf ein Ziel außerhalb des gebündelten Dokuments.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.skip_page" number="12429">
+[1-%0!05u!] Seite %1!d! wird übersprungen.
+</MESSAGE>
+<MESSAGE name="DjVuFile.2nd_init" number="12500">
+[1-%0!05u!] DjVuFile wurde bereits initialisiert.
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_BG44" number="12501">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Daten (Größe im Abschnitt BG44 ist nicht korrekt)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_dupl" number="12502">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Datei (doppelter INFO-Abschnitt)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_INFO" number="12503">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Datei (INFO-Abschnitt in FORM:DJVI gefunden)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_missing_info" number="12504">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Daten (INFO-Abschnitt fehlt)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_missing_IW44" number="12505">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Daten (IW44-Datenabschnitte fehlen)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_zero" number="12506">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Datei (Bildgröße ist null)
+</MESSAGE>
+<MESSAGE name="DjVuFile.decode_fail" number="12507">
+[1-%0!05u!] Decodierung einer einbezogenen Datei fehlgeschlagen
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_backgrnd" number="12508">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Daten (doppelte Hintergrundebene)
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_Dxxx" number="12509">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Daten (doppelter Dxxx-Abschnitt)
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_foregrnd" number="12510">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Daten (doppelte Vordergrundfarbinformationen)
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_Sxxx" number="12511">
+[1-%0!05u!] DjVu-Decoder: Fehlerhafte Daten (doppelter Sxxx-Abschnitt)
+</MESSAGE>
+<MESSAGE name="DjVuFile.Dxxx_after_Sxxx" number="12512">
+[1-%0!05u!] Decoder: Fehlerhafte Daten (Dxxx-Abschnitt nach Sxxx-Abschnitt gefunden)
+</MESSAGE>
+<MESSAGE name="DjVuFile.empty_URL" number="12513">
+[1-%0!05u!] Leerer URL zu DjVuFile geleitet
+</MESSAGE>
+<MESSAGE name="DjVuFile.EOF" number="12514">
+[1-%0!05u!] Beim Lesen wurde ein unerwartetes Dateiende gefunden:
+	%1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuFile.failed" number="12515">
+[1-%0!05u!] %1!s! FEHLGESCHLAGEN.
+</MESSAGE>
+<MESSAGE name="DjVuFile.illegal_chunk" number="12516">
+[1-%0!05u!] Ungültige Abschnittsnummer
+</MESSAGE>
+<MESSAGE name="DjVuFile.malformed" number="12517">
+[1-%0!05u!] Ungültiges Format in INCL-Abschnitt. Querstriche nicht zulässig.
+</MESSAGE>
+<MESSAGE name="DjVuFile.missing_chunk" number="12518">
+[1-%0!05u!] Zu wenig Abschnitte
+</MESSAGE>
+<MESSAGE name="DjVuFile.new_version" number="12519">
+[1-%0!05u!] DjVu-Decoder: DjVu-Dateien der Version&gt;= %1!d! können nicht decodiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuFile.no_create" number="12520">
+[1-%0!05u!] Interner Fehler: Für id_to_file(%1!s!) wurde keine Datei erstellt.
+</MESSAGE>
+<MESSAGE name="DjVuFile.no_data" number="12521">
+[1-%0!05u!] Es konnten keine Daten für den URL &apos;%1!s!&apos; erfaßt werden.k
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_finished" number="12522">
+[1-%0!05u!] Interner Fehler: Eine einbezogene Datei ist noch nicht fertig.
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_init" number="12523">
+[1-%0!05u!] DjVuFile wurde nicht initialisiert.
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_secured" number="12524">
+[1-%0!05u!] DjVuFile ist nicht durch GP&lt;DjVuFile&gt; gesichert.
+</MESSAGE>
+<MESSAGE name="DjVuFile.stopped" number="12525">
+[1-%0!05u!] %1!s! GESTOPPT.
+</MESSAGE>
+<MESSAGE name="DjVuFile.unexp_image" number="12526">
+[1-%0!05u!] DjVu-Decoder: Es wurde ein DJVU- oder IW44-Bild erwartet.
+</MESSAGE>
+<MESSAGE name="DjVuFile.unrecog_chunk" number="12527"
+  value="%1!5.1f! KB '%2!4s!' Unerkannter Abschnitt." />
+<MESSAGE name="DjVuFile.page_info" number="12528"
+  value="%1!5.1f! KB '%2!4s!' Seiteninformationen." />
+<MESSAGE name="DjVuFile.indir_chunk1" number="12529"
+  value="%2!5.1f! KB '%3!4s!' Indirection-Abschnitt (%1!s!)." />
+<MESSAGE name="DjVuFile.indir_chunk2" number="12530"
+  value="%1!5.1f! KB '%2!4s!' Indirection-Abschnitt." />
+<MESSAGE name="DjVuFile.shape_dict" number="12531"
+  value="%2!5.1f! KB '%3!4s!' JB2-Formverzeichniss (%1!d! Formen)." />
+<MESSAGE name="DjVuFile.fg_mask" number="12532"
+  value="%4!5.1f! KB '%5!4s!' JB2-Vordergrundmaske (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.G4_mask" number="12533"
+  value="%4!5.1f! KB '%5!4s!' G4/MMR-codierte Maske (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg1" number="12534"
+  value="%4!5.1f! KB '%5!4s!' IW44-Hintergrund (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg2" number="12535"
+  value="%3!5.1f! KB '%4!4s!' IW44-Hintergrund (Teil %1!d!, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_fg" number="12536"
+  value="%4!5.1f! KB '%5!4s!' IW44-Vordergrundfarben (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.color_import1" number="12537"
+  value="%4!5.1f! KB '%5!4s!' LINK-Farbenimport (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.color_import2" number="12538"
+  value="%1!5.1f! KB '%2!4s!' LINK-Farbenimport (nicht angewendet)." />
+<MESSAGE name="DjVuFile.JPEG_bg1" number="12539"
+  value="%4!5.1f! KB '%5!4s!' JPEG-Hintergrund (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.JPEG_bg2" number="12540"
+  value="%1!5.1f! KB '%2!4s!' JPEG-Hintergrund (nicht angewendet)." />
+<MESSAGE name="DjVuFile.JPEG_fg1" number="12541"
+  value="%4!5.1f! KB '%5!4s!' JPEG-Vordergrundfarben (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.JPEG_fg2" number="12542"
+  value="%1!5.1f! KB '%2!4s!' JPEG-Vordergrundfarben (nicht angewendet)." />
+<MESSAGE name="DjVuFile.JPEG2K_bg" number="12543"
+  value="%1!5.1f! KB '%2!4s!' JPEG-2000-Hintergrund (nicht angewendet)." />
+<MESSAGE name="DjVuFile.JPEG2K_fg" number="12544"
+  value="[1-%0!05u!] %1!5.1f! KB '%2!4s!' JPEG-2000-Vordergrundfarben (nicht angewendet)." />
+<MESSAGE name="DjVuFile.JB2_fg" number="12545"
+  value="%3!5.1f! KB '%4!4s!' JB2-Vordergrundfarben (%1!d! Farben, %2!d! ccs)." />
+<MESSAGE name="DjVuFile.IW44_data1" number="12546"
+  value="%4!5.1f! KB '%5!4s!' IW44-Daten (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_data2" number="12547"
+  value="%3!5.1f! KB '%4!4s!' IW44-Daten (Teil %1!d!, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.nav_dir" number="12548"
+  value="%1!5.1f! KB '%2!4s!' Navigationsverzeichnis (veraltet)." />
+<MESSAGE name="DjVuFile.anno1" number="12549"
+  value="%1!5.1f! KB '%2!4s!' Anmerkungen (gebündelt)." />
+<MESSAGE name="DjVuFile.anno2" number="12550"
+  value="%1!5.1f! KB '%2!4s!' Anmerkungen (Hyperlinks etc.)." />
+<MESSAGE name="DjVuFile.text" number="12551"
+  value="%1!5.1f! KB '%2!4s!' Text (Text etc.)." />
+<MESSAGE name="DjVuFile.djvu_header" number="12552"
+  value="DJVU Bild (%1!d!x%2!d!, %3!d! dpi) Version %4!d!:&#10;" />
+<MESSAGE name="DjVuFile.IW44_header" number="12553"
+  value="IW44 Bild (%1!d!x%2!d!, %3!d! dpi):&#10;" />
+<MESSAGE name="DjVuFile.ratio" number="12554"
+  value="&#10;Komprimierungsverhältins: %1!0.f! (%2!0.1f! KB)" />
+<MESSAGE name="DjVuFile.securedjvu" number="12555">
+Incompatible file (so-called "Secure DjVu".)
+</MESSAGE>
+<MESSAGE name="DjVuGlobalMemory.exhausted" number="12600">
+[1-%0!05u!] Speicher ausgelastet.
+</MESSAGE>
+<MESSAGE name="DjVuGlobal.not_compatible" number="12700">
+[1-%0!05u!] DjVuProgress ist nicht mit Multithreading kompatibel.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_call" number="12800">
+[1-%0!05u!] DjVuImage::decode sollte nicht nach DjVuImage::connect aufgerufen werden.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_rect2" number="12801">
+[1-%0!05u!] (DjVuImage::do_pixmap) Ungültige Zielrechtecke.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_rect" number="12802">
+[1-%0!05u!] (DjVuImage::get_pixmap) Ungültige Zielrechtecke.
+</MESSAGE>
+<MESSAGE name="DjVuImage.corrupted" number="12803">
+[1-%0!05u!] Fehlerhafte Datei (Farbindex ist umfangreicher als Palettengröße).
+</MESSAGE>
+<MESSAGE name="DjVuImage.mult_error" number="12804">
+[1-%0!05u!] Mehrere Fehler bei der Decodierung.
+</MESSAGE>
+<MESSAGE name="DjVuImage.not_decode" number="12805">
+[1-%0!05u!] Das DjVu-Dokument kann nicht im abwärtskompatiblen Modus
+decodiert werden.
+</MESSAGE>
+<MESSAGE name="DjVuImage.short1" number="12806"
+  value="%1!d!x%2!d! in %3!0.1f! Kb" />
+<MESSAGE name="DjVuImage.short2" number="12807" 
+  value="%1!d!x%2!d!" />
+<MESSAGE name="DjVuInfo.corrupt_file" number="12900">
+[1-%0!05u!] DjVu-Decoder: Beschädigte Datei (abgeschnittener INFO-Abschnitt).
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.bad_page" number="13000">
+[1-%0!05u!] Ungültige Seitennummer als Eingabe.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.large_page" number="13001">
+[1-%0!05u!] Seitennummer ist zu hoch
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.long_line" number="13002">
+[1-%0!05u!] DjVu-Verzeichnis konnte nicht gelesen werden. Zeile ist zu lang.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.neg_page" number="13003">
+[1-%0!05u!] Negative Seitenzahlen sind nicht zulässig.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.zero_dir" number="13004">
+[1-%0!05u!] NULL Verzeichnis-URL durch DjVuNavDir-Constructor empfangen.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.bad_palette" number="13100">
+[1-%0!05u!] Fehlerhafte Vordergrundfarbpalette
+</MESSAGE>
+<MESSAGE name="DjVuPalette.bad_version" number="13101">
+[1-%0!05u!] Unbekannter Version-Tag in Palettendaten
+</MESSAGE>
+<MESSAGE name="DjVuPalette.many_colors" number="13102">
+[1-%0!05u!] Unrealistische Farbanzahl
+</MESSAGE>
+<MESSAGE name="DjVuPalette.no_color" number="13103">
+[1-%0!05u!] Farbhistogramm wurde nicht gefunden
+</MESSAGE>
+<MESSAGE name="DjVuPalette.not_init" number="13104">
+[1-%0!05u!] Palette wurde nicht initialisiert
+</MESSAGE>
+<MESSAGE name="DjVuPalette.test_usage" number="13105">
+[1-%0!05u!] Erforderliches Format: quant&lt;ncol&gt;&lt;minbox&gt;&lt;ppmfile&gt;
+</MESSAGE>
+<MESSAGE name="DjVuPort.not_alloc" number="13200">
+[1-%0!05u!] DjVuPort nicht auf dem Heap
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_EPS_num" number="13300">
+[1-%0!05u!] Es kann nur 1 Kopie im EPS-Format gedruckt werden.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_format" number="13301">
+[1-%0!05u!] PostScript-Format muß entweder PS oder EPS lauten.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_gamma" number="13302">
+[1-%0!05u!] Ungültiger Gammawert. Wert muß zwischen 0,3 und 5,0 liegen.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_level" number="13303">
+[1-%0!05u!] PostScript-Level %1!d! ist ungültig. Nur Level 1 oder 2 zulässig.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_mode" number="13304">
+[1-%0!05u!] Ungültigen Bildmodus an Druckercode weitergegeben
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_number" number="13305">
+[1-%0!05u!] Anzahl Kopien kann nicht negativ sein.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_orient" number="13306">
+[1-%0!05u!] Ungültige Ausrichtung an Druckercode weitergegeben.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_page" number="13307">
+[1-%0!05u!] Die Seitenzahl  &apos;%1!d!&apos; ist ungültig.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_range" number="13308">
+[1-%0!05u!] Der Druckbereich &apos;%1!s!&apos; ist ungültig.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_scale" number="13309">
+[1-%0!05u!] Beim Drucken wurde versucht, das Bild auf Punkt zu skalieren.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_zoom" number="13310">
+[1-%0!05u!] Ungültigen Zoomfaktor an Druckercode übergeben
+</MESSAGE>
+<MESSAGE name="DjVuToPS.big_page" number="13311">
+[1-%0!05u!] Die Seitenzahl %1!d! ist zu hoch.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.empty_image" number="13313">
+[1-%0!05u!] Es wurde versucht, ein leeres Bild zu drucken.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.empty_rect" number="13314">
+[1-%0!05u!] Es wurde versucht, ein leeres Rechteck zu drucken.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_image" number="13315">
+[1-%0!05u!] Bild für Seite %1!d! wurde nicht gefunden.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_landscape" number="13316">
+[1-%0!05u!] QUERFORMAT wird nicht durch EPS-Format unterstützt.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_to" number="13318">
+[1-%0!05u!] Seitenzahl für &apos;Bis&apos; fehlt im Druckbereich für &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuToPS.only_one_page" number="13319">
+[1-%0!05u!] Es kann nur eine Seite im EPS-Format gedruckt werden.
+</MESSAGE>
+<MESSAGE name="EOF" number="13400">
+Unexpected End Of file.
+</MESSAGE>
+<MESSAGE name="Error" number="13500">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="error" number="13600">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="Failed" number="13700">
+Failed.
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_format" number="13800">
+[1-%0!05u!] Unbekanntes PBM-, PGM- oder RLE-Dateiformat
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_levels" number="13801">
+[1-%0!05u!] (GBitmap::set_grays) ungültige Graustufenanzahl
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_PBM" number="13802">
+[1-%0!05u!] Ungültiges Format für PBM-Datei
+</MESSAGE>
+<MESSAGE name="GBitmap.cant_compress" number="13803">
+[1-%0!05u!] Graustufen-Bitmap kann nicht komprimiert werden
+</MESSAGE>
+<MESSAGE name="GBitmap.cant_make_PBM" number="13804">
+[1-%0!05u!] PBM-Datei kann nicht mit Graustufen-Bitmap erstellt werden.
+</MESSAGE>
+<MESSAGE name="GBitmap.left_damaged" number="13805">
+[1-%0!05u!] Debug: Linker Rand beschädigt
+</MESSAGE>
+<MESSAGE name="GBitmap.lost_sync2" number="13806">
+[1-%0!05u!] (GBitmap::decode) RLE-Synchronisierung gescheitert
+</MESSAGE>
+<MESSAGE name="GBitmap.lost_sync" number="13807">
+[1-%0!05u!] RLE: Synchronisierung gescheitert
+</MESSAGE>
+<MESSAGE name="GBitmap.not_init" number="13808">
+[1-%0!05u!] Bitmap nicht initialisiert
+</MESSAGE>
+<MESSAGE name="GBitmap.not_int" number="13809">
+[1-%0!05u!] Bitmap-Lesevorgang: nur Ganzzahlen zulässig
+</MESSAGE>
+<MESSAGE name="GBitmap.null_arg" number="13810">
+[1-%0!05u!] (GBitmap::decode) Aufruf mit Null-Argument
+</MESSAGE>
+<MESSAGE name="GBitmap.right_damaged" number="13811">
+[1-%0!05u!] Debug: Rechter Rand ist beschädigt
+</MESSAGE>
+<MESSAGE name="GBitmap.zero_damaged" number="13812">
+[1-%0!05u!] Debug: Null-Array ist beschädigt
+</MESSAGE>
+<MESSAGE name="GBitmap.zero_small" number="13813">
+[1-%0!05u!] Debug: Nullpuffer ist zu klein.
+</MESSAGE>
+<MESSAGE name="GContainer.bad_args" number="13900">
+[1-%0!05u!] Ungültige Argumente für GArray::resize.
+</MESSAGE>
+<MESSAGE name="GContainer.bad_howmany" number="13901">
+[1-%0!05u!] Ungültiger Wert für Argument &apos;howmany&apos;
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos_cont" number="13902">
+[1-%0!05u!] Ungültige Position (Verweis auf anderen Container)
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos" number="13903">
+[1-%0!05u!] Ungültige Position
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos_null" number="13904">
+[1-%0!05u!] Ungültige Position (Nullzeiger).
+</MESSAGE>
+<MESSAGE name="GContainer.bad_sub2" number="13905">
+[1-%0!05u!] Ungültiger Index in GArray::del.
+</MESSAGE>
+<MESSAGE name="GContainer.cannot_add" number="13906">
+[1-%0!05u!] Taste kann konstanter Zuordnung nicht hinzugefügt werden.
+</MESSAGE>
+<MESSAGE name="GContainer.illegal_subscript" number="13907">
+[1-%0!05u!] Index in GArray außerhalb des zulässigen Bereichs.
+</MESSAGE>
+<MESSAGE name="GException.outofmemory" number="14000">
+[1-%0!05u!] Nicht genügend Speicher
+</MESSAGE>
+<MESSAGE name="GIFFManager.bad_char" number="14100">
+[1-%0!05u!] Abschnittsnamen dürfen keine Punkte oder Klammern enthalten.
+</MESSAGE>
+<MESSAGE name="GIFFManager.cant_find2" number="14101">
+[1-%0!05u!] Oberste Ebene des FORM-Abschnitts kann nicht in zu ladender
+IFF-Datei gefunden werden.
+</MESSAGE>
+<MESSAGE name="GIFFManager.cant_find" number="14102">
+[1-%0!05u!] Abschnitt mit Name &apos;%1!s!&apos; wurde nicht gefunden.
+</MESSAGE>
+<MESSAGE name="GIFFManager.del_empty" number="14103">
+[1-%0!05u!] Es wurde versucht, einen Abschnit ohne Namen zu löschen.
+</MESSAGE>
+<MESSAGE name="GIFFManager.garbage" number="14104">
+[1-%0!05u!] Abschnittsname enthält Datenmüll nach &apos;]&apos;.
+</MESSAGE>
+<MESSAGE name="GIFFManager.get_empty" number="14105">
+[1-%0!05u!] Es wurde versucht, auf einen Abschnit ohne Namen zuzugreifen.
+</MESSAGE>
+<MESSAGE name="GIFFManager.malformed" number="14106">
+[1-%0!05u!] Format des Abschnittsnamens &apos;%1!s!&apos; ist unzulässig: Punkt am Ende
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_brackets" number="14107">
+[1-%0!05u!] Abschnittsnamen dürfen keine Klammern enthalten.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_chunk" number="14108">
+[1-%0!05u!] Der Abschnitt 
+&apos;%3!s!&apos; enthält keinen Unterabschnitt &apos;%1!s!&apos; #%2!d!.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_dots" number="14109">
+[1-%0!05u!] Abschnittsnamen dürfen keine Klammern enthalten.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_top_cont" number="14110">
+[1-%0!05u!] Oberster Abschnitt muß ein Container sein.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_top_name" number="14111">
+[1-%0!05u!] Oberster Abschnitt ist noch nicht bekannt.
+</MESSAGE>
+<MESSAGE name="GIFFManager.one_colon" number="14112">
+[1-%0!05u!] Abschnittsname darf nur einen Doppelpunkt enthalten.
+</MESSAGE>
+<MESSAGE name="GIFFManager.unknown" number="14114">
+[1-%0!05u!] Interner Fehler: Abschnitt &apos;%1!s!&apos; ist unbekannt.
+</MESSAGE>
+<MESSAGE name="GIFFManager.unmatched" number="14115">
+[1-%0!05u!] Abschnittsname enthält Öffnungsklammer ohne Gegenstück.
+</MESSAGE>
+<MESSAGE name="GIFFManager.wrong_name2" number="14116">
+[1-%0!05u!] Der Name des obersten Abschnitts lautet nicht &apos;%1!s!&apos;.
+</MESSAGE>
+<MESSAGE name="GIFFManager.wrong_name" number="14117">
+[1-%0!05u!] Der Name des obersten Abschnitts der Datei lautet nicht &apos;%1!s!
+&apos;.
+</MESSAGE>
+<MESSAGE name="GMapAreas.intersect" number="14200">
+[1-%0!05u!] Einige Polygonsegmente überschneiden sich.
+</MESSAGE>
+<MESSAGE name="GMapAreas.oval_border" number="14201">
+[1-%0!05u!] Dieser Randtyp ist nicht für ovale Map-Bereiche zulässig.
+</MESSAGE>
+<MESSAGE name="GMapAreas.oval_hilite" number="14202">
+[1-%0!05u!] Hervorhebung wird in ovalen Map-Bereichen nicht unterstützt.
+</MESSAGE>
+<MESSAGE name="GMapAreas.poly_border" number="14203">
+[1-%0!05u!] Dieser Randtyp wird nicht für polygonale Map-Bereiche zulässig.
+</MESSAGE>
+<MESSAGE name="GMapAreas.poly_hilite" number="14204">
+[1-%0!05u!] Hervorhebung wird in polygonalen Map-Bereichen nicht unterstützt.
+</MESSAGE>
+<MESSAGE name="GMapAreas.too_few_points" number="14205">
+[1-%0!05u!] Zu wenig Punkte in Polygon.
+</MESSAGE>
+<MESSAGE name="GMapAreas.width_1" number="14206">
+[1-%0!05u!] Randbreite für Randtyp XOR und SOLID muss 1 lauten.
+</MESSAGE>
+<MESSAGE name="GMapAreas.width_3-32" number="14207">
+[1-%0!05u!] Randbreite für SHADOW-Randtypen muß zwischen 3 und 32 liegen.
+</MESSAGE>
+<MESSAGE name="GMapAreas.zero_height" number="14208">
+[1-%0!05u!] Höhe des Bereichs ist NULL.
+</MESSAGE>
+<MESSAGE name="GMapAreas.zero_width" number="14209">
+[1-%0!05u!] Breite des Bereichs ist NULL.
+</MESSAGE>
+<MESSAGE name="GPixmap.bad_param" number="14400">
+[1-%0!05u!] (GPixmap::color_correct) Ungültiger Parameter
+</MESSAGE>
+<MESSAGE name="GPixmap.diff_size" number="14401">
+[1-%0!05u!] Unterschiedliche Größen für Farb-Pixmap und Alpha-Bitmap
+</MESSAGE>
+<MESSAGE name="GPixmap.no_int" number="14402">
+[1-%0!05u!] Pixmap-Lesevorgang: nur Ganzzahlen zulässig
+</MESSAGE>
+<MESSAGE name="GPixmap.null_alpha" number="14403">
+[1-%0!05u!] Null Alpha-Bitmap-Zeiger
+</MESSAGE>
+<MESSAGE name="GPixmap.null_color" number="14404">
+[1-%0!05u!] Null Farb-Pixmap-Zeiger
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow1" number="14405">
+[1-%0!05u!] (GPixmap::downsample) Angegebenes Rechteck ragt über Ziel-Pixmap
+hinaus.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow2" number="14406">
+[1-%0!05u!] (GPixmap::upsample) Angegebenes Rechteck ragt über Ziel-Pixmap
+hinaus.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow3" number="14407">
+[1-%0!05u!] (GPixmap::downsample43) Angegebenes Rechteck ragt über Ziel-Pixmap
+hinaus.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow4" number="14408">
+[1-%0!05u!] (GPixmap::upsample23) Angegebenes Rechteck ragt über Ziel-Pixmap
+hinaus.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow5" number="14409">
+[1-%0!05u!] (GPixmap::stencil) Angegebenes Rechteck ragt über Vordergrund-Pixmap
+hinaus.
+</MESSAGE>
+<MESSAGE name="GPixmap.unk_PPM" number="14410">
+[1-%0!05u!] Unbekanntes PPM-Dateiformat
+</MESSAGE>
+<MESSAGE name="GRect.div_zero" number="14500">
+[1-%0!05u!] Teilen durch null nicht möglich
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect1" number="14501">
+[1-%0!05u!] Unzulässiges leeres Rechteck in GRectMapper::set_input.
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect2" number="14502">
+[1-%0!05u!] Unzulässiges leeres Rechteck in GRectMapper::set_output.
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect3" number="14503">
+[1-%0!05u!] Unzulässige leere Rechtecke in GRectMapper::[un]map.
+</MESSAGE>
+<MESSAGE name="GScaler.assertion" number="14600">
+[1-%0!05u!] Angabe nicht akzeptiert
+</MESSAGE>
+<MESSAGE name="GScaler.no_match" number="14601">
+[1-%0!05u!] Eingabe-Pixmap stimmt nicht mit Eingaberechteck überein.
+</MESSAGE>
+<MESSAGE name="GScaler.ratios" number="14602">
+[1-%0!05u!] Beide GScaler-Verhältniswerte müssen entweder 0 lauten oder positv sein.
+</MESSAGE>
+<MESSAGE name="GScaler.too_big" number="14603">
+[1-%0!05u!] Gewünschte Ausgabe ist größer als Gesamtbildausgaberechteck.
+</MESSAGE>
+<MESSAGE name="GScaler.too_small" number="14604">
+[1-%0!05u!] Angegebenes Eingabe-Pixmap ist zu klein.
+</MESSAGE>
+<MESSAGE name="GScaler.undef_size" number="14605">
+[1-%0!05u!] GScaler input_size und output_size wurden noch nicht angegeben.
+</MESSAGE>
+<MESSAGE name="GSmartPointer.suspicious" number="14700">
+[1-%0!05u!] Irrtümliche Löschung des referenzierten GPEnabled-Objekts?
+</MESSAGE>
+<MESSAGE name="GString.bad_subscript" number="14800">
+[1-%0!05u!] Ungültiger Index in GString::operator[].
+</MESSAGE>
+<MESSAGE name="GString.overwrite" number="14801">
+[1-%0!05u!] Speicherüberschreibung. Programm ist nicht mehr stabil.
+</MESSAGE>
+<MESSAGE name="GStringRep.NativeToNative" number="14802">
+[1-%0!05u!] Versuch, ursprünglichen Code in ursprünglichen Code zu konvertieren.
+</MESSAGE>>
+<MESSAGE name="GStringRep.UTF8ToUTF8" number="14803">
+[1-%0!05u!] Versuch, UTF8-Codierung in UTF8-Codierung zu konvertieren.
+</MESSAGE>>
+<MESSAGE name="GStringRep.appendNativeToUTF8" number="14804">
+[1-%0!05u!] Versuch, ursprünglichen String an UTF8-String anzuhängen.
+</MESSAGE>>
+<MESSAGE name="GStringRep.appendUTF8toNative" number="14805">
+[1-%0!05u!] Versuch, UTF8-String an ursprünglichen String anzuhängen.
+</MESSAGE>>
+<MESSAGE name="GThreads.co_panic" number="14900">
+[1-%0!05u!] Panik bei COTHREADS: Ausnahmekontext nicht gefunden.
+</MESSAGE>
+<MESSAGE name="GThreads.dupl_callback" number="14901">
+[1-%0!05u!] GThread::set_scheduling_callback zweimal angerufen.
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_broad" number="14902">
+[1-%0!05u!] Monitor wurde nicht für diesen Thread empfangen (GMonitor::broadcast).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_leave" number="14903">
+[1-%0!05u!] Monitor wurde nicht für diesen Thread empfangen (GMonitor::leave).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_signal" number="14904">
+[1-%0!05u!] Monitor wurde nicht für diesen Thread empfangen (GMonitor::signal).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_wait" number="14905">
+[1-%0!05u!] Monitor wurde nicht für diesen Thread empfangen (GMonitor::wait).
+</MESSAGE>
+<MESSAGE name="GThreads.panic" number="14906">
+[1-%0!05u!] PANIK: Cothreads festgefahren
+</MESSAGE>
+<MESSAGE name="GThreads.uncaught" number="14907">
+[1-%0!05u!] GThreads: unerfasste Ausnahme
+</MESSAGE>
+<MESSAGE name="GThreads.unrecognized" number="14908">
+[1-%0!05u!] GThreads: unbekannte unerfasste Ausnahme
+</MESSAGE>
+<MESSAGE name="GURL.fail_to_file" number="15000">
+[1-%0!05u!] URL konnte nicht in Dateinamen konvertiert werden.
+</MESSAGE>
+<MESSAGE name="GURL.fail_to_URL" number="15001">
+[1-%0!05u!] Dateiname konnte nicht in URL zurückkonvertiert werden.
+</MESSAGE>
+<MESSAGE name="GURL.no_protocol" number="15002">
+[1-%0!05u!] URL &apos;%1!s!&apos; enthält keine Protokollpräfix
+</MESSAGE>
+<MESSAGE name="GURL.big_name" number="15003">
+[1-%0!05u!] Dateiname zu lang
+</MESSAGE>
+<MESSAGE name="GURL.listdir" number="15004">
+[1-%0!05u!] GURL::listdir nicht auf dieser Plattform implementiert.
+</MESSAGE>
+<MESSAGE name="GURL.no_rename" number="15005">
+[1-%0!05u!] rename() ist auf Windows CE-Geräten nicht verfügbar.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.bad_chunk" number="15100">
+[1-%0!05u!] Ungültige Abschnitts-ID (IFFByteStream::put_chunk)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.bad_offset" number="15101">
+[1-%0!05u!] IFFByteStream (interner Fehler) Versatz liegt außerhalb der Abschnittsgrenzen.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.cant_close" number="15102">
+[1-%0!05u!] Schließen des Abschnitts nicht möglich: kein Abschnitt geöffnet.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.cant_write" number="15103">
+[1-%0!05u!] Schreiben erst nach Beendigung des vorherigen Abschnitts möglich
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_2nd_id" number="15104">
+[1-%0!05u!] Fehlerhafte IFF-Datei (ungültige sekundäre Abschnitts-ID)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_end2" number="15105">
+[1-%0!05u!] Fehlerhafte IFF-Datei (EndOfChunk beim Lesen der Abschnittsgröße)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_end" number="15106">
+[1-%0!05u!] Fehlerhafte IFF-Datei (EndOfChunk beim Lesen der Abschnitts-ID)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_header" number="15107">
+[1-%0!05u!] Fehlerhafte IFF-Datei (EndOfChunk beim Lesen des Headers der
+zusammengesetzten Abschnitte)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_id" number="15108">
+[1-%0!05u!] Fehlerhafte IFF-Datei (ungültige Abschnitts-ID)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_mangled" number="15109">
+[1-%0!05u!] Fehlerhafte IFF-Datei (ausgefranste Abschnittsgrenzen).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.no_chunk_id" number="15110">
+[1-%0!05u!] Abschnitts-ID noch nicht verfügbar
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready2" number="15111">
+[1-%0!05u!] IFFByteStream ist nicht zum Schreiben von Abschnitten bereit.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready3" number="15112">
+[1-%0!05u!] IFFByteStream ist nicht zum Lesen von Bytes bereit.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready4" number="15113">
+[1-%0!05u!] IFFByteStream ist nicht zum Schreiben von Bytes bereit.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready" number="15114">
+[1-%0!05u!] IFFByteStream ist nicht zum Lesen von Abschnitten bereit.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.read_write" number="15115">
+[1-%0!05u!] Versuch, denselben IFFByteStream zu schreiben und zu lesen.
+</MESSAGE>
+<MESSAGE name="Internal.error" number="15200">
+[1-%0!05u!] Interner Fehler
+</MESSAGE>
+<MESSAGE name="IW44Image.bad_rect" number="15300">
+[1-%0!05u!] (IWMap::image) Rechteck außerhalb des zulässigen Bereichs.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_primary2" number="15302">
+[1-%0!05u!] (IWPixmap::decode_chunk) Primärer Header kann nicht gelesen werden.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_primary" number="15303">
+[1-%0!05u!] (IWBitmap::decode_chunk) Primärer Header kann nicht gelesen werden.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_secondary2" number="15304">
+[1-%0!05u!] (IWPixmap::decode_chunk) Sekundärer Header kann nicht gelesen werden.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_secondary" number="15305">
+[1-%0!05u!] (IWBitmap::decode_chunk) Sekundärer Header kann nicht gelesen werden.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_tertiary2" number="15306">
+[1-%0!05u!] (IWPixmap::decode_chunk) Tertiärer Header kann nicht gelesen werden.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_tertiary" number="15307">
+[1-%0!05u!] (IWBitmap::decode_chunk) Tertiärer Header kann nicht gelesen werden.
+</MESSAGE>
+<MESSAGE name="IW44Image.codec_open2" number="15308">
+[1-%0!05u!] (IWBitmap::decode_chunk) Codec noch immer zur Decodierung geöffnet.
+</MESSAGE>
+<MESSAGE name="IW44Image.corrupt_BM44_2" number="15312">
+[1-%0!05u!] (IWPixmap::decode_iff) Datei ist fehlerhaft (Lesen von FORM.BM44 nicht möglich)
+</MESSAGE>
+<MESSAGE name="IW44Image.corrupt_BM44" number="15313">
+[1-%0!05u!] (IWBitmap::decode_iff) Datei ist fehlerhaft (Lesen von FORM.BM44 nicht möglich)
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_object2" number="15315">
+[1-%0!05u!] (IWPixmap::encode_chunk) Objekt IWBitmap ist leer.
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_object" number="15316">
+[1-%0!05u!] (IWBitmap::encode_chunk) Objekt IWBitmap ist leer.
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_rect" number="15317">
+[1-%0!05u!] (IWMap::image) Rechteck ist leer.
+</MESSAGE>
+<MESSAGE name="IW44Image.has_color" number="15318">
+[1-%0!05u!] (IWBitmap::decode_chunk) Datei enthält ein Farbbild.
+</MESSAGE>
+<MESSAGE name="IW44Image.incompat_codec2" number="15319">
+[1-%0!05u!] (IWPixmap::decode_chunk) Datei wurde mit einem nicht
+ kompatiblen IWCodec komprimiert.
+</MESSAGE>
+<MESSAGE name="IW44Image.incompat_codec" number="15320">
+[1-%0!05u!] (IWBitmap::decode_chunk) Datei wurde mit einem nicht
+ kompatiblen IWCodec komprimiert.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open1" number="15321">
+[1-%0!05u!] (IWBitmap::encode_iff) Codec ist noch geöffnet.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open2" number="15322">
+[1-%0!05u!] (IWBitmap::decode_iff) Codec ist noch geöffnet.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open3" number="15323">
+[1-%0!05u!] (IWPixmap::encode_iff) Codec ist noch geöffnet.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open4" number="15324">
+[1-%0!05u!] (IWPixmap::decode_iff) Codec ist noch geöffnet.
+</MESSAGE>
+<MESSAGE name="IW44Image.need_stop2" number="15325">
+[1-%0!05u!] (IWPixmap::encode_chunk) Legen Sie eine Stop-Bedingung fest.
+</MESSAGE>
+<MESSAGE name="IW44Image.need_stop" number="15326">
+[1-%0!05u!] (IWBitmap::encode_chunk) Legen Sie eine Stop-Bedingung fest.
+</MESSAGE>
+<MESSAGE name="IW44Image.param_range2" number="15327">
+[1-%0!05u!] (IWPixmap::parm_dbfrac) Parameter außerhalb des Bereichs.
+</MESSAGE>
+<MESSAGE name="IW44Image.param_range" number="15328">
+[1-%0!05u!] (IWBitmap::parm_dbfrac) Parameter außerhalb des Bereichs.
+</MESSAGE>
+<MESSAGE name="IW44Image.recent_codec2" number="15329">
+[1-%0!05u!] (IWPixmap::decode_chunk) Datei wurde mit einem neueren IWCodec
+komprimiert.
+</MESSAGE>
+<MESSAGE name="IW44Image.recent_codec" number="15330">
+[1-%0!05u!] (IWBitmap::decode_chunk) Datei wurde mit einem neueren IWCodec
+komprimiert.
+</MESSAGE>
+<MESSAGE name="IW44Image.sample_factor" number="15331">
+[1-%0!05u!] (IWMap::image) Neuberechnungsfaktor wird nicht unterstützt.
+</MESSAGE>
+<MESSAGE name="IW44Image.wrong_serial2" number="15332">
+[1-%0!05u!] (IWPixmap::decode_chunk) Abschnitt verfügt nicht über erwartete
+Seriennummer.
+</MESSAGE>
+<MESSAGE name="IW44Image.wrong_serial" number="15333">
+[1-%0!05u!] (IWBitmap::decode_chunk) Abschnitt verfügt nicht über erwartete
+Seriennummer.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_dict2" number="15400">
+[1-%0!05u!] Fehlerhafte Datei: Bildmaße in JB2-Verzeichnis müssen größer als null sein.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_dict" number="15401">
+[1-%0!05u!] Größe des Formverzeichnisses entspricht nicht JB2-Daten.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_number" number="15402">
+[1-%0!05u!] (JB2Codec::CodeNum) Nummer liegt außerhalb des Bereichs.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_numcontext" number="15403">
+[1-%0!05u!] (JB2Codec::CodeNum) Ungültiger NumContext.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_parent_shape" number="15404">
+[1-%0!05u!] Übergeordnete Formnummer in JB2Shape.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_shape" number="15405">
+[1-%0!05u!] Unzulässige Fromnummer in JB2Blit.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_type" number="15406">
+[1-%0!05u!] Fehlerhafte Datei: Ungültiger Datensatztyp für Formverzeichnis.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_change" number="15407">
+[1-%0!05u!] Verzeichnisse können nach der Festlegung nicht mehr geändert werden.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_create" number="15408">
+[1-%0!05u!] Bitmap-Bild kann nicht für ein JB2Image-Objekt ohne Maße erstellt werden.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_set" number="15409">
+[1-%0!05u!] Verzeichnisse können nach dem Hinzufügen von Formen nicht mehr geändert werden.
+</MESSAGE>
+<MESSAGE name="JB2Image.need_dict" number="15410">
+[1-%0!05u!] JB2-Daten erfordern ein Formverzeichnis.
+</MESSAGE>
+<MESSAGE name="JB2Image.no_start" number="15411">
+[1-%0!05u!] Fehlerhafte Datei: Kein Startdatensatz.
+</MESSAGE>
+<MESSAGE name="JB2Image.unknown_type" number="15412">
+[1-%0!05u!] Fehlerhafte Datei: Unbekannter Datensatztyp.
+</MESSAGE>
+<MESSAGE name="JB2Image.zero_dim" number="15413">
+[1-%0!05u!] Fehlerhafte Datei: JB2-Bildmaße gleich null.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_codebook" number="15500">
+[1-%0!05u!] Nicht eindeutiges MMR-Codebuch.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_data" number="15501">
+[1-%0!05u!] Ungültige G4/MMR-Daten
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_header" number="15502">
+[1-%0!05u!] Fehlerhafter G4/MMR-Header
+</MESSAGE>
+<MESSAGE name="MMRDecoder.cant_process" number="15503">
+[1-%0!05u!] Unkomprimierte Bits können nicht in G4/MMR-Daten verarbeitet werden.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.unrecog_header" number="15504">
+[1-%0!05u!] G4/MMR-Header wurde nicht erkannt.
+</MESSAGE>
+<MESSAGE name="not_implemented_n" number="15600">
+[1-%0!05u!] %1!s! wurde nicht angewendet.
+</MESSAGE>
+<MESSAGE name="not_implemented" number="15700">
+[1-%0!05u!] Nicht angewendet.
+</MESSAGE>
+<MESSAGE name="parseoptions.ambiguous" number="15800">
+[1-%0!05u!] Nicht eindeutige Optionen: &apos;%1!s!=%2!s!&apos; und &apos;%3!s!=%4!s!
+&apos; angegeben.
+</MESSAGE>
+<MESSAGE name="parseoptions.bad_number" number="15802">
+[1-%0!05u!] &apos;%1!s!&apos; ist keine Zahl.
+</MESSAGE>
+<MESSAGE name="parseoptions.bad_value" number="15803">
+[1-%0!05u!] &apos;%1!s!&apos; ist keine Zahl und kein logischer Wert.
+</MESSAGE>
+<MESSAGE name="parseoptions.cant_inherit" number="15804">
+[1-%0!05u!] %1!s!: Fehler in Zeile %2!d! von &apos;%3!s!&apos;&#10;&#09;--
+&gt; kann unbekanntes Profil &apos;%4!s!&apos; nicht erben.
+</MESSAGE>
+<MESSAGE name="parseoptions.illegal_profile" number="15805">
+[1-%0!05u!] %1!s!: Fehler in Zeile %2!d! von Profil &apos;%3!s!&apos;&#10;
+&#09;--&gt;: Ungültiger Profilname &apos;%4!s!&apos;
+</MESSAGE>
+<MESSAGE name="parseoptions.missing_arg_option" number="15806">
+[1-%0!05u!] Argument für Option --%1!s! erforderlich.
+</MESSAGE>
+<MESSAGE name="parseoptions.profile_error" number="15807">
+[1-%0!05u!] %1!s!: Fehler in Zeile %2!d! von Profil &apos;%3!s!&apos;&#10;
+&#09;--&gt; %4!s!.
+</MESSAGE>
+<MESSAGE name="parseoptions.unrecog_option_c" number="15808">
+[1-%0!05u!] Unerkannte Option: -%1!s!.
+</MESSAGE>
+<MESSAGE name="parseoptions.unrecog_option" number="15809">
+[1-%0!05u!] Unerkannte Option: &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="STOP" number="16000">
+[1-%0!05u!] STOP-Meldung wurde nicht erfasst.
+</MESSAGE>
+<MESSAGE name="TextException.test" number="16100">
+[1-%0!05u!] Testausnahme
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_color" number="16200">
+[1-%0!05u!] Farbe %1!s! wird nicht unterstützt.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_page" number="16201">
+[1-%0!05u!] Angegebene Seite nicht gefunden.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_rect" number="16202">
+[1-%0!05u!] Zu wenig Koordinaten für rechteckingen Bereich.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_circle" number="16203">
+[1-%0!05u!] Zu wenig Koordinaten für rechteckingen Bereich.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_oval" number="16204">
+[1-%0!05u!] Zu wenig Koordinaten für ovalen Bereich.
+</MESSAGE>
+<MESSAGE name="XMLAnno.unknown_shape" number="16205">
+[1-%0!05u!] Unbekannte Form: %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLAnno.unknown_border" number="16206">
+[1-%0!05u!] Nicht erkannter Randtyp: %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLAnno.extra_body" number="16207">
+[1-%0!05u!] Es ist ein komplettes Paar der Tags &lt;BODY&gt;&lt;/BODY&gt; erforderlich.
+</MESSAGE>
+<MESSAGE name="XMLAnno.no_body" number="16208">
+[1-%0!05u!] Es wurde kein Paar der Tags &lt;BODY&gt;&lt;/BODY&gt; gefunden.
+</MESSAGE>
+<MESSAGE name="XMLAnno.map_find" number="16209">
+[1-%0!05u!] Angegebenes Map %1!s! nicht gefunden.
+</MESSAGE>
+<MESSAGE name="XMLAnno.fail_init" number="16210">
+[1-%0!05u!] %1!s! konnte nicht initialisiert werden.
+</MESSAGE>
+<MESSAGE name="XMLTags.no_GP" number="16300">
+[1-%0!05u!] Nicht durch einen GP-Zeiger gesichert.
+</MESSAGE>
+<MESSAGE name="XMLTags.raw_string" number="16301">
+[1-%0!05u!] Roher String '%1!s!' außerhalb des Dokumentbereichs gefunden.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_tag" number="16302">
+[1-%0!05u!] Tag %1!s! ohne Ende.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_PI" number="16303">
+[1-%0!05u!] Verarbeitsungsanweisung ohne Ende: %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_comment" number="16304">
+[1-%0!05u!] Kommentar ohne Ende: %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_form" number="16305">
+[1-%0!05u!] Überformatierungsfehler: Zu viele End-Tags.
+</MESSAGE>
+<MESSAGE name="XMLTags.no_body" number="16306">
+[1-%0!05u!] Kein BODY.
+</MESSAGE>
+<MESSAGE name="XMLTags.unmatched_end" number="16307">
+[1-%0!05u!] XML-Tag &apos;%1!s!&apos; in Zeile %2!u! wurde durch das XML-Tag
+tag &apos;%3!s!&apos; in Zeile %4!u! beendet.
+</MESSAGE>
+<MESSAGE name="ZPCodec.no_encoding" number="16400">
+[1-%0!05u!] Es wurde kein ZPCodec für die Codierung erstellt.
+</MESSAGE>
+<MESSAGE name="ZPCodec.write_error" number="16401">
+[1-%0!05u!] ZPCodec-Schreibfehler
+</MESSAGE>
+</BODY>
+</DjVuMessages>
+
+ 
\ No newline at end of file
diff --git a/share/djvu/osi/de/messages.xml b/share/djvu/osi/de/messages.xml
new file mode 100644
index 0000000..dfc1d25
--- /dev/null
+++ b/share/djvu/osi/de/messages.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- List of files to include to get the entire list of messages -->
+<DjVuMessages>
+<HEAD>
+<!-- Message numbers 17000-19999 -->
+<INCLUDE name="../en/djvutools-reference.xml" />
+<!-- Message numbers 10000-16999 -->
+<INCLUDE name="libdjvu++.xml" />
+</HEAD>
+<BODY>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/en/djvutools-reference.xml b/share/djvu/osi/en/djvutools-reference.xml
new file mode 100644
index 0000000..67d9431
--- /dev/null
+++ b/share/djvu/osi/en/djvutools-reference.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- Error messages from the reference library -->
+<DjVuMessages>
+<BODY>
+<MESSAGE name="annotate.failed_chunk" number="17000" 
+  value="[%0!05d!] Failed to find chunk %1!d! in the source file." />
+<MESSAGE name="annotate.failed_stat" number="17001" 
+  value="[%0!05d!] Failed to stat annotation file." />
+<MESSAGE name="annotate.usage" number="17002" 
+  value="[%0!05d!] usage:&#10;    annotate -extract|-insert &lt;djvu_in&gt; &lt;ant_file&gt; [&lt;djvu_out&gt;]&#10;or  annotate -remove &lt;djvu_in&gt; [&lt;djvu_out&gt;]." />
+<MESSAGE name="c44.bitrate_not_number"  number="17500"
+  value="[1-%0!05u!] illegal bitrate specification (number expected)" />
+<MESSAGE name="c44.bitrate_out_of_range"  number="17501"
+  value="[1-%0!05u!] illegal bitrate specification (number out of range)" />
+<MESSAGE name="c44.bitrate_comma_expected"  number="17502"
+  value="[1-%0!05u!] illegal bitrate specification (comma or plus expected)" />
+<MESSAGE name="c44.bitrate_too_many"  number="17503"
+  value="[1-%0!05u!] illegal bitrate specification (too many chunks)" />
+<MESSAGE name="c44.bitrate_no_chunks"  number="17504"
+  value="[1-%0!05u!] illegal bitrate specification (no chunks)" />
+<MESSAGE name="c44.no_bpp_arg" number="17505"
+  value="[1-%0!05u!] no argument for option '-bpp'" />
+<MESSAGE name="c44.multiple_bitrate" number="17506"
+  value="[1-%0!05u!] multiple bitrate specification" />
+<MESSAGE name="c44.size_not_number"  number="17510"
+  value="[1-%0!05u!] illegal size specification (number expected)" />
+<MESSAGE name="c44.size_out_of_range"  number="17511"
+  value="[1-%0!05u!] illegal size specification (number out of range)" />
+<MESSAGE name="c44.size_comma_expected"  number="17512"
+  value="[1-%0!05u!] illegal size specification (comma or plus expected)" />
+<MESSAGE name="c44.size_too_many"  number="17513"
+  value="[1-%0!05u!] illegal size specification (too many chunks)" />
+<MESSAGE name="c44.size_no_chunks"  number="17514"
+  value="[1-%0!05u!] illegal size specification (no chunks)" />
+<MESSAGE name="c44.no_size_arg" number="17515"
+  value="[1-%0!05u!] no argument for option '-size'" />
+<MESSAGE name="c44.multiple_size" number="17516"
+  value="[1-%0!05u!] multiple size specification" />
+<MESSAGE name="c44.slice_not_number"  number="17520"
+  value="[1-%0!05u!] illegal slice specification (number expected)" />
+<MESSAGE name="c44.slice_out_of_range"  number="17521"
+  value="[1-%0!05u!] illegal slice specification (number out of range)" />
+<MESSAGE name="c44.slice_comma_expected"  number="17522"
+  value="[1-%0!05u!] illegal slice specification (comma or plus expected)" />
+<MESSAGE name="c44.slice_too_many"  number="17523"
+  value="[1-%0!05u!] illegal slice specification (too many chunks)" />
+<MESSAGE name="c44.slice_no_chunks"  number="17524"
+  value="[1-%0!05u!] illegal slice specification (no chunks)" />
+<MESSAGE name="c44.no_slice_arg" number="17525"
+  value="[1-%0!05u!] no argument for option '-slice'" />
+<MESSAGE name="c44.multiple_slice" number="17526"
+  value="[1-%0!05u!] multiple slice specification" />
+<MESSAGE name="c44.decibel_not_number"  number="17530"
+  value="[1-%0!05u!] illegal decibel specification (number expected)" />
+<MESSAGE name="c44.decibel_out_of_range"  number="17531"
+  value="[1-%0!05u!] illegal decibel specification (number out of range)" />
+<MESSAGE name="c44.decibel_comma_expected"  number="17532"
+  value="[1-%0!05u!] illegal decibel specification (comma or plus expected)" />
+<MESSAGE name="c44.decibel_too_many"  number="17533"
+  value="[1-%0!05u!] illegal decibel specification (too many chunks)" />
+<MESSAGE name="c44.decibel_no_chunks"  number="17534"
+  value="[1-%0!05u!] illegal decibel specification (no chunks)" />
+<MESSAGE name="c44.no_decibel_arg" number="17535"
+  value="[1-%0!05u!] no argument for option '-decibel'" />
+<MESSAGE name="c44.multiple_decibel" number="17537"
+  value="[1-%0!05u!] multiple decibel specification" />
+<MESSAGE name="c44.no_mask_arg" number="17540"
+  value="[1-%0!05u!] no argument for option '-mask'" />
+<MESSAGE name="c44.multiple_mask" number="17541"
+  value="[1-%0!05u!] multiple mask specification" />
+<MESSAGE name="c44.no_dbfrac_arg" number="17542"
+  value="[1-%0!05u!] no argument for option '-dbfrac'" />
+<MESSAGE name="c44.multiple_dbfrac" number="17543"
+  value="[1-%0!05u!] multiple dbfrac specification" />
+<MESSAGE name="c44.illegal_dbfrac" number="17544"
+  value="[1-%0!05u!] illegal dbfrac specification" />
+<MESSAGE name="c44.no_crcbdelay_arg" number="17545"
+  value="[1-%0!05u!] no argument for option '-crcbdelay'" />
+<MESSAGE name="c44.illegal_crcbdelay" number="17546"
+  value="[1-%0!05u!] illegal argument for option '-crcbdelay'" />
+<MESSAGE name="c44.no_dpi_arg" number="17547"
+  value="[1-%0!05u!] no argument for option '-dpi'" />
+<MESSAGE name="c44.illegal_dpi" number="17548"
+  value="[1-%0!05u!] illegal argument for option '-dpi'" />
+<MESSAGE name="c44.duplicate_dpi" number="17549"
+  value="[1-%0!05u!] duplicate argument for option '-dpi'" />
+<MESSAGE name="c44.no_gamma_arg" number="17550"
+  value="[1-%0!05u!] no argument for option '-gamma'" />
+<MESSAGE name="c44.illegal_gamma" number="17551"
+  value="[1-%0!05u!] illegal argument for option '-gamma'" />
+<MESSAGE name="c44.duplicate_gamma" number="17552"
+  value="[1-%0!05u!] duplicate argument for option '-gamma'" />
+<MESSAGE name="c44.incompatable_chrominance" number="17553"
+  value="[1-%0!05u!] incompatible chrominance options" />
+<MESSAGE name="c44.different_size" number="17554"
+  value="[1-%0!05u!] mask and image have different size" />
+<MESSAGE name="c44.exclusive" number="17555"
+  value="[1-%0!05u!] options -bpp and -size are exclusive" />
+<MESSAGE name="c44.failed_pnm_header" number="17556"
+  value="[1-%0!05u!] cannot read pnm file header" />
+<MESSAGE name="c44.unrecognized" number="17557"
+  value="[1-%0!05u!] unrecognized file" />
+<MESSAGE name="c44.failed_mask" number="17558"
+  value="[1-%0!05u!] cannot apply mask on an already compressed image" />
+<MESSAGE name="djthumb.one_page" number="17600"
+  value="[1-%0!05u!] Thumbnails cannot be generated for one-page documents." />
+<MESSAGE name="djthumb.new_size" number="17601"
+  value="[1-%0!05u!] Document size has increased %!d!%% (from %1!d! to %2!d!)." />
+<MESSAGE name="djthumb.size" number="17602"
+  value="[1-%0!05u!] Thumbnail size is %1!d!." />
+<MESSAGE name="ddjvu.bad_page" number="17700"
+  value="[1-%0!05u!] Illegal argument for option '-page'." />
+<MESSAGE name="ddjvu.bad_scale" number="17701"
+  value="[1-%0!05u!] Illegal argument for option '-scale'." />
+<MESSAGE name="ddjvu.bad_size" number="17702"
+  value="[1-%0!05u!] Illegal argument for option '-size'." />
+<MESSAGE name="ddjvu.bilevel" number="17703"
+  value="This is a legal Bitonal DjVu image." />
+<MESSAGE name="ddjvu.cant_render" number="17704"
+  value="[1-%0!05u!] Cannot render the requested image." />
+<MESSAGE name="ddjvu.compound" number="17705"
+  value="This is a legal Compound DjVu image." />
+<MESSAGE name="ddjvu.decode" number="17706"
+  value="Decoding time: %1!lu! ms" />
+<MESSAGE name="ddjvu.dupl_page" number="17707"
+  value="[1-%0!05u!] Duplicate page number specification." />
+<MESSAGE name="ddjvu.dupl_render" number="17708"
+  value="[1-%0!05u!] Duplicate rendering mode specification." />
+<MESSAGE name="ddjvu.dupl_scale" number="17709"
+  value="[1-%0!05u!] Duplicate scale specification." />
+<MESSAGE name="ddjvu.dupl_seg" number="17710"
+  value="[1-%0!05u!] Duplicate segment specification." />
+<MESSAGE name="ddjvu.dupl_size" number="17711"
+  value="[1-%0!05u!] Duplicate size specification." />
+<MESSAGE name="ddjvu.failed" number="17712"
+  value="[1-%0!05u!] Decoding failed. Nothing can be done." />
+<MESSAGE name="ddjvu.memory" number="17713"
+  value="Direct memory usage is %1!4.1f! Kb." />
+<MESSAGE name="ddjvu.no_info" number="17714"
+  value="[1-%0!05u!] Cannot find INFO chunk." />
+<MESSAGE name="ddjvu.no_page" number="17715"
+  value="[1-%0!05u!] No argument for option '-page'." />
+<MESSAGE name="ddjvu.no_scale" number="17716"
+  value="[1-%0!05u!] No argument for option '-scale'." />
+<MESSAGE name="ddjvu.no_seg" number="17717"
+  value="[1-%0!05u!] No argument for option '-segment'." />
+<MESSAGE name="ddjvu.no_size" number="17718"
+  value="[1-%0!05u!] No argument for option '-size'." />
+<MESSAGE name="ddjvu.photo" number="17719"
+  value="This is a legal Photo DjVu image." />
+<MESSAGE name="ddjvu.render" number="17720"
+  value="Rendering time: %1!lu! ms." />
+<MESSAGE name="ddjvu.syntax" number="17721"
+  value="[1-%0!05u!] Syntax error in geometry specification." />
+<MESSAGE name="cjb2.ccs_after" number="17800"
+  value="cjb2: %1!d! ccs after merging/splitting." />
+<MESSAGE name="cjb2.ccs_before" number="17801"
+  value="cjb2: %1!d! ccs after preprocessing." />
+<MESSAGE name="cjb2.runs" number="17802"
+  value="cjb2: %1!d! runs." />
+<MESSAGE name="cjb2.shapes" number="17803"
+  value="cjb2: %1!d! shapes after matching (%2!d! are cross-coded)." />
+<MESSAGE name="cpaldjvu.bkgnd" number="17900"
+  value="cpaldjvu: background color is #%1!02x!%2!02x!%3!02x!." />
+<MESSAGE name="cpaldjvu.ccs_after" number="17901"
+  value="cpaldjvu: %1!d! ccs after merging/splitting." />
+<MESSAGE name="cpaldjvu.ccs_before" number="17902"
+  value="cpaldjvu: %1!d! ccs." />
+<MESSAGE name="cpaldjvu.color_runs" number="17903"
+  value="cpaldjvu: %1!d! color runs." />
+<MESSAGE name="cpaldjvu.cross_code" number="17904"
+  value="cpaldjvu: %1!d! shapes after matching (%2!d! are cross-coded)." />
+<MESSAGE name="cpaldjvu.quantizied" number="17905"
+  value="cpaldjvu: image %1!d!x%2!d! quantized to %3!d! colors." />
+<MESSAGE name="csepdjvu.analyzed" number="18000"
+  value="csepdjvu: %1!d! ccs after cc analysis." />
+<MESSAGE name="csepdjvu.bilevel" number="18001"
+  value="csepdjvu: encoding as a bitonal image." />
+<MESSAGE name="csepdjvu.color" number="18002"
+  value="csepdjvu: encoding as a full color image." />
+<MESSAGE name="csepdjvu.cross_code" number="18003"
+  value="csepdjvu: %1!d! shapes after matching (%2!d! are cross-coded)." />
+<MESSAGE name="csepdjvu.gray_bg" number="18004"
+  value="csepdjvu: encoding with a gray level background." />
+<MESSAGE name="csepdjvu.merge_split" number="18005"
+  value="csepdjvu: %1!d! ccs after merging/splitting." />
+<MESSAGE name="csepdjvu.reduction" number="18006"
+  value="csepdjvu: found background (reduction=%1!d!)" />
+<MESSAGE name="csepdjvu.summary" number="18007"
+  value="csepdjvu: %1!d!x%2!d! foreground, %3!d! colors, %4!d! runs." />
+<MESSAGE name="csepdjvu.white_bg" number="18008"
+  value="csepdjvu: encoding with a white background." />
+<MESSAGE name="color.color" number="18101"
+  value="color" />
+<MESSAGE name="color.gray" number="18102"
+  value="gray" />
+<MESSAGE name="d44.summary" number="18100">
+image: %1!s! %2!d! x %3!d!
+times: %4!d!ms (decoding) + %5!d!ms (rendering)
+memory: %6!d!kB (%7!d!%% active coefficients)
+</MESSAGE>
+<MESSAGE name="DjVuToXML.negative_num" number="18201"
+  value="[1-%0!05u!] djvutoxml: negative number after option '-page'." />
+<MESSAGE name="DjVuToXML.no_name" number="18202"
+  value="[1-%0!05u!] djvutoxml: unspecified input file name." />
+<MESSAGE name="DjVuToXML.no_num" number="18203"
+  value="[1-%0!05u!] djvutoxml: missing page number after option '-page'." />
+<MESSAGE name="DjVuToXML.std_read" number="18204"
+  value="[1-%0!05u!] djvutoxml: cannot process standard input." />
+<MESSAGE name="DjVuToXML.unrecog_opt" number="18205"
+  value="[1-%0!05u!] djvutoxml: unrecognized option '%1!s!'." />
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/en/libdjvu++.xml b/share/djvu/osi/en/libdjvu++.xml
new file mode 100644
index 0000000..d0be9e1
--- /dev/null
+++ b/share/djvu/osi/en/libdjvu++.xml
@@ -0,0 +1,1340 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- Messages from libdjvu++ -->
+<DjVuMessages>
+<BODY>
+<MESSAGE name="DjVuMessage.Unrecognized" number="10000">
+[1-%0!05u!] Unrecognized message:
+	Message name: %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuMessage.Parameter" number="10001">
+&#09;Parameter: %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuMessage.failed_to_parse_XML" number="10002">
+[1-%0!05u!] Failed to parse XML message file:
+	&apos;%1!s!&apos;.
+</MESSAGE>
+<MESSAGE name="DjVuText.corrupt_text" number="10100">
+[1-%0!05u!] Text layer hierarchy is corrupt"
+</MESSAGE>
+<MESSAGE name="DjVuText.no_text" number="10101">
+[1-%0!05u!] Text expected but not found.
+</MESSAGE>
+<MESSAGE name="DjVuText.corrupt_chunk" number="10102">
+[1-%0!05u!] File chunk corrupt -- too short.
+</MESSAGE>
+<MESSAGE name="DjVuText.bad_version" number="10103">
+[1-%0!05u!] Text version '%1!c!' unexpected.
+</MESSAGE>
+<MESSAGE name="DjVuText.one_word" number="10104">
+[1-%0!05u!] Separator found in the middle of a word.
+</MESSAGE>
+<MESSAGE name="DjVuText.dupl_text" number="10105">
+[1-%0!05u!] More than one text layer found.
+</MESSAGE>
+<MESSAGE name="arrays.ill_arg" number="11500">
+[1-%0!05u!] Illegal arguments in DArray::del.
+</MESSAGE>
+<MESSAGE name="arrays.ill_sub" number="11501">
+[1-%0!05u!] Illegal DArray subscript.
+</MESSAGE>
+<MESSAGE name="arrays.resize" number="11502">
+[1-%0!05u!] Invalid low and high bounds in DArray resize.
+</MESSAGE>
+<MESSAGE name="bad_arg" number="11600">
+[1-%0!05u!] Illegal argument in %1!s!.
+</MESSAGE>
+<MESSAGE name="ByteStream.backward" number="11700">
+[1-%0!05u!] Seeking backwards is not supported by this ByteStream.
+</MESSAGE>
+<MESSAGE name="ByteStream.bad_arg" number="11701">
+[1-%0!05u!] Illegal argument in ByteStream::seek.
+</MESSAGE>
+<MESSAGE name="ByteStream.bad_mode" number="11703">
+[1-%0!05u!] Illegal mode in StdioByteStream.
+</MESSAGE>
+<MESSAGE name="ByteStream.cant_write" number="11704">
+[1-%0!05u!] Cannot write to BSByteStream created for decoding.
+</MESSAGE>
+<MESSAGE name="ByteStream.corrupt" number="11705">
+[1-%0!05u!] Corrupted decoder input.
+</MESSAGE>
+<MESSAGE name="ByteStream.flush_error" number="11707">
+[1-%0!05u!] StdioByteStream::flush, flush error.
+</MESSAGE>
+<MESSAGE name="ByteStream.no_read" number="11708">
+[1-%0!05u!] StdioByteStream not opened for reading.
+</MESSAGE>
+<MESSAGE name="ByteStream.no_write" number="11709">
+[1-%0!05u!] StdioByteStream not opened for writing.
+</MESSAGE>
+<MESSAGE name="ByteStream.open_fail2" number="11710">
+[1-%0!05u!] StdioByteStream::StdioByteStream, failed to open file.
+</MESSAGE>
+<MESSAGE name="ByteStream.open_fail" number="11711">
+[1-%0!05u!] Failed to open &apos;%1!s!&apos;: %2!s!.
+</MESSAGE>
+<MESSAGE name="ByteStream.read_error2" number="11712">
+[1-%0!05u!] StdioByteStream::read, read error.
+</MESSAGE>
+<MESSAGE name="ByteStream.read_error" number="11713">
+[1-%0!05u!] ByteStream::readall, read error.
+</MESSAGE>
+<MESSAGE name="ByteStream.seek_error2" number="11714">
+[1-%0!05u!] Attempt to seek before the beginning of the file.
+</MESSAGE>
+<MESSAGE name="ByteStream.seek_error" number="11715">
+[1-%0!05u!] StdioByteStream::seek, seek error.
+</MESSAGE>
+<MESSAGE name="ByteStream.seek" number="11716">
+[1-%0!05u!] Seeking works funny on this ByteStream (ftell() acts strange).
+</MESSAGE>
+<MESSAGE name="ByteStream.write" number="11717">
+[1-%0!05u!] ByteStream::write%1!s!, write error.
+</MESSAGE>
+<MESSAGE name="ByteStream.write_error2" number="11718">
+[1-%0!05u!] StdioByteStream::write, write error.
+</MESSAGE>
+<MESSAGE name="ByteStream.write_error" number="11720">
+[1-%0!05u!] Unknown error in ByteStream::write.
+</MESSAGE>
+<MESSAGE name="ByteStream.not_implemented" number="11721">
+[1-%0!05u!] ByteStream::scanf is not implemented.
+</MESSAGE>
+<MESSAGE name="DataPool.add_data" number="11800">
+[1-%0!05u!] Function DataPool::add_data() may not be called for connected
+DataPools.
+</MESSAGE>
+<MESSAGE name="DataPool.bad_length" number="11801">
+[1-%0!05u!] The length must be positive.
+</MESSAGE>
+<MESSAGE name="DataPool.bad_size" number="11802">
+[1-%0!05u!] Size must be non negative.
+</MESSAGE>
+<MESSAGE name="DataPool.connected1" number="11803">
+[1-%0!05u!] Already connected to another DataPool.
+</MESSAGE>
+<MESSAGE name="DataPool.connected2" number="11804">
+[1-%0!05u!] Already connected to a file.
+</MESSAGE>
+<MESSAGE name="DataPool.neg_start" number="11805">
+[1-%0!05u!] The start offset of the range may not be negative.
+</MESSAGE>
+<MESSAGE name="DataPool.no_threadless" number="11806">
+[1-%0!05u!] Internal error. This function can &apos;t be used in threadless
+mode.
+</MESSAGE>
+<MESSAGE name="DataPool.reenter" number="11807">
+[1-%0!05u!] DATA_POOL_REENTER.
+</MESSAGE>
+<MESSAGE name="DataPool.seek_backward" number="11808">
+[1-%0!05u!] Seeking backwards from EOF is not supported by this ByteStream.
+</MESSAGE>
+<MESSAGE name="DataPool.zero_DataPool" number="11809">
+[1-%0!05u!] Internal error: ZERO DataPool passed as input.
+</MESSAGE>
+<MESSAGE name="DjVmDir0.no_slash" number="11900">
+[1-%0!05u!] File name may not contain slashes.
+</MESSAGE>
+<MESSAGE name="DjVmDir.bad_dir" number="12000">
+[1-%0!05u!] The directory contains both indirect and bundled records.
+</MESSAGE>
+<MESSAGE name="DjVmDir.bad_file" number="12001">
+[1-%0!05u!] DjVm File ID &apos;%1!s!&apos; contains illegal character(s).
+</MESSAGE>
+<MESSAGE name="DjVmDir.corrupt" number="12002">
+[1-%0!05u!] DjVu document is corrupt. There may be only one file
+with shared annotations in a multipage document.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_id2" number="12003">
+[1-%0!05u!] File with ID &apos;%1!s!&apos; already exists in the DJVM
+directory.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_id" number="12004">
+[1-%0!05u!] Error in &apos;DIRM&apos; chunk: two records for the same ID
+&apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_name2" number="12005">
+[1-%0!05u!] File with NAME &apos;%1!s!&apos; already exists in the DJVM
+directory.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_name" number="12006">
+[1-%0!05u!] Error in &apos;DIRM&apos; chunk: two records for the same NAME
+&apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_title2" number="12007">
+[1-%0!05u!] File with TITLE &apos;%1!s!&apos; already exists in the DJVM
+directory.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_title" number="12008">
+[1-%0!05u!] Error in &apos;DIRM&apos; chunk: two records for the same TITLE
+&apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.get_str_type" number="12009">
+[1-%0!05u!] Internal error: please modify DjVmDir::File::get_str_type()
+to contain all possible File types.
+</MESSAGE>
+<MESSAGE name="DjVmDir.multi_save2" number="12010">
+[1-%0!05u!] Current DjVu multipage format does not support
+more than one file with shared annotations.
+</MESSAGE>
+<MESSAGE name="DjVmDir.multi_save" number="12011">
+[1-%0!05u!] Cannot save a multipage document containing more than one file
+with shared annotations.
+</MESSAGE>
+<MESSAGE name="DjVmDir.name_in_use" number="12012">
+[1-%0!05u!] Name &apos;%1!s!&apos; is already in use.
+</MESSAGE>
+<MESSAGE name="DjVmDir.no_indirect" number="12013">
+[1-%0!05u!] Directory error: no indirect entries allowed in bundled document.
+</MESSAGE>
+<MESSAGE name="DjVmDir.no_info" number="12014">
+[1-%0!05u!] Nothing is known about file with ID &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDir.title_in_use" number="12015">
+[1-%0!05u!] Title &apos;%1!s!&apos; is already in use.
+</MESSAGE>
+<MESSAGE name="DjVmDir.version_error" number="12016">
+[1-%0!05u!] Unable to read DJVM directories of versions higher than %1!s!.
+Data version number is %2!s!.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_delete" number="12100">
+[1-%0!05u!] There is no file with ID &apos;%1!s!&apos; to delete.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_find" number="12101">
+[1-%0!05u!] Can&apos;t find file with ID &apos;%1!s!&apos;.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_read_indr" number="12102">
+[1-%0!05u!] Can&apos;t read indirect DjVm documents from DataPools or
+ByteStreams.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_data" number="12103">
+[1-%0!05u!] Strange: there is no data for file &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_dirm_chunk" number="12104">
+[1-%0!05u!] The first chunk of a DJVM document must be DIRM: must be an old
+format.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_duplicate" number="12105">
+[1-%0!05u!] Attempt to insert the same file twice.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_form_djvm2" number="12106">
+[1-%0!05u!] Can&apos;t find form DJVM. The document is not in new multipage
+format.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_form_djvm" number="12107">
+[1-%0!05u!] Can&apos;t find form DJVM in the input data.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.not_IFF" number="12108">
+[1-%0!05u!] File &apos;%1!s!&apos; is not in IFF format.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_zero_file" number="12109">
+[1-%0!05u!] Can&apos;t insert ZERO file.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.zero_file" number="12110">
+[1-%0!05u!] Strange: File size is zero.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_type" number="12200">
+[1-%0!05u!] GLObject(): Wrong object type passed. Should be either STRING or
+SYMBOL.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_url" number="12201">
+[1-%0!05u!] Invalid URL specification.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_zoom" number="12203">
+[1-%0!05u!] Illegal zoom specification.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2list" number="12207">
+[1-%0!05u!] Invalid object type. Can&apos;t convert to list.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2number" number="12208">
+[1-%0!05u!] Invalid object type. Can&apos;t convert to number.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2string" number="12209">
+[1-%0!05u!] Invalid object type. Can&apos;t convert to string.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2symbol" number="12210">
+[1-%0!05u!] Invalid object type. Can&apos;t convert to symbol.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2number" number="12211">
+[1-%0!05u!] Invalid object type. Can&apos;t convert compound object
+&apos;%1!s!&apos; to number.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2string" number="12212">
+[1-%0!05u!] Invalid object type. Can&apos;t convert compound object
+&apos;%1!s!&apos; to string.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2symbol" number="12213">
+[1-%0!05u!] Invalid object type. Can&apos;t convert compound object
+&apos;%1!s!&apos; to symbol.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_number" number="12214">
+[1-%0!05u!] Error occurred when parsing contents of object &apos;%1!s!&apos;:
+&apos;(&apos; must be followed by object name, not by number.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_paren" number="12215">
+[1-%0!05u!] Error occurred when parsing contents of object &apos;%1!s!&apos;:
+&apos;(&apos; must be followed by object name, not by parenthesis.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_string" number="12216">
+[1-%0!05u!] Error occurred when parsing contents of object &apos;%1!s!&apos;:
+&apos;(&apos; must be followed by object name, not by string.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2list" number="12218">
+[1-%0!05u!] Invalid object type. Can&apos;t convert number &apos;%1!d!&apos;
+to compound object.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2string" number="12219">
+[1-%0!05u!] Invalid object type. Can&apos;t convert number &apos;%1!d!&apos;
+to string.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2symbol" number="12220">
+[1-%0!05u!] Invalid object type. Can&apos;t convert number &apos;%1!d!&apos;
+to symbol.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.paren" number="12222">
+[1-%0!05u!] Error occurred when parsing contents of object
+&apos;%1!s!&apos;:
+&apos;(&apos; must be IMMEDIATELY followed by an object name.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2list" number="12223">
+[1-%0!05u!] Invalid object type. Can&apos;t convert string &apos;%1!s!&apos;
+to compound object.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2number" number="12224">
+[1-%0!05u!] Invalid object type. Can&apos;t convert string &apos;%1!s!&apos;
+to number.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2symbol" number="12225">
+[1-%0!05u!] Invalid object type. Can&apos;t convert string &apos;%1!s!&apos;
+to symbol.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2list" number="12226">
+[1-%0!05u!] Invalid object type. Can&apos;t convert symbol &apos;%1!s!&apos;
+to compound object.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2number" number="12227">
+[1-%0!05u!] Invalid object type. Can&apos;t convert symbol &apos;%1!s!&apos;
+to number.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2string" number="12228">
+[1-%0!05u!] Invalid object type. Can&apos;t convert symbol &apos;%1!s!&apos;
+to string.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.too_few" number="12229">
+[1-%0!05u!] Too few elements in &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.bad_page" number="12300">
+[1-%0!05u!] Page number %1!d! is invalid.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.cant_save2" number="12301">
+[1-%0!05u!] Can&apos;t &apos;Save&apos; the document in the requested
+format. Use &apos;Save As&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.cant_save" number="12302">
+[1-%0!05u!] Can&apos;t save the document. Use &apos;Save As&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.create_fail" number="12303">
+[1-%0!05u!] Failed to create file with ID &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.dir_fail" number="12304">
+[1-%0!05u!] Failed to create directory &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.init" number="12305">
+[1-%0!05u!] DjVuDocEditor has already been initialized.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_codec" number="12306">
+[1-%0!05u!] Failed to load compression codec.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_file" number="12307">
+[1-%0!05u!] There is no file with ID &apos;%1!s!&apos; in this document.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.not_1_page" number="12308">
+[1-%0!05u!] File &apos;%1!s!&apos; is not a single page DjVu file.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_thumb" number="12309">
+[1-%0!05u!] Internal error: Can&apos;t find thumbnail for page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.not_init" number="12310">
+[1-%0!05u!] DjVuDocEditor should have been initialized before used.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.open_fail" number="12311">
+[1-%0!05u!] Failed to open document &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.page_fail" number="12312">
+[1-%0!05u!] Internal error: unable to get page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.page_num" number="12313">
+[1-%0!05u!] Invalid page number %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.render" number="12314">
+[1-%0!05u!] Unable to render image of page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.share_fail" number="12315">
+[1-%0!05u!] Attempt to create another file with shared annotations failed.
+There may be only one such file in a multipage document.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.2nd_init" number="12400">
+[1-%0!05u!] DjVuDocument cannot be initialized twice.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.bad_format" number="12401">
+[1-%0!05u!] Unknown document format. Can&apos;t decode.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.bad_thumb" number="12402">
+[1-%0!05u!] Corrupted thumbnails.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.big_num" number="12403">
+[1-%0!05u!] Page number is too big.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.cant_extract" number="12405">
+[1-%0!05u!] Failed to extract predecoded thumbnails:.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.cant_render" number="12406">
+[1-%0!05u!] Unable to render page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.comp_codec" number="12407">
+[1-%0!05u!] Compression codec not loaded.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.empty_url" number="12408">
+[1-%0!05u!] Empty URL passed to DjVuDocument.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.exclude_page" number="12409">
+[1-%0!05u!] Excluding page %1!d! from the file list due to errors.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.fail_URL" number="12411">
+[1-%0!05u!] Failed to get data for URL &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuDocument.file_outside" number="12412">
+[1-%0!05u!] File &apos;%1!s!&apos; is not in this bundle.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.init_eof" number="12413">
+[1-%0!05u!] Unexpected End Of File encountered during document initialization.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.init_not_done" number="12414">
+[1-%0!05u!] Document has not been completely initialized yet.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.miss_page_name" number="12415">
+[1-%0!05u!] Page with name &apos;%1!s!&apos; is not in this document.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.miss_page_num" number="12416">
+[1-%0!05u!] Page &apos;%1!d!&apos; does not exist in this document.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_dir" number="12417">
+[1-%0!05u!] Single page documents don&apos;t have a DjVm directory.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_file" number="12418">
+[1-%0!05u!] The requested file does not exist.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_page" number="12419">
+[1-%0!05u!] Failed to find any page in this document.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_DjVu" number="12420">
+[1-%0!05u!] The requested input is not a DjVu File.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_init" number="12421">
+[1-%0!05u!] DjVuDocument is not initialized.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_secure" number="12422">
+[1-%0!05u!] DjVuDocument is not secured by a GP&lt;DjVuDocument&gt;
+</MESSAGE>
+<MESSAGE name="DjVuDocument.obsolete" number="12423">
+[1-%0!05u!] The document is in obsolete format.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.old_bundle" number="12424">
+[1-%0!05u!] Only OLD_BUNDLED documents have DjVm v.0 directory.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.stopped" number="12425">
+[1-%0!05u!] DjVuDocument init thread STOPped.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.unk_type" number="12426">
+[1-%0!05u!] Unknown document type.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.URL_outside2" number="12427">
+[1-%0!05u!] URL &apos;%1!s!&apos; points outside of the INDIRECT document.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.URL_outside" number="12428">
+[1-%0!05u!] URL &apos;%1!s!&apos; points outside of the bundled document.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.skip_page" number="12429">
+[1-%0!05u!] Skipping page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuFile.2nd_init" number="12500">
+[1-%0!05u!] DjVuFile is already initialized.
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_BG44" number="12501">
+[1-%0!05u!] DjVu Decoder: Corrupted data (Incorrect size in BG44 chunk).
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_dupl" number="12502">
+[1-%0!05u!] DjVu Decoder: Corrupted file (Duplicate INFO chunk).
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_INFO" number="12503">
+[1-%0!05u!] DjVu Decoder: Corrupted file (Found INFO chunk in FORM:DJVI).
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_missing_info" number="12504">
+[1-%0!05u!] DjVu Decoder: Corrupted data (Missing INFO chunk).
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_missing_IW44" number="12505">
+[1-%0!05u!] DjVu Decoder: Corrupted data (Missing IW44 data chunks).
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_zero" number="12506">
+[1-%0!05u!] DjVu Decoder: Corrupted file (image size is zero).
+</MESSAGE>
+<MESSAGE name="DjVuFile.decode_fail" number="12507">
+[1-%0!05u!] Decode of an included file failed.
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_backgrnd" number="12508">
+[1-%0!05u!] DjVu Decoder: Corrupted data (Duplicate background layer).
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_Dxxx" number="12509">
+[1-%0!05u!] DjVu Decoder: Corrupted data (Duplicate Dxxx chunk).
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_foregrnd" number="12510">
+[1-%0!05u!] DjVu Decoder: Corrupted data (Duplicate foreground color info).
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_Sxxx" number="12511">
+[1-%0!05u!] DjVu Decoder: Corrupted data (Duplicate Sxxx chunk).
+</MESSAGE>
+<MESSAGE name="DjVuFile.Dxxx_after_Sxxx" number="12512">
+[1-%0!05u!] Decoder: Corrupted data (Dxxx chunk found after Sxxx chunk).
+</MESSAGE>
+<MESSAGE name="DjVuFile.empty_URL" number="12513">
+[1-%0!05u!] Empty URL passed to DjVuFile.
+</MESSAGE>
+<MESSAGE name="DjVuFile.EOF" number="12514">
+[1-%0!05u!] Unexpected End Of File Encountered Reading:
+	%1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuFile.failed" number="12515">
+[1-%0!05u!] %1!s! FAILED.
+</MESSAGE>
+<MESSAGE name="DjVuFile.illegal_chunk" number="12516">
+[1-%0!05u!] Illegal chunk number.
+</MESSAGE>
+<MESSAGE name="DjVuFile.malformed" number="12517">
+[1-%0!05u!] Malformed INCL chunk. No slashes allowed.
+</MESSAGE>
+<MESSAGE name="DjVuFile.missing_chunk" number="12518">
+[1-%0!05u!] Too few chunks.
+</MESSAGE>
+<MESSAGE name="DjVuFile.new_version" number="12519">
+[1-%0!05u!] DjVu Decoder: Cannot decode DjVu files with version&gt;= %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuFile.no_create" number="12520">
+[1-%0!05u!] Internal error: id_to_file(%1!s!) did not create any file.
+</MESSAGE>
+<MESSAGE name="DjVuFile.no_data" number="12521">
+[1-%0!05u!] Failed get data for URL &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_finished" number="12522">
+[1-%0!05u!] Internal error: an included file has not finished yet.
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_init" number="12523">
+[1-%0!05u!] DjVuFile is not initialized.
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_secured" number="12524">
+[1-%0!05u!] DjVuFile is not secured by a GP&lt;DjVuFile&gt;
+</MESSAGE>
+<MESSAGE name="DjVuFile.stopped" number="12525">
+[1-%0!05u!] %1!s! STOPPED.
+</MESSAGE>
+<MESSAGE name="DjVuFile.unexp_image" number="12526">
+[1-%0!05u!] DejaVu decoder: a DJVU or IW44 image was expected.
+</MESSAGE>
+<MESSAGE name="DjVuFile.unrecog_chunk" number="12527"
+  value="%1!5.1f! Kb '%2!4s!' Unrecognized chunk." />
+<MESSAGE name="DjVuFile.page_info" number="12528"
+  value="%1!5.1f! Kb '%2!4s!' Page information." />
+<MESSAGE name="DjVuFile.indir_chunk1" number="12529"
+  value="%2!5.1f! Kb '%3!4s!' Indirection chunk (%1!s!)." />
+<MESSAGE name="DjVuFile.indir_chunk2" number="12530"
+  value="%1!5.1f! Kb '%2!4s!' Indirection chunk." />
+<MESSAGE name="DjVuFile.shape_dict" number="12531"
+  value="%2!5.1f! Kb '%3!4s!' JB2 shape dictionary (%1!d! shapes)." />
+<MESSAGE name="DjVuFile.fg_mask" number="12532"
+  value="%4!5.1f! Kb '%5!4s!' JB2 foreground mask (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.G4_mask" number="12533"
+  value="%4!5.1f! Kb '%5!4s!' G4/MMR encoded mask (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg1" number="12534"
+  value="%4!5.1f! Kb '%5!4s!' IW44 background (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg2" number="12535"
+  value="%3!5.1f! Kb '%4!4s!' IW44 background (part %1!d!, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_fg" number="12536"
+  value="%4!5.1f! Kb '%5!4s!' IW44 foreground colors (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.color_import1" number="12537"
+  value="%4!5.1f! Kb '%5!4s!' LINK Color Import (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.color_import2" number="12538"
+  value="%1!5.1f! Kb '%2!4s!' LINK Color Import (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG_bg1" number="12539"
+  value="%4!5.1f! Kb '%5!4s!' JPEG background (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.JPEG_bg2" number="12540"
+  value="%1!5.1f! Kb '%2!4s!' JPEG background (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG_fg1" number="12541"
+  value="%4!5.1f! Kb '%5!4s!' JPEG foreground colors (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.JPEG_fg2" number="12542"
+  value="%1!5.1f! Kb '%2!4s!' JPEG foreground colors (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG2K_bg" number="12543"
+  value="%1!5.1f! Kb '%2!4s!' JPEG-2000 background (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG2K_fg" number="12544"
+  value="[1-%0!05u!] %1!5.1f! Kb '%2!4s!' JPEG-2000 foreground colors (Unimplemented)." />
+<MESSAGE name="DjVuFile.JB2_fg" number="12545"
+  value="%3!5.1f! Kb '%4!4s!' JB2 foreground colors (%1!d! colors, %2!d! ccs)." />
+<MESSAGE name="DjVuFile.IW44_data1" number="12546"
+  value="%4!5.1f! Kb '%5!4s!' IW44 data (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_data2" number="12547"
+  value="%3!5.1f! Kb '%4!4s!' IW44 data (part %1!d!, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.nav_dir" number="12548"
+  value="%1!5.1f! Kb '%2!4s!' Navigation directory (obsolete)." />
+<MESSAGE name="DjVuFile.anno1" number="12549"
+  value="%1!5.1f! Kb '%2!4s!' Annotations (bundled)." />
+<MESSAGE name="DjVuFile.anno2" number="12550"
+  value="%1!5.1f! Kb '%2!4s!' Annotations (hyperlinks, etc.)." />
+<MESSAGE name="DjVuFile.text" number="12551"
+  value="%1!5.1f! Kb '%2!4s!' Text (text, etc.)." />
+<MESSAGE name="DjVuFile.djvu_header" number="12552"
+  value="DJVU Image (%1!d!x%2!d!, %3!d! dpi) version %4!d!:&#10;" />
+<MESSAGE name="DjVuFile.IW44_header" number="12553"
+  value="IW44 Image (%1!d!x%2!d!, %3!d! dpi):&#10;" />
+<MESSAGE name="DjVuFile.ratio" number="12554"
+  value="&#10;Compression ratio: %1!0.f! (%2!0.1f! Kb)" />
+<MESSAGE name="DjVuFile.securedjvu" number="12555">
+Incompatible file (so-called "Secure DjVu".)
+</MESSAGE>
+<MESSAGE name="DjVuGlobalMemory.exhausted" number="12600">
+[1-%0!05u!] Memory Exhausted.
+</MESSAGE>
+<MESSAGE name="DjVuGlobal.not_compatible" number="12700">
+[1-%0!05u!] DjVuProgress is not compatible with multithreading.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_call" number="12800">
+[1-%0!05u!] DjVuImage::decode should not be called after DjVuImage::connect.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_rect2" number="12801">
+[1-%0!05u!] (DjVuImage::do_pixmap) Illegal target rectangles.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_rect" number="12802">
+[1-%0!05u!] (DjVuImage::get_pixmap) Illegal target rectangles.
+</MESSAGE>
+<MESSAGE name="DjVuImage.corrupted" number="12803">
+[1-%0!05u!] Corrupted file (color index is greater than palette size).
+</MESSAGE>
+<MESSAGE name="DjVuImage.mult_error" number="12804">
+[1-%0!05u!] Multiple errors while decoding.
+</MESSAGE>
+<MESSAGE name="DjVuImage.not_decode" number="12805">
+[1-%0!05u!] Cannot decode this DjVu document using the backward-compatibility
+mode.
+</MESSAGE>
+<MESSAGE name="DjVuImage.short1" number="12806"
+  value="%1!d!x%2!d! in %3!0.1f! Kb" />
+<MESSAGE name="DjVuImage.short2" number="12807" 
+  value="%1!d!x%2!d!" />
+<MESSAGE name="DjVuInfo.corrupt_file" number="12900">
+[1-%0!05u!] DjVu Decoder: Corrupted file (truncated INFO chunk).
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.bad_page" number="13000">
+[1-%0!05u!] Invalid page number passed as input.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.large_page" number="13001">
+[1-%0!05u!] Page number is too big.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.long_line" number="13002">
+[1-%0!05u!] Failed to read DjVu directory. Line is too long.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.neg_page" number="13003">
+[1-%0!05u!] Page number may not be negative.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.zero_dir" number="13004">
+[1-%0!05u!] ZERO directory URL passed to the DjVuNavDir constructor.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.bad_palette" number="13100">
+[1-%0!05u!] Corrupted foreground color palette.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.bad_version" number="13101">
+[1-%0!05u!] Unrecognized version tag in palette data.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.many_colors" number="13102">
+[1-%0!05u!] Unrealistic number of colors.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.no_color" number="13103">
+[1-%0!05u!] Color histogram not found.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.not_init" number="13104">
+[1-%0!05u!] Palette is not initialized.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.test_usage" number="13105">
+[1-%0!05u!] Usage: quant&lt;ncol&gt;&lt;minbox&gt;&lt;ppmfile&gt;
+</MESSAGE>
+<MESSAGE name="DjVuPort.not_alloc" number="13200">
+[1-%0!05u!] DjVuPort was not allocated on the heap.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_EPS_num" number="13300">
+[1-%0!05u!] Only one copy can be printed in EPS format.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_format" number="13301">
+[1-%0!05u!] PostScript format must be either PS or EPS.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_gamma" number="13302">
+[1-%0!05u!] Invalid gamma specified. Must be between 0.3 and 5.0.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_level" number="13303">
+[1-%0!05u!] Invalid PostScript level %1!d!. Must be either 1 or 2.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_mode" number="13304">
+[1-%0!05u!] Invalid image mode passed to printing code.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_number" number="13305">
+[1-%0!05u!] The number of copies must be positive.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_orient" number="13306">
+[1-%0!05u!] Invalid orientation passed to printing code.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_page" number="13307">
+[1-%0!05u!] Illegal page number &apos;%1!d!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_range" number="13308">
+[1-%0!05u!] Illegal range &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_scale" number="13309">
+[1-%0!05u!] Attempt to scale image to point while printing.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_zoom" number="13310">
+[1-%0!05u!] Invalid zoom factor passed to printing code.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.big_page" number="13311">
+[1-%0!05u!] Page number %1!d! is too big.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.empty_image" number="13313">
+[1-%0!05u!] Attempt to print an empty image.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.empty_rect" number="13314">
+[1-%0!05u!] Attempt to print an empty rectangle.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_image" number="13315">
+[1-%0!05u!] Failed to get image for page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_landscape" number="13316">
+[1-%0!05u!] LANDSCAPE mode is not supported by EPS format.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_to" number="13318">
+[1-%0!05u!] Missing &apos;To&apos; page number in range &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="DjVuToPS.only_one_page" number="13319">
+[1-%0!05u!] Can&apos;t print more than one page in EPS format.
+</MESSAGE>
+<MESSAGE name="EOF" number="13400">
+Unexpected End Of File.
+</MESSAGE>
+<MESSAGE name="Error" number="13500">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="error" number="13600">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="Failed" number="13700">
+Failed.
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_format" number="13800">
+[1-%0!05u!] Unknown PBM, PGM or RLE file format.
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_levels" number="13801">
+[1-%0!05u!] (GBitmap::set_grays) Illegal number of gray levels.
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_PBM" number="13802">
+[1-%0!05u!] Malformed PBM file.
+</MESSAGE>
+<MESSAGE name="GBitmap.cant_compress" number="13803">
+[1-%0!05u!] Cannot compress gray level bitmap.
+</MESSAGE>
+<MESSAGE name="GBitmap.cant_make_PBM" number="13804">
+[1-%0!05u!] Cannot make PBM file with a gray level bitmap.
+</MESSAGE>
+<MESSAGE name="GBitmap.left_damaged" number="13805">
+[1-%0!05u!] debug: left border is damaged.
+</MESSAGE>
+<MESSAGE name="GBitmap.lost_sync2" number="13806">
+[1-%0!05u!] (GBitmap::decode) RLE synchronization lost.
+</MESSAGE>
+<MESSAGE name="GBitmap.lost_sync" number="13807">
+[1-%0!05u!] RLE: synchronization lost.
+</MESSAGE>
+<MESSAGE name="GBitmap.not_init" number="13808">
+[1-%0!05u!] Uninitialized bitmap.
+</MESSAGE>
+<MESSAGE name="GBitmap.not_int" number="13809">
+[1-%0!05u!] Reading bitmap: integer expected.
+</MESSAGE>
+<MESSAGE name="GBitmap.null_arg" number="13810">
+[1-%0!05u!] (GBitmap::decode) Called with null argument.
+</MESSAGE>
+<MESSAGE name="GBitmap.right_damaged" number="13811">
+[1-%0!05u!] debug: right border is damaged.
+</MESSAGE>
+<MESSAGE name="GBitmap.zero_damaged" number="13812">
+[1-%0!05u!] debug: zero array is damaged.
+</MESSAGE>
+<MESSAGE name="GBitmap.zero_small" number="13813">
+[1-%0!05u!] debug: zerobuffer is too small.
+</MESSAGE>
+<MESSAGE name="GContainer.bad_args" number="13900">
+[1-%0!05u!] Invalid arguments for GArray::resize.
+</MESSAGE>
+<MESSAGE name="GContainer.bad_howmany" number="13901">
+[1-%0!05u!] Illegal value for argument &apos;howmany&apos;
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos_cont" number="13902">
+[1-%0!05u!] Invalid position (points into another container).
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos" number="13903">
+[1-%0!05u!] Invalid position.
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos_null" number="13904">
+[1-%0!05u!] Invalid position (null pointer).
+</MESSAGE>
+<MESSAGE name="GContainer.bad_sub2" number="13905">
+[1-%0!05u!] Illegal subscript in GArray::del.
+</MESSAGE>
+<MESSAGE name="GContainer.cannot_add" number="13906">
+[1-%0!05u!] Cannot add key to constant associative map.
+</MESSAGE>
+<MESSAGE name="GContainer.illegal_subscript" number="13907">
+[1-%0!05u!] GArray subscript is out of bounds.
+</MESSAGE>
+<MESSAGE name="GException.outofmemory" number="14000">
+[1-%0!05u!] Out of memory.
+</MESSAGE>
+<MESSAGE name="GIFFManager.bad_char" number="14100">
+[1-%0!05u!] Chunk name may not contain dots, and brackets.
+</MESSAGE>
+<MESSAGE name="GIFFManager.cant_find2" number="14101">
+[1-%0!05u!] Can&apos;t find top level FORM chunk in the IFF file being
+loaded.
+</MESSAGE>
+<MESSAGE name="GIFFManager.cant_find" number="14102">
+[1-%0!05u!] Can&apos;t find chunk with name &apos;%1!s!&apos;.
+</MESSAGE>
+<MESSAGE name="GIFFManager.del_empty" number="14103">
+[1-%0!05u!] Attempt to delete a chunk with empty name.
+</MESSAGE>
+<MESSAGE name="GIFFManager.garbage" number="14104">
+[1-%0!05u!] Chunk name contains garbage after &apos;]&apos;.
+</MESSAGE>
+<MESSAGE name="GIFFManager.get_empty" number="14105">
+[1-%0!05u!] Attempt to get a chunk with empty name.
+</MESSAGE>
+<MESSAGE name="GIFFManager.malformed" number="14106">
+[1-%0!05u!] Malformed chunk name &apos;%1!s!&apos;: ends with a dot.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_brackets" number="14107">
+[1-%0!05u!] Chunk name may not contain brackets.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_chunk" number="14108">
+[1-%0!05u!] There is no subchunk &apos;%1!s!&apos; #%2!d! in chunk
+&apos;%3!s!&apos;.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_dots" number="14109">
+[1-%0!05u!] Chunk name may not contain dots.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_top_cont" number="14110">
+[1-%0!05u!] Only a container may be top level chunk.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_top_name" number="14111">
+[1-%0!05u!] Top level chunk name is not known yet.
+</MESSAGE>
+<MESSAGE name="GIFFManager.one_colon" number="14112">
+[1-%0!05u!] Chunk name may contain only one colon.
+</MESSAGE>
+<MESSAGE name="GIFFManager.unknown" number="14114">
+[1-%0!05u!] Internal error: chunk &apos;%1!s!&apos; is not known.
+</MESSAGE>
+<MESSAGE name="GIFFManager.unmatched" number="14115">
+[1-%0!05u!] Unmatched opening bracket in chunk name encountered.
+</MESSAGE>
+<MESSAGE name="GIFFManager.wrong_name2" number="14116">
+[1-%0!05u!] The name of the top level chunk is not &apos;%1!s!&apos;.
+</MESSAGE>
+<MESSAGE name="GIFFManager.wrong_name" number="14117">
+[1-%0!05u!] The top level chunk of the file does not have the name &apos;%1!s!
+&apos;.
+</MESSAGE>
+<MESSAGE name="GMapAreas.intersect" number="14200">
+[1-%0!05u!] Some polygon segments intersect.
+</MESSAGE>
+<MESSAGE name="GMapAreas.oval_border" number="14201">
+[1-%0!05u!] This border type is not supported by oval map areas.
+</MESSAGE>
+<MESSAGE name="GMapAreas.oval_hilite" number="14202">
+[1-%0!05u!] Area highlighting is not supported by oval map areas.
+</MESSAGE>
+<MESSAGE name="GMapAreas.poly_border" number="14203">
+[1-%0!05u!] This border type is not supported by polygon map areas.
+</MESSAGE>
+<MESSAGE name="GMapAreas.poly_hilite" number="14204">
+[1-%0!05u!] Area highlighting is not supported by polygon map areas.
+</MESSAGE>
+<MESSAGE name="GMapAreas.too_few_points" number="14205">
+[1-%0!05u!] Too few points in polygon.
+</MESSAGE>
+<MESSAGE name="GMapAreas.width_1" number="14206">
+[1-%0!05u!] Border width must be 1 for XOR and SOLID border types.
+</MESSAGE>
+<MESSAGE name="GMapAreas.width_3-32" number="14207">
+[1-%0!05u!] Border width must be between 3 and 32 for SHADOW border types.
+</MESSAGE>
+<MESSAGE name="GMapAreas.zero_height" number="14208">
+[1-%0!05u!] Area height is ZERO.
+</MESSAGE>
+<MESSAGE name="GMapAreas.zero_width" number="14209">
+[1-%0!05u!] Area width is ZERO.
+</MESSAGE>
+<MESSAGE name="GPixmap.bad_param" number="14400">
+[1-%0!05u!] (GPixmap::color_correct) Illegal parameter.
+</MESSAGE>
+<MESSAGE name="GPixmap.diff_size" number="14401">
+[1-%0!05u!] Color pixmap and alpha bitmap have different sizes.
+</MESSAGE>
+<MESSAGE name="GPixmap.no_int" number="14402">
+[1-%0!05u!] Reading pixmap: integer expected.
+</MESSAGE>
+<MESSAGE name="GPixmap.null_alpha" number="14403">
+[1-%0!05u!] Null alpha bitmap pointer.
+</MESSAGE>
+<MESSAGE name="GPixmap.null_color" number="14404">
+[1-%0!05u!] Null color pixmap pointer.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow1" number="14405">
+[1-%0!05u!] (GPixmap::downsample) Specified rectangle overflows destination
+pixmap.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow2" number="14406">
+[1-%0!05u!] (GPixmap::upsample) Specified rectangle overflows destination
+pixmap.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow3" number="14407">
+[1-%0!05u!] (GPixmap::downsample43) Specified rectangle overflows destination
+pixmap.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow4" number="14408">
+[1-%0!05u!] (GPixmap::upsample23) Specified rectangle overflows destination
+pixmap.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow5" number="14409">
+[1-%0!05u!] (GPixmap::stencil) Specified rectangle overflows foreground
+pixmap.
+</MESSAGE>
+<MESSAGE name="GPixmap.unk_PPM" number="14410">
+[1-%0!05u!] Unknown PPM file format.
+</MESSAGE>
+<MESSAGE name="GRect.div_zero" number="14500">
+[1-%0!05u!] Division by zero.
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect1" number="14501">
+[1-%0!05u!] Illegal empty rect in GRectMapper::set_input.
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect2" number="14502">
+[1-%0!05u!] Illegal empty rect in GRectMapper::set_output.
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect3" number="14503">
+[1-%0!05u!] Illegal empty rectangles in GRectMapper::[un]map.
+</MESSAGE>
+<MESSAGE name="GScaler.assertion" number="14600">
+[1-%0!05u!] Assertion failed.
+</MESSAGE>
+<MESSAGE name="GScaler.no_match" number="14601">
+[1-%0!05u!] Input pixmap does not match input rectangle.
+</MESSAGE>
+<MESSAGE name="GScaler.ratios" number="14602">
+[1-%0!05u!] GScaler ratios must be both null or both positive.
+</MESSAGE>
+<MESSAGE name="GScaler.too_big" number="14603">
+[1-%0!05u!] Desired output exceeds full image output rect.
+</MESSAGE>
+<MESSAGE name="GScaler.too_small" number="14604">
+[1-%0!05u!] Provided input pixmap is too small.
+</MESSAGE>
+<MESSAGE name="GScaler.undef_size" number="14605">
+[1-%0!05u!] GScaler input_size and output_size are still undefined.
+</MESSAGE>
+<MESSAGE name="GSmartPointer.suspicious" number="14700">
+[1-%0!05u!] Suspicious destruction of referenced GPEnabled object.
+</MESSAGE>
+<MESSAGE name="GString.bad_subscript" number="14800">
+[1-%0!05u!] Illegal subscript in GString::operator[].
+</MESSAGE>
+<MESSAGE name="GString.overwrite" number="14801">
+[1-%0!05u!] Memory Overwrite. Program in unstable state.
+</MESSAGE>
+<MESSAGE name="GStringRep.NativeToNative" number="14802">
+[1-%0!05u!] Attempt to convert native encoding to native encoding.
+</MESSAGE>>
+<MESSAGE name="GStringRep.UTF8ToUTF8" number="14803">
+[1-%0!05u!] Attempt to convert UTF8 encoding to UTF8 encoding.
+</MESSAGE>>
+<MESSAGE name="GStringRep.appendNativeToUTF8" number="14804">
+[1-%0!05u!] Attempt to append native string to UTF8 string.
+</MESSAGE>>
+<MESSAGE name="GStringRep.appendUTF8toNative" number="14805">
+[1-%0!05u!] Attempt to append UTF8 string to native string.
+</MESSAGE>>
+<MESSAGE name="GThreads.co_panic" number="14900">
+[1-%0!05u!] Panic COTHREADS : exception context not found.
+</MESSAGE>
+<MESSAGE name="GThreads.dupl_callback" number="14901">
+[1-%0!05u!] GThread::set_scheduling_callback called twice.
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_broad" number="14902">
+[1-%0!05u!] Monitor was not acquired by this thread (GMonitor::broadcast).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_leave" number="14903">
+[1-%0!05u!] Monitor was not acquired by this thread (GMonitor::leave).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_signal" number="14904">
+[1-%0!05u!] Monitor was not acquired by this thread (GMonitor::signal).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_wait" number="14905">
+[1-%0!05u!] Monitor was not acquired by this thread (GMonitor::wait).
+</MESSAGE>
+<MESSAGE name="GThreads.panic" number="14906">
+[1-%0!05u!] PANIC: Cothreads deadlock.
+</MESSAGE>
+<MESSAGE name="GThreads.uncaught" number="14907">
+[1-%0!05u!] GThreads: uncaught exception.
+</MESSAGE>
+<MESSAGE name="GThreads.unrecognized" number="14908">
+[1-%0!05u!] GThreads: unrecognized uncaught exception.
+</MESSAGE>
+<MESSAGE name="GURL.fail_to_file" number="15000">
+[1-%0!05u!] Failed to convert URL to filename.
+</MESSAGE>
+<MESSAGE name="GURL.fail_to_URL" number="15001">
+[1-%0!05u!] Failed to convert filename back to URL.
+</MESSAGE>
+<MESSAGE name="GURL.no_protocol" number="15002">
+[1-%0!05u!] URL &apos;%1!s!&apos; does not contain a protocol prefix.
+</MESSAGE>
+<MESSAGE name="GURL.big_name" number="15003">
+[1-%0!05u!] File name is too long.
+</MESSAGE>
+<MESSAGE name="GURL.listdir" number="15004">
+[1-%0!05u!] GURL::listdir is not implemented on this platform.
+</MESSAGE>
+<MESSAGE name="GURL.no_rename" number="15005">
+[1-%0!05u!] rename() is not available on WinCE devices.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.bad_chunk" number="15100">
+[1-%0!05u!] Illegal chunk id (IFFByteStream::put_chunk).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.bad_offset" number="15101">
+[1-%0!05u!] IFFByteStream (internal error) offset beyond chunk boundary.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.cant_close" number="15102">
+[1-%0!05u!] Cannot close chunk when no chunk is open.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.cant_write" number="15103">
+[1-%0!05u!] Cannot write until previous chunk is complete.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_2nd_id" number="15104">
+[1-%0!05u!] Corrupted IFF file (Illegal secondary chunk id).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_end2" number="15105">
+[1-%0!05u!] Corrupted IFF file (EndOfChunk while reading chunk size).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_end" number="15106">
+[1-%0!05u!] Corrupted IFF file (EndOfChunk while reading chunk ID).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_header" number="15107">
+[1-%0!05u!] Corrupted IFF file (EndOfChunk while reading composite chunk
+header).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_id" number="15108">
+[1-%0!05u!] Corrupted IFF file (Illegal chunk id).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_mangled" number="15109">
+[1-%0!05u!] Corrupted IFF file (Mangled chunk boundaries).
+</MESSAGE>
+<MESSAGE name="IFFByteStream.no_chunk_id" number="15110">
+[1-%0!05u!] No chunk id available yet.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready2" number="15111">
+[1-%0!05u!] IFFByteStream not ready for writing chunks.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready3" number="15112">
+[1-%0!05u!] IFFByteStream not ready for reading bytes.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready4" number="15113">
+[1-%0!05u!] IFFByteStream not ready for writing bytes.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready" number="15114">
+[1-%0!05u!] IFFByteStream not ready for reading chunk.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.read_write" number="15115">
+[1-%0!05u!] Attempt to write and read the same IFFByteStream.
+</MESSAGE>
+<MESSAGE name="Internal.error" number="15200">
+[1-%0!05u!] Internal error.
+</MESSAGE>
+<MESSAGE name="IW44Image.bad_rect" number="15300">
+[1-%0!05u!] (IWMap::image) Rectangle is out of bounds.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_primary2" number="15302">
+[1-%0!05u!] (IWPixmap::decode_chunk) Cannot read primary header.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_primary" number="15303">
+[1-%0!05u!] (IWBitmap::decode_chunk) Cannot read primary header.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_secondary2" number="15304">
+[1-%0!05u!] (IWPixmap::decode_chunk) Cannot read secondary header.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_secondary" number="15305">
+[1-%0!05u!] (IWBitmap::decode_chunk) Cannot read secondary header.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_tertiary2" number="15306">
+[1-%0!05u!] (IWPixmap::decode_chunk) Cannot read tertiary header.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_tertiary" number="15307">
+[1-%0!05u!] (IWBitmap::decode_chunk) Cannot read tertiary header.
+</MESSAGE>
+<MESSAGE name="IW44Image.codec_open2" number="15308">
+[1-%0!05u!] (IWBitmap::decode_chunk) Codec still open for decoding.
+</MESSAGE>
+<MESSAGE name="IW44Image.corrupt_BM44_2" number="15312">
+[1-%0!05u!] (IWPixmap::decode_iff) File is corrupted (cannot read FORM.BM44).
+</MESSAGE>
+<MESSAGE name="IW44Image.corrupt_BM44" number="15313">
+[1-%0!05u!] (IWBitmap::decode_iff) File is corrupted (cannot read FORM.BM44).
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_object2" number="15315">
+[1-%0!05u!] (IWPixmap::encode_chunk) IWBitmap object is empty.
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_object" number="15316">
+[1-%0!05u!] (IWBitmap::encode_chunk) IWBitmap object is empty.
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_rect" number="15317">
+[1-%0!05u!] (IWMap::image) Rectangle is empty.
+</MESSAGE>
+<MESSAGE name="IW44Image.has_color" number="15318">
+[1-%0!05u!] (IWBitmap::decode_chunk) File contains a color image.
+</MESSAGE>
+<MESSAGE name="IW44Image.incompat_codec2" number="15319">
+[1-%0!05u!] (IWPixmap::decode_chunk) File has been compressed with an
+incompatible IWCodec.
+</MESSAGE>
+<MESSAGE name="IW44Image.incompat_codec" number="15320">
+[1-%0!05u!] (IWBitmap::decode_chunk) File has been compressed with an
+incompatible IWCodec.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open1" number="15321">
+[1-%0!05u!] (IWBitmap::encode_iff) Codec has been left open.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open2" number="15322">
+[1-%0!05u!] (IWBitmap::decode_iff) Codec has been left open.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open3" number="15323">
+[1-%0!05u!] (IWPixmap::encode_iff) Codec has been left open.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open4" number="15324">
+[1-%0!05u!] (IWPixmap::decode_iff) Codec has been left open.
+</MESSAGE>
+<MESSAGE name="IW44Image.need_stop2" number="15325">
+[1-%0!05u!] (IWPixmap::encode_chunk) Must specify a stopping criterion.
+</MESSAGE>
+<MESSAGE name="IW44Image.need_stop" number="15326">
+[1-%0!05u!] (IWBitmap::encode_chunk) Must specify a stopping criterion.
+</MESSAGE>
+<MESSAGE name="IW44Image.param_range2" number="15327">
+[1-%0!05u!] (IWPixmap::parm_dbfrac) parameter out of range.
+</MESSAGE>
+<MESSAGE name="IW44Image.param_range" number="15328">
+[1-%0!05u!] (IWBitmap::parm_dbfrac) parameter out of range.
+</MESSAGE>
+<MESSAGE name="IW44Image.recent_codec2" number="15329">
+[1-%0!05u!] (IWPixmap::decode_chunk) File has been compressed with a more
+recent IWCodec.
+</MESSAGE>
+<MESSAGE name="IW44Image.recent_codec" number="15330">
+[1-%0!05u!] (IWBitmap::decode_chunk) File has been compressed with a more
+recent IWCodec.
+</MESSAGE>
+<MESSAGE name="IW44Image.sample_factor" number="15331">
+[1-%0!05u!] (IWMap::image) Unsupported subsampling factor.
+</MESSAGE>
+<MESSAGE name="IW44Image.wrong_serial2" number="15332">
+[1-%0!05u!] (IWPixmap::decode_chunk) Chunk does not bear expected serial
+number.
+</MESSAGE>
+<MESSAGE name="IW44Image.wrong_serial" number="15333">
+[1-%0!05u!] (IWBitmap::decode_chunk) Chunk does not bear expected serial
+number.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_dict2" number="15400">
+[1-%0!05u!] Corrupted file: non zero image dimension in JB2 dictionary.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_dict" number="15401">
+[1-%0!05u!] Size of shape dictionary does not match JB2 data.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_number" number="15402">
+[1-%0!05u!] (JB2Codec::CodeNum) Number is outside the bounds.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_numcontext" number="15403">
+[1-%0!05u!] (JB2Codec::CodeNum) Illegal NumContext.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_parent_shape" number="15404">
+[1-%0!05u!] Illegal parent shape number in JB2Shape.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_shape" number="15405">
+[1-%0!05u!] Illegal shape number in JB2Blit.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_type" number="15406">
+[1-%0!05u!] Corrupted file: Illegal record type for shape dictionary.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_change" number="15407">
+[1-%0!05u!] Cannot change dictionary once set.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_create" number="15408">
+[1-%0!05u!] Cannot create bitmap image for an unsized JB2Image object.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_set" number="15409">
+[1-%0!05u!] Cannot set dictionary after adding shapes.
+</MESSAGE>
+<MESSAGE name="JB2Image.need_dict" number="15410">
+[1-%0!05u!] JB2 data requires a shape dictionary.
+</MESSAGE>
+<MESSAGE name="JB2Image.no_start" number="15411">
+[1-%0!05u!] Corrupted file: No start record.
+</MESSAGE>
+<MESSAGE name="JB2Image.unknown_type" number="15412">
+[1-%0!05u!] Corrupted file: Unknown record type.
+</MESSAGE>
+<MESSAGE name="JB2Image.zero_dim" number="15413">
+[1-%0!05u!] Corrupted file: JB2 image dimension is zero.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_codebook" number="15500">
+[1-%0!05u!] Ambiguous MMR codebook.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_data" number="15501">
+[1-%0!05u!] Invalid G4/MMR Data.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_header" number="15502">
+[1-%0!05u!] Corrupted G4/MMR header.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.cant_process" number="15503">
+[1-%0!05u!] Cannot processed uncompressed bits in G4/MMR data.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.unrecog_header" number="15504">
+[1-%0!05u!] Cannot recognize G4/MMR header.
+</MESSAGE>
+<MESSAGE name="not_implemented_n" number="15600">
+[1-%0!05u!] %1!s! is not implemented.
+</MESSAGE>
+<MESSAGE name="not_implemented" number="15700">
+[1-%0!05u!] Not implemented.
+</MESSAGE>
+<MESSAGE name="parseoptions.ambiguous" number="15800">
+[1-%0!05u!] Ambiguous options: &apos;%1!s!=%2!s!&apos; and &apos;%3!s!=%4!s!
+&apos; specified.
+</MESSAGE>
+<MESSAGE name="parseoptions.bad_number" number="15802">
+[1-%0!05u!] &apos;%1!s!&apos; is not a number.
+</MESSAGE>
+<MESSAGE name="parseoptions.bad_value" number="15803">
+[1-%0!05u!] &apos;%1!s!&apos; is not a number or boolean value.
+</MESSAGE>
+<MESSAGE name="parseoptions.cant_inherit" number="15804">
+[1-%0!05u!] %1!s!: Error in line %2!d! of &apos;%3!s!&apos;&#10;&#09;--
+&gt; can not inherit unknown profile &apos;%4!s!&apos;
+</MESSAGE>
+<MESSAGE name="parseoptions.illegal_profile" number="15805">
+[1-%0!05u!] %1!s!: Error in line %2!d! of profile &apos;%3!s!&apos;&#10;
+&#09;--&gt; Illegal profile name &apos;%4!s!&apos;
+</MESSAGE>
+<MESSAGE name="parseoptions.missing_arg_option" number="15806">
+[1-%0!05u!] Argument required for --%1!s! option.
+</MESSAGE>
+<MESSAGE name="parseoptions.profile_error" number="15807">
+[1-%0!05u!] %1!s!: Error in line %2!d! of profile &apos;%3!s!&apos;&#10;
+&#09;--&gt; %4!s!.
+</MESSAGE>
+<MESSAGE name="parseoptions.unrecog_option_c" number="15808">
+[1-%0!05u!] Unrecognized option -%1!s!.
+</MESSAGE>
+<MESSAGE name="parseoptions.unrecog_option" number="15809">
+[1-%0!05u!] Unrecognized option &apos;%1!s!&apos;
+</MESSAGE>
+<MESSAGE name="STOP" number="16000">
+[1-%0!05u!] Uncaught STOP message.
+</MESSAGE>
+<MESSAGE name="TextException.test" number="16100">
+[1-%0!05u!] Test exception.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_color" number="16200">
+[1-%0!05u!] Color %1!s! is not supported.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_page" number="16201">
+[1-%0!05u!] Failed to get specified page.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_rect" number="16202">
+[1-%0!05u!] Too few coordinates for rectangular region.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_circle" number="16203">
+[1-%0!05u!] Too few coordinates for circular region.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_oval" number="16204">
+[1-%0!05u!] Too few coordinates for oval region.
+</MESSAGE>
+<MESSAGE name="XMLAnno.unknown_shape" number="16205">
+[1-%0!05u!] Unknown shape %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLAnno.unknown_border" number="16206">
+[1-%0!05u!] Unrecongized border type %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLAnno.extra_body" number="16207">
+[1-%0!05u!] Exactly one&lt;BODY&gt;&lt;/BODY&gt; pair is needed.
+</MESSAGE>
+<MESSAGE name="XMLAnno.no_body" number="16208">
+[1-%0!05u!] No&lt;BODY&gt;&lt;/BODY&gt; pair found.
+</MESSAGE>
+<MESSAGE name="XMLAnno.map_find" number="16209">
+[1-%0!05u!] Failed to find specified map %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLAnno.fail_init" number="16210">
+[1-%0!05u!] Failed to initialize %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLTags.no_GP" number="16300">
+[1-%0!05u!] Not secured by a GP pointer.
+</MESSAGE>
+<MESSAGE name="XMLTags.raw_string" number="16301">
+[1-%0!05u!] Raw string '%1!s!' found outside document scope.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_tag" number="16302">
+[1-%0!05u!] Unterminated Tag %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_PI" number="16303">
+[1-%0!05u!] Unterminated Processing Instruction: %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_comment" number="16304">
+[1-%0!05u!] Unterminated Comment: %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_form" number="16305">
+[1-%0!05u!] Well formed error. Too many end tags.
+</MESSAGE>
+<MESSAGE name="XMLTags.no_body" number="16306">
+[1-%0!05u!] No body.
+</MESSAGE>
+<MESSAGE name="XMLTags.unmatched_end" number="16307">
+[1-%0!05u!] XML tag &apos;%1!s!&apos; on line %2!u! was terminated with XML
+tag &apos;%3!s!&apos; line %4!u!.
+</MESSAGE>
+<MESSAGE name="ZPCodec.no_encoding" number="16400">
+[1-%0!05u!] ZPCodec has not been created for encoding.
+</MESSAGE>
+<MESSAGE name="ZPCodec.write_error" number="16401">
+[1-%0!05u!] ZPCodec write error.
+</MESSAGE>
+<MESSAGE name="DjVuDynamicLib.failed_open2" number="16402">
+[1-%0!05u!] Failed to open dynamic library '%1!s!'.
+	System reported: '%2!s!'.
+</MESSAGE>
+<MESSAGE name="DjVuDynamicLib.failed_open" number="16403">
+[1-%0!05u!] Failed to open dynamic library '%1!s!'.
+</MESSAGE>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/en/messages.xml b/share/djvu/osi/en/messages.xml
new file mode 100644
index 0000000..be92bb1
--- /dev/null
+++ b/share/djvu/osi/en/messages.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- List of files to include to get the entire list of messages -->
+<DjVuMessages>
+<HEAD>
+<!-- Message numbers 17000-19999 -->
+<INCLUDE name="djvutools-reference.xml" />
+<!-- Message numbers 10000-16999 -->
+<INCLUDE name="libdjvu++.xml" />
+</HEAD>
+<BODY>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/fr/libdjvu++.xml b/share/djvu/osi/fr/libdjvu++.xml
new file mode 100644
index 0000000..0725a90
--- /dev/null
+++ b/share/djvu/osi/fr/libdjvu++.xml
@@ -0,0 +1,1331 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- Messages from libdjvu++ -->
+<DjVuMessages>
+<BODY>
+<MESSAGE name="DjVuMessage.Unrecognized" number="10000">
+[1-%0!05u!] Message inconnu :
+	Nom du message : %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuMessage.Parameter" number="10001">
+&#09;Parameter: %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuMessage.failed_to_parse_XML" number="10002">
+[1-%0!05u!] Echec de l&apos;analyse du fichier message XML :
+	%1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuText.corrupt_text" number="10100">
+[1-%0!05u!] La structure du calque de texte est endommagée.
+</MESSAGE>
+<MESSAGE name="DjVuText.no_text" number="10101">
+[1-%0!05u!] Texte attendu introuvable
+</MESSAGE>
+<MESSAGE name="DjVuText.corrupt_chunk" number="10102">
+[1-%0!05u!] Bloc de fichier endommagé : taille insuffisante.
+</MESSAGE>
+<MESSAGE name="DjVuText.bad_version" number="10103">
+[1-%0!05u!] Version de texte %1!c! inattendue
+</MESSAGE>
+<MESSAGE name="DjVuText.one_word" number="10104">
+[1-%0!05u!] Détection d'un séparateur au milieu d&apos;un mot.
+</MESSAGE>
+<MESSAGE name="DjVuText.dupl_text" number="10105">
+[1-%0!05u!] Présence de plusieurs calques de texte.
+</MESSAGE>
+<MESSAGE name="arrays.ill_arg" number="11500">
+[1-%0!05u!] Arguments non autorisés dans DArray::del
+</MESSAGE>
+<MESSAGE name="arrays.ill_sub" number="11501">
+[1-%0!05u!] Indice DArray non autorisé
+</MESSAGE>
+<MESSAGE name="arrays.resize" number="11502">
+[1-%0!05u!] Limites inférieure et supérieure après redimensionnement de DArray incorrectes
+</MESSAGE>
+<MESSAGE name="bad_arg" number="11600">
+[1-%0!05u!] Arguments non autorisés dans %1!s!
+</MESSAGE>
+<MESSAGE name="ByteStream.backward" number="11700">
+[1-%0!05u!] La recherche en arrière n&apos;est pas prise en charge par ce ByteStream.
+</MESSAGE>
+<MESSAGE name="ByteStream.bad_arg" number="11701">
+[1-%0!05u!] Arguments non autorisés dans ByteStream::seek.
+</MESSAGE>
+<MESSAGE name="ByteStream.bad_mode" number="11703">
+[1-%0!05u!] Mode non autorisé dans StdioByteStream
+</MESSAGE>
+<MESSAGE name="ByteStream.cant_write" number="11704">
+[1-%0!05u!] Impossible d&apos;écrire dans BSByteStream créé pour le décodage
+</MESSAGE>
+<MESSAGE name="ByteStream.corrupt" number="11705">
+[1-%0!05u!] Entrée de décodage endommagée
+</MESSAGE>
+<MESSAGE name="ByteStream.flush_error" number="11707">
+[1-%0!05u!] StdioByteStream::flush, erreur de vidage.
+</MESSAGE>
+<MESSAGE name="ByteStream.no_read" number="11708">
+[1-%0!05u!] StdioByteStream n&apos;est pas disponible pour la lecture.
+</MESSAGE>
+<MESSAGE name="ByteStream.no_write" number="11709">
+[1-%0!05u!] StdioByteStream n&apos;est pas disponible pour l'écriture.
+</MESSAGE>
+<MESSAGE name="ByteStream.open_fail2" number="11710">
+[1-%0!05u!] StdioByteStream::StdioByteStream. Echec lors de l&apos;ouverture du fichier.
+</MESSAGE>
+<MESSAGE name="ByteStream.open_fail" number="11711">
+[1-%0!05u!] Echec lors de l&apos;ouverture de %1!s! : %2!s!.
+</MESSAGE>
+<MESSAGE name="ByteStream.read_error2" number="11712">
+[1-%0!05u!] StdioByteStream::read, erreur de lecture.
+</MESSAGE>
+<MESSAGE name="ByteStream.read_error" number="11713">
+[1-%0!05u!] ByteStream::readall, erreur de lecture.
+</MESSAGE>
+<MESSAGE name="ByteStream.seek_error2" number="11714">
+[1-%0!05u!] Tentative de recherche avant le début du fichier
+</MESSAGE>
+<MESSAGE name="ByteStream.seek_error" number="11715">
+[1-%0!05u!] StdioByteStream::seek, erreur de recherche.
+</MESSAGE>
+<MESSAGE name="ByteStream.seek" number="11716">
+[1-%0!05u!] La recherche fonctionne de manière inattendue dans ce ByteStream (ftell() a un comportement inhabituel).
+</MESSAGE>
+<MESSAGE name="ByteStream.write" number="11717">
+[1-%0!05u!] ByteStream::write%1!s!, erreur d&apos;écriture.
+</MESSAGE>
+<MESSAGE name="ByteStream.write_error2" number="11718">
+[1-%0!05u!] StdioByteStream::write, erreur d&apos;écriture.
+</MESSAGE>
+<MESSAGE name="ByteStream.write_error" number="11720">
+[1-%0!05u!] Erreur inconnue dans ByteStream::write.
+</MESSAGE>
+<MESSAGE name="ByteStream.not_implemented" number="11721">
+[1-%0!05u!] ByteStream::scanf non implémenté.
+</MESSAGE>
+<MESSAGE name="DataPool.add_data" number="11800">
+[1-%0!05u!] La fonction DataPool::add_data() ne peut pas être
+appelée pour les DataPools connectés.
+</MESSAGE>
+<MESSAGE name="DataPool.bad_length" number="11801">
+[1-%0!05u!] La longueur doit être positive.
+</MESSAGE>
+<MESSAGE name="DataPool.bad_size" number="11802">
+[1-%0!05u!] La taille ne peut pas être négative.
+</MESSAGE>
+<MESSAGE name="DataPool.connected1" number="11803">
+[1-%0!05u!] Une connexion à un autre DataPool existe déjà.
+</MESSAGE>
+<MESSAGE name="DataPool.connected2" number="11804">
+[1-%0!05u!] Une connexion à un autre fichier existe déjà.
+</MESSAGE>
+<MESSAGE name="DataPool.neg_start" number="11805">
+[1-%0!05u!] Le décalage de début d&apos;intervalle ne peut pas être négatif.
+</MESSAGE>
+<MESSAGE name="DataPool.no_threadless" number="11806">
+[1-%0!05u!] Erreur interne. Cette fonction peut être utilisée uniquement en
+mode thread.
+</MESSAGE>
+<MESSAGE name="DataPool.reenter" number="11807">
+[1-%0!05u!] DATA_POOL_REENTER.
+</MESSAGE>
+<MESSAGE name="DataPool.seek_backward" number="11808">
+[1-%0!05u!] La recherche en arrière à partir de la fin du fichier n&apos;est pas prise en charge par ce ByteStream.
+</MESSAGE>
+<MESSAGE name="DataPool.zero_DataPool" number="11809">
+[1-%0!05u!] Erreur interne : le DataPool envoyé comme entrée est NUL.
+</MESSAGE>
+<MESSAGE name="DjVmDir0.no_slash" number="11900">
+[1-%0!05u!] Le nom du fichier ne peut pas contenir de barres obliques
+</MESSAGE>
+<MESSAGE name="DjVmDir.bad_dir" number="12000">
+[1-%0!05u!] Le répertoire comprend des enregistrements séparés et groupés.
+</MESSAGE>
+<MESSAGE name="DjVmDir.bad_file" number="12001">
+[1-%0!05u!] L&apos;ID du fichier DjVm %1!s! contient un ou plusieurs caractères non autorisés.
+</MESSAGE>
+<MESSAGE name="DjVmDir.corrupt" number="12002">
+[1-%0!05u!] Le document DjVu est endommagé. Un document multipage ne peut contenir qu&apos;un seul fichier
+d&apos;annotations partagées.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_id2" number="12003">
+[1-%0!05u!] Le fichier ID = %1!s! existe déjà dans le répertoire DJVM.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_id" number="12004">
+[1-%0!05u!] Une erreur est survenue dans le bloc DIRM : présence de deux enregistrements pour le même ID
+%1!s!
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_name2" number="12005">
+[1-%0!05u!] Un fichier NOM = %1!s! existe déjà dans le répertoire DJVM.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_name" number="12006">
+[1-%0!05u!] Une erreur est survenue dans le bloc DIRM : présence de deux enregistrements pour le même NOM
+%1!s!
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_title2" number="12007">
+[1-%0!05u!] Le fichier TITRE = %1!s! existe déjà dans le répertoire DJVM.
+</MESSAGE>
+<MESSAGE name="DjVmDir.dupl_title" number="12008">
+[1-%0!05u!] Une erreur est survenue dans le bloc DIRM : présence de deux enregistrements pour le même TITRE
+%1!s!
+</MESSAGE>
+<MESSAGE name="DjVmDir.get_str_type" number="12009">
+[1-%0!05u!] Erreur interne : veuillez modifier DjVmDir::File::get_str_type()
+pour référencer tous les types de fichiers possibles.
+</MESSAGE>
+<MESSAGE name="DjVmDir.multi_save2" number="12010">
+[1-%0!05u!] Le format multipage DjVu actif ne prend pas en charge
+plusieurs fichiers d&apos;annotations partagées.
+</MESSAGE>
+<MESSAGE name="DjVmDir.multi_save" number="12011">
+[1-%0!05u!] Impossible d&apos;enregistrer un document multipage contenant plusieurs fichiers
+d&apos;annotations partagées.
+</MESSAGE>
+<MESSAGE name="DjVmDir.name_in_use" number="12012">
+[1-%0!05u!] Le nom %1!s! est déjà utilisé.
+</MESSAGE>
+<MESSAGE name="DjVmDir.no_indirect" number="12013">
+[1-%0!05u!] Erreur de répertoire : les entrées séparées ne sont pas autorisées pour les documents groupés.
+</MESSAGE>
+<MESSAGE name="DjVmDir.no_info" number="12014">
+[1-%0!05u!] Aucune information disponible pour le fichier ID= %1!s!
+</MESSAGE>
+<MESSAGE name="DjVmDir.title_in_use" number="12015">
+[1-%0!05u!] Le titre %1!s! est déjà utilisé.
+</MESSAGE>
+<MESSAGE name="DjVmDir.version_error" number="12016">
+[1-%0!05u!] Impossible de lire les répertoires DJVM créés avec des versions ultérieures à %1!s!.
+La version des données est %2!s!.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_delete" number="12100">
+[1-%0!05u!] Suppression impossible : il n&apos;existe aucun fichier ID = %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_find" number="12101">
+[1-%0!05u!] Fichier ID = %1!s! introuvable
+</MESSAGE>
+<MESSAGE name="DjVmDoc.cant_read_indr" number="12102">
+[1-%0!05u!] Impossible de lire des documents DjVm séparés dans les DataPools
+ou les ByteStreams
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_data" number="12103">
+[1-%0!05u!] Résultat inattendu : le fichier %1!s! ne contient aucune donnée.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_dirm_chunk" number="12104">
+[1-%0!05u!] Le premier bloc d&apos;un document DJVM doit être au format DIRM :
+format ancien utilisé.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_duplicate" number="12105">
+[1-%0!05u!] Tentative d&apos;insertion en double du même fichier
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_form_djvm2" number="12106">
+[1-%0!05u!] Impossible de trouver le format DJVM. Ce document n&apos;est pas au nouveau
+format multipage.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_form_djvm" number="12107">
+[1-%0!05u!] Impossible de trouver le format DJVM dans les données d&apos;entrée.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.not_IFF" number="12108">
+[1-%0!05u!] Le fichier %1!s! n&apos;est pas au format IFF.
+</MESSAGE>
+<MESSAGE name="DjVmDoc.no_zero_file" number="12109">
+[1-%0!05u!] Impossible d&apos;insérer un fichier dont la taille est nulle
+</MESSAGE>
+<MESSAGE name="DjVmDoc.zero_file" number="12110">
+[1-%0!05u!] Résultat inattendu : la taille du fichier est nulle.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_type" number="12200">
+[1-%0!05u!] GLObject(): type d'objet envoyé incorrect. L&apos;objet doit être une chaîne
+ou un symbole.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_url" number="12201">
+[1-%0!05u!] URL spécifié incorrect
+</MESSAGE>
+<MESSAGE name="DjVuAnno.bad_zoom" number="12203">
+[1-%0!05u!] Zoom spécifié non autorisé
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2list" number="12207">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible d&apos;effectuer la conversion en liste.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2number" number="12208">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible d&apos;effectuer la conversion en nombre.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2string" number="12209">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible d&apos;effectuer la conversion en chaîne.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.invalid2symbol" number="12210">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible d&apos;effectuer la conversion en symbole.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2number" number="12211">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir
+l&apos;objet composé %1!s! en nombre.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2string" number="12212">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir
+l&apos;objet composé %1!s! en chaîne.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.list2symbol" number="12213">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir
+l&apos;objet composé %1!s! en symbole.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_number" number="12214">
+[1-%0!05u!] Une erreur est survenue lors de l&apos;analyse du contenu de l&apos;objet %1!s! :
+Le signe ( doit être suivi du nom de l&apos;objet, pas d&apos;un nombre.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_paren" number="12215">
+[1-%0!05u!] Une erreur est survenue lors de l&apos;analyse du contenu de l&apos;objet %1!s! :
+Le signe ( doit être suivi du nom de l&apos;objet, pas d&apos;une autre parenthèse.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.no_string" number="12216">
+[1-%0!05u!] Une erreur est survenue lors de l&apos;analyse du contenu de l&apos;objet %1!s! :
+Le signe ( doit être suivi du nom de l&apos;objet, pas d&apos;une chaîne.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2list" number="12218">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir le nombre %1!d!
+en objet composé.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2string" number="12219">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir le nombre %1!d!
+en chaîne.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.number2symbol" number="12220">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir le nombre %1!d!
+en symbole.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.paren" number="12222">
+[1-%0!05u!] Une erreur est survenue lors de l&apos;analyse du contenu de l&apos;objet %1!s! :
+Le signe ( doit être immédiatement suivi d&apos;un nom d&apos;objet.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2list" number="12223">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir la chaîne %1!s!
+en objet composé.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2number" number="12224">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir la chaîne %1!s!
+en nombre.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.string2symbol" number="12225">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir la chaîne %1!s!
+en symbole.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2list" number="12226">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir le symbole %1!s!
+en objet composé.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2number" number="12227">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir le symbole %1!s!
+en nombre.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.symbol2string" number="12228">
+[1-%0!05u!] Type d&apos;objet incorrect. Impossible de convertir le symbole %1!s!
+en chaîne.
+</MESSAGE>
+<MESSAGE name="DjVuAnno.too_few" number="12229">
+[1-%0!05u!] %1!s! contient un nombre insuffisant d&apos;éléments.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.bad_page" number="12300">
+[1-%0!05u!] Le numéro de page %1!d! est incorrect.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.cant_save2" number="12301">
+[1-%0!05u!] Impossible d&apos;enregistrer le document au format souhaité.
+Utilisez la commande Enregistrer sous.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.cant_save" number="12302">
+[1-%0!05u!] Impossible d&apos;enregistrer le document.
+Utilisez la commande Enregistrer sous.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.create_fail" number="12303">
+[1-%0!05u!] La création du fichier ID = %1!s! a échoué.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.dir_fail" number="12304">
+[1-%0!05u!] La création du répertoire ID = %1!s! a échoué.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.init" number="12305">
+[1-%0!05u!] DjVuDocEditor a déjà été initialisé.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_codec" number="12306">
+[1-%0!05u!] Impossible de charger le codec de compression
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_file" number="12307">
+[1-%0!05u!] Ce document ne contient pas de fichier ID = %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.not_1_page" number="12308">
+[1-%0!05u!] Le fichier %1!s! n&apos;est pas un fichier DjVu d&apos;une seule page.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.no_thumb" number="12309">
+[1-%0!05u!] Erreur interne : impossible de trouver une vignette pour la page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.not_init" number="12310">
+[1-%0!05u!] DjVuDocEditor doit être initialisé avant d'être utilisé.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.open_fail" number="12311">
+[1-%0!05u!] Impossible d&apos;ouvrir le document %1!s!
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.page_fail" number="12312">
+[1-%0!05u!] Erreur interne : impossible d&apos;obtenir la page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.page_num" number="12313">
+[1-%0!05u!] Numéro de page %1!d! incorrect
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.render" number="12314">
+[1-%0!05u!] Impossible de réaliser un rendu de l&apos;image de la page %1!d!
+</MESSAGE>
+<MESSAGE name="DjVuDocEditor.share_fail" number="12315">
+[1-%0!05u!] Impossible de créer un second fichier d&apos;annotations partagées.
+Un document multipage ne peut contenir qu&apos;un seul fichier de ce type.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.2nd_init" number="12400">
+[1-%0!05u!] DjVuDocument ne peut pas être initialisé deux fois.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.bad_format" number="12401">
+[1-%0!05u!] Format de document inconnu. Décodage impossible.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.bad_thumb" number="12402">
+[1-%0!05u!] Vignettes endommagées
+</MESSAGE>
+<MESSAGE name="DjVuDocument.big_num" number="12403">
+[1-%0!05u!] Le numéro de page est trop élevé.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.cant_extract" number="12405">
+[1-%0!05u!] Impossible d&apos;extraire les vignettes précodées :
+</MESSAGE>
+<MESSAGE name="DjVuDocument.cant_render" number="12406">
+[1-%0!05u!] Impossible de réaliser le rendu de la page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.comp_codec" number="12407">
+[1-%0!05u!] Le codec de compression n&apos;est pas chargé.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.empty_url" number="12408">
+[1-%0!05u!] Un URL vide a été envoyé dans DjVuDocument.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.exclude_page" number="12409">
+[1-%0!05u!] La page %1!d! est exclue du fichier suite à des erreurs.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.fail_URL" number="12411">
+[1-%0!05u!] Aucune donnée disponible pour l&apos;URL %1!s!
+</MESSAGE>
+<MESSAGE name="DjVuDocument.file_outside" number="12412">
+[1-%0!05u!] Le fichier %1!s! ne se trouve pas dans ce groupe.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.init_eof" number="12413">
+[1-%0!05u!] Une fin de fichier inattendue est survenue lors de l'initialisation du document.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.init_not_done" number="12414">
+[1-%0!05u!] Le document n&apos;a pas encore été complètement initialisé.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.miss_page_name" number="12415">
+[1-%0!05u!] Ce document ne comprend pas de page intitulée %1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.miss_page_num" number="12416">
+[1-%0!05u!] Ce document ne contient pas de page %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_dir" number="12417">
+[1-%0!05u!] Les documents d&apos;une seule page ne contiennent pas de répertoire DjVm.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_file" number="12418">
+[1-%0!05u!] Le fichier requis n&apos;existe pas.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.no_page" number="12419">
+[1-%0!05u!] Ce document ne contient aucune page.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_DjVu" number="12420">
+[1-%0!05u!] L&apos;entrée requise n&apos;est pas un fichier DjVu.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_init" number="12421">
+[1-%0!05u!] DjVuDocument n&apos;est pas initialisé.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.not_secure" number="12422">
+[1-%0!05u!] DjVuDocument ne dispose pas de protection générale GP&lt;DjVuDocument&gt;
+</MESSAGE>
+<MESSAGE name="DjVuDocument.obsolete" number="12423">
+[1-%0!05u!] Le format de ce document est obsolète.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.old_bundle" number="12424">
+[1-%0!05u!] Seuls les documents ANCIEN_GROUPE disposent d&apos;un répertoire DjVm v.0.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.stopped" number="12425">
+[1-%0!05u!] L&apos;initialisation de la thread de DjVuDocument a été arrêtée.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.unk_type" number="12426">
+[1-%0!05u!] Type de document inconnu
+</MESSAGE>
+<MESSAGE name="DjVuDocument.URL_outside2" number="12427">
+[1-%0!05u!] La cible de l&apos;URL %1!s! se situe en dehors du document séparé.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.URL_outside" number="12428">
+[1-%0!05u!] La cible de l&apos;URL %1!s! se situe en dehors du document groupé.
+</MESSAGE>
+<MESSAGE name="DjVuDocument.skip_page" number="12429">
+[1-%0!05u!] La page %1!d! est ignorée.
+</MESSAGE>
+<MESSAGE name="DjVuFile.2nd_init" number="12500">
+[1-%0!05u!] DjVuFile est déjà initialisé.
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_BG44" number="12501">
+[1-%0!05u!] Décodeur DjVu : données endommagées (taille incorrecte dans le bloc BG44)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_dupl" number="12502">
+[1-%0!05u!] Décodeur DjVu : fichier endommagé (copie du bloc INFO)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_INFO" number="12503">
+[1-%0!05u!] Décodeur DjVu : fichier endommagé (Le bloc INFO a été détecté dans FORM:DJVI.)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_missing_info" number="12504">
+[1-%0!05u!] Décodeur DjVu : données endommagées (bloc INFO manquant)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_missing_IW44" number="12505">
+[1-%0!05u!] Décodeur DjVu : données endommagées (blocs de données IW44 manquant)
+</MESSAGE>
+<MESSAGE name="DjVuFile.corrupt_zero" number="12506">
+[1-%0!05u!] Décodeur DjVu : fichier endommagé (La taille de l&apos;image est nulle.)
+</MESSAGE>
+<MESSAGE name="DjVuFile.decode_fail" number="12507">
+[1-%0!05u!] Le décodage d&apos;un fichier include a échoué.
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_backgrnd" number="12508">
+[1-%0!05u!] Décodeur DjVu : données endommagées (copie du calque d'arrière-plan)
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_Dxxx" number="12509">
+[1-%0!05u!] Décodeur DjVu : données endommagées (copie du bloc Dxxx)
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_foregrnd" number="12510">
+[1-%0!05u!] Décodeur DjVu : données endommagées (copie des informations de couleurs du premier plan)
+</MESSAGE>
+<MESSAGE name="DjVuFile.dupl_Sxxx" number="12511">
+[1-%0!05u!] Décodeur DjVu : données endommagées (copie du bloc Sxxx)
+</MESSAGE>
+<MESSAGE name="DjVuFile.Dxxx_after_Sxxx" number="12512">
+[1-%0!05u!] Décodeur : données endommagées (Le bloc Dxxx a été détecté après le bloc Sxxx.)
+</MESSAGE>
+<MESSAGE name="DjVuFile.empty_URL" number="12513">
+[1-%0!05u!] Un URL vide a été envoyé dans DjVuFile.
+</MESSAGE>
+<MESSAGE name="DjVuFile.EOF" number="12514">
+[1-%0!05u!] Une fin inattendue est survenue lors de la lecture du fichier suivant :
+	%1!s!.
+</MESSAGE>
+<MESSAGE name="DjVuFile.failed" number="12515">
+[1-%0!05u!] %1!s! : échec
+</MESSAGE>
+<MESSAGE name="DjVuFile.illegal_chunk" number="12516">
+[1-%0!05u!] Numéro de bloc incorrect
+</MESSAGE>
+<MESSAGE name="DjVuFile.malformed" number="12517">
+[1-%0!05u!] Bloc INCL mal formulé. Les barres obliques ne sont pas autorisées.
+</MESSAGE>
+<MESSAGE name="DjVuFile.missing_chunk" number="12518">
+[1-%0!05u!] Nombre de blocs insuffisant
+</MESSAGE>
+<MESSAGE name="DjVuFile.new_version" number="12519">
+[1-%0!05u!] Décodeur DjVu : impossible de décoder des fichiers DjVu avec une version &gt;= %1!d!.
+</MESSAGE>
+<MESSAGE name="DjVuFile.no_create" number="12520">
+[1-%0!05u!] Erreur interne : id_to_file(%1!s!) n'a créé aucun fichier.
+</MESSAGE>
+<MESSAGE name="DjVuFile.no_data" number="12521">
+[1-%0!05u!] Aucune donnée disponible pour l&apos;URL %1!s!
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_finished" number="12522">
+[1-%0!05u!] Erreur interne : un fichier include n&apos;est pas terminé.
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_init" number="12523">
+[1-%0!05u!] DjVuFile n&apos;est pas initialisé.
+</MESSAGE>
+<MESSAGE name="DjVuFile.not_secured" number="12524">
+[1-%0!05u!] DjVuFile ne dispose pas de protection générale GP&lt;DjVuFile&gt;
+</MESSAGE>
+<MESSAGE name="DjVuFile.stopped" number="12525">
+[1-%0!05u!] %1!s! : arrêt
+</MESSAGE>
+<MESSAGE name="DjVuFile.unexp_image" number="12526">
+[1-%0!05u!] Décodeur DjVu : une image DJVU ou IW44 était attendue.
+</MESSAGE>
+<MESSAGE name="DjVuFile.unrecog_chunk" number="12527"
+  value="%1!5.1f! Ko '%2!4s!' Bloc non reconnu." />
+<MESSAGE name="DjVuFile.page_info" number="12528"
+  value="%1!5.1f! Ko '%2!4s!' Informations sur la page" />
+<MESSAGE name="DjVuFile.indir_chunk1" number="12529"
+  value="%2!5.1f! Ko '%3!4s!' Bloc d'indirection (%1!s!)" />
+<MESSAGE name="DjVuFile.indir_chunk2" number="12530"
+  value="%1!5.1f! Ko '%2!4s!' Bloc d'indirection" />
+<MESSAGE name="DjVuFile.shape_dict" number="12531"
+  value="%2!5.1f! Ko '%3!4s!' Dictionnaire de formes JB2 (%1!d! formes)" />
+<MESSAGE name="DjVuFile.fg_mask" number="12532"
+  value="%4!5.1f! Ko '%5!4s!' Calque de premier plan JB2 (%1!d!x%2!d!, %3!d! ppp)" />
+<MESSAGE name="DjVuFile.G4_mask" number="12533"
+  value="%4!5.1f! Ko '%5!4s!' Masque codé G4/MMR (%1!d!x%2!d!, %3!d! ppp)" />
+<MESSAGE name="DjVuFile.IW44_bg1" number="12534"
+  value="%4!5.1f! Ko '%5!4s!' Arrière-plan IW44 (%1!d!x%2!d!, %3!d! ppp)" />
+<MESSAGE name="DjVuFile.IW44_bg2" number="12535"
+  value="%3!5.1f! Ko '%4!4s!' Arrière-plan IW44 (partie %1!d!, %2!d! ppp)" />
+<MESSAGE name="DjVuFile.IW44_fg" number="12536"
+  value="%4!5.1f! Ko '%5!4s!' Premier plan IW44 (%1!d!x%2!d!, %3!d! ppp)" />
+<MESSAGE name="DjVuFile.color_import1" number="12537"
+  value="%4!5.1f! Ko '%5!4s!' Importation de couleurs LINK (%1!d!x%2!d!, %3!d! ppp)" />
+<MESSAGE name="DjVuFile.color_import2" number="12538"
+  value="%1!5.1f! Ko '%2!4s!' Importation de couleurs LINK (fonction non implémentée)" />
+<MESSAGE name="DjVuFile.JPEG_bg1" number="12539"
+  value="%4!5.1f! Ko '%5!4s!' Arrière-plan JPEG (%1!d!x%2!d!, %3!d! ppp)" />
+<MESSAGE name="DjVuFile.JPEG_bg2" number="12540"
+  value="%1!5.1f! Ko '%2!4s!' Arrière-plan JPEG (fonction non implémentée)" />
+<MESSAGE name="DjVuFile.JPEG_fg1" number="12541"
+  value="%4!5.1f! Ko '%5!4s!' Couleurs de premier plan JPEG (%1!d!x%2!d!, %3!d! ppp)" />
+<MESSAGE name="DjVuFile.JPEG_fg2" number="12542"
+  value="%1!5.1f! Ko '%2!4s!' Couleurs de premier plan JPEG (fonction non implémentée)" />
+<MESSAGE name="DjVuFile.JPEG2K_bg" number="12543"
+  value="%1!5.1f! Ko '%2!4s!' Arrière-plan JPEG-2000 (fonction non implémentée)" />
+<MESSAGE name="DjVuFile.JPEG2K_fg" number="12544"
+  value="[1-%0!05u!] %1!5.1f! Ko '%2!4s!' Couleurs de premier plan JPEG-2000 (fonction non implémentée)" />
+<MESSAGE name="DjVuFile.JB2_fg" number="12545"
+  value="%3!5.1f! Ko '%4!4s!' Couleurs de premier plan JB2 (%1!d! couleurs, %2!d! ccs)." />
+<MESSAGE name="DjVuFile.IW44_data1" number="12546"
+  value="%4!5.1f! Ko '%5!4s!' Données IW44 (%1!d!x%2!d!, %3!d! ppp)." />
+<MESSAGE name="DjVuFile.IW44_data2" number="12547"
+  value="%3!5.1f! Ko '%4!4s!' Données IW44 (partie %1!d!, %2!d! ppp)." />
+<MESSAGE name="DjVuFile.nav_dir" number="12548"
+  value="%1!5.1f! Ko '%2!4s!' Répertoire de navigation (obsolète)." />
+<MESSAGE name="DjVuFile.anno1" number="12549"
+  value="%1!5.1f! Ko '%2!4s!' Annotations (format groupé)." />
+<MESSAGE name="DjVuFile.anno2" number="12550"
+  value="%1!5.1f! Ko '%2!4s!' Annotations (hyperliens, etc.)." />
+<MESSAGE name="DjVuFile.text" number="12551"
+  value="%1!5.1f! Ko '%2!4s!' Texte (chaînes, etc.)." />
+<MESSAGE name="DjVuFile.djvu_header" number="12552"
+  value="Image DJVU (%1!d!x%2!d!, %3!d! ppp) version %4!d!:&#10;" />
+<MESSAGE name="DjVuFile.IW44_header" number="12553"
+  value="Image IW44 (%1!d!x%2!d!, %3!d! ppp):&#10;" />
+<MESSAGE name="DjVuFile.ratio" number="12554"
+  value="&#10;Taux de compression: %1!0.f! (%2!0.1f! Ko)" />
+<MESSAGE name="DjVuFile.securedjvu" number="12555">
+Incompatible file (so-called "Secure DjVu".)
+</MESSAGE>
+<MESSAGE name="DjVuGlobalMemory.exhausted" number="12600">
+[1-%0!05u!] Mémoire insuffisante
+</MESSAGE>
+<MESSAGE name="DjVuGlobal.not_compatible" number="12700">
+[1-%0!05u!] DjVuProgress n&apos;est pas compatible avec le mode multithread.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_call" number="12800">
+[1-%0!05u!] DjVuImage::decode ne peut pas être appelé après DjVuImage::connect.
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_rect2" number="12801">
+[1-%0!05u!] (DjVuImage::do_pixmap) Rectangles cible non autorisés
+</MESSAGE>
+<MESSAGE name="DjVuImage.bad_rect" number="12802">
+[1-%0!05u!] (DjVuImage::get_pixmap) Rectangles cible non autorisés
+</MESSAGE>
+<MESSAGE name="DjVuImage.corrupted" number="12803">
+[1-%0!05u!] Fichier endommagé (l&apos;index de couleur est plus important que la taille de la palette).
+</MESSAGE>
+<MESSAGE name="DjVuImage.mult_error" number="12804">
+[1-%0!05u!] Plusieurs erreurs sont survenues lors du décodage.
+</MESSAGE>
+<MESSAGE name="DjVuImage.not_decode" number="12805">
+[1-%0!05u!] Impossible de décoder ce document DjVu à l&apos;aide du mode de
+compabilité avec les versions précédentes
+</MESSAGE>
+<MESSAGE name="DjVuImage.short1" number="12806"
+  value="%1!d!x%2!d! in %3!0.1f! Kb" />
+<MESSAGE name="DjVuImage.short2" number="12807" 
+  value="%1!d!x%2!d!" />
+<MESSAGE name="DjVuInfo.corrupt_file" number="12900">
+[1-%0!05u!] Décodeur DjVu : fichier endommagé (bloc INFO tronqué)
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.bad_page" number="13000">
+[1-%0!05u!] Le numéro de page envoyé comme entrée est incorrect.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.large_page" number="13001">
+[1-%0!05u!] Le numéro de page est trop élevé.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.long_line" number="13002">
+[1-%0!05u!] Impossible de lire le répertoire DjVu, car la ligne est trop longue.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.neg_page" number="13003">
+[1-%0!05u!] Le numéro de page ne peut pas être négatif.
+</MESSAGE>
+<MESSAGE name="DjVuNavDir.zero_dir" number="13004">
+[1-%0!05u!] L&apos;URL de répertoire envoyé au constructeur DjVuNavDir est NUL.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.bad_palette" number="13100">
+[1-%0!05u!] La palette des couleurs de premier plan est endommagée.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.bad_version" number="13101">
+[1-%0!05u!] La balise de version des données de palette est inconnue.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.many_colors" number="13102">
+[1-%0!05u!] Nombre de couleurs incorrect
+</MESSAGE>
+<MESSAGE name="DjVuPalette.no_color" number="13103">
+[1-%0!05u!] Impossible de trouver l&apos;histogramme des couleurs
+</MESSAGE>
+<MESSAGE name="DjVuPalette.not_init" number="13104">
+[1-%0!05u!] La palette n&apos;est pas initialisée.
+</MESSAGE>
+<MESSAGE name="DjVuPalette.test_usage" number="13105">
+[1-%0!05u!] Utilisation : quant&lt;ncol&gt;&lt;minbox&gt;&lt;ppmfile&gt;
+
+</MESSAGE>
+<MESSAGE name="DjVuPort.not_alloc" number="13200">
+[1-%0!05u!] DjVuPort ne dispose pas d&apos;espace alloué dans le segment de mémoire.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_EPS_num" number="13300">
+[1-%0!05u!] Une seule copie peut être imprimée au format EPS.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_format" number="13301">
+[1-%0!05u!] Le format PostScript doit être PS ou EPS.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_gamma" number="13302">
+[1-%0!05u!] Le gamma spécifié est incorrect. La valeur doit être comprise entre 0,3 et 5,0.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_level" number="13303">
+[1-%0!05u!] Le niveau PostScript %1!d! est incorrect. Choisissez le niveau 1 ou 2.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_mode" number="13304">
+[1-%0!05u!] Le mode d&apos;image envoyé au code d&apos;impression est incorrect.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_number" number="13305">
+[1-%0!05u!] Le nombre de copies doit être positif.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_orient" number="13306">
+[1-%0!05u!] L&apos;orientation envoyée au code d&apos;impression est incorrecte.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_page" number="13307">
+[1-%0!05u!] Numéro de page %1!d! incorrect
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_range" number="13308">
+[1-%0!05u!] Série de page %1!s! incorrecte
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_scale" number="13309">
+[1-%0!05u!] Tentative de mise à l&apos;,échelle de l&apos;image selon un point lors de l&apos;impression
+</MESSAGE>
+<MESSAGE name="DjVuToPS.bad_zoom" number="13310">
+[1-%0!05u!] Le facteur de zoom envoyé au code d&apos;impression est incorrect.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.big_page" number="13311">
+[1-%0!05u!] Le numéro de page %1!d! est trop élevé.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.empty_image" number="13313">
+[1-%0!05u!] Tentative d&apos;impression d&apos;une page vide
+</MESSAGE>
+<MESSAGE name="DjVuToPS.empty_rect" number="13314">
+[1-%0!05u!] Tentative d&apos;impression d&apos;un rectangle vide
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_image" number="13315">
+[1-%0!05u!] Impossible d&apos;obtenir l&apos;image de la page %1!d!
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_landscape" number="13316">
+[1-%0!05u!] Le mode paysage n&apos;est pas pris en charge par le format EPS.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.no_to" number="13318">
+[1-%0!05u!] La série de pages %1!s! ne comprend pas de page finale.
+</MESSAGE>
+<MESSAGE name="DjVuToPS.only_one_page" number="13319">
+[1-%0!05u!] Impossible d&apos;imprimer plus d&apos;une page au format EPS
+</MESSAGE>
+<MESSAGE name="EOF" number="13400">
+Unexpected End Of file.
+</MESSAGE>
+<MESSAGE name="Error" number="13500">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="error" number="13600">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="Failed" number="13700">
+Failed.
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_format" number="13800">
+[1-%0!05u!] Format de fichier PBM, PGM ou RLE inconnu
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_levels" number="13801">
+[1-%0!05u!] (GBitmap::set_grays) Nombre de niveaux de gris non autorisé
+</MESSAGE>
+<MESSAGE name="GBitmap.bad_PBM" number="13802">
+[1-%0!05u!] Fichier PBM incorrect
+</MESSAGE>
+<MESSAGE name="GBitmap.cant_compress" number="13803">
+[1-%0!05u!] Impossible de compresser le bitmap en niveaux de gris
+</MESSAGE>
+<MESSAGE name="GBitmap.cant_make_PBM" number="13804">
+[1-%0!05u!] Impossible de créer un fichier PBM avec un bitmap en niveaux de gris
+</MESSAGE>
+<MESSAGE name="GBitmap.left_damaged" number="13805">
+[1-%0!05u!] Déboguage : le contour gauche est endommagé.
+</MESSAGE>
+<MESSAGE name="GBitmap.lost_sync2" number="13806">
+[1-%0!05u!] (GBitmap::decode) Synchronisation RLE perdue
+</MESSAGE>
+<MESSAGE name="GBitmap.lost_sync" number="13807">
+[1-%0!05u!] RLE : synchronisation perdue.
+</MESSAGE>
+<MESSAGE name="GBitmap.not_init" number="13808">
+[1-%0!05u!] Bitmap non initialisé
+</MESSAGE>
+<MESSAGE name="GBitmap.not_int" number="13809">
+[1-%0!05u!] Lecture du bitmap : nombre entier attendu
+</MESSAGE>
+<MESSAGE name="GBitmap.null_arg" number="13810">
+[1-%0!05u!] (GBitmap::decode) Cette fonction a été appelée avec un argument nul.
+</MESSAGE>
+<MESSAGE name="GBitmap.right_damaged" number="13811">
+[1-%0!05u!] Déboguage : le contour droit est endommagé.
+</MESSAGE>
+<MESSAGE name="GBitmap.zero_damaged" number="13812">
+[1-%0!05u!] Déboguage : le tableau nul est endommagé.
+</MESSAGE>
+<MESSAGE name="GBitmap.zero_small" number="13813">
+[1-%0!05u!] Déboguage : le tampon nul est trop petit.
+</MESSAGE>
+<MESSAGE name="GContainer.bad_args" number="13900">
+[1-%0!05u!] Arguments incorrects pour GArray::resize
+</MESSAGE>
+<MESSAGE name="GContainer.bad_howmany" number="13901">
+[1-%0!05u!] Valeur non autorisée pour l&apos;argument &apos;combien&apos;
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos_cont" number="13902">
+[1-%0!05u!] Position incorrecte (La cible se trouve dans un autre conteneur.)
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos" number="13903">
+[1-%0!05u!] Position incorrecte
+</MESSAGE>
+<MESSAGE name="GContainer.bad_pos_null" number="13904">
+[1-%0!05u!] Position incorrecte (pointeur nul).
+</MESSAGE>
+<MESSAGE name="GContainer.bad_sub2" number="13905">
+[1-%0!05u!] Indice non autorisé dans GArray::del.
+</MESSAGE>
+<MESSAGE name="GContainer.cannot_add" number="13906">
+[1-%0!05u!] Impossible d&apos;ajouter une clé au mappage associatif constant
+</MESSAGE>
+<MESSAGE name="GContainer.illegal_subscript" number="13907">
+[1-%0!05u!] L&apos;indice GArray est en dehors des limites.
+</MESSAGE>
+<MESSAGE name="GException.outofmemory" number="14000">
+[1-%0!05u!] Mémoire insuffisante
+</MESSAGE>
+<MESSAGE name="GIFFManager.bad_char" number="14100">
+[1-%0!05u!] Le nom de bloc ne peut contenir ni points ni parenthèses.
+</MESSAGE>
+<MESSAGE name="GIFFManager.cant_find2" number="14101">
+[1-%0!05u!] Impossible de trouver le bloc FORM de niveau supérieur dans
+le fichier IFF en cours de chargement
+</MESSAGE>
+<MESSAGE name="GIFFManager.cant_find" number="14102">
+[1-%0!05u!] Impossible de trouver le bloc nommé %1!s!
+</MESSAGE>
+<MESSAGE name="GIFFManager.del_empty" number="14103">
+[1-%0!05u!] Tentative de suppression d&apos;un bloc sans nom
+</MESSAGE>
+<MESSAGE name="GIFFManager.garbage" number="14104">
+[1-%0!05u!] Le nom du bloc contient des caractères incorrects après le signe ].
+</MESSAGE>
+<MESSAGE name="GIFFManager.get_empty" number="14105">
+[1-%0!05u!] Tentative d&apos;obtention d&apos;un bloc sans nom
+</MESSAGE>
+<MESSAGE name="GIFFManager.malformed" number="14106">
+[1-%0!05u!] Le nom du bloc %1!s! est mal formulé : il comprend un point final.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_brackets" number="14107">
+[1-%0!05u!] Le nom du bloc ne peut pas contenir de parenthèses.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_chunk" number="14108">
+[1-%0!05u!] Le bloc %3!s! ne comprend pas de sous-élément %1!s! #%2!d!
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_dots" number="14109">
+[1-%0!05u!] Le nom du bloc ne peut pas contenir de points.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_top_cont" number="14110">
+[1-%0!05u!] Seul un conteneur peut être défini comme bloc racine.
+</MESSAGE>
+<MESSAGE name="GIFFManager.no_top_name" number="14111">
+[1-%0!05u!] Le nom du bloc racine est encore inconnu.
+</MESSAGE>
+<MESSAGE name="GIFFManager.one_colon" number="14112">
+[1-%0!05u!] Le nom du bloc ne peut contenir qu&apos;un seul &apos;:&apos;.
+</MESSAGE>
+<MESSAGE name="GIFFManager.unknown" number="14114">
+[1-%0!05u!] Erreur interne : le bloc %1!s! est inconnu.
+</MESSAGE>
+<MESSAGE name="GIFFManager.unmatched" number="14115">
+[1-%0!05u!] Il manque une parenthèse dans le nom du bloc.
+</MESSAGE>
+<MESSAGE name="GIFFManager.wrong_name2" number="14116">
+[1-%0!05u!] Le nom du bloc racine ne correspond pas à %1!s!.
+</MESSAGE>
+<MESSAGE name="GIFFManager.wrong_name" number="14117">
+[1-%0!05u!] Le nom du bloc racine de ce fichier ne correspond pas à %1!s!.
+</MESSAGE>
+<MESSAGE name="GMapAreas.intersect" number="14200">
+[1-%0!05u!] Certains segments de polygones se coupent.
+</MESSAGE>
+<MESSAGE name="GMapAreas.oval_border" number="14201">
+[1-%0!05u!] Ce type de contour n&apos;est pas pris en charge par les zones de mappage ovales.
+</MESSAGE>
+<MESSAGE name="GMapAreas.oval_hilite" number="14202">
+[1-%0!05u!] La mise en surbrillance de zone n&apos;est pas prise en charge par les zones de mappage ovales.
+</MESSAGE>
+<MESSAGE name="GMapAreas.poly_border" number="14203">
+[1-%0!05u!] Ce type de contour n&apos;est pas pris en charge par les zones de mappage polygonales.
+</MESSAGE>
+<MESSAGE name="GMapAreas.poly_hilite" number="14204">
+[1-%0!05u!] La mise en surbrillance de zone n&apos;est pas prise en charge par les zones de mappage polygonales.
+</MESSAGE>
+<MESSAGE name="GMapAreas.too_few_points" number="14205">
+[1-%0!05u!] Le nombre de points du polygone est insuffisant.
+</MESSAGE>
+<MESSAGE name="GMapAreas.width_1" number="14206">
+[1-%0!05u!] La valeur de la largeur du contour doit être 1 pour les contours de type  Xor et solide.
+</MESSAGE>
+<MESSAGE name="GMapAreas.width_3-32" number="14207">
+[1-%0!05u!] La valeur de la largeur du contour doit être comprise entre 3 et 32 pour les contours de type ombré.
+</MESSAGE>
+<MESSAGE name="GMapAreas.zero_height" number="14208">
+[1-%0!05u!] La hauteur de la zone est nulle.
+</MESSAGE>
+<MESSAGE name="GMapAreas.zero_width" number="14209">
+[1-%0!05u!] La largeur de la zone est nulle.
+</MESSAGE>
+<MESSAGE name="GPixmap.bad_param" number="14400">
+[1-%0!05u!] (GPixmap::color_correct) Paramètre non autorisé
+</MESSAGE>
+<MESSAGE name="GPixmap.diff_size" number="14401">
+[1-%0!05u!] Le pixmap couleur et le bitmap alpha sont de tailles différentes.
+</MESSAGE>
+<MESSAGE name="GPixmap.no_int" number="14402">
+[1-%0!05u!] Lecture du pixmap : nombre entier attendu
+</MESSAGE>
+<MESSAGE name="GPixmap.null_alpha" number="14403">
+[1-%0!05u!] Pointeur de bitmap alpha nul
+</MESSAGE>
+<MESSAGE name="GPixmap.null_color" number="14404">
+[1-%0!05u!] Pointeur de pixmap couleur nul
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow1" number="14405">
+[1-%0!05u!] (GPixmap::downsample) Le rectangle spécifié est plus grand que le
+pixmap cible.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow2" number="14406">
+[1-%0!05u!] (GPixmap::upsample) Le rectangle spécifié est plus grand que le
+pixmap cible.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow3" number="14407">
+[1-%0!05u!] (GPixmap::downsample43) Le rectangle spécifié est plus grand que le
+pixmap cible.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow4" number="14408">
+[1-%0!05u!] (GPixmap::upsample23) Le rectangle spécifié est plus grand que le
+pixmap cible.
+</MESSAGE>
+<MESSAGE name="GPixmap.overflow5" number="14409">
+[1-%0!05u!] (GPixmap::stencil) Le rectangle spécifié est plus grand que le
+pixmap de premier plan.
+</MESSAGE>
+<MESSAGE name="GPixmap.unk_PPM" number="14410">
+[1-%0!05u!] Format de fichier PPM inconnu
+</MESSAGE>
+<MESSAGE name="GRect.div_zero" number="14500">
+[1-%0!05u!] Division par zéro
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect1" number="14501">
+[1-%0!05u!] Rectangle vide non autorisé dans GRectMapper::set_input
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect2" number="14502">
+[1-%0!05u!] Rectangle vide non autorisé dans GRectMapper::set_output
+</MESSAGE>
+<MESSAGE name="GRect.empty_rect3" number="14503">
+[1-%0!05u!] Rectangle vide non autorisé dans GRectMapper::[un]map
+</MESSAGE>
+<MESSAGE name="GScaler.assertion" number="14600">
+[1-%0!05u!] Echec d&apos;assertion
+</MESSAGE>
+<MESSAGE name="GScaler.no_match" number="14601">
+[1-%0!05u!] Le pixmap d&apos;entrée ne correspond pas au rectangle d&apos;entrée.
+</MESSAGE>
+<MESSAGE name="GScaler.ratios" number="14602">
+[1-%0!05u!] Les deux taux GScaler doivent être nuls ou positifs.
+</MESSAGE>
+<MESSAGE name="GScaler.too_big" number="14603">
+[1-%0!05u!] La sortie souhaitée est plus grande que le rectangle de sortie de l&apos;image entière.
+</MESSAGE>
+<MESSAGE name="GScaler.too_small" number="14604">
+[1-%0!05u!] Le pixmap d&apos;entrée fourni est trop petit.
+</MESSAGE>
+<MESSAGE name="GScaler.undef_size" number="14605">
+[1-%0!05u!] Les valeurs taille_entrée et taille_sortie de GScaler ne sont pas encore définies.
+</MESSAGE>
+<MESSAGE name="GSmartPointer.suspicious" number="14700">
+[1-%0!05u!] Destruction suspecte de l&apos;objet GPEnabled référencé
+</MESSAGE>
+<MESSAGE name="GString.bad_subscript" number="14800">
+[1-%0!05u!] Indice non autorisé dans GString::operator[]
+</MESSAGE>
+<MESSAGE name="GString.overwrite" number="14801">
+[1-%0!05u!] Ecrasement de la mémoire. Le programme n&apos;est pas stable.
+</MESSAGE>
+<MESSAGE name="GStringRep.NativeToNative" number="14802">
+[1-%0!05u!] Tentative de conversion de l&apos;encodage natif en encodage natif
+</MESSAGE>>
+<MESSAGE name="GStringRep.UTF8ToUTF8" number="14803">
+[1-%0!05u!] Tentative de conversion de l&apos;encodage UTF8 en encodage UTF8
+</MESSAGE>>
+<MESSAGE name="GStringRep.appendNativeToUTF8" number="14804">
+[1-%0!05u!] Tentative d&apos;ajout d&apos;une chaîne native à une chaîne UTF8
+</MESSAGE>>
+<MESSAGE name="GStringRep.appendUTF8toNative" number="14805">
+[1-%0!05u!] Tentative d&apos;ajout d&apos;une chaîne UTF8 à une chaîne native
+</MESSAGE>>
+<MESSAGE name="GThreads.co_panic" number="14900">
+[1-%0!05u!] Erreur fatale COTHREADS : contexte d&apos;exception introuvable
+</MESSAGE>
+<MESSAGE name="GThreads.dupl_callback" number="14901">
+[1-%0!05u!] GThread::set_scheduling_callback appelé deux fois
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_broad" number="14902">
+[1-%0!05u!] Le moniteur n&apos;a pas été acquis par cette thread (GMonitor::broadcast).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_leave" number="14903">
+[1-%0!05u!] Le moniteur n&apos;a pas été acquis par cette thread (GMonitor::leave).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_signal" number="14904">
+[1-%0!05u!] Le moniteur n&apos;a pas été acquis par cette thread (GMonitor::signal).
+</MESSAGE>
+<MESSAGE name="GThreads.not_acq_wait" number="14905">
+[1-%0!05u!] Le moniteur n&apos;a pas été acquis par cette thread (GMonitor::wait).
+</MESSAGE>
+<MESSAGE name="GThreads.panic" number="14906">
+[1-%0!05u!] Erreur fatale : blocage Cothreads.
+</MESSAGE>
+<MESSAGE name="GThreads.uncaught" number="14907">
+[1-%0!05u!] GThreads : exception non capturée
+</MESSAGE>
+<MESSAGE name="GThreads.unrecognized" number="14908">
+[1-%0!05u!] GThreads : exception non capturée inconnue
+</MESSAGE>
+<MESSAGE name="GURL.fail_to_file" number="15000">
+[1-%0!05u!] Impossible de convertir l&apos;URL en nom de fichier
+</MESSAGE>
+<MESSAGE name="GURL.fail_to_URL" number="15001">
+[1-%0!05u!] Impossible de reconvertir le nom de fichier en URL
+</MESSAGE>
+<MESSAGE name="GURL.no_protocol" number="15002">
+[1-%0!05u!] L&apos;URL %1!s! ne contient pas de préfixe de protocole.
+</MESSAGE>
+<MESSAGE name="GURL.big_name" number="15003">
+[1-%0!05u!] Le nom de fichier est trop long.
+</MESSAGE>
+<MESSAGE name="GURL.listdir" number="15004">
+[1-%0!05u!] GURL::listdir n&apos;est pas implémenté sur cette plate-forme.
+</MESSAGE>
+<MESSAGE name="GURL.no_rename" number="15005">
+[1-%0!05u!] Renommer() n&apos;est pas disponible sur les périphériques WinCE.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.bad_chunk" number="15100">
+[1-%0!05u!] ID de bloc non autorisé (IFFByteStream::put_chunk)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.bad_offset" number="15101">
+[1-%0!05u!] Décalage de IFFByteStream (erreur interne) en dehors des limites du bloc
+</MESSAGE>
+<MESSAGE name="IFFByteStream.cant_close" number="15102">
+[1-%0!05u!] Impossible de fermer un bloc quand aucun bloc n&apos;est ouvert.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.cant_write" number="15103">
+[1-%0!05u!] Impossible d&apos;effectuer une écriture tant que le bloc précédent n&apos;est pas terminé.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_2nd_id" number="15104">
+[1-%0!05u!] Fichier IFF endommagé (ID de bloc secondaire non autorisé)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_end2" number="15105">
+[1-%0!05u!] Fichier IFF endommagé (Une fin de bloc est survenue lors de la lecture de la taille du bloc.)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_end" number="15106">
+[1-%0!05u!] Fichier IFF endommagé (Une fin de bloc est survenue lors de la lecture de l&apos;ID du bloc.)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_header" number="15107">
+[1-%0!05u!] Fichier IFF endommagé (Une fin de bloc est survenue lors de la lecture de l&apos;en-tête du bloc composite.)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_id" number="15108">
+[1-%0!05u!] Fichier IFF endommagé (ID de bloc non autorisé)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.corrupt_mangled" number="15109">
+[1-%0!05u!] Fichier IFF endommagé (limites de blocs détériorées)
+</MESSAGE>
+<MESSAGE name="IFFByteStream.no_chunk_id" number="15110">
+[1-%0!05u!] Aucun ID de bloc disponible pour le moment
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready2" number="15111">
+[1-%0!05u!] IFFByteStream n&apos;est pas prêt pour l&apos;écriture des blocs.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready3" number="15112">
+[1-%0!05u!] IFFByteStream n&apos;est pas prêt pour la lecture des octets.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready4" number="15113">
+[1-%0!05u!] IFFByteStream n&apos;est pas prêt pour l&apos;écriture des octets.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.not_ready" number="15114">
+[1-%0!05u!] IFFByteStream n&apos;est pas prêt pour la lecture des blocs.
+</MESSAGE>
+<MESSAGE name="IFFByteStream.read_write" number="15115">
+[1-%0!05u!] Tentative d&apos;écriture et de lecture du même IFFByteStream
+</MESSAGE>
+<MESSAGE name="Internal.error" number="15200">
+[1-%0!05u!] Erreur interne
+</MESSAGE>
+<MESSAGE name="IW44Image.bad_rect" number="15300">
+[1-%0!05u!] (IWMap::image) Le rectangle est hors limites.
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_primary2" number="15302">
+[1-%0!05u!] (IWPixmap::decode_chunk) Impossible de lire l&apos;en-tête primaire
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_primary" number="15303">
+[1-%0!05u!] (IWBitmap::decode_chunk) Impossible de lire l&apos;en-tête primaire
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_secondary2" number="15304">
+[1-%0!05u!] (IWPixmap::decode_chunk) Impossible de lire l&apos;en-tête secondaire
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_secondary" number="15305">
+[1-%0!05u!] (IWBitmap::decode_chunk) Impossible de lire l&apos;en-tête secondaire
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_tertiary2" number="15306">
+[1-%0!05u!] (IWPixmap::decode_chunk) Impossible de lire l&apos;en-tête tertiaire
+</MESSAGE>
+<MESSAGE name="IW44Image.cant_read_tertiary" number="15307">
+[1-%0!05u!] (IWBitmap::decode_chunk) Impossible de lire l&apos;en-tête tertiaire
+</MESSAGE>
+<MESSAGE name="IW44Image.codec_open2" number="15308">
+[1-%0!05u!] (IWBitmap::decode_chunk) Le codec est toujours ouvert pour le décodage.
+</MESSAGE>
+<MESSAGE name="IW44Image.corrupt_BM44_2" number="15312">
+[1-%0!05u!] (IWPixmap::decode_iff) Fichier endommagé (impossible de lire FORM.BM44)
+</MESSAGE>
+<MESSAGE name="IW44Image.corrupt_BM44" number="15313">
+[1-%0!05u!] (IWBitmap::decode_iff) Fichier endommagé (impossible de lire FORM.BM44)
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_object2" number="15315">
+[1-%0!05u!] (IWPixmap::encode_chunk) L&apos;objet IWBitmap est vide.
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_object" number="15316">
+[1-%0!05u!] (IWBitmap::encode_chunk) L&apos;objet IWBitmap est vide.
+</MESSAGE>
+<MESSAGE name="IW44Image.empty_rect" number="15317">
+[1-%0!05u!] (IWMap::image) Le rectangle est vide.
+</MESSAGE>
+<MESSAGE name="IW44Image.has_color" number="15318">
+[1-%0!05u!] (IWBitmap::decode_chunk) Le fichier contient une image couleur.
+</MESSAGE>
+<MESSAGE name="IW44Image.incompat_codec2" number="15319">
+[1-%0!05u!] (IWPixmap::decode_chunk) Le fichier a été compressé avec
+un IWCodec incompatible.
+</MESSAGE>
+<MESSAGE name="IW44Image.incompat_codec" number="15320">
+[1-%0!05u!] (IWBitmap::decode_chunk) Le fichier a été compressé avec
+un IWCodec incompatible.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open1" number="15321">
+[1-%0!05u!] (IWBitmap::encode_iff) Le codec est resté ouvert.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open2" number="15322">
+[1-%0!05u!] (IWBitmap::decode_iff) Le codec est resté ouvert.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open3" number="15323">
+[1-%0!05u!] (IWPixmap::encode_iff) Le codec est resté ouvert.
+</MESSAGE>
+<MESSAGE name="IW44Image.left_open4" number="15324">
+[1-%0!05u!] (IWPixmap::decode_iff) Le codec est resté ouvert.
+</MESSAGE>
+<MESSAGE name="IW44Image.need_stop2" number="15325">
+[1-%0!05u!] (IWPixmap::encode_chunk) Un critère d&apos;arrêt doit être spécifié.
+</MESSAGE>
+<MESSAGE name="IW44Image.need_stop" number="15326">
+[1-%0!05u!] (IWBitmap::encode_chunk) Un critère d&apos;arrêt doit être spécifié.
+</MESSAGE>
+<MESSAGE name="IW44Image.param_range2" number="15327">
+[1-%0!05u!] (IWPixmap::parm_dbfrac) Paramètre hors intervalle
+</MESSAGE>
+<MESSAGE name="IW44Image.param_range" number="15328">
+[1-%0!05u!] (IWBitmap::parm_dbfrac) Paramètre hors intervalle
+</MESSAGE>
+<MESSAGE name="IW44Image.recent_codec2" number="15329">
+[1-%0!05u!] (IWPixmap::decode_chunk) Le fichier a été compressé avec un
+\IWCodec plus récent.
+</MESSAGE>
+<MESSAGE name="IW44Image.recent_codec" number="15330">
+[1-%0!05u!] (IWBitmap::decode_chunk) Le fichier a été compressé avec un
+\IWCodec plus récent.
+</MESSAGE>
+<MESSAGE name="IW44Image.sample_factor" number="15331">
+[1-%0!05u!] (IWMap::image) Facteur d&apos;échantillonnage non pris en charge
+</MESSAGE>
+<MESSAGE name="IW44Image.wrong_serial2" number="15332">
+[1-%0!05u!] (IWPixmap::decode_chunk) Numéro de série du bloc inattendu
+</MESSAGE>
+<MESSAGE name="IW44Image.wrong_serial" number="15333">
+[1-%0!05u!] (IWBitmap::decode_chunk) Numéro de série du bloc inattendu
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_dict2" number="15400">
+[1-%0!05u!] Fichier endommagé : la dimension d&apos;image dans le dictionnaire JB2 n&apos;est pas nulle.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_dict" number="15401">
+[1-%0!05u!] La taille du dictionnaire de formes ne correspond pas aux données JB2.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_number" number="15402">
+[1-%0!05u!] (JB2Codec::CodeNum) Le nombre est hors limites.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_numcontext" number="15403">
+[1-%0!05u!] (JB2Codec::CodeNum) NumContext non autorisé.
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_parent_shape" number="15404">
+[1-%0!05u!] Numéro de forme parent non autorisé dans JB2Shape
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_shape" number="15405">
+[1-%0!05u!] Numéro de forme non autorisé dans JB2Blit
+</MESSAGE>
+<MESSAGE name="JB2Image.bad_type" number="15406">
+[1-%0!05u!] Fichier endommagé : type d&apos;enregistrement non autorisé pour le dictionnaire de formes.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_change" number="15407">
+[1-%0!05u!] Impossible de modifier le dictionnaire une fois qu'il est défini.
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_create" number="15408">
+[1-%0!05u!] Impossible de créer une image bitmap pour un objet JB2Image non dimensionné
+</MESSAGE>
+<MESSAGE name="JB2Image.cant_set" number="15409">
+[1-%0!05u!] Impossible de définir le dictionnaire après l&apos;ajout de formes
+</MESSAGE>
+<MESSAGE name="JB2Image.need_dict" number="15410">
+[1-%0!05u!] Les données JB2 requièrent un dictionnaire de formes.
+</MESSAGE>
+<MESSAGE name="JB2Image.no_start" number="15411">
+[1-%0!05u!] Fichier endommagé : aucun début d&apos;enregistrement
+</MESSAGE>
+<MESSAGE name="JB2Image.unknown_type" number="15412">
+[1-%0!05u!] Fichier endommagé : type d&apos;enregistrement inconnu
+</MESSAGE>
+<MESSAGE name="JB2Image.zero_dim" number="15413">
+[1-%0!05u!] Fichier endommagé : la dimension de l&apos;image JB2 est nulle.
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_codebook" number="15500">
+[1-%0!05u!] Guide de codification MMR ambigu
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_data" number="15501">
+[1-%0!05u!] Données G4/MMR incorrectes
+</MESSAGE>
+<MESSAGE name="MMRDecoder.bad_header" number="15502">
+[1-%0!05u!] En-tête G4/MMR endommagé
+</MESSAGE>
+<MESSAGE name="MMRDecoder.cant_process" number="15503">
+[1-%0!05u!] Impossible de traiter les bits non compressés dans les données G4/MMR
+</MESSAGE>
+<MESSAGE name="MMRDecoder.unrecog_header" number="15504">
+[1-%0!05u!] Impossible de reconnaître la&apos;en-tête G4/MMR
+</MESSAGE>
+<MESSAGE name="not_implemented_n" number="15600">
+[1-%0!05u!] %1!s! n&apos;est pas implémenté(e).
+</MESSAGE>
+<MESSAGE name="not_implemented" number="15700">
+[1-%0!05u!] Non implémenté(e)
+</MESSAGE>
+<MESSAGE name="parseoptions.ambiguous" number="15800">
+[1-%0!05u!] Options spécifiées ambiguës : 1!s!=%2!s! et %3!s!=%4!s!
+.
+</MESSAGE>
+<MESSAGE name="parseoptions.bad_install" number="15801">
+[1-%0!05u!] Le kit de développement logiciel n&apos;est pas installé correctement. Veuillez le réinstaller.
+</MESSAGE>
+<MESSAGE name="parseoptions.bad_number" number="15802">
+[1-%0!05u!] %1!s! n&apos;est pas un nombre.
+</MESSAGE>
+<MESSAGE name="parseoptions.bad_value" number="15803">
+[1-%0!05u!] %1!s! n&apos;est ni un nombre ni une valeur booléenne.
+</MESSAGE>
+<MESSAGE name="parseoptions.cant_inherit" number="15804">
+[1-%0!05u!] %1!s! : erreur à la ligne %2!d! de &apos;%3!s!&apos;&#10;&#09;
+&gt; ne peut pas hériter du profil inconnu &apos;%4!s!&apos;.
+</MESSAGE>
+<MESSAGE name="parseoptions.illegal_profile" number="15805">
+[1-%0!05u!] %1!s! : erreur à la ligne %2!d! du profil &apos;%3!s!&apos;&#10;
+&#09; &gt; nom de profil non autorisé %4!s!.
+</MESSAGE>
+<MESSAGE name="parseoptions.missing_arg_option" number="15806">
+[1-%0!05u!] Argument requis pour l&apos;option %1!s!
+</MESSAGE>
+<MESSAGE name="parseoptions.profile_error" number="15807">
+[1-%0!05u!] %1!s! : erreur à la ligne %2!d! du profil %3!s!&#10;
+&#09; &gt; %4!s!.
+</MESSAGE>
+<MESSAGE name="parseoptions.unrecog_option_c" number="15808">
+[1-%0!05u!] Option non reconnue : %1!s! 
+</MESSAGE>
+<MESSAGE name="parseoptions.unrecog_option" number="15809">
+[1-%0!05u!] Option %1!s! non reconnue
+</MESSAGE>
+<MESSAGE name="STOP" number="16000">
+[1-%0!05u!] Message d&apos;arrêt non capturé
+</MESSAGE>
+<MESSAGE name="TextException.test" number="16100">
+[1-%0!05u!] Exception de test
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_color" number="16200">
+[1-%0!05u!] La couleur %1!s! n&apos;est pas prise en charge.
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_page" number="16201">
+[1-%0!05u!] Impossible d&apos;obtenir la page spécifiée
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_rect" number="16202">
+[1-%0!05u!] Coordonnées de zone rectangulaire insuffisantes
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_circle" number="16203">
+[1-%0!05u!] Coordonnées de zone circulaire insuffisantes
+</MESSAGE>
+<MESSAGE name="XMLAnno.bad_oval" number="16204">
+[1-%0!05u!] Coordonnées de zone ovale insuffisantes
+</MESSAGE>
+<MESSAGE name="XMLAnno.unknown_shape" number="16205">
+[1-%0!05u!] Forme inconnue %1!s!
+</MESSAGE>
+<MESSAGE name="XMLAnno.unknown_border" number="16206">
+[1-%0!05u!] Type de contour non reconnu %1!s!
+</MESSAGE>
+<MESSAGE name="XMLAnno.extra_body" number="16207">
+[1-%0!05u!] Une&lt;BODY&gt;&lt;/BODY&gt; seule paire est requise.
+</MESSAGE>
+<MESSAGE name="XMLAnno.no_body" number="16208">
+[1-%0!05u!] Aucune&lt;BODY&gt;&lt;/BODY&gt; paire détectée
+</MESSAGE>
+<MESSAGE name="XMLAnno.map_find" number="16209">
+[1-%0!05u!] Impossible de détecter le mappage %1!s! spécifié
+</MESSAGE>
+<MESSAGE name="XMLAnno.fail_init" number="16210">
+[1-%0!05u!] Impossible d&apos;initialiser %1!s!
+</MESSAGE>
+<MESSAGE name="XMLTags.no_GP" number="16300">
+[1-%0!05u!] Aucun pointeur de protection générale défini
+</MESSAGE>
+<MESSAGE name="XMLTags.raw_string" number="16301">
+[1-%0!05u!] La chaîne brute %1!s! a été détectée en dehors du document.
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_tag" number="16302">
+[1-%0!05u!] Balise %1!s! incomplète
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_PI" number="16303">
+[1-%0!05u!] Instruction de traitement incomplète : %1!s!
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_comment" number="16304">
+[1-%0!05u!] Commentaire incomplet : %1!s!
+</MESSAGE>
+<MESSAGE name="XMLTags.bad_form" number="16305">
+[1-%0!05u!] Erreur de formulation. Nombre de balises fermantes trop élevé.
+</MESSAGE>
+<MESSAGE name="XMLTags.no_body" number="16306">
+[1-%0!05u!] Pas de corps
+</MESSAGE>
+<MESSAGE name="XMLTags.unmatched_end" number="16307">
+[1-%0!05u!] La balise XML %1!s! de la ligne %2!u! a été fermée par la balise XML
+%3!s! de la ligne %4!u!.
+</MESSAGE>
+<MESSAGE name="ZPCodec.no_encoding" number="16400">
+[1-%0!05u!] ZPCodec n&apos;a pas été créé pour l&apos;encodage.
+</MESSAGE>
+<MESSAGE name="ZPCodec.write_error" number="16401">
+[1-%0!05u!] Erreur d&apos;écriture ZPCodec
+</MESSAGE>
+</BODY>
+</DjVuMessages>
+
+ 
diff --git a/share/djvu/osi/fr/messages.xml b/share/djvu/osi/fr/messages.xml
new file mode 100644
index 0000000..dfc1d25
--- /dev/null
+++ b/share/djvu/osi/fr/messages.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- List of files to include to get the entire list of messages -->
+<DjVuMessages>
+<HEAD>
+<!-- Message numbers 17000-19999 -->
+<INCLUDE name="../en/djvutools-reference.xml" />
+<!-- Message numbers 10000-16999 -->
+<INCLUDE name="libdjvu++.xml" />
+</HEAD>
+<BODY>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/ja/libdjvu++.xml b/share/djvu/osi/ja/libdjvu++.xml
new file mode 100644
index 0000000..d763d01
--- /dev/null
+++ b/share/djvu/osi/ja/libdjvu++.xml
@@ -0,0 +1,896 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- Error messages from libdjvu++ -->
+<DjVuMessages>
+<BODY>
+<MESSAGE name="DjVuMessage.Unrecognized" number="10000"
+  value="[%0!05u!] 認識できないエラーメッセージ：&#10;&#09;メッセージ名：&apos;%1!s!&apos;" />
+<MESSAGE name="DjVuMessage.Parameter" number="10001"
+  value="パラメーター &apos;%1!s!&apos;" />
+<MESSAGE name="DjVuMessage.failed_to_parse_XML" number="10002"
+  value="[%0!05u!] XMLメッセージを解析することができません。ファイル：;&#09;&apos;%1!s!&apos;" />
+<MESSAGE name="DjVuText.no_text" number="10101">
+[1-%0!05u!] テキストが必要です。テキストが見つかりませんでした。
+</MESSAGE>
+<MESSAGE name="DjVuText.corrupt_chunk" number="10102">
+[1-%0!05u!] ファイルチャンクが不正です。ファイルチャンクが短すぎます。
+</MESSAGE>
+<MESSAGE name="DjVuText.bad_version" number="10103">
+[1-%0!05u!] テキストバージョン &apos;%1!c!&apos; はサポートしていません。
+</MESSAGE>
+<MESSAGE name="DjVuText.one_word" number="10104">
+[1-%0!05u!] 単語中にセパレータが見つかりました。
+</MESSAGE>
+<MESSAGE name="DjVuText.dupl_text" number="10105">
+[1-%0!05u!] 1つ以上のテキストレイヤが見つかりました。
+</MESSAGE>
+<MESSAGE name="arrays.ill_arg" number="11500"
+  value="[%0!05u!] DArray::del に不正な引数があります。" />
+<MESSAGE name="arrays.ill_sub" number="11501"
+  value="[%0!05u!] DArray の添え字が不正です。" />
+<MESSAGE name="arrays.resize" number="11502"
+  value="[%0!05u!] DArray のサイズ変更で指定された値が範囲外です。" />
+<MESSAGE name="bad_arg" number="11600"
+  value="[%0!05u!] 引数が正しくありません &apos;%1!s!&apos;" />
+<MESSAGE name="ByteStream.backward" number="11700"
+  value="[%0!05u!] この ByteStream では後方に捜索することができません。" />
+<MESSAGE name="ByteStream.bad_arg" number="11701"
+  value="[%0!05u!] ByteStream::seek に不正な引数があります。" />
+<MESSAGE name="ByteStream.bad_mode" number="11703"
+  value="[%0!05u!] StdioByteStream に不正なモードがあります。" />
+<MESSAGE name="ByteStream.cant_write" number="11704"
+  value="[%0!05u!] デコード時に作成される BSByteStream に書き込めません。" />
+<MESSAGE name="ByteStream.corrupt" number="11705"
+  value="[%0!05u!] デコーダーからの入力情報が破損しています。" />
+<MESSAGE name="ByteStream.flush_error" number="11707"
+  value="[%0!05u!] StdioByteStream::flush、フラッシュエラー" />
+<MESSAGE name="ByteStream.no_read" number="11708"
+  value="[%0!05u!] StdioByteStream が読み込むために開けません。" />
+<MESSAGE name="ByteStream.no_write" number="11709"
+  value="[%0!05u!] StdioByteStream が書き込むために開けません。" />
+<MESSAGE name="ByteStream.open_fail2" number="11710"
+  value="[%0!05u!] StdioByteStream::StdioByteStream が開けません。" />
+<MESSAGE name="ByteStream.open_fail" number="11711"
+  value="[%0!05u!] &apos;%1!s!&apos;：&apos;%2!s!&apos; を開くことができません。" />
+<MESSAGE name="ByteStream.read_error2" number="11712"
+  value="[%0!05u!] StdioByteStream::read、読み込みエラー" />
+<MESSAGE name="ByteStream.read_error" number="11713"
+  value="[%0!05u!] ByteStream::readall、読み込みエラー" />
+<MESSAGE name="ByteStream.seek_error2" number="11714"
+  value="[%0!05u!] ファイルの先頭より前方に捜索することができません。" />
+<MESSAGE name="ByteStream.seek_error" number="11715"
+  value="[%0!05u!] StdioByteStream::seek、捜索エラー" />
+<MESSAGE name="ByteStream.seek" number="11716"
+  value="[%0!05u!] この ByteStream のシーク中に異常がみつかりました(ftell()が異常な動作をしています)" />
+<MESSAGE name="ByteStream.write" number="11717"
+  value="[%0!05u!] ByteStream::write%1!s!、書き込みエラー" />
+<MESSAGE name="ByteStream.write_error2" number="11718"
+  value="[%0!05u!] StdioByteStream::write、書き込みエラー" />
+<MESSAGE name="ByteStream.write_error" number="11720"
+  value="[%0!05u!] ByteStream::write に未知のエラーがあります。" />
+<MESSAGE name="ByteStream.not_implemented" number="11721"
+  value="[%0!05u!] ByteStream::scanf が実装されていません。" />
+<MESSAGE name="DataPool.add_data" number="11800"
+  value="[%0!05u!] 関数 DataPool::add_data()は、接続済みの DataPools に対して呼び出してはいけません。" />
+<MESSAGE name="DataPool.bad_length" number="11801"
+  value="[%0!05u!] 長さは正の値でなければなりません。" />
+<MESSAGE name="DataPool.bad_size" number="11802"
+  value="[%0!05u!] サイズは、0以上でなければなりません。" />
+<MESSAGE name="DataPool.connected1" number="11803"
+  value="[%0!05u!] すでに、別の DataPool に接続されています。" />
+<MESSAGE name="DataPool.connected2" number="11804"
+  value="[%0!05u!] すでにファイルに接続されています。" />
+<MESSAGE name="DataPool.neg_start" number="11805"
+  value="[%0!05u!] 範囲の起点は負の値ではいけません。" />
+<MESSAGE name="DataPool.no_threadless" number="11806"
+  value="[%0!05u!] 内部エラーです：このファンクションはスレッドレスモードで使用することは出来ません。" />
+<MESSAGE name="DataPool.seek_backward" number="11808"
+  value="[%0!05u!] この ByteStream では EOF から後方に走査することができません。" />
+<MESSAGE name="DataPool.zero_DataPool" number="11809"
+  value="[%0!05u!] 内部エラー：入力にZERO DataPoolが指定されました。" />
+<MESSAGE name="DjVmDir0.no_slash" number="11900"
+  value="[%0!05u!] ファイル名には、スラッシュが入ってはいけません。" />
+<MESSAGE name="DjVmDir.bad_dir" number="12000"
+  value="[%0!05u!] ディレクトリには、バンドルド形式とインダイレクト形式が含まれています。" />
+<MESSAGE name="DjVmDir.bad_file" number="12001"
+  value="[%0!05u!] DjVm File ID &apos;%1!s!&apos; 不正な文字が含まれています。" />
+<MESSAGE name="DjVmDir.corrupt" number="12002"
+  value="[%0!05u!] DjVu 文書が不正です。 マルチページドキュメントのシェアードアノテーションは1ファイルしか使用できません。" />
+<MESSAGE name="DjVmDir.dupl_id2" number="12003"
+  value="[%0!05u!] File with ID &apos;%1!s!&apos; すでに、DJVM ディレクトリが存在します。" />
+<MESSAGE name="DjVmDir.dupl_id" number="12004"
+  value="[%0!05u!] エラー &apos;DIRM&apos; chunk：重複する ID(&apos;%1!s!&apos;) を持つレコードが存在します。" />
+<MESSAGE name="DjVmDir.dupl_name2" number="12005"
+  value="[%0!05u!] File with NAME &apos;%1!s!&apos; すでに、DJVM ディレクトリが存在します。" />
+<MESSAGE name="DjVmDir.dupl_name" number="12006"
+  value="[%0!05u!] エラー &apos;DIRM&apos; chunk：重複する名称(&apos;%1!s!&apos;)を持つレコードが存在します。" />
+<MESSAGE name="DjVmDir.dupl_title2" number="12007"
+  value="[%0!05u!] File with TITLE &apos;%1!s!&apos; すでに、DJVM ディレクトリが存在します。" />
+<MESSAGE name="DjVmDir.dupl_title" number="12008"
+  value="[%0!05u!] エラー &apos;DIRM&apos; chunk：重複するタイトル(&apos;%1!s!&apos;)を持つのレコードが存在します。" />
+<MESSAGE name="DjVmDir.get_str_type" number="12009"
+  value="[%0!05u!] 内部エラーです：すべての有効なファイルを含むように DjVmDir::File::get_str_type() を変更してください。" />
+<MESSAGE name="DjVmDir.multi_save2" number="12010"
+  value="[%0!05u!] 現在の DjVu のマルチページフォーマットは、シェアードアノテーション付の複数ファイルに対応していません。" />
+<MESSAGE name="DjVmDir.multi_save" number="12011"
+  value="[%0!05u!] シェアードアノテーション付きの複数ファイル形式でマルチページ文書を保存することはできません。" />
+<MESSAGE name="DjVmDir.name_in_use" number="12012"
+  value="[%0!05u!] 名前 &apos;%1!s!&apos; は現在使用されています。" />
+<MESSAGE name="DjVmDir.no_indirect" number="12013"
+  value="[%0!05u!] ディレクトリエラー：バンドルド形式ではインダイレクトエントリは許可されません。" />
+<MESSAGE name="DjVmDir.no_info" number="12014"
+  value="[%0!05u!] ファイルID &apos;%1!s!&apos; の情報がありません。" />
+<MESSAGE name="DjVmDir.title_in_use" number="12015"
+  value="[%0!05u!] タイトル &apos;%1!s!&apos; は現在使用されています。" />
+<MESSAGE name="DjVmDir.version_error" number="12016"
+  value="[%0!05u!] &apos;%1!s!&apos; より高いバージョンの DJVM ディレクトリを読むことはできません&#10;データバージョン番号は &apos;%2!s!&apos; です。" />
+<MESSAGE name="DjVmDoc.cant_delete" number="12100"
+  value="[%0!05u!] ID(&apos;%1!s!&apos;) を持つファイルが見つからないため削除できません。" />
+<MESSAGE name="DjVmDoc.cant_find" number="12101"
+  value="[%0!05u!] ID(&apos;%1!s!&apos;) を持つファイルがみつかりません。" />
+<MESSAGE name="DjVmDoc.cant_read_indr" number="12102"
+  value="[%0!05u!] DataPools または ByteStreams からインダイレクト形式の DjVm ドキュメントを読むことができません。" />
+<MESSAGE name="DjVmDoc.no_data" number="12103"
+  value="[%0!05u!] Strange：ファイル(&apos;%1!s!&apos;)にデータがありません。" />
+<MESSAGE name="DjVmDoc.no_dirm_chunk" number="12104"
+  value="[%0!05u!] DJVM ドキュメントの最初のチャンクは DIRM でなければなりません。" />
+<MESSAGE name="DjVmDoc.no_duplicate" number="12105"
+  value="[%0!05u!] 同じファイルを2ど挿入しようとしています。" />
+<MESSAGE name="DjVmDoc.no_form_djvm2" number="12106"
+  value="[%0!05u!] DJVM形式が見つかりません。ドキュメントは新しいマルチページ形式ではありません。" />
+<MESSAGE name="DjVmDoc.no_form_djvm" number="12107"
+  value="[%0!05u!] 入力されたデータから DJVM 形式を見つけることができません。" />
+<MESSAGE name="DjVmDoc.not_IFF" number="12108"
+  value="[%0!05u!] ファイル &apos;%1!s!&apos; は、IFFフォーマットの中にありません。" />
+<MESSAGE name="DjVmDoc.no_zero_file" number="12109"
+  value="[%0!05u!] ZERO ファイルを挿入することができません。" />
+<MESSAGE name="DjVmDoc.zero_file" number="12110"
+  value="[%0!05u!] Strange：ファイルサイズがゼロです。" />
+<MESSAGE name="DjVuAnno.bad_type" number="12200"
+  value="[%0!05u!] GLObject()：誤ったオブジェクト型が渡されました。STRING または SYMBOL を指定してください。" />
+<MESSAGE name="DjVuAnno.bad_url" number="12201"
+  value="[%0!05u!] URL仕様が無効です。" />
+<MESSAGE name="DjVuAnno.bad_zoom" number="12203"
+  value="[%0!05u!] ズーム仕様が正しくありません。" />
+<MESSAGE name="DjVuAnno.invalid2list" number="12207"
+  value="[%0!05u!] オブジェクトタイプが無効です　リストに変換することができません。" />
+<MESSAGE name="DjVuAnno.invalid2number" number="12208"
+  value="[%0!05u!] オブジェクトタイプが無効です　数値に変換することができません。" />
+<MESSAGE name="DjVuAnno.invalid2string" number="12209"
+  value="[%0!05u!] オブジェクトタイプが無効です　文字列に変換することができません。" />
+<MESSAGE name="DjVuAnno.invalid2symbol" number="12210"
+  value="[%0!05u!] オブジェクトタイプが無効です　シンボルに変換することができません。" />
+<MESSAGE name="DjVuAnno.list2number" number="12211"
+  value="[%0!05u!] オブジェクトタイプが無効です　オブジェクト &apos;%1!s!&apos; を数値に変換することができません。" />
+<MESSAGE name="DjVuAnno.list2string" number="12212"
+  value="[%0!05u!] オブジェクトタイプが無効です　オブジェクト &apos;%1!s!&apos; を文字列に変換することができません。" />
+<MESSAGE name="DjVuAnno.list2symbol" number="12213"
+  value="[%0!05u!] オブジェクトタイプが無効です　オブジェクト &apos;%1!s!&apos; をシンボルに変換することができません。" />
+<MESSAGE name="DjVuAnno.no_number" number="12214"
+  value="[%0!05u!] オブジェクト &apos;%1!s!&apos; の内容を走査中にエラーが発生しました：;&apos;(&apos; のあとには数値でなくオブジェクト名を記述します。" />
+<MESSAGE name="DjVuAnno.no_paren" number="12215"
+  value="[%0!05u!] オブジェクト &apos;%1!s!&apos;の内容を走査中にエラーが発生しました：;&apos;(&apos; のあとにはパーレンでなくオブジェクト名を記述します。" />
+<MESSAGE name="DjVuAnno.no_string" number="12216"
+  value="[%0!05u!] オブジェクト &apos;%1!s!&apos; の内容を走査中にエラーが発生しました：;&apos;(&apos; のあとには文字列でなくオブジェクト名を記述します。" />
+<MESSAGE name="DjVuAnno.number2list" number="12218"
+  value="[%0!05u!] オブジェクトタイプが無効です　数値 &apos;%1!d!&apos; を複合オブジェクトに変換することができません。" />
+<MESSAGE name="DjVuAnno.number2string" number="12219"
+  value="[%0!05u!] オブジェクトタイプが無効です　数値 &apos;%1!d!&apos; を文字列に変換することができません。" />
+<MESSAGE name="DjVuAnno.number2symbol" number="12220"
+  value="[%0!05u!] オブジェクトタイプが無効です　数値 &apos;%1!d!&apos; をシンボルに変換することができません。" />
+<MESSAGE name="DjVuAnno.paren" number="12222"
+  value="[%0!05u!] オブジェクト &apos;%1!s!&apos; の内容を走査中にエラーが発生しました：;&apos;(&apos; の直後にはオブジェクト名を記述します。" />
+<MESSAGE name="DjVuAnno.string2list" number="12223"
+  value="[%0!05u!] オブジェクトタイプが無効です　文字列 &apos;%1!d!&apos; を複合オブジェクトに変換することができません。" />
+<MESSAGE name="DjVuAnno.string2number" number="12224"
+  value="[%0!05u!] オブジェクトタイプが無効です　文字列 &apos;%1!d!&apos; を数値に変換することができません。" />
+<MESSAGE name="DjVuAnno.string2symbol" number="12225"
+  value="[%0!05u!] オブジェクトタイプが無効です　文字列 &apos;%1!d!&apos; をシンボルに変換することができません。" />
+<MESSAGE name="DjVuAnno.symbol2list" number="12226"
+  value="[%0!05u!] オブジェクトタイプが無効です　シンボル &apos;%1!d!&apos; を複合オブジェクトに変換することができません。" />
+<MESSAGE name="DjVuAnno.symbol2number" number="12227"
+  value="[%0!05u!] オブジェクトタイプが無効です　シンボル &apos;%1!d!&apos; を数値に変換することができません。" />
+<MESSAGE name="DjVuAnno.symbol2string" number="12228"
+  value="[%0!05u!] オブジェクトタイプが無効です　シンボル &apos;%1!d!&apos; を文字列に変換することができません。" />
+<MESSAGE name="DjVuAnno.too_few" number="12229"
+  value="[%0!05u!] &apos;%1!s!&apos; の要素が少なすぎます。" />
+<MESSAGE name="DjVuDocEditor.bad_page" number="12300"
+  value="[%0!05u!] ページ番号 %1!d! が異常です。" />
+<MESSAGE name="DjVuDocEditor.cant_save2" number="12301"
+  value="[%0!05u!] &apos;Save&apos; は使用できません。&apos;Save As&apos;を使用してください。" />
+<MESSAGE name="DjVuDocEditor.cant_save" number="12302"
+  value="[%0!05u!] 文章が保存できません。&apos;Save As&apos;を使用してください。" />
+<MESSAGE name="DjVuDocEditor.create_fail" number="12303"
+  value="[%0!05u!] ID &apos;%1!s!&apos; でファイルを作成することができません。" />
+<MESSAGE name="DjVuDocEditor.dir_fail" number="12304"
+  value="[%0!05u!] ディレクトリ &apos;%1!s!&apos; を作成できません。" />
+<MESSAGE name="DjVuDocEditor.init" number="12305"
+  value="[%0!05u!] DjVuDocEditor は既に初期化されています。" />
+<MESSAGE name="DjVuDocEditor.no_codec" number="12306"
+  value="[%0!05u!] 圧縮コーデックのロードに失敗しました。" />
+<MESSAGE name="DjVuDocEditor.no_file" number="12307"
+  value="[%0!05u!] この文章の中に ID &apos;%1!s!&apos; のファイルがありません。" />
+<MESSAGE name="DjVuDocEditor.not_1_page" number="12308"
+  value="[%0!05u!] ファイル &apos;%1!s!&apos; はシングルページの DjVu ファイルではありません。" />
+<MESSAGE name="DjVuDocEditor.no_thumb" number="12309"
+  value="[%0!05u!] 内部エラー：ページ %1!d! にサムネイルを見つけることができません。" />
+<MESSAGE name="DjVuDocEditor.not_init" number="12310"
+  value="[%0!05u!] DjVuDocEditor は使用される前に初期化されていなければいけません。" />
+<MESSAGE name="DjVuDocEditor.open_fail" number="12311"
+  value="[%0!05u!] 文書 &apos;%1!s!&apos; を開くことができません。" />
+<MESSAGE name="DjVuDocEditor.page_fail" number="12312"
+  value="[%0!05u!] 内部エラー：%1!d! ページがありません。" />
+<MESSAGE name="DjVuDocEditor.page_num" number="12313"
+  value="[%0!05u!] ページ番号 %1!d! が不正です。" />
+<MESSAGE name="DjVuDocEditor.render" number="12314"
+  value="[%0!05u!] %1!d! ページの画像が取得できません。" />
+<MESSAGE name="DjVuDocEditor.share_fail" number="12315"
+  value="[%0!05u!] シェアードアノテーション付きの別ファイルの作成に失敗しました。マルチページドキュメントでは1つしか持てません。" />
+<MESSAGE name="DjVuDocument.2nd_init" number="12400"
+  value="[%0!05u!] DjVuDocument を2度初期化することはできません。" />
+<MESSAGE name="DjVuDocument.bad_format" number="12401"
+  value="[%0!05u!] 未知の文書フォーマットのためデコードできません。" />
+<MESSAGE name="DjVuDocument.bad_thumb" number="12402"
+  value="[%0!05u!] サムネイルが破損しています。" />
+<MESSAGE name="DjVuDocument.big_num" number="12403"
+  value="[%0!05u!] ページ番号が大きすぎます。" />
+<MESSAGE name="DjVuDocument.cant_extract" number="12405"
+  value="[%0!05u!] プレデコードされたサムネイルが作成できません:" />
+<MESSAGE name="DjVuDocument.cant_render" number="12406"
+  value="[%0!05u!] %1!d! ページが取得できません。" />
+<MESSAGE name="DjVuDocument.comp_codec" number="12407"
+  value="[%0!05u!] 圧縮コーデックがロードされていません。" />
+<MESSAGE name="DjVuDocument.empty_url" number="12408"
+  value="[%0!05u!] 無効なURL が DjVuDocument に存在します。" />
+<MESSAGE name="DjVuDocument.exclude_page" number="12409"
+  value="[%0!05u!] エラーのため %1!d! ページをファイルリストから削除されます。" />
+<MESSAGE name="DjVuDocument.fail_URL" number="12411"
+  value="[%0!05u!] URL &apos;%1!s!&apos; のデータの取得に失敗しました。" />
+<MESSAGE name="DjVuDocument.file_outside" number="12412"
+  value="[%0!05u!] ファイル &apos;%1!s!&apos; はバンドルされていません。" />
+<MESSAGE name="DjVuDocument.init_eof" number="12413"
+  value="[%0!05u!] 初期化中に予期しない EOF が見つかりました。" />
+<MESSAGE name="DjVuDocument.init_not_done" number="12414"
+  value="[%0!05u!] 文章は正常に初期化されませんでした。" />
+<MESSAGE name="DjVuDocument.miss_page_name" number="12415"
+  value="[%0!05u!] 名称 &apos;%1!s!&apos;のページはこの文章中にありません。" />
+<MESSAGE name="DjVuDocument.miss_page_num" number="12416"
+  value="[%0!05u!] &apos;%1!d!&apos; ページはこの文章中にありません。" />
+<MESSAGE name="DjVuDocument.no_dir" number="12417"
+  value="[%0!05u!] シングルページ文書には、DjVm ディレクトリがありません。" />
+<MESSAGE name="DjVuDocument.no_file" number="12418"
+  value="[%0!05u!] 要求されたファイルが存在しません。" />
+<MESSAGE name="DjVuDocument.no_page" number="12419"
+  value="[%0!05u!] この文書にはページが存在しません。" />
+<MESSAGE name="DjVuDocument.not_DjVu" number="12420"
+  value="[%0!05u!] 要求された入力ファイルは DjVu ファイルではありません。" />
+<MESSAGE name="DjVuDocument.not_init" number="12421"
+  value="[%0!05u!] DjVuDocument は初期化されていません。" />
+<MESSAGE name="DjVuDocument.not_secure" number="12422"
+  value="[%0!05u!] DjVuDocument は GP&lt;DjVuDocument&gt; で保護されていません。" />
+<MESSAGE name="DjVuDocument.obsolete" number="12423"
+  value="[%0!05u!] 文書は現在用いられていないフォーマットです。" />
+<MESSAGE name="DjVuDocument.old_bundle" number="12424"
+  value="[%0!05u!] OLD_BUNDLED 文書のみ DjVm v.0 ディレクトリを持っています。" />
+<MESSAGE name="DjVuDocument.stopped" number="12425"
+  value="[%0!05u!] DjVuDocument のスレッドの初期化は 停止しました。" />
+<MESSAGE name="DjVuDocument.unk_type" number="12426"
+  value="[%0!05u!] 未知の文書タイプ" />
+<MESSAGE name="DjVuDocument.URL_outside2" number="12427"
+  value="[%0!05u!] URL &apos;%1!s!&apos; はインダイレクト形式ドキュメントの範囲外を指しています。" />
+<MESSAGE name="DjVuDocument.URL_outside" number="12428"
+  value="[%0!05u!] URL &apos;%1!s!&apos; はバンドルド形式ドキュメントの範囲外を指しています。" />
+<MESSAGE name="DjVuDocument.skip_page" number="12429"
+  value="[%0!05u!] %1!d! がスキップされました。" />
+<MESSAGE name="DjVuFile.2nd_init" number="12500"
+  value="[%0!05u!] DjVu ファイルはすでに初期化されています。" />
+<MESSAGE name="DjVuFile.corrupt_BG44" number="12501"
+  value="[%0!05u!] DjVu デコーダ：データが破損しています。(BG44 チャンクのサイズが不正です。)" />
+<MESSAGE name="DjVuFile.corrupt_dupl" number="12502"
+  value="[%0!05u!] DjVu デコーダ：ファイルが破損しています。(INFO チャンクが重複しています。)" />
+<MESSAGE name="DjVuFile.corrupt_INFO" number="12503"
+  value="[%0!05u!] DjVu デコーダ：ファイルが破損しています。(FORM:DJVI で INFO チャンクが見つかりました。)" />
+<MESSAGE name="DjVuFile.corrupt_missing_info" number="12504"
+  value="[%0!05u!] DjVu デコーダ：データが破損しています。(INFO チャンクがありません。)" />
+<MESSAGE name="DjVuFile.corrupt_missing_IW44" number="12505"
+  value="[%0!05u!] DjVu デコーダ：データが破損しています。(IW44 データチャンクがありません。)" />
+<MESSAGE name="DjVuFile.corrupt_zero" number="12506"
+  value="[%0!05u!] DjVu デコーダ：ファイルが破損しています。(画像サイズがゼロです。)" />
+<MESSAGE name="DjVuFile.decode_fail" number="12507"
+  value="[%0!05u!] インクルードファイルのデコードに失敗しました。" />
+<MESSAGE name="DjVuFile.dupl_backgrnd" number="12508"
+  value="[%0!05u!] DjVu デコーダ：データが破損しています。(背景レイヤーが重複しています。)" />
+<MESSAGE name="DjVuFile.dupl_Dxxx" number="12509"
+  value="[%0!05u!] DjVu デコーダ：データが破損しています。(Dxxx チャンクが重複しています。)" />
+<MESSAGE name="DjVuFile.dupl_foregrnd" number="12510"
+  value="[%0!05u!] DjVu デコーダ：データが破損しています。(前景色情報が重複しています。)" />
+<MESSAGE name="DjVuFile.dupl_Sxxx" number="12511"
+  value="[%0!05u!] DjVu デコーダ：データが破損しています。(Sxxx チャンクが重複しています。)" />
+<MESSAGE name="DjVuFile.Dxxx_after_Sxxx" number="12512"
+  value="[%0!05u!] デコーダ：データが破損しています。(Sxxx チャンクの後に Dxxx チャンクがあります。)" />
+<MESSAGE name="DjVuFile.empty_URL" number="12513"
+  value="[%0!05u!] DjVuFile が空の URL を参照しています。" />
+<MESSAGE name="DjVuFile.failed" number="12515"
+  value="[%0!05u!] &apos;%1!s!&apos; 失敗しました。" />
+<MESSAGE name="DjVuFile.illegal_chunk" number="12516"
+  value="[%0!05u!] チャンク番号が不正です。" />
+<MESSAGE name="DjVuFile.malformed" number="12517"
+  value="[%0!05u!] INCL チャンクの形式が不正です。スラッシュは使用できません。" />
+<MESSAGE name="DjVuFile.missing_chunk" number="12518"
+  value="[%0!05u!] チャンクが少なすぎます。" />
+<MESSAGE name="DjVuFile.new_version" number="12519"
+  value="[%0!05u!] DjVu デコーダ：バージョン &gt;= %1!d! で DjVu ファイルをデコードできません。" />
+<MESSAGE name="DjVuFile.no_create" number="12520"
+  value="[%0!05u!] 内部エラー：id_to_file(&apos;%1!s!&apos;) で任意のファイルが作成されませんでした。" />
+<MESSAGE name="DjVuFile.no_data" number="12521"
+  value="[%0!05u!] URL &apos;%1!s!&apos; からデータを取得できませんでした。" />
+<MESSAGE name="DjVuFile.not_finished" number="12522"
+  value="[%0!05u!] 内部エラー：含まれたファイルが終了していません。" />
+<MESSAGE name="DjVuFile.not_init" number="12523"
+  value="[%0!05u!] DjVuFile が初期化されていません。" />
+<MESSAGE name="DjVuFile.not_secured" number="12524"
+  value="[%0!05u!] DjVuFile は GP&lt;DjVuFile&gt; で保護されていません。" />
+<MESSAGE name="DjVuFile.stopped" number="12525"
+  value="[%0!05u!] &apos;%1!s!&apos; が中止されました。" />
+<MESSAGE name="DjVuFile.unexp_image" number="12526"
+  value="[%0!05u!] DejaVu デコーダ：DJVU もしくは IW44 が必要です。" />
+<MESSAGE name="DjVuFile.unrecog_chunk" number="12527"
+  value="%1!5.1f! Kb '%2!4s!' 不明なチャンク." />
+<MESSAGE name="DjVuFile.page_info" number="12528"
+  value="%1!5.1f! Kb '%2!4s!' ページ情報." />
+<MESSAGE name="DjVuFile.indir_chunk1" number="12529"
+  value="%2!5.1f! Kb '%3!4s!' インディレクションチャンク (%1!s!)." />
+<MESSAGE name="DjVuFile.indir_chunk2" number="12530"
+  value="%1!5.1f! Kb '%2!4s!' インディレクションチャンク." />
+<MESSAGE name="DjVuFile.shape_dict" number="12531"
+  value="%2!5.1f! Kb '%3!4s!' JB2シェイプ辞書 (%1!d! shapes)." />
+<MESSAGE name="DjVuFile.fg_mask" number="12532"
+  value="%4!5.1f! Kb '%5!4s!' JB2フォアグラウンドマスク (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.G4_mask" number="12533"
+  value="%4!5.1f! Kb '%5!4s!' G4/MMRマスク (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg1" number="12534"
+  value="%4!5.1f! Kb '%5!4s!' IW44バックグラウンド (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg2" number="12535"
+  value="%3!5.1f! Kb '%4!4s!' IW44バックグラウンド (part %1!d!, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_fg" number="12536"
+  value="%4!5.1f! Kb '%5!4s!' IW44フォアグラウンドカラー (%1!d!x%2!d!, %3!d!dpi)." />
+<MESSAGE name="DjVuFile.color_import1" number="12537"
+  value="%4!5.1f! Kb '%5!4s!' LINKカラーインポート (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.color_import2" number="12538"
+  value="%1!5.1f! Kb '%2!4s!' LINKカラーインポート (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG_bg1" number="12539"
+  value="%4!5.1f! Kb '%5!4s!' JPEGバックグラウンド (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.JPEG_bg2" number="12540"
+  value="%1!5.1f! Kb '%2!4s!' JPEGバックグラウンド (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG_fg1" number="12541"
+  value="%4!5.1f! Kb '%5!4s!' JPEGフォアグラウンドカラー (%1!d!x%2!d!, %3!d!dpi)." />
+<MESSAGE name="DjVuFile.JPEG_fg2" number="12542"
+  value="%1!5.1f! Kb '%2!4s!' JPEGフォアグラウンドカラー (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG2K_bg" number="12543"
+  value="%1!5.1f! Kb '%2!4s!' JPEG-2000バックグラウンド (Unimplemented)." />
+<MESSAGE name="DjVuFile.JPEG2K_fg" number="12544"
+  value="[1-%0!05u!] %1!5.1f! Kb '%2!4s!' JPEG-2000フォアグラウンドカラー (Unimplemented)." />
+<MESSAGE name="DjVuFile.JB2_fg" number="12545"
+  value="%3!5.1f! Kb '%4!4s!' JB2フォアグラウンドカラー (%1!d! colors, %2!d! ccs)." />
+<MESSAGE name="DjVuFile.IW44_data1" number="12546"
+  value="%4!5.1f! Kb '%5!4s!' IW44データ (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_data2" number="12547"
+  value="%3!5.1f! Kb '%4!4s!' IW44データ (part %1!d!, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.nav_dir" number="12548"
+  value="%1!5.1f! Kb '%2!4s!' Navigation directory (obsolete)." />
+<MESSAGE name="DjVuFile.anno1" number="12549"
+  value="%1!5.1f! Kb '%2!4s!' アノテーション (bundled)." />
+<MESSAGE name="DjVuFile.anno2" number="12550"
+  value="%1!5.1f! Kb '%2!4s!' アノテーション (hyperlinks, etc.)." />
+<MESSAGE name="DjVuFile.text" number="12551"
+  value="%1!5.1f! Kb '%2!4s!' テキスト (text, etc.)." />
+<MESSAGE name="DjVuFile.djvu_header" number="12552"
+  value="DJVU Image (%1!d!x%2!d!, %3!d! dpi) version %4!d!:&#10;" />
+<MESSAGE name="DjVuFile.IW44_header" number="12553"
+  value="IW44 Image (%1!d!x%2!d!, %3!d! dpi):&#10;" />
+<MESSAGE name="DjVuFile.ratio" number="12554"
+  value="&#10;圧縮比率： %1!0.f! (%2!0.1f! Kb)" />
+<MESSAGE name="DjVuFile.securedjvu" number="12555">
+Incompatible file (so-called "Secure DjVu".)
+</MESSAGE>
+<MESSAGE name="DjVuGlobalMemory.exhausted" number="12600"
+  value="[%0!05u!] メモリが使い尽くされました。" />
+<MESSAGE name="DjVuGlobal.not_compatible" number="12700"
+  value="[%0!05u!] DjVuProgress は マルチスレッドと互換性がありません。" />
+<MESSAGE name="DjVuImage.bad_call" number="12800"
+  value="[%0!05u!] DjVuImage::connect のあとに DjVuImage::decode を呼び出してはいけません。" />
+<MESSAGE name="DjVuImage.bad_rect2" number="12801"
+  value="[%0!05u!] (DjVuImage::do_pixmap) ターゲットの矩形が不正です。" />
+<MESSAGE name="DjVuImage.bad_rect" number="12802"
+  value="[%0!05u!] (DjVuImage::get_pixmap) ターゲットの矩形が不正です。" />
+<MESSAGE name="DjVuImage.corrupted" number="12803"
+  value="[%0!05u!] ファイルが破損しています。(カラーインデックスがパレットサイズを超えています。)" />
+<MESSAGE name="DjVuImage.mult_error" number="12804"
+  value="[%0!05u!] デコード中に複数のエラーがあります。" />
+<MESSAGE name="DjVuImage.not_decode" number="12805"
+  value="[%0!05u!] この DjVu ドキュメントを下位互換モードでデコードすることが出来ません。" />
+<MESSAGE name="DjVuImage.short1" number="12806"
+  value="%1!d!x%2!d!, %3!0.1f! Kb" />
+<MESSAGE name="DjVuImage.short2" number="12807" 
+  value="%1!d!x%2!d!" />
+<MESSAGE name="DjVuInfo.corrupt_file" number="12900"
+  value="[%0!05u!] DjVu デコーダ：ファイルが破損しています。(INFO チャンクが不完全です。)" />
+<MESSAGE name="DjVuNavDir.bad_page" number="13000"
+  value="[%0!05u!] 入力されたページ番号が不正です。" />
+<MESSAGE name="DjVuNavDir.large_page" number="13001"
+  value="[%0!05u!] ページ番号が大きすぎます。" />
+<MESSAGE name="DjVuNavDir.long_line" number="13002"
+  value="[%0!05u!] DjVu ディレクトリが読み込めません。ラインが長すぎます。" />
+<MESSAGE name="DjVuNavDir.neg_page" number="13003"
+  value="[%0!05u!] ページ番号が負の値ではいけません。" />
+<MESSAGE name="DjVuNavDir.zero_dir" number="13004"
+  value="[%0!05u!] DjVuNavDir コンストラクタにZERO directory URL が渡されました。" />
+<MESSAGE name="DjVuPalette.bad_palette" number="13100"
+  value="[%0!05u!] 前景色のパレットが破損しています。" />
+<MESSAGE name="DjVuPalette.bad_version" number="13101"
+  value="[%0!05u!] パレットデータの中に認識できないバージョンタグがあります。" />
+<MESSAGE name="DjVuPalette.many_colors" number="13102"
+  value="[%0!05u!] 色番号が不正です。" />
+<MESSAGE name="DjVuPalette.no_color" number="13103"
+  value="[%0!05u!] カラーヒストグラムが見つかりません。" />
+<MESSAGE name="DjVuPalette.not_init" number="13104"
+  value="[%0!05u!] パレットが初期化されていません。" />
+<MESSAGE name="DjVuPalette.test_usage" number="13105"
+  value="[%0!05u!] 使用方法：quant &lt;ncol&gt; &lt;minbox&gt; &lt;ppmfile&gt;" />
+<MESSAGE name="DjVuPort.not_alloc" number="13200"
+  value="[%0!05u!] ヒープに DjVuPort がアロケートされていません。" />
+<MESSAGE name="DjVuToPS.bad_EPS_num" number="13300"
+  value="[%0!05u!] EPS フォーマットでは ひとつのコピーだけを印刷することができます。" />
+<MESSAGE name="DjVuToPS.bad_format" number="13301"
+  value="[%0!05u!] ポストスクリプトフォーマットは、PS か EPS でなければなりません。" />
+<MESSAGE name="DjVuToPS.bad_gamma" number="13302"
+  value="[%0!05u!] ガンマ値が不正です　0.3 から 5.0 の間で指定してください。" />
+<MESSAGE name="DjVuToPS.bad_level" number="13303"
+  value="[%0!05u!] ポストスクリプトレベル %1!d! は不正です。1 か 2 を指定してください。" />
+<MESSAGE name="DjVuToPS.bad_mode" number="13304"
+  value="[%0!05u!] 不正なイメージモードが印刷コードに渡されました。" />
+<MESSAGE name="DjVuToPS.bad_number" number="13305"
+  value="[%0!05u!] コピー枚数が正の値でなければなりません。" />
+<MESSAGE name="DjVuToPS.bad_orient" number="13306"
+  value="[%0!05u!] 不正なオリエンテーションが印刷コードに渡されました。" />
+<MESSAGE name="DjVuToPS.bad_page" number="13307"
+  value="[%0!05u!] ページ番号が不正です。&apos;%1!d!&apos;" />
+<MESSAGE name="DjVuToPS.bad_range" number="13308"
+  value="[%0!05u!] 範囲が不正です。&apos;%1!s!&apos;" />
+<MESSAGE name="DjVuToPS.bad_scale" number="13309"
+  value="[%0!05u!] 印刷中に画像のスケーリングを試みました。" />
+<MESSAGE name="DjVuToPS.bad_zoom" number="13310"
+  value="[%0!05u!] 不正なズーム要因が印刷コードに渡されました。" />
+<MESSAGE name="DjVuToPS.big_page" number="13311"
+  value="[%0!05u!] ページ番号 %1!d! が大きすぎます。" />
+<MESSAGE name="DjVuToPS.empty_image" number="13313"
+  value="[%0!05u!] 空のページの印刷を試みました。" />
+<MESSAGE name="DjVuToPS.empty_rect" number="13314"
+  value="[%0!05u!] 空の矩形の印刷を試みました" />
+<MESSAGE name="DjVuToPS.no_image" number="13315"
+  value="[%0!05u!] ページ %1!d! の画像を取得できませんでした。" />
+<MESSAGE name="DjVuToPS.no_landscape" number="13316"
+  value="[%0!05u!] LANDSCAPE モードは EPS 形式でサポートされていません。" />
+<MESSAGE name="DjVuToPS.no_to" number="13318"
+  value="[%0!05u!] &apos;To&apos; で指定されているページが見つかりません &apos;%1!s!&apos;" />
+<MESSAGE name="DjVuToPS.only_one_page" number="13319"
+  value="[%0!05u!] EPSフォーマットでは複数のページを印刷することができません。" />
+<MESSAGE name="EOF" number="13400"
+  value="予想外の位置でファイルが終了しています。" />
+<MESSAGE name="Failed" number="13700"
+  value="失敗しました。" />
+<MESSAGE name="GBitmap.bad_format" number="13800"
+  value="[%0!05u!] PBM、PGM、RLE形式でフォーマットされたファイルが見つかりません。" />
+<MESSAGE name="GBitmap.bad_levels" number="13801"
+  value="[%0!05u!] (GBitmap::set_grays) グレーレベルの値が不正です。" />
+<MESSAGE name="GBitmap.bad_PBM" number="13802"
+  value="[%0!05u!] PBM ファイルが Malformed されています。" />
+<MESSAGE name="GBitmap.cant_compress" number="13803"
+  value="[%0!05u!] グレーレベルのビットマップを圧縮することはできません。" />
+<MESSAGE name="GBitmap.cant_make_PBM" number="13804"
+  value="[%0!05u!] グレー・レベルビットマップでは PBM ファイルを作ることができません。" />
+<MESSAGE name="GBitmap.left_damaged" number="13805"
+  value="[%0!05u!] デバッグ：左の境界が損害を受けています。" />
+<MESSAGE name="GBitmap.lost_sync2" number="13806"
+  value="[%0!05u!] (GBitmap::decode) RLE 同期が消失しています。" />
+<MESSAGE name="GBitmap.lost_sync" number="13807"
+  value="[%0!05u!] RLE：同期が消失しています。" />
+<MESSAGE name="GBitmap.not_init" number="13808"
+  value="[%0!05u!] 初期化されていないビットマップ。" />
+<MESSAGE name="GBitmap.not_int" number="13809"
+  value="[%0!05u!] ビットマップ読み込み：整数が必要です。" />
+<MESSAGE name="GBitmap.null_arg" number="13810"
+  value="[%0!05u!] (GBitmap::decode) 無効な引数で呼び出されました。" />
+<MESSAGE name="GBitmap.right_damaged" number="13811"
+  value="[%0!05u!] デバッグ：右の境界が破損しています。" />
+<MESSAGE name="GBitmap.zero_damaged" number="13812"
+  value="[%0!05u!] デバッグ：ゼロ配列が破損しています。" />
+<MESSAGE name="GBitmap.zero_small" number="13813"
+  value="[%0!05u!] デバッグ：ゼロバッファが小さすぎます。" />
+<MESSAGE name="GContainer.bad_args" number="13900"
+  value="[%0!05u!] GArray::resize の引数が無効です。" />
+<MESSAGE name="GContainer.bad_howmany" number="13901"
+  value="[%0!05u!] &apos;howmany&apos; の引数が不正な値です。" />
+<MESSAGE name="GContainer.bad_pos_cont" number="13902"
+  value="[%0!05u!] 位置が無効です。(別のコンテナへのポイント)" />
+<MESSAGE name="GContainer.bad_pos" number="13903"
+  value="[%0!05u!] 位置が無効です。" />
+<MESSAGE name="GContainer.bad_pos_null" number="13904"
+  value="[%0!05u!] 位置が無効です。(無効なポインタ)" />
+<MESSAGE name="GContainer.bad_sub2" number="13905"
+  value="[%0!05u!] GArray::del の添え字が無効です。" />
+<MESSAGE name="GContainer.cannot_add" number="13906"
+  value="[%0!05u!] 定数関連マップにキーを加えることができません。" />
+<MESSAGE name="GContainer.illegal_subscript" number="13907"
+  value="[%0!05u!] GArray の添え字が範囲外です。" />
+<MESSAGE name="GException.outofmemory" number="14000"
+  value="[%0!05u!] メモリーが足りません。" />
+<MESSAGE name="GIFFManager.bad_char" number="14100"
+  value="[%0!05u!] 名前にはドットや括弧を含んではいけません。" />
+<MESSAGE name="GIFFManager.cant_find2" number="14101"
+  value="[%0!05u!] IFF の読み込み中に、トップレベルの FORM チャンクが見つかりませんでした。" />
+<MESSAGE name="GIFFManager.cant_find" number="14102"
+  value="[%0!05u!] 名前 &apos;%1!s!&apos; のチャンクが見つかりません。" />
+<MESSAGE name="GIFFManager.del_empty" number="14103"
+  value="[%0!05u!] 名前が空のチャンクを削除しようとしました。" />
+<MESSAGE name="GIFFManager.garbage" number="14104"
+  value="[%0!05u!] チャンク名は &apos;]&apos; の後に不要データを含んでいます。" />
+<MESSAGE name="GIFFManager.get_empty" number="14105"
+  value="[%0!05u!] 名前が空のチャンクを取得しようとしました。" />
+<MESSAGE name="GIFFManager.malformed" number="14106"
+  value="[%0!05u!] &apos;%1!s!&apos; チャンク名が不正です: 最後はドットです。" />
+<MESSAGE name="GIFFManager.no_brackets" number="14107"
+  value="[%0!05u!] チャンク名には括弧を含んではいけません。" />
+<MESSAGE name="GIFFManager.no_chunk" number="14108"
+  value="[%0!05u!] チャンク &apos;%3!s!&apos; にサブチャンク &apos;%1!s!&apos; #%2!d! がありません。" />
+<MESSAGE name="GIFFManager.no_dots" number="14109"
+  value="[%0!05u!] チャンク名にはドットを含んではいけません。" />
+<MESSAGE name="GIFFManager.no_top_cont" number="14110"
+  value="[%0!05u!] コンテナのみがトップレベルチャンクとして許可されています。" />
+<MESSAGE name="GIFFManager.no_top_name" number="14111"
+  value="[%0!05u!] トップレベルチャンク名がわかりません。" />
+<MESSAGE name="GIFFManager.one_colon" number="14112"
+  value="[%0!05u!] チャンク名には１つのコロンだけを含むことが出来ます。" />
+<MESSAGE name="GIFFManager.unknown" number="14114"
+  value="[%0!05u!] 内部エラー：チャンク &apos;%1!s!&apos; が不明です。" />
+<MESSAGE name="GIFFManager.unmatched" number="14115"
+  value="[%0!05u!] チャンクにマッチしない括弧があります。" />
+<MESSAGE name="GIFFManager.wrong_name2" number="14116"
+  value="[%0!05u!] トップレベルチャンクの名前が &apos;%1!s!&apos; ではありません。" />
+<MESSAGE name="GIFFManager.wrong_name" number="14117"
+  value="[%0!05u!] ファイルのトップレベルチャンク名が &apos;%1!s!&apos; ではありません。" />
+<MESSAGE name="GMapAreas.intersect" number="14200"
+  value="[%0!05u!] いくつかのポリゴンセグメントが交差しています。" />
+<MESSAGE name="GMapAreas.oval_border" number="14201"
+  value="[%0!05u!] 楕円マップ領域はこのボーダータイプをサポートしていません。" />
+<MESSAGE name="GMapAreas.oval_hilite" number="14202"
+  value="[%0!05u!] 領域のハイライトはこのボーダータイプをサポートしていません。" />
+<MESSAGE name="GMapAreas.poly_border" number="14203"
+  value="[%0!05u!] ポリゴンマップ領域はこのボーダータイプをサポートしていません。" />
+<MESSAGE name="GMapAreas.poly_hilite" number="14204"
+  value="[%0!05u!] ポリゴンマップ領域はハイライトをサポートしていません。" />
+<MESSAGE name="GMapAreas.too_few_points" number="14205"
+  value="[%0!05u!] ポリゴンのポイントが少なすぎます。" />
+<MESSAGE name="GMapAreas.width_1" number="14206"
+  value="[%0!05u!] XOR または SOLID ボーダータイプでは、ボーダー幅は1でなければいけません。" />
+<MESSAGE name="GMapAreas.width_3-32" number="14207"
+  value="[%0!05u!] SHADOW ボーダータイプでは、ボーダー幅3から32の間でなければいけません。" />
+<MESSAGE name="GMapAreas.zero_height" number="14208"
+  value="[%0!05u!] 領域の高さがゼロです。" />
+<MESSAGE name="GMapAreas.zero_width" number="14209"
+  value="[%0!05u!] 領域の幅がゼロです。" />
+<MESSAGE name="GPixmap.bad_param" number="14400"
+  value="[%0!05u!] (GPixmap::color_correct) 不正なパラメータ" />
+<MESSAGE name="GPixmap.diff_size" number="14401"
+  value="[%0!05u!] カラー pixmap とアルファビットマップのサイズが違っています。" />
+<MESSAGE name="GPixmap.no_int" number="14402"
+  value="[%0!05u!] pixmap 読み込み：整数が必要です。" />
+<MESSAGE name="GPixmap.null_alpha" number="14403"
+  value="[%0!05u!] アルファビットマップのポインタが無効です。" />
+<MESSAGE name="GPixmap.null_color" number="14404"
+  value="[%0!05u!] カラー pixmap のポインタが無効です。" />
+<MESSAGE name="GPixmap.overflow1" number="14405"
+  value="[%0!05u!] (GPixmap::downsample) 指定された矩形は目的の pixmap からあふれ出ます。" />
+<MESSAGE name="GPixmap.overflow2" number="14406"
+  value="[%0!05u!] (GPixmap::upsample) 指定された矩形は目的の pixmap からあふれ出ます。" />
+<MESSAGE name="GPixmap.overflow3" number="14407"
+  value="[%0!05u!] (GPixmap::downsample43) 指定された矩形は目的の pixmap からあふれ出ます。" />
+<MESSAGE name="GPixmap.overflow4" number="14408"
+  value="[%0!05u!] (GPixmap::upsample23) 指定された矩形は目的の pixmap からあふれ出ます。" />
+<MESSAGE name="GPixmap.overflow5" number="14409"
+  value="[%0!05u!] (GPixmap::stencil) 指定された矩形は目的の pixmap からあふれ出ます。" />
+<MESSAGE name="GPixmap.unk_PPM" number="14410"
+  value="[%0!05u!] PPM ファイルフォーマットが見つかりません。" />
+<MESSAGE name="GRect.div_zero" number="14500"
+  value="[%0!05u!] ゼロで除算されました。" />
+<MESSAGE name="GRect.empty_rect1" number="14501"
+  value="[%0!05u!] GRectMapper::set_input に無効な空の矩形があります。" />
+<MESSAGE name="GRect.empty_rect2" number="14502"
+  value="[%0!05u!] GRectMapper::set_output に無効な空の矩形があります。" />
+<MESSAGE name="GRect.empty_rect3" number="14503"
+  value="[%0!05u!] GRectMapper::[un]map に無効な空の矩形があります。" />
+<MESSAGE name="GScaler.assertion" number="14600"
+  value="[%0!05u!] 失敗しました。" />
+<MESSAGE name="GScaler.no_match" number="14601"
+  value="[%0!05u!] 入力された pixmap は、入力された矩形にマッチしません。" />
+<MESSAGE name="GScaler.ratios" number="14602"
+  value="[%0!05u!] GScaler 比率は両方ともヌルまたは両方とも正の値でなければいけません。" />
+<MESSAGE name="GScaler.too_big" number="14603"
+  value="[%0!05u!] 要求された出力は最大限のイメージ出力 rect を上回っています。" />
+<MESSAGE name="GScaler.too_small" number="14604"
+  value="[%0!05u!] 入力された pixmap が小さすぎます。" />
+<MESSAGE name="GScaler.undef_size" number="14605"
+  value="[%0!05u!] GScaler の入力サイズと出力サイズが未定義です。" />
+<MESSAGE name="GSmartPointer.suspicious" number="14700"
+  value="[%0!05u!] 参照された GPEnabled オブジェクト は破壊されている疑いがあります。" />
+<MESSAGE name="GString.bad_subscript" number="14800"
+  value="[%0!05u!] GString::operator[] の添え字が不正です。" />
+<MESSAGE name="GString.overwrite" number="14801"
+  value="[%0!05u!] メモリが上書きされます。プログラムが不安定です。" />
+<MESSAGE name="GStringRep.NativeToNative" number="14802">
+[1-%0!05u!] ネイティブエンコードからネイティブエンコードに変換しました。
+</MESSAGE>
+<MESSAGE name="GStringRep.UTF8ToUTF8" number="14803">
+[1-%0!05u!] UTF-8からUTF-8に変換しました。
+</MESSAGE>
+<MESSAGE name="GStringRep.appendNativeToUTF8" number="14804">
+[1-%0!05u!] ネイティブストリングをUTF-8ストリングに変換しました。
+</MESSAGE>
+<MESSAGE name="GStringRep.appendUTF8toNative" number="14805">
+[1-%0!05u!] UTF-8ストリングをネイティブストリングに変換しました。
+</MESSAGE>
+<MESSAGE name="GThreads.co_panic" number="14900"
+  value="[%0!05u!] パニック COTHREADS：例外コンテキストが見つかりません。" />
+<MESSAGE name="GThreads.dupl_callback" number="14901"
+  value="[%0!05u!] GThread::set_scheduling_callback が2回呼び出されました。" />
+<MESSAGE name="GThreads.not_acq_broad" number="14902"
+  value="[%0!05u!] モニターは、このスレッドによって取得されませんでした (GMonitor::broadcast)" />
+<MESSAGE name="GThreads.not_acq_leave" number="14903"
+  value="[%0!05u!] モニターは、このスレッドによって取得されませんでした (GMonitor::leave)" />
+<MESSAGE name="GThreads.not_acq_signal" number="14904"
+  value="[%0!05u!] モニターは、このスレッドによって取得されませんでした (GMonitor::signal)" />
+<MESSAGE name="GThreads.not_acq_wait" number="14905"
+  value="[%0!05u!] モニターは、このスレッドによって取得されませんでした (GMonitor::wait)" />
+<MESSAGE name="GThreads.panic" number="14906"
+  value="[%0!05u!] パニック：Cothreads デッドロック" />
+<MESSAGE name="GThreads.uncaught" number="14907"
+  value="[%0!05u!] GThreads：トラップできない例外" />
+<MESSAGE name="GThreads.unrecognized" number="14908"
+  value="[%0!05u!] GThreads：未確認のトラップできない例外" />
+<MESSAGE name="GURL.fail_to_file" number="15000"
+  value="[%0!05u!] URL をファイル名に変換することができませんでした。" />
+<MESSAGE name="GURL.fail_to_URL" number="15001"
+  value="[%0!05u!] ファイル名称をURLへ変換することができませんでした。" />
+<MESSAGE name="GURL.no_protocol" number="15002"
+  value="[%0!05u!] URL &apos;%1!s!&apos; プロトコル接頭辞が含まれていません。" />
+<MESSAGE name="GURL.big_name" number="15003"
+  value="[%0!05u!] ファイル名が長すぎます。" />
+<MESSAGE name="GURL.listdir" number="15004"
+  value="[%0!05u!] GURL::listdir がこのプラットフォームでは実装されていません。" />
+<MESSAGE name="GURL.no_rename" number="15005">
+[1-%0!05u!] WinCEデバイスではrename()を使用できません。
+</MESSAGE>
+<MESSAGE name="IFFByteStream.bad_chunk" number="15100"
+  value="[%0!05u!] チャンクID が不正です。(IFFByteStream::put_chunk)" />
+<MESSAGE name="IFFByteStream.bad_offset" number="15101"
+  value="[%0!05u!] IFFByteStream (内部エラー) チャンクの境界を越えたオフセット" />
+<MESSAGE name="IFFByteStream.cant_close" number="15102"
+  value="[%0!05u!] チャンクがオープンされていないので、チャンクを閉じることは出来ません。" />
+<MESSAGE name="IFFByteStream.cant_write" number="15103"
+  value="[%0!05u!] 前のチャンクが終了するまで、書き込みは出来ません。" />
+<MESSAGE name="IFFByteStream.corrupt_2nd_id" number="15104"
+  value="[%0!05u!] IFF ファイルが壊れています。(二番目のチャンクID が不正です。)" />
+<MESSAGE name="IFFByteStream.corrupt_end2" number="15105"
+  value="[%0!05u!] IFF ファイルが壊れています。(チャンクサイズの読み込み中に EndOfChunk が見つかりました。" />
+<MESSAGE name="IFFByteStream.corrupt_end" number="15106"
+  value="[%0!05u!] IFF ファイルが壊れています。(チャンクID の読み込み中に EndOfChunk が見つかりました。)" />
+<MESSAGE name="IFFByteStream.corrupt_header" number="15107"
+  value="[%0!05u!] IFF ファイルが壊れています。(合成チャンクヘッダの読み込み中に EndOfChunk が見つかりました。)" />
+<MESSAGE name="IFFByteStream.corrupt_id" number="15108"
+  value="[%0!05u!] IFF ファイルが壊れています。(チャンクID が不正です。)" />
+<MESSAGE name="IFFByteStream.corrupt_mangled" number="15109"
+  value="[%0!05u!] IFF ファイルが壊れています。(チャンクの境界が異常です。)" />
+<MESSAGE name="IFFByteStream.no_chunk_id" number="15110"
+  value="[%0!05u!] チャンクID が利用できません。" />
+<MESSAGE name="IFFByteStream.not_ready2" number="15111"
+  value="[%0!05u!] IFFByteStream に書き込む準備ができていません。" />
+<MESSAGE name="IFFByteStream.not_ready3" number="15112"
+  value="[%0!05u!] IFFByteStream からバイトを読み込む準備ができていません。" />
+<MESSAGE name="IFFByteStream.not_ready4" number="15113"
+  value="[%0!05u!] IFFByteStream にバイトを書き込む準備ができていません。" />
+<MESSAGE name="IFFByteStream.not_ready" number="15114"
+  value="[%0!05u!] IFFByteStream から読み込む準備ができていません。" />
+<MESSAGE name="IFFByteStream.read_write" number="15115"
+  value="[%0!05u!] 同じ IFFByteStream に読み込みと書き込みを試みました。" />
+<MESSAGE name="Internal.error" number="15200"
+  value="[%0!05u!] 内部エラー" />
+<MESSAGE name="IW44Image.bad_rect" number="15300"
+  value="[%0!05u!] (IWMap::image) 矩形が範囲外です。" />
+<MESSAGE name="IW44Image.cant_read_primary2" number="15302"
+  value="[%0!05u!] (IWPixmap::decode_chunk) プライマリヘッダを読むことができません。" />
+<MESSAGE name="IW44Image.cant_read_primary" number="15303"
+  value="[%0!05u!] (IWBitmap::decode_chunk) プライマリヘッダを読むことができません。" />
+<MESSAGE name="IW44Image.cant_read_secondary2" number="15304"
+  value="[%0!05u!] (IWPixmap::decode_chunk) 2番目のヘッダを読むことができません。" />
+<MESSAGE name="IW44Image.cant_read_secondary" number="15305"
+  value="[%0!05u!] (IWBitmap::decode_chunk) 2番目のヘッダを読むことができません。" />
+<MESSAGE name="IW44Image.cant_read_tertiary2" number="15306"
+  value="[%0!05u!] (IWPixmap::decode_chunk) 3番目のヘッダを読むことができません。" />
+<MESSAGE name="IW44Image.cant_read_tertiary" number="15307"
+  value="[%0!05u!] (IWBitmap::decode_chunk) 3番目のヘッダを読むことができません。" />
+<MESSAGE name="IW44Image.codec_open2" number="15308"
+  value="[%0!05u!] (IWBitmap::decode_chunk) デコードの Codec が開いたままです。" />
+<MESSAGE name="IW44Image.corrupt_BM44_2" number="15312"
+  value="[%0!05u!] (IWPixmap::decode_iff) ファイルが壊れています。(FORM.BM44 が読み込めません。)" />
+<MESSAGE name="IW44Image.corrupt_BM44" number="15313"
+  value="[%0!05u!] (IWBitmap::decode_iff) ファイルが壊れています。(FORM.BM44 が読み込めません。)" />
+<MESSAGE name="IW44Image.empty_object2" number="15315"
+  value="[%0!05u!] (IWPixmap::encode_chunk) IWBitmap オブジェクトが空です。" />
+<MESSAGE name="IW44Image.empty_object" number="15316"
+  value="[%0!05u!] (IWBitmap::encode_chunk) IWBitmap オブジェクトが空です。" />
+<MESSAGE name="IW44Image.empty_rect" number="15317"
+  value="[%0!05u!] (IWMap::image) 長方形が空です。" />
+<MESSAGE name="IW44Image.has_color" number="15318"
+  value="[%0!05u!] (IWBitmap::decode_chunk) ファイルはカラーイメージを含んでいます。" />
+<MESSAGE name="IW44Image.incompat_codec2" number="15319"
+  value="[%0!05u!] (IWPixmap::decode_chunk) ファイルは互換性のない IWCodec で圧縮されました。" />
+<MESSAGE name="IW44Image.incompat_codec" number="15320"
+  value="[%0!05u!] (IWBitmap::decode_chunk) ファイルは互換性のない IWCodec で圧縮されました。" />
+<MESSAGE name="IW44Image.left_open1" number="15321"
+  value="[%0!05u!] (IWBitmap::encode_iff) Codec は開いたままです。" />
+<MESSAGE name="IW44Image.left_open2" number="15322"
+  value="[%0!05u!] (IWBitmap::decode_iff) Codec は開いたままです。" />
+<MESSAGE name="IW44Image.left_open3" number="15323"
+  value="[%0!05u!] (IWPixmap::encode_iff) Codec は開いたままです。" />
+<MESSAGE name="IW44Image.left_open4" number="15324"
+  value="[%0!05u!] (IWPixmap::decode_iff) Codec は開いたままです。" />
+<MESSAGE name="IW44Image.need_stop2" number="15325"
+  value="[%0!05u!] (IWPixmap::encode_chunk) ストップ基準を指定しなければなりません。" />
+<MESSAGE name="IW44Image.need_stop" number="15326"
+  value="[%0!05u!] (IWBitmap::encode_chunk) ストップ基準を指定しなければなりません。" />
+<MESSAGE name="IW44Image.param_range2" number="15327"
+  value="[%0!05u!] (IWPixmap::parm_dbfrac) パラメータが範囲外です。" />
+<MESSAGE name="IW44Image.param_range" number="15328"
+  value="[%0!05u!] (IWBitmap::parm_dbfrac) パラメータが範囲外です。" />
+<MESSAGE name="IW44Image.recent_codec2" number="15329"
+  value="[%0!05u!] (IWPixmap::decode_chunk) ファイルは比較的新しい IWCodec で圧縮されました。" />
+<MESSAGE name="IW44Image.recent_codec" number="15330"
+  value="[%0!05u!] (IWBitmap::decode_chunk) ファイルは比較的新しい IWCodec で圧縮されました。" />
+<MESSAGE name="IW44Image.sample_factor" number="15331"
+  value="[%0!05u!] (IWMap::image) サポートされていないサブサンプル値" />
+<MESSAGE name="IW44Image.wrong_serial2" number="15332"
+  value="[%0!05u!] (IWPixmap::decode_chunk) チャンクは予期していたシリアル番号を持っていません。" />
+<MESSAGE name="IW44Image.wrong_serial" number="15333"
+  value="[%0!05u!] (IWBitmap::decode_chunk) チャンクは予期していたシリアル番号を持っていません。" />
+<MESSAGE name="JB2Image.bad_dict2" number="15400"
+  value="[%0!05u!] ファイルが破損しています：JB2 辞書に非0イメージディメンジョンがあります。" />
+<MESSAGE name="JB2Image.bad_dict" number="15401"
+  value="[%0!05u!] シェイプ辞書のサイズは JB2 データとマッチしません。" />
+<MESSAGE name="JB2Image.bad_number" number="15402"
+  value="[%0!05u!] (JB2Codec::CodeNum) 範囲外の数値です。" />
+<MESSAGE name="JB2Image.bad_numcontext" number="15403"
+  value="[%0!05u!] (JB2Codec::CodeNum) NumContext が不正です。" />
+<MESSAGE name="JB2Image.bad_parent_shape" number="15404"
+  value="[%0!05u!] JB2Shape でのペアレントシェイプ番号が不正です。" />
+<MESSAGE name="JB2Image.bad_shape" number="15405"
+  value="[%0!05u!] JB2Blit でのシェイプ番号が不正です。" />
+<MESSAGE name="JB2Image.bad_type" number="15406"
+  value="[%0!05u!] ファイルが壊れています：シェイプ辞書のためのレコードタイプが不正です。" />
+<MESSAGE name="JB2Image.cant_change" number="15407"
+  value="[%0!05u!] 一度セットされた辞書を変更することはできません。" />
+<MESSAGE name="JB2Image.cant_create" number="15408"
+  value="[%0!05u!] 大きさが設定されていない JB2Image オブジェクトのためにビットマップイメージをつくることができません。" />
+<MESSAGE name="JB2Image.cant_set" number="15409"
+  value="[%0!05u!] シェイプを加えた後に辞書をセットすることはできません。" />
+<MESSAGE name="JB2Image.need_dict" number="15410"
+  value="[%0!05u!] JB2データはシェイプ辞書を必要としています。" />
+<MESSAGE name="JB2Image.no_start" number="15411"
+  value="[%0!05u!] ファイルが壊れています：スタートレコードが見つかりません。" />
+<MESSAGE name="JB2Image.unknown_type" number="15412"
+  value="[%0!05u!] ファイルが壊れています：レコードタイプが見つかりません。" />
+<MESSAGE name="JB2Image.zero_dim" number="15413"
+  value="[%0!05u!] ファイルが壊れています：NJB2 イメージ寸法のスタートレコードがゼロです。" />
+<MESSAGE name="MMRDecoder.bad_codebook" number="15500"
+  value="[%0!05u!] MMR codebook があいまいです。" />
+<MESSAGE name="MMRDecoder.bad_data" number="15501"
+  value="[%0!05u!] G4/MMR データが無効です。" />
+<MESSAGE name="MMRDecoder.bad_header" number="15502"
+  value="[%0!05u!] G4/MMR ヘッダが壊れています。" />
+<MESSAGE name="MMRDecoder.cant_process" number="15503"
+  value="[%0!05u!] G4/MMR データで非圧縮ビットを処理できません。" />
+<MESSAGE name="MMRDecoder.unrecog_header" number="15504"
+  value="[%0!05u!] G4/MMR ヘッダが認識できません。" />
+<MESSAGE name="not_implemented_n" number="15600"
+  value="[%0!05u!] &apos;%1!s!&apos; が実装されていません。" />
+<MESSAGE name="not_implemented" number="15700"
+  value="[%0!05u!] 実装されていません" />
+<MESSAGE name="parseoptions.ambiguous" number="15800"
+  value="[%0!05u!] オプションがあいまいです：&apos;%1!s!=%2!s!&apos; と &apos;%3!s!=%4!s!&apos; が指定されています。" />
+<MESSAGE name="parseoptions.bad_number" number="15802"
+  value="[%0!05u!] &apos;%1!s!&apos; は数値ではありません。" />
+<MESSAGE name="parseoptions.bad_value" number="15803"
+  value="[%0!05u!] &apos;%1!s!&apos; は数値またはブーリアン値ではありません。" />
+<MESSAGE name="parseoptions.cant_inherit" number="15804"
+  value="[%0!05u!] &apos;%1!s!&apos;：&apos;%3!s!&apos;の行 %2!d! でエラーが発生しました。&#09;--&gt; 未知のプロファイル &apos;%4!s!&apos; を継承できません。" />
+<MESSAGE name="parseoptions.illegal_profile" number="15805"
+  value="[%0!05u!] &apos;%1!s!&apos;：プロファイル &apos;%3!s!&apos; の行 %2!d! でエラーが発生しました。&#09;--&gt; 無効なプロファイル名 &apos;%4!s!&apos;。" />
+<MESSAGE name="parseoptions.missing_arg_option" number="15806"
+  value="[%0!05u!] 引数が必要です： --&apos;%1!s!&apos;" />
+<MESSAGE name="parseoptions.profile_error" number="15807"
+  value="[%0!05u!] &apos;%1!s!&apos;：プロファイル &apos;%3!s!&apos; の行 %2!d! でエラーが発生しました。&#09;--&gt; %4!s!" />
+<MESSAGE name="parseoptions.unrecog_option_c" number="15808"
+  value="[%0!05u!] 認識できないオプション -&apos;%1!s!&apos;" />
+<MESSAGE name="parseoptions.unrecog_option" number="15809"
+  value="[%0!05u!] 認識できないオプション &apos;%1!s!&apos;" />
+<MESSAGE name="STOP" number="16000"
+  value="[%0!05u!] トラップできないストップメッセージ。" />
+<MESSAGE name="TextException.test" number="16100"
+  value="[%0!05u!] テスト例外" />
+<MESSAGE name="XMLAnno.bad_color" number="16200"
+  value="[%0!05u!] カラー &apos;%1!s!&apos; はサポートされていません。" />
+<MESSAGE name="XMLAnno.bad_page" number="16201"
+  value="[%0!05u!] 指定したページの取得に失敗しました。" />
+<MESSAGE name="XMLAnno.bad_rect" number="16202"
+  value="[%0!05u!] 矩形領域の座標が少なすぎます。" />
+<MESSAGE name="XMLAnno.bad_circle" number="16203"
+  value="[%0!05u!] 円領域の座標が少なすぎます。" />
+<MESSAGE name="XMLAnno.bad_oval" number="16204"
+  value="[%0!05u!] 楕円領域の座標が少なすぎます。" />
+<MESSAGE name="XMLAnno.unknown_shape" number="16205"
+  value="[%0!05u!] 未知のシェイプ &apos;%1!s!&apos;" />
+<MESSAGE name="XMLAnno.unknown_border" number="16206"
+  value="[%0!05u!] 未知のボーダータイプ &apos;%1!s!&apos;" />
+<MESSAGE name="XMLAnno.extra_body" number="16207"
+  value="[%0!05u!] &lt;BODY&gt;&lt;/BODY&gt; は1対だけ許可されます。" />
+<MESSAGE name="XMLAnno.no_body" number="16208"
+  value="[%0!05u!] &lt;BODY&gt;&lt;/BODY&gt; の対が見つかりません。" />
+<MESSAGE name="XMLAnno.map_find" number="16209"
+  value="[%0!05u!] 指定されたマップが見つかりません &apos;%1!s!&apos;" />
+<MESSAGE name="XMLAnno.fail_init" number="16210"
+  value="[%0!05u!] 初期化に失敗しました &apos;%1!s!&apos;" />
+<MESSAGE name="XMLTags.no_GP" number="16300"
+  value="[%0!05u!] GP ポインタで保護されていません。" />
+<MESSAGE name="XMLTags.raw_string" number="16301"
+  value="[%0!05u!] &apos;%1!s!&apos; ドキュメントスコープの外で文字列が見つかりました。" />
+<MESSAGE name="XMLTags.bad_tag" number="16302"
+  value="[%0!05u!] 未終了のタグ &apos;%1!s!&apos;" />
+<MESSAGE name="XMLTags.bad_PI" number="16303"
+  value="[%0!05u!] 未終了の処理指示：&apos;%1!s!&apos;" />
+<MESSAGE name="XMLTags.bad_comment" number="16304"
+  value="[%0!05u!] 未終了のコメント：&apos;%1!s!&apos;" />
+<MESSAGE name="XMLTags.bad_form" number="16305"
+  value="[%0!05u!] 整形式XML文書エラー。終了タグが多すぎます。" />
+<MESSAGE name="XMLTags.no_body" number="16306"
+  value="[%0!05u!] ボディがありません。" />
+<MESSAGE name="ZPCodec.no_encoding" number="16400"
+  value="[%0!05u!] エンコードの ZPCodec が作成されていません。" />
+<MESSAGE name="ZPCodec.write_error" number="16401"
+  value="[%0!05u!] ZPCodec 書込みエラー" />
+<MESSAGE name="DjVuText.corrupt_text" number="10100">
+[1-%0!05u!] Text layer hierarchy is corrupt"
+</MESSAGE>
+<MESSAGE name="DataPool.reenter" number="11807"
+  value="[%0!05u!] DATA_POOL_REENTER" />
+<MESSAGE name="DjVuFile.EOF" number="12514">
+[1-%0!05u!] Unexpected End Of File Encountered Reading:
+	%1!s!.
+</MESSAGE>
+<MESSAGE name="Error" number="13500">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="error" number="13600">
+Error: %1!s!.
+</MESSAGE>
+<MESSAGE name="XMLTags.unmatched_end" number="16307">
+[1-%0!05u!] XML tag &apos;%1!s!&apos; on line %2!u! was terminated with XML
+tag &apos;%3!s!&apos; line %4!u!.
+</MESSAGE>
+<MESSAGE name="DjVuDynamicLib.failed_open2" number="16402">
+[1-%0!05u!] Failed to open dynamic library '%1!s!'.
+	System reported: '%2!s!'.
+</MESSAGE>
+<MESSAGE name="DjVuDynamicLib.failed_open" number="16403">
+[1-%0!05u!] Failed to open dynamic library '%1!s!'.
+</MESSAGE>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/ja/messages.xml b/share/djvu/osi/ja/messages.xml
new file mode 100644
index 0000000..dfc1d25
--- /dev/null
+++ b/share/djvu/osi/ja/messages.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- List of files to include to get the entire list of messages -->
+<DjVuMessages>
+<HEAD>
+<!-- Message numbers 17000-19999 -->
+<INCLUDE name="../en/djvutools-reference.xml" />
+<!-- Message numbers 10000-16999 -->
+<INCLUDE name="libdjvu++.xml" />
+</HEAD>
+<BODY>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/languages.xml b/share/djvu/osi/languages.xml
new file mode 100644
index 0000000..64d420b
--- /dev/null
+++ b/share/djvu/osi/languages.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../pubtext/DjVuLanguages.dtd">
+<!-- List of files to include to get the entire list of messages -->
+<DjVuLanguages>
+<BODY>
+<!-- English -->
+<LANGUAGE locale="C" src="en" />
+<LANGUAGE locale="downcase^en" src="en" />
+<LANGUAGE locale="downcase^eng" src="en" />
+<LANGUAGE locale="downcase^english" src="en" />
+<LANGUAGE locale="downcase^english-us" src="en" />
+<LANGUAGE locale="downcase^english-usa" src="en" />
+<LANGUAGE locale="downcase^english-uk" src="en" />
+<LANGUAGE locale="downcase^enu" src="en" />
+<LANGUAGE locale="downcase^uk" src="en" />
+<LANGUAGE locale="downcase^us" src="en" />
+<LANGUAGE locale="downcase^usa" src="en" />
+<LANGUAGE locale="downcase^american" src="en" />
+<LANGUAGE locale="downcase^american-english" src="en" />
+<LANGUAGE locale="downcase^american english" src="en" />
+<!-- French (France) -->
+<LANGUAGE locale="downcase^fr" src="fr" />
+<LANGUAGE locale="downcase^fra" src="fr" />
+<LANGUAGE locale="downcase^fre" src="fr" />
+<LANGUAGE locale="downcase^french" src="fr" />
+<!-- German (Germany) -->
+<LANGUAGE locale="downcase^german" src="de" />
+<LANGUAGE locale="downcase^de" src="de" />
+<LANGUAGE locale="downcase^deu" src="de" />
+<!-- Japanese -->
+<LANGUAGE locale="downcase^japanese" src="ja" />
+<LANGUAGE locale="downcase^jpn" src="ja" />
+<LANGUAGE locale="downcase^ja" src="ja" />
+<!-- Chinese -->
+<LANGUAGE locale="downcase^zh" src="zh" />
+<LANGUAGE locale="downcase^chinese" src="zh" />
+<!-- Czech -->
+<LANGUAGE locale="downcase^cs" src="cs" />
+<LANGUAGE locale="downcase^czech" src="cs" />
+</BODY>
+</DjVuLanguages>
+
diff --git a/share/djvu/osi/zh/libdjvu++.xml b/share/djvu/osi/zh/libdjvu++.xml
new file mode 100644
index 0000000..1238068
--- /dev/null
+++ b/share/djvu/osi/zh/libdjvu++.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- Error messages from libdjvu++ -->
+<DjVuMessages>
+<BODY>
+<MESSAGE name="DjVuMessage.Unrecognized" value="不明错误信息:&#10;&#09;错误信息名称: %1!s!" />
+<MESSAGE name="DjVuMessage.Parameter" value="参数%1!s!" />
+<MESSAGE name="arrays.ill_arg" number="11500" value="[%0!s!] DArray::del中出现非法参数" />
+<MESSAGE name="arrays.ill_sub" number="11501" value="[%0!s!] 非法 DArray下标" />
+<MESSAGE name="arrays.resize" number="11502" value="[%0!s!] DArray在调整大小时出现无效上下限" />
+<MESSAGE name="bad_arg" number="11600" value="[%0!s!] 非法参数出现在 %1!s!" />
+<MESSAGE name="ByteStream.backward" number="11700" value="[%0!s!] ByteStream不支持反向搜寻" />
+<MESSAGE name="ByteStream.bad_arg" number="11701" value="[%0!s!] ByteStream::seek中出现非法参数" />
+<MESSAGE name="ByteStream.bad_mode2" number="11702" value="[%0!s!] 此模式对于stdin/stdout文件描述符非法" />
+<MESSAGE name="ByteStream.bad_mode" number="11703" value="[%0!s!] StdioByteStream中出现无效状态" />
+<MESSAGE name="ByteStream.cant_write" number="11704" value="[%0!s!] 不能写入为解码而建立的BSByteStream" />
+<MESSAGE name="ByteStream.corrupt" number="11705" value="[%0!s!] 损坏的解码器输入" />
+<MESSAGE name="ByteStream.decoder_only" number="11706" value="[%0!s!] 在NEED_DECODER_ONLY条件下编译" />
+<MESSAGE name="ByteStream.flush_error" number="11707" value="[%0!s!] StdioByteStream::flush, 刷新出错。" />
+<MESSAGE name="ByteStream.no_read" number="11708" value="[%0!s!] StdioByteStream 不是为读出打开" />
+<MESSAGE name="ByteStream.no_write" number="11709" value="[%0!s!] StdioByteStream 不是为写入打开" />
+<MESSAGE name="ByteStream.open_fail2" number="11710" value="[%0!s!] StdioByteStream::StdioByteStream, 无法打开文件。" />
+<MESSAGE name="ByteStream.open_fail" number="11711" value="[%0!s!] 无法打开 &apos;%1!s!&apos;: %2!s!" />
+<MESSAGE name="ByteStream.read_error2" number="11712" value="[%0!s!] StdioByteStream::read, 读出时出错。" />
+<MESSAGE name="ByteStream.read_error" number="11713" value="[%0!s!] ByteStream::readall, 读出全部时出错。" />
+<MESSAGE name="ByteStream.seek_error2" number="11714" value="[%0!s!] 寻道超出文件的开头" />
+<MESSAGE name="ByteStream.seek_error" number="11715" value="[%0!s!] StdioByteStream::seek, 寻道出错。" />
+<MESSAGE name="ByteStream.seek" number="11716" value="[%0!s!] 在ByteStream (ftell() acts strange)上寻道异常" />
+<MESSAGE name="ByteStream.write" number="11717" value="[%0!s!] ByteStream::write%1!s!, 写入出错。" />
+<MESSAGE name="ByteStream.write_error2" number="11718" value="[%0!s!] StdioByteStream::write, 写入出错。" />
+<MESSAGE name="ByteStream.write_error3" number="11719" value="[%0!s!] 试图写入 StaticByteStream" />
+<MESSAGE name="ByteStream.write_error" number="11720" value="[%0!s!] ByteStream::write出错, 类型不明。" />
+<MESSAGE name="ByteStream.not_implemented" number="11721" value="[%0!s!] 没有ByteStream::scanf功能" />
+<MESSAGE name="DataPool.add_data" number="11800" value="[%0!s!] 函数DataPool::add_data()可能尚未为连接的数据池调用。" />
+<MESSAGE name="DataPool.bad_length" number="11801" value="[%0!s!] 长度必须是正数" />
+<MESSAGE name="DataPool.bad_size" number="11802" value="[%0!s!] 尺寸大小必须非负" />
+<MESSAGE name="DataPool.connected1" number="11803" value="[%0!s!] 已经连接到另一个数据池。" />
+<MESSAGE name="DataPool.connected2" number="11804" value="[%0!s!] 已经连接到一个文件。" />
+<MESSAGE name="DataPool.neg_start" number="11805" value="[%0!s!] 起始位置偏移必须非负" />
+<MESSAGE name="DataPool.no_threadless" number="11806" value="[%0!s!] 内部出错，此函数&apos;t可被用于无主流模式。" />
+<MESSAGE name="DataPool.reenter" number="11807" value="[%0!s!] DATA_POOL_REENTER" />
+<MESSAGE name="DataPool.seek_backward" number="11808" value="[%0!s!] ByteStream不支持反向搜寻" />
+<MESSAGE name="DataPool.zero_DataPool" number="11809" value="[%0!s!] 内部出错，输入了空数据池。" />
+<MESSAGE name="DjVmDir0.no_slash" number="11900" value="[%0!s!] 文件名不能含有斜杆" />
+<MESSAGE name="DjVmDir.bad_dir" number="12000" value="[%0!s!] 此目录下同时含有成束和分散的记录。" />
+<MESSAGE name="DjVmDir.bad_file" number="12001" value="[%0!s!] DjVu文件 ID &apos;%1!s!&apos; 含有非法字符。" />
+<MESSAGE name="DjVmDir.corrupt" number="12002" value="[%0!s!] DjVu 文件已毁坏，在一个多页文件中可能只有一个文件&#10;具有分享的批注。" />
+<MESSAGE name="DjVmDir.dupl_id2" number="12003" value="[%0!s!] ID 为 &apos;%1!s!&apos; 的文件已出现在DJVM目录下。" />
+<MESSAGE name="DjVmDir.dupl_id" number="12004" value="[%0!s!] 数据块&apos;DIRM&apos; 出错: 同名为 &apos;%1!s!&apos;的有两个记录" />
+<MESSAGE name="DjVmDir.dupl_name2" number="12005" value="[%0!s!] 名为&apos;%1!s!&apos;的文件已出现在DJVM目录下。" />
+<MESSAGE name="DjVmDir.dupl_name" number="12006" value="[%0!s!] 数据块&apos;DIRM&apos; 出错: 同名为 &apos;%1!s!&apos; 的有两个记录" />
+<MESSAGE name="DjVmDir.dupl_title2" number="12007" value="[%0!s!] 标题为&apos;%1!s!&apos;的文件已经存在于DJVM 目录下。" />
+<MESSAGE name="DjVmDir.dupl_title" number="12008" value="[%0!s!] 数据块&apos;DIRM&apos; 出错: 两个记录具有相同的标题&apos;%1!s!&apos;" />
+<MESSAGE name="DjVmDir.get_str_type" number="12009" value="[%0!s!] 内部出错，请修改DjVmDir::File::get_str_type()&#10;使包含所有可能的文件类型。" />
+<MESSAGE name="DjVmDir.multi_save2" number="12010" value="[%0!s!] 当前的DjVu多页格式&#10;最多只能有一个文件具有分享批注。" />
+<MESSAGE name="DjVmDir.multi_save" number="12011" value="[%0!s!] 不能保存含多个具有分享批注子文件的文件。" />
+<MESSAGE name="DjVmDir.name_in_use" number="12012" value="[%0!s!] 名字&apos;%1!s!&apos;已被使用。" />
+<MESSAGE name="DjVmDir.no_indirect" number="12013" value="[%0!s!] 目录错误：在成束的文件中不能有分散的个体。" />
+<MESSAGE name="DjVmDir.no_info" number="12014" value="[%0!s!] 没有任何关于ID 为&apos;%1!s!&apos;的文件的消息" />
+<MESSAGE name="DjVmDir.title_in_use" number="12015" value="[%0!s!] 标题&apos;%1!s!&apos;已被使用。" />
+<MESSAGE name="DjVmDir.version_error" number="12016" value="[%0!s!] 不能读版本高于%1!s!.&#10;的DJVM目录。数据版本号是%2!s!。" />
+<MESSAGE name="DjVmDoc.cant_delete" number="12100" value="[%0!s!] 没有ID为&apos;%1!s!&apos;的文件可删除。" />
+<MESSAGE name="DjVmDoc.cant_find" number="12101" value="[%0!s!] 找不到ID为&apos;%1!s!&apos;的文件。" />
+<MESSAGE name="DjVmDoc.cant_read_indr" number="12102" value="[%0!s!] 没法从DataPools 或 ByteStreams 中读出分散方式的DjVu文件。" />
+<MESSAGE name="DjVmDoc.no_data" number="12103" value="[%0!s!] 文件&apos;%1!s!&apos;没有数据。" />
+<MESSAGE name="DjVmDoc.no_dirm_chunk" number="12104" value="[%0!s!] DJVM文件的第一个数据块必须是DIRM: 可能是老的格式。" />
+<MESSAGE name="DjVmDoc.no_duplicate" number="12105" value="[%0!s!] 试图重复插入同一个文件。" />
+<MESSAGE name="DjVmDoc.no_form_djvm2" number="12106" value="[%0!s!] 找不到DJVM。文件不是新的多页格式。" />
+<MESSAGE name="DjVmDoc.no_form_djvm" number="12107" value="[%0!s!] Can&apos;t find form DJVM in the input data." />
+<MESSAGE name="DjVmDoc.not_IFF" number="12108" value="[%0!s!] 在输入数据中找不到DJVM。" />
+<MESSAGE name="DjVmDoc.no_zero_file" number="12109" value="[%0!s!] 不能插入空文件。" />
+<MESSAGE name="DjVmDoc.zero_file" number="12110" value="[%0!s!] 空文件。" />
+<MESSAGE name="DjVuAnno.bad_type" number="12200" value="[%0!s!] GLObject(): 错误的目标类型。 应是STRING或SYMBOL。" />
+<MESSAGE name="DjVuAnno.bad_url" number="12201" value="[%0!s!] 无效的URL" />
+<MESSAGE name="DjVuAnno.bad_version" number="12202" value="[%0!s!] 不支持文字区信息的%1!s!版本。" />
+<MESSAGE name="DjVuAnno.bad_zoom" number="12203" value="[%0!s!] 无效的放缩要求。" />
+<MESSAGE name="DjVuAnno.corrupt_chunk" number="12204" value="[%0!s!] 损坏的TXT数据块。" />
+<MESSAGE name="DjVuAnno.corrupt_text" number="12205" value="[%0!s!] 损坏的文字区分层。" />
+<MESSAGE name="DjVuAnno.dupl_text" number="12206" value="[%0!s!] 重复的TXT批注。" />
+<MESSAGE name="DjVuAnno.invalid2list" number="12207" value="[%0!s!] 无效的目标类型。无法转换成表。" />
+<MESSAGE name="DjVuAnno.invalid2number" number="12208" value="[%0!s!] 无效的目标类型。无法转换成数。" />
+<MESSAGE name="DjVuAnno.invalid2string" number="12209" value="[%0!s!] 无效的目标类型。无法转换成字符窜。" />
+<MESSAGE name="DjVuAnno.invalid2symbol" number="12210" value="[%0!s!] 无效的目标类型。无法转换成符号。" />
+<MESSAGE name="DjVuAnno.list2number" number="12211" value="[%0!s!] 无效的复合目标类型。无法转换成数。" />
+<MESSAGE name="DjVuAnno.list2string" number="12212" value="[%0!s!] 无效的复合目标类型。无法转换成字符窜。" />
+<MESSAGE name="DjVuAnno.list2symbol" number="12213" value="[%0!s!] 无效的复合目标类型。无法转换成符号。" />
+<MESSAGE name="DjVuAnno.no_number" number="12214" value="[%0!s!]分析目标内容时出错。 &apos;%1!s!&apos;:&#10;&apos;(&apos;之后应是目标名， 而非数字。" />
+<MESSAGE name="DjVuAnno.no_paren" number="12215" value="[%0!s!] 分析目标内容时出错。 &apos;%1!s!&apos;:&#10;&apos;(&apos;之后应是目标名， 而非括符。" />
+<MESSAGE name="DjVuAnno.no_string" number="12216" value="[%0!s!] 分析目标内容时出错。 &apos;%1!s!&apos;:&#10;&apos;(&apos;之后应是目标名， 而非字符窜。" />
+<MESSAGE name="DjVuAnno.no_text" number="12217" value="[%0!s!] 无文本信息供编码。" />
+<MESSAGE name="DjVuAnno.number2list" number="12218" value="[%0!s!] 无效的目标类型。无法转换数字&apos;%d!1!&apos;成复合目标。" />
+<MESSAGE name="DjVuAnno.number2string" number="12219" value="[%0!s!] 无效的目标类型。无法转换数字&apos;%d!1!&apos;成字符窜。" />
+<MESSAGE name="DjVuAnno.number2symbol" number="12220" value="[%0!s!] 无效的目标类型。无法转换数字&apos;%d!1!&apos;成符号。" />
+<MESSAGE name="DjVuAnno.one_word" number="12221" value="[%0!s!] 在全词匹配搜索中， 字符窜只能含一个字&#10;" />
+<MESSAGE name="DjVuAnno.paren" number="12222" value="[%0!s!] 分析目标内容时出错，紧接着&apos;%1!s!&apos;:&#10;&apos;(&apos;必须是目标名。" />
+<MESSAGE name="DjVuAnno.string2list" number="12223" value="[%0!s!] 无效的目标类型。无法转换字符窜&apos;%1!s!&apos;成复合目标。" />
+<MESSAGE name="DjVuAnno.string2number" number="12224" value="[%0!s!] Invalid object type. Can&apos;t convert string &apos;%1!s!&apos; to number." />
+<MESSAGE name="DjVuAnno.string2symbol" number="12225" value="[%0!s!] 无效的目标类型。无法转换字符窜&apos;%1!s!&apos; 成数字。" />
+<MESSAGE name="DjVuAnno.symbol2list" number="12226" value="[%0!s!] 无效的目标类型。无法转换符号&apos;%1!s!&apos;成复合目标。" />
+<MESSAGE name="DjVuAnno.symbol2number" number="12227" value="[%0!s!] 无效的目标类型。无法转换符号&apos;%1!s!&apos;成数字。" />
+<MESSAGE name="DjVuAnno.symbol2string" number="12228" value="[%0!s!] 无效的目标类型。无法转换符号&apos;%1!s!&apos;成字符窜。" />
+<MESSAGE name="DjVuAnno.too_few" number="12229" value="[%0!s!] &apos;%1!s!&apos;中目标个数太少。" />
+<MESSAGE name="DjVuDocEditor.bad_page" number="12300" value="[%0!s!] %d!1!是无效页号。" />
+<MESSAGE name="DjVuDocEditor.cant_save2" number="12301" value="[%0!s!] 无法按要求的格是保存。请用另存为。" />
+<MESSAGE name="DjVuDocEditor.cant_save" number="12302" value="[%0!s!] 无法保存文件。请用另存为。" />
+<MESSAGE name="DjVuDocEditor.create_fail" number="12303" value="[%0!s!] 无法建立ID为&apos;%1!s!&apos;的文件。" />
+<MESSAGE name="DjVuDocEditor.dir_fail" number="12304" value="[%0!s!] 无法建立目录&apos;%1!s!&apos;" />
+<MESSAGE name="DjVuDocEditor.init" number="12305" value="[%0!s!] DjVuDocEditor 已经初始化。" />
+<MESSAGE name="DjVuDocEditor.no_codec" number="12306" value="[%0!s!] 无法装载压缩的codec" />
+<MESSAGE name="DjVuDocEditor.no_file" number="12307" value="[%0!s!] 本文件中没有ID为&apos;%1!s!&apos;的子文件。" />
+<MESSAGE name="DjVuDocEditor.not_1_page" number="12308" value="[%0!s!] &apos;%1!s!&apos;不是单页文件。" />
+<MESSAGE name="DjVuDocEditor.no_thumb" number="12309" value="[%0!s!] 内部出错。无法找到%1!d!页的略图。" />
+<MESSAGE name="DjVuDocEditor.not_init" number="12310" value="[%0!s!] DjVuDocEditor 须初始化才能使用。" />
+<MESSAGE name="DjVuDocEditor.open_fail" number="12311" value="[%0!s!] 无法打开文件&apos;%1!s!&apos;" />
+<MESSAGE name="DjVuDocEditor.page_fail" number="12312" value="[%0!s!] 内部出错。无法找到%1!d!页。" />
+<MESSAGE name="DjVuDocEditor.page_num" number="12313" value="[%0!s!] %1!d!是无效页码。" />
+<MESSAGE name="DjVuDocEditor.render" number="12314" value="[%0!s!] 无法显示%1!d!页的图像。" />
+<MESSAGE name="DjVuDocEditor.share_fail" number="12315" value="[%0!s!] 无法建立另一个具有分享批注的文件。在一个多页文件中只能有一个文件&#10;具有分享的批注。" />
+<MESSAGE name="DjVuDocument.2nd_init" number="12400" value="[%0!s!] 文件不能重复初始化。" />
+<MESSAGE name="DjVuDocument.bad_format" number="12401" value="[%0!s!] 未知格式，无法解码。" />
+<MESSAGE name="DjVuDocument.bad_thumb" number="12402" value="[%0!s!] 毁坏的略图。" />
+<MESSAGE name="DjVuDocument.big_num" number="12403" value="[%0!s!] 页码太大。" />
+<MESSAGE name="DjVuDocument.cant_extract2" number="12404" value="[%0!s!] 无法取出略图。" />
+<MESSAGE name="DjVuDocument.cant_extract" number="12405" value="[%0!s!] 无法取出预解码的略图。" />
+<MESSAGE name="DjVuDocument.cant_render" number="12406" value="[%0!s!] 无法显示%1!d!页。" />
+<MESSAGE name="DjVuDocument.comp_codec" number="12407" value="[%0!s!] 压缩的codec没有装上。" />
+<MESSAGE name="DjVuDocument.empty_url" number="12408" value="[%0!s!] DjVuDocument得到空的URL。" />
+<MESSAGE name="DjVuDocument.exclude_page" number="12409" value="[%0!s!] 由于出错，文件略去1!d!页。" />
+<MESSAGE name="DjVuDocument.fail_file" number="12410" value="[%0!s!] 无法读出&apos;%1!s!&apos;" />
+<MESSAGE name="DjVuDocument.fail_URL" number="12411" value="[%0!s!] 无法得到URL &apos;%1!s!&apos;所要的数据。" />
+<MESSAGE name="DjVuDocument.file_outside" number="12412" value="[%0!s!] 子文件&apos;%1!s!&apos;不在此文见中" />
+<MESSAGE name="DjVuDocument.init_eof" number="12413" value="[%0!s!] 初始化文件时意外终止。" />
+<MESSAGE name="DjVuDocument.init_not_done" number="12414" value="[%0!s!] 文件尚未完全初始化。" />
+<MESSAGE name="DjVuDocument.miss_page_name" number="12415" value="[%0!s!] 名为&apos;%1!s!&apos;的子文件不在此文件中。" />
+<MESSAGE name="DjVuDocument.miss_page_num" number="12416" value="[%0!s!] 第&apos;%1!d!&apos;页不在此文件中。" />
+<MESSAGE name="DjVuDocument.no_dir" number="12417" value="[%0!s!] 单页文件没有DjVm目录。" />
+<MESSAGE name="DjVuDocument.no_file" number="12418" value="[%0!s!] 要求的文件不存在。" />
+<MESSAGE name="DjVuDocument.no_page" number="12419" value="[%0!s!] 无法找到文件中任何一页。" />
+<MESSAGE name="DjVuDocument.not_DjVu" number="12420" value="[%0!s!] 要求输入的不是DjVu文件。" />
+<MESSAGE name="DjVuDocument.not_init" number="12421" value="[%0!s!] 文件尚未初始化。" />
+<MESSAGE name="DjVuDocument.not_secure" number="12422" value="[%0!s!] 文件尚未由GP&lt;DjVuDocument&gt;保险。" />
+<MESSAGE name="DjVuDocument.obsolete" number="12423" value="[%0!s!] 此文件是obsolete格式。" />
+<MESSAGE name="DjVuDocument.old_bundle" number="12424" value="[%0!s!] 只又OLD_BUNDLED文件具有DjVm v.0目录。" />
+<MESSAGE name="DjVuDocument.stopped" number="12425" value="[%0!s!] DjVuDocument 初始化流程已停止。" />
+<MESSAGE name="DjVuDocument.unk_type" number="12426" value="[%0!s!] 文件类型未知。" />
+<MESSAGE name="DjVuDocument.URL_outside2" number="12427" value="[%0!s!] URL &apos;%1!s!&apos; 指到了INDIRECT文件的界外。" />
+<MESSAGE name="DjVuDocument.URL_outside" number="12428" value="[%0!s!] URL &apos;%1!s!&apos; 指到了bundled文件的界外。" />
+<MESSAGE name="DjVuDocument.skip_page" number="12429" value="[%0!s!] 跳过第%1!d!页。" />
+<MESSAGE name="DjVuFile.2nd_init" number="12500" value="[%0!s!] DjVuFile 已经初始化。" />
+<MESSAGE name="DjVuFile.corrupt_BG44" number="12501" value="[%0!s!] DjVu 解码器: 毁坏的数据 (BG44 数据块的大小不正确)" />
+<MESSAGE name="DjVuFile.corrupt_dupl" number="12502" value="[%0!s!] DjVu 解码器: 毁坏的文件 (INFO 数据块重复)" />
+<MESSAGE name="DjVuFile.corrupt_INFO" number="12503" value="[%0!s!] DjVu 解码器: 毁坏的文件(INFO 数据块出现在FORM:DJVI中)" />
+<MESSAGE name="DjVuFile.corrupt_missing_info" number="12504" value="[%0!s!] DjVu 解码器: 毁坏的数据 (INFO 数据块丢失)" />
+<MESSAGE name="DjVuFile.corrupt_missing_IW44" number="12505" value="[%0!s!] DjVu 解码器: 毁坏的数据 (IW44 数据块丢失)" />
+<MESSAGE name="DjVuFile.corrupt_zero" number="12506" value="[%0!s!] DjVu 解码器: 毁坏的文件(图像大小为0)" />
+<MESSAGE name="DjVuFile.decode_fail" number="12507" value="[%0!s!] 解码一个included文件时失败。" />
+<MESSAGE name="DjVuFile.dupl_backgrnd" number="12508" value="[%0!s!] DjVu 解码器: 毁坏的数据 (重叠的背境层)" />
+<MESSAGE name="DjVuFile.dupl_Dxxx" number="12509" value="[%0!s!] DjVu 解码器: 毁坏的数据 (重叠的Dxxx数据块)" />
+<MESSAGE name="DjVuFile.dupl_foregrnd" number="12510" value="[%0!s!] DjVu 解码器: 毁坏的数据 (重叠的近景色彩信息)" />
+<MESSAGE name="DjVuFile.dupl_Sxxx" number="12511" value="[%0!s!] DjVu 解码器: 毁坏的数据 (重叠的Sxxx数据块)" />
+<MESSAGE name="DjVuFile.Dxxx_after_Sxxx" number="12512" value="[%0!s!] DjVu 解码器: 毁坏的数据 (Dxxx数据块出现在Sxxx数据块之后)" />
+<MESSAGE name="DjVuFile.empty_URL" number="12513" value="[%0!s!] DjVuFile得到空的URL。" />
+<MESSAGE name="DjVuFile.EOF" number="12514" value="[%0!s!] 读取&#10;&#09;%1!s!时意外终止。" />
+<MESSAGE name="DjVuFile.failed" number="12515" value="[%0!s!] %1!s! 失败。" />
+<MESSAGE name="DjVuFile.illegal_chunk" number="12516" value="[%0!s!] 无效块号。" />
+<MESSAGE name="DjVuFile.malformed" number="12517" value="[%0!s!] 斜杆不允许出现在INCL数据块中。" />
+<MESSAGE name="DjVuFile.missing_chunk" number="12518" value="[%0!s!] 数据块太少。" />
+<MESSAGE name="DjVuFile.new_version" number="12519" value="[%0!s!] DjVu 解码器: 无法解码版本为 &gt;= %d!1!的DjVu文件。" />
+<MESSAGE name="DjVuFile.no_create" number="12520" value="[%0!s!] 内部出错：id_to_file(%1!s!)没有建立任何文件。" />
+<MESSAGE name="DjVuFile.no_data" number="12521" value="[%0!s!] 没有为URL &apos;%1!s!&apos;取得任何数据。" />
+<MESSAGE name="DjVuFile.not_finished" number="12522" value="[%0!s!] 内部出错：包含的文件尚未结束。" />
+<MESSAGE name="DjVuFile.not_init" number="12523" value="[%0!s!] DjVuFile尚未初始化。" />
+<MESSAGE name="DjVuFile.not_secured" number="12524" value="[%0!s!] DjVuFile尚未由GP&lt;DjVuFile&gt;保险。" />
+<MESSAGE name="DjVuFile.stopped" number="12525" value="[%0!s!] %1!s! 已停止。" />
+<MESSAGE name="DjVuFile.unexp_image" number="12526" value="[%0!s!] DjVu 解码器:需要一个DJVU或IW44图像。" />
+
+<!-- The following set of messages describe the chunks of a file. -->
+<MESSAGE name="DjVuFile.unrecog_chunk" number="12527" value=" %1!5.1f! Kb  '%2!4s!'  不认识的数据块" />
+<MESSAGE name="DjVuFile.page_info" number="12528" value=" %1!5.1f! Kb  '%2!4s!'  本页信息" />
+<MESSAGE name="DjVuFile.indir_chunk1" number="12529" value=" %2!5.1f! Kb  '%3!4s!'  间接数据块 (%1!s!)" />
+<MESSAGE name="DjVuFile.indir_chunk2" number="12530" value=" %1!5.1f! Kb  '%2!4s!'  间接数据块" />
+<MESSAGE name="DjVuFile.shape_dict" number="12531" value=" %2!5.1f! Kb  '%3!4s!'  JB2 样本字典 (%1!d! 样本)." />
+<MESSAGE name="DjVuFile.fg_mask" number="12532" value=" %4!5.1f! Kb  '%5!4s!'  JB2 前景掩模 (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.G4_mask" number="12533" value=" %4!5.1f! Kb  '%5!4s!'  G4/MMR 编码掩模 (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg1" number="12534" value=" %4!5.1f! Kb  '%5!4s!'  IW44 背景(%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_bg2" number="12535" value=" %3!5.1f! Kb  '%4!4s!'  IW44 背景 (第 %1!d! 部分, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_fg" number="12536" value=" %4!5.1f! Kb  '%5!4s!'  IW44 前景颜色 (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.color_import1" number="12537" value=" %4!5.1f! Kb  '%5!4s!'  LINK 颜色输入 (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.color_import2" number="12538" value=" %1!5.1f! Kb  '%2!4s!'  LINK 颜色输入 (未实现)" />
+<MESSAGE name="DjVuFile.JPEG_bg1" number="12539" value=" %4!5.1f! Kb  '%5!4s!'  JPEG 背景(%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.JPEG_bg2" number="12540" value=" %1!5.1f! Kb  '%2!4s!'  JPEG 背景(未实现)" />
+<MESSAGE name="DjVuFile.JPEG_fg1" number="12541" value=" %4!5.1f! Kb  '%5!4s!'  JPEG 前景颜色 (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.JPEG_fg2" number="12542" value=" %1!5.1f! Kb  '%2!4s!'  JPEG 前景颜色 (未实现)" />
+<MESSAGE name="DjVuFile.JPEG2K_bg" number="12543" value=" %1!5.1f! Kb  '%2!4s!'  JPEG-2000 背景(未实现)" />
+<MESSAGE name="DjVuFile.JPEG2K_fg" number="12544" value=" %1!5.1f! Kb  '%2!4s!'  JPEG-2000 前景颜色 (未实现)" />
+<MESSAGE name="DjVuFile.JB2_fg" number="12545" value=" %3!5.1f! Kb  '%4!4s!'  JB2 前景颜色 (%1!d! 颜色, %2!d! ccs)." />
+<MESSAGE name="DjVuFile.IW44_data1" number="12546" value=" %4!5.1f! Kb  '%5!4s!'  IW44 数据 (%1!d!x%2!d!, %3!d! dpi)." />
+<MESSAGE name="DjVuFile.IW44_data2" number="12547" value=" %3!5.1f! Kb  '%4!4s!'  IW44 数据 (第 %1!d! 部分, %2!d! dpi)." />
+<MESSAGE name="DjVuFile.nav_dir" number="12548" value=" %1!5.1f! Kb  '%2!4s!'  搜索目录 (已不用)" />
+<MESSAGE name="DjVuFile.anno1" number="12549" value=" %1!5.1f! Kb  '%2!4s!'  批注(成束)" />
+<MESSAGE name="DjVuFile.anno2" number="12550" value=" %1!5.1f! Kb  '%2!4s!'  批注(超级链接及其它)." />
+<MESSAGE name="DjVuFile.text" number="12551" value=" %1!5.1f! Kb  '%2!4s!'  文字 (文字及其它)" />
+<!-- End of chunk descriptions -->
+
+<MESSAGE name="DjVuFile.djvu_header" number="12552" value="DJVU 图像 (%1!d!x%2!d!, %3!d! dpi) 版本 %4!d!:&#10;" />
+<MESSAGE name="DjVuFile.IW44_header" number="12553" value="IW44 图像 (%1!d!x%2!d!, %3!d! dpi):&#10;" />
+<MESSAGE name="DjVuFile.ratio" number="12554" value="&#10;压缩率: %1!0.f! (%2!0.1f! Kb)" />
+<MESSAGE name="DjVuFile.securedjvu" number="12555">
+Incompatible file (so-called "Secure DjVu".)
+</MESSAGE>
+<MESSAGE name="DjVuGlobalMemory.exhausted" number="12600" value="[%0!s!] 内存耗尽" />
+<MESSAGE name="DjVuGlobal.not_compatible" number="12700" value="[%0!s!] DjVuProgress 与 multithreading不兼容。" />
+<MESSAGE name="DjVuImage.bad_call" number="12800" value="[%0!s!] DjVuImage::decode 不应在 DjVuImage::connect之后调用。" />
+<MESSAGE name="DjVuImage.bad_rect2" number="12801" value="[%0!s!] (DjVuImage::do_pixmap) 非法的目标长方形。" />
+<MESSAGE name="DjVuImage.bad_rect" number="12802" value="[%0!s!] (DjVuImage::get_pixmap) 非法的目标长方形。" />
+<MESSAGE name="DjVuImage.corrupted" number="12803" value="[%0!s!] 毁坏的文件(色彩指标超出调色板范围)" />
+<MESSAGE name="DjVuImage.mult_error" number="12804" value="[%0!s!] 解码时多处出错。" />
+<MESSAGE name="DjVuImage.not_decode" number="12805" value="[%0!s!] 不能用向后兼容模式解码此DjVu文件" />
+<MESSAGE name="DjVuInfo.corrupt_file" number="12900" value="[%0!s!] DjVu 解码器：毁坏的文件(截断的INFO数据块)" />
+<MESSAGE name="DjVuNavDir.bad_page" number="13000" value="[%0!s!] 输入了无效页号。" />
+<MESSAGE name="DjVuNavDir.large_page" number="13001" value="[%0!s!] 页号太大。" />
+<MESSAGE name="DjVuNavDir.long_line" number="13002" value="[%0!s!] 无法读出DjVu目录。行太长。" />
+<MESSAGE name="DjVuNavDir.neg_page" number="13003" value="[%0!s!] 页号必须非负。" />
+<MESSAGE name="DjVuNavDir.zero_dir" number="13004" value="[%0!s!] 零目录URL交给DjVuNavDir 构造函数" />
+<MESSAGE name="DjVuPalette.bad_palette" number="13100" value="[%0!s!] 毁坏的近景色彩调色板。" />
+<MESSAGE name="DjVuPalette.bad_version" number="13101" value="[%0!s!] 未知的调色数据版本标记。" />
+<MESSAGE name="DjVuPalette.many_colors" number="13102" value="[%0!s!] 不现实的色彩数目。" />
+<MESSAGE name="DjVuPalette.no_color" number="13103" value="[%0!s!] 彩色直方图没找到。" />
+<MESSAGE name="DjVuPalette.not_init" number="13104" value="[%0!s!] 调色板未初始化" />
+<MESSAGE name="DjVuPalette.test_usage" number="13105" value="[%0!s!] 用语: quant &lt;ncol&gt; &lt;minbox&gt; &lt;ppmfile&gt;" />
+<MESSAGE name="DjVuPort.not_alloc" number="13200" value="[%0!s!] DjVuPort 没有配置于堆栈" />
+<MESSAGE name="DjVuToPS.bad_EPS_num" number="13300" value="[%0!s!] 只有一个拷贝可达印成EPS格式。" />
+<MESSAGE name="DjVuToPS.bad_format" number="13301" value="[%0!s!] PostScript 格式必须是 PS 或 EPS。" />
+<MESSAGE name="DjVuToPS.bad_gamma" number="13302" value="[%0!s!] 给定的gamma无效。 必须位于0.3与0.5之间。" />
+<MESSAGE name="DjVuToPS.bad_level" number="13303" value="[%0!s!] PostScript 水平 %1!d!无效的. 必须位于1与2之间。" />
+<MESSAGE name="DjVuToPS.bad_mode" number="13304" value="[%0!s!] 无效的图像模式交给达印函数。" />
+<MESSAGE name="DjVuToPS.bad_number" number="13305" value="[%0!s!] 复印份数须为正数。" />
+<MESSAGE name="DjVuToPS.bad_orient" number="13306" value="[%0!s!] 无效的定向交给打印函数。" />
+<MESSAGE name="DjVuToPS.bad_page" number="13307" value="[%0!s!] 无效的页码&apos;%d!1!&apos;" />
+<MESSAGE name="DjVuToPS.bad_range" number="13308" value="[%0!s!] 无效的范围&apos;%1!d!&apos;" />
+<MESSAGE name="DjVuToPS.bad_scale" number="13309" value="[%0!s!] 打印时试图把图像调成点。" />
+<MESSAGE name="DjVuToPS.bad_zoom" number="13310" value="[%0!s!] 无效的缩放比例交给打印函数。" />
+<MESSAGE name="DjVuToPS.big_page" number="13311" value="[%0!s!] 页码%1!d!太大。" />
+<MESSAGE name="DjVuToPS.empty_image" number="13313" value="[%0!s!] 试图打印空图像。" />
+<MESSAGE name="DjVuToPS.empty_rect" number="13314" value="[%0!s!] 试图打印空长方形。" />
+<MESSAGE name="DjVuToPS.no_image" number="13315" value="[%0!s!] 无法得到第 %1!d!页的图像" />
+<MESSAGE name="DjVuToPS.no_landscape" number="13316" value="[%0!s!] EPS格式不支持LANDSCAPE模式。" />
+<MESSAGE name="DjVuToPS.no_memory" number="13317" value="[%0!s!] 没有足够内存来打印图像。" />
+<MESSAGE name="DjVuToPS.no_to" number="13318" value="[%0!s!] 范围&apos;%1!s!&apos;内丢失页码&apos;To&apos;" />
+<MESSAGE name="DjVuToPS.only_one_page" number="13319" value="[%0!s!] 在EPS格式下最多打印一页。" />
+<MESSAGE name="EOF" number="13400" value="文件结尾" />
+<MESSAGE name="Error" number="13500" value="出错" />
+<MESSAGE name="error" number="13600" value="出错" />
+<MESSAGE name="Failed" number="13700" value="失败" />
+<MESSAGE name="GBitmap.bad_format" number="13800" value="[%0!s!] 未知的PBM, PGM 或 RLE 文件格式。" />
+<MESSAGE name="GBitmap.bad_levels" number="13801" value="[%0!s!] (GBitmap::set_grays) 非法的灰度" />
+<MESSAGE name="GBitmap.bad_PBM" number="13802" value="[%0!s!] 错误组成的PBM文件。" />
+<MESSAGE name="GBitmap.cant_compress" number="13803" value="[%0!s!] 无法压缩灰度bitmap" />
+<MESSAGE name="GBitmap.cant_make_PBM" number="13804" value="[%0!s!] 无法从一个灰度bitmap购造一个PBM文件。" />
+<MESSAGE name="GBitmap.left_damaged" number="13805" value="[%0!s!] 调试：左边界损坏。" />
+<MESSAGE name="GBitmap.lost_sync2" number="13806" value="[%0!s!] (GBitmap::decode) RLE 同步化丢失。" />
+<MESSAGE name="GBitmap.lost_sync" number="13807" value="[%0!s!] RLE 同步化丢失。" />
+<MESSAGE name="GBitmap.not_init" number="13808" value="[%0!s!] 非初始化的bitmap" />
+<MESSAGE name="GBitmap.not_int" number="13809" value="[%0!s!] 读出bitmap：预期整数。" />
+<MESSAGE name="GBitmap.null_arg" number="13810" value="[%0!s!] (GBitmap::decode) 空参数调用。" />
+<MESSAGE name="GBitmap.right_damaged" number="13811" value="[%0!s!] 调试：右边界损坏。" />
+<MESSAGE name="GBitmap.zero_damaged" number="13812" value="[%0!s!] 调试：零数组损坏。" />
+<MESSAGE name="GBitmap.zero_small" number="13813" value="[%0!s!] 调试: zerobuffer 太小" />
+<MESSAGE name="GContainer.bad_args" number="13900" value="[%0!s!] 对GArray::resize无效的参数。" />
+<MESSAGE name="GContainer.bad_howmany" number="13901" value="[%0!s!] 非法的参数值&apos;howmany&apos;" />
+<MESSAGE name="GContainer.bad_pos_cont" number="13902" value="[%0!s!] 无效的位置（指向另一个载体）" />
+<MESSAGE name="GContainer.bad_pos" number="13903" value="[%0!s!] 无效的位置" />
+<MESSAGE name="GContainer.bad_pos_null" number="13904" value="[%0!s!] 无效的位置 (空指针)" />
+<MESSAGE name="GContainer.bad_sub2" number="13905" value="[%0!s!] GArray::del中出现非法下标。" />
+<MESSAGE name="GContainer.cannot_add" number="13906" value="[%0!s!] 不能添加关键字到固定映射中。" />
+<MESSAGE name="GContainer.illegal_subscript" number="13907" value="[%0!s!] GArray 下标出界。" />
+<MESSAGE name="GException.outofmemory" number="14000" value="[%0!s!] 内存耗尽。" />
+<MESSAGE name="GIFFManager.bad_char" number="14100" value="[%0!s!] 块名可能不含点或括号。" />
+<MESSAGE name="GIFFManager.cant_find2" number="14101" value="[%0!s!] 正装载的IFF文件不见顶层的FORM块" />
+<MESSAGE name="GIFFManager.cant_find" number="14102" value="[%0!s!] 不见名为&apos;%1!s!&apos;的块" />
+<MESSAGE name="GIFFManager.del_empty" number="14103" value="[%0!s!] 试图删除一个无名块。" />
+<MESSAGE name="GIFFManager.garbage" number="14104" value="[%0!s!] 块名在&apos;]&apos;之后含有垃圾。" />
+<MESSAGE name="GIFFManager.get_empty" number="14105" value="[%0!s!] 试图取得一个空名块。" />
+<MESSAGE name="GIFFManager.malformed" number="14106" value="[%0!s!] 错误组成的块名&apos;%1!s!&apos;：以点结尾。" />
+<MESSAGE name="GIFFManager.no_brackets" number="14107" value="[%0!s!] 块名不能含有括号。" />
+<MESSAGE name="GIFFManager.no_chunk" number="14108" value="[%0!s!] 块&apos;%3!s!&apos;中不含子块&apos;%1!s!&apos; #%2!d!" />
+<MESSAGE name="GIFFManager.no_dots" number="14109" value="[%0!s!] 块名不能含有点。" />
+<MESSAGE name="GIFFManager.no_top_cont" number="14110" value="[%0!s!] 只有栽体可成为顶层块。" />
+<MESSAGE name="GIFFManager.no_top_name" number="14111" value="[%0!s!] 顶层块块名未知。" />
+<MESSAGE name="GIFFManager.one_colon" number="14112" value="[%0!s!] 块名只能含一个冒号。" />
+<MESSAGE name="GIFFManager.unbalanced" number="14113" value="[%0!s!] 块名中括号不匹配。" />
+<MESSAGE name="GIFFManager.unknown" number="14114" value="[%0!s!] 内部出错：&apos;%1!s!&apos;块未知。" />
+<MESSAGE name="GIFFManager.unmatched" number="14115" value="[%0!s!] 遇到括号不匹配的块名。" />
+<MESSAGE name="GIFFManager.wrong_name2" number="14116" value="[%0!s!] 顶层块块名不是&apos;%1!s!&apos;。" />
+<MESSAGE name="GIFFManager.wrong_name" number="14117" value="[%0!s!] 文件的顶层块块名不是&apos;%1!s!&apos;" />
+<MESSAGE name="GMapAreas.intersect" number="14200" value="[%0!s!] 某些多边形交在一起。" />
+<MESSAGE name="GMapAreas.oval_border" number="14201" value="[%0!s!] oval映射区不支持此边界类型。" />
+<MESSAGE name="GMapAreas.oval_hilite" number="14202" value="[%0!s!] oval映射区不支持区域增亮。" />
+<MESSAGE name="GMapAreas.poly_border" number="14203" value="[%0!s!] 多边形映射区不支持此边界类型。" />
+<MESSAGE name="GMapAreas.poly_hilite" number="14204" value="[%0!s!] 多边形映射区不支持区域增亮。" />
+<MESSAGE name="GMapAreas.too_few_points" number="14205" value="[%0!s!] 多边形中点数太少。" />
+<MESSAGE name="GMapAreas.width_1" number="14206" value="[%0!s!] 对于XOR 与 SOLID边界类型，边界宽度必须为1。" />
+<MESSAGE name="GMapAreas.width_3-32" number="14207" value="[%0!s!] 对于SHADOW边界类型，边界宽度必须是3与32之间。" />
+<MESSAGE name="GMapAreas.zero_height" number="14208" value="[%0!s!] 区域高度为零" />
+<MESSAGE name="GMapAreas.zero_width" number="14209" value="[%0!s!] 区域宽度为零" />
+<MESSAGE name="GOS.big_name" number="14300" value="[%0!s!] 文件名长度超过系统限制。" />
+<MESSAGE name="GOS.cleardir" number="14301" value="[%0!s!] 请为此平台提供GOS::cleardir()的正确实现。" />
+<MESSAGE name="GOS.unknown1" number="14302" value="[%0!s!] 未知的libc错误(errno=%1!d!)" />
+<MESSAGE name="GOS.unknown2" number="14303" value="[%0!s!] Windows CE下未知的GOS.cpp错误(errno=%1!d!)" />
+<MESSAGE name="GOS.unknown3" number="14304" value="[%0!s!] %1!s! (errno=%2!d!)" />
+<MESSAGE name="GPixmap.bad_param" number="14400" value="[%0!s!] (GPixmap::color_correct) 非法参数。" />
+<MESSAGE name="GPixmap.diff_size" number="14401" value="[%0!s!] 彩色 pixmap 与 alpha bitmap 大小不同。" />
+<MESSAGE name="GPixmap.no_int" number="14402" value="[%0!s!] 读出pixmap:预期为整数。" />
+<MESSAGE name="GPixmap.null_alpha" number="14403" value="[%0!s!] 空的alpha bitmap指针。" />
+<MESSAGE name="GPixmap.null_color" number="14404" value="[%0!s!] 空的彩色 bitmap指针。" />
+<MESSAGE name="GPixmap.overflow1" number="14405" value="[%0!s!] (GPixmap::downsample) 所给的矩形超出目标pixmap" />
+<MESSAGE name="GPixmap.overflow2" number="14406" value="[%0!s!] (GPixmap::upsample) 所给的矩形超出目标pixmap" />
+<MESSAGE name="GPixmap.overflow3" number="14407" value="[%0!s!] (GPixmap::downsample43) 所给的矩形超出目标pixmap" />
+<MESSAGE name="GPixmap.overflow4" number="14408" value="[%0!s!] (GPixmap::upsample23) 所给的矩形超出目标pixmap" />
+<MESSAGE name="GPixmap.overflow5" number="14409" value="[%0!s!] (GPixmap::stencil) 所给的矩形超出前景pixmap" />
+<MESSAGE name="GPixmap.unk_PPM" number="14410" value="[%0!s!] 未知的PPM文件格式。" />
+<MESSAGE name="GRect.div_zero" number="14500" value="[%0!s!] 分母为零。" />
+<MESSAGE name="GRect.empty_rect1" number="14501" value="[%0!s!] GRectMapper::set_input中非法空多边形。" />
+<MESSAGE name="GRect.empty_rect2" number="14502" value="[%0!s!] GRectMapper::set_output中非法空多边形。" />
+<MESSAGE name="GRect.empty_rect3" number="14503" value="[%0!s!] GRectMapper::[un]map中非法空多边形。" />
+<MESSAGE name="GScaler.assertion" number="14600" value="[%0!s!] 断言失败。" />
+<MESSAGE name="GScaler.no_match" number="14601" value="[%0!s!] 输入的pixmap与输入的矩形不匹配。" />
+<MESSAGE name="GScaler.ratios" number="14602" value="[%0!s!] GScaler比率必须同正或同为空。" />
+<MESSAGE name="GScaler.too_big" number="14603" value="[%0!s!] 要求的输出超出整个图像的输出矩形。" />
+<MESSAGE name="GScaler.too_small" number="14604" value="[%0!s!] 提供的输入pixmap太小。" />
+<MESSAGE name="GScaler.undef_size" number="14605" value="[%0!s!] GScaler 的输入与输出大小未定义。" />
+<MESSAGE name="GSmartPointer.suspicious" number="14700" value="[%0!s!] 怀疑此时可解除调用的GPEnabled目标。" />
+<MESSAGE name="GString.bad_subscript" number="14800" value="[%0!s!] GString::operator[]非法下标。" />
+<MESSAGE name="GString.overwrite" number="14801" value="[%0!s!] 内存重写。程序处于不稳定状态。" />
+<MESSAGE name="GThreads.co_panic" number="14900" value="[%0!s!] 可怕的COTHREADS :找不到异常内容。" />
+<MESSAGE name="GThreads.dupl_callback" number="14901" value="[%0!s!] GThread::set_scheduling_callback 被重复调用。" />
+<MESSAGE name="GThreads.not_acq_broad" number="14902" value="[%0!s!] 此线程(GMonitor::broadcast)不要求监督器。" />
+<MESSAGE name="GThreads.not_acq_leave" number="14903" value="[%0!s!] 此线程(GMonitor::leave)不要求监督器。" />
+<MESSAGE name="GThreads.not_acq_signal" number="14904" value="[%0!s!] 此线程(GMonitor::signal)不要求监督器。" />
+<MESSAGE name="GThreads.not_acq_wait" number="14905" value="[%0!s!] 此线程(GMonitor::wait)不要求监督器。" />
+<MESSAGE name="GThreads.panic" number="14906" value="[%0!s!] 可怕：Cothreads死锁。" />
+<MESSAGE name="GThreads.uncaught" number="14907" value="[%0!s!] GThreads: 未捕获的异常。。" />
+<MESSAGE name="GThreads.unrecognized" number="14908" value="[%0!s!] GThreads: 不明的未捕获的异常。。" />
+<MESSAGE name="GURL.fail_to_file" number="15000" value="[%0!s!] 转换URL成文件名时失败。" />
+<MESSAGE name="GURL.fail_to_URL" number="15001" value="[%0!s!] 从文件名换回URL时失败。" />
+<MESSAGE name="GURL.no_protocol" number="15002" value="[%0!s!] URL &apos;%1!s!&apos; 不含协议前缀。" />
+<MESSAGE name="GURL.big_name" number="15003" value="[%0!s!] 文件名太长。" />
+<MESSAGE name="GURL.listdir" number="15004" value="[%0!s!] GURL::listdir 没有在此平台上实现。" />
+<MESSAGE name="IFFByteStream.bad_chunk" number="15100" value="[%0!s!] 非法块标识符(IFFByteStream::put_chunk)" />
+<MESSAGE name="IFFByteStream.bad_offset" number="15101" value="[%0!s!] 内部出错，IFFByteStream偏移超出数据块范围。" />
+<MESSAGE name="IFFByteStream.cant_close" number="15102" value="[%0!s!] 没有打开的块可关闭。" />
+<MESSAGE name="IFFByteStream.cant_write" number="15103" value="[%0!s!] 前面的块未完成，不能写入。" />
+<MESSAGE name="IFFByteStream.corrupt_2nd_id" number="15104" value="[%0!s!] 损坏的IFF文件 (非法的第二数据块标识符)" />
+<MESSAGE name="IFFByteStream.corrupt_end2" number="15105" value="[%0!s!] 损坏的IFF文件 (读出块大小时出现EndOfChunk)" />
+<MESSAGE name="IFFByteStream.corrupt_end" number="15106" value="[%0!s!] 损坏的IFF文件 (读出块ID时出现EndOfChunk)" />
+<MESSAGE name="IFFByteStream.corrupt_header" number="15107" value="[%0!s!] 损坏的IFF文件 (读出复合块头时出现EndOfChunk)" />
+<MESSAGE name="IFFByteStream.corrupt_id" number="15108" value="[%0!s!] 损坏的IFF文件 (非法的数据块块标识符)" />
+<MESSAGE name="IFFByteStream.corrupt_mangled" number="15109" value="[%0!s!] 损坏的IFF文件 (交错的数据块边界)" />
+<MESSAGE name="IFFByteStream.no_chunk_id" number="15110" value="[%0!s!] 尚无数据块标识符" />
+<MESSAGE name="IFFByteStream.not_ready2" number="15111" value="[%0!s!] IFFByteStream 尚未准备好写入数据块" />
+<MESSAGE name="IFFByteStream.not_ready3" number="15112" value="[%0!s!] IFFByteStream 尚未准备好读出字节" />
+<MESSAGE name="IFFByteStream.not_ready4" number="15113" value="[%0!s!] IFFByteStream 尚未准备好写入字节" />
+<MESSAGE name="IFFByteStream.not_ready" number="15114" value="[%0!s!] IFFByteStream 尚未准备好读出数据块" />
+<MESSAGE name="IFFByteStream.read_write" number="15115" value="[%0!s!] 试图写入和读出同一个IFFByteStream" />
+<MESSAGE name="Internal.error" number="15200" value="[%0!s!] 内部出错" />
+<MESSAGE name="IW44Image.bad_rect" number="15300" value="[%0!s!] (IWMap::image) 长方形出界。" />
+<MESSAGE name="IW44Image.cant_estimate" number="15301" value="[%0!s!] 解码时无法估错。" />
+<MESSAGE name="IW44Image.cant_read_primary2" number="15302" value="[%0!s!] (IWPixmap::decode_chunk) 无法读出数据块主块头" />
+<MESSAGE name="IW44Image.cant_read_primary" number="15303" value="[%0!s!] (IWBitmap::decode_chunk) 无法读出数据块主块头" />
+<MESSAGE name="IW44Image.cant_read_secondary2" number="15304" value="[%0!s!] (IWPixmap::decode_chunk) 无法读出数据块次块头" />
+<MESSAGE name="IW44Image.cant_read_secondary" number="15305" value="[%0!s!] (IWBitmap::decode_chunk) 无法读出数据块次块头" />
+<MESSAGE name="IW44Image.cant_read_tertiary2" number="15306" value="[%0!s!] (IWPixmap::decode_chunk) 无法读出数据块第三块头" />
+<MESSAGE name="IW44Image.cant_read_tertiary" number="15307" value="[%0!s!] (IWBitmap::decode_chunk) 无法读出数据块第三块头" />
+<MESSAGE name="IW44Image.codec_open2" number="15308" value="[%0!s!] (IWBitmap::decode_chunk) Codec 仍为解码开着。" />
+<MESSAGE name="IW44Image.codec_open3" number="15309" value="[%0!s!] (IWPixmap::decode_chunk) Codec 仍为编码开着。" />
+<MESSAGE name="IW44Image.codec_open4" number="15310" value="[%0!s!] (IWPixmap::decode_chunk) Codec 仍为解码开着。" />
+<MESSAGE name="IW44Image.codec_open" number="15311" value="[%0!s!] (IWBitmap::decode_chunk) Codec 仍为编码开着。" />
+<MESSAGE name="IW44Image.corrupt_BM44_2" number="15312" value="[%0!s!] (IWPixmap::decode_iff) 文件已损坏（不能读出FORM.BM44）" />
+<MESSAGE name="IW44Image.corrupt_BM44" number="15313" value="[%0!s!] (IWBitmap::decode_iff) 文件已损坏（不能读出FORM.BM44）" />
+<MESSAGE name="IW44Image.decoder_only" number="15314" value="[%0!s!] Compiled with NEED_DECODER_ONLY" />
+<MESSAGE name="IW44Image.empty_object2" number="15315" value="[%0!s!] (IWPixmap::encode_chunk) IWBitmap 是空目标" />
+<MESSAGE name="IW44Image.empty_object" number="15316" value="[%0!s!] (IWBitmap::encode_chunk) IWBitmap 是空目标" />
+<MESSAGE name="IW44Image.empty_rect" number="15317" value="[%0!s!] (IWMap::image) 是空矩形" />
+<MESSAGE name="IW44Image.has_color" number="15318" value="[%0!s!] (IWBitmap::decode_chunk) 文件包含彩色图像。" />
+<MESSAGE name="IW44Image.incompat_codec2" number="15319" value="[%0!s!] (IWPixmap::decode_chunk) 文件已用非兼容的IWCodec压缩。" />
+<MESSAGE name="IW44Image.incompat_codec" number="15320" value="[%0!s!] (IWBitmap::decode_chunk) 文件已用非兼容的IWCodec压缩。" />
+<MESSAGE name="IW44Image.left_open1" number="15321" value="[%0!s!] (IWBitmap::encode_iff) Codec 已离开打开状态" />
+<MESSAGE name="IW44Image.left_open2" number="15322" value="[%0!s!] (IWBitmap::decode_iff) Codec 已离开打开状态" />
+<MESSAGE name="IW44Image.left_open3" number="15323" value="[%0!s!] (IWPixmap::encode_iff) Codec 已离开打开状态" />
+<MESSAGE name="IW44Image.left_open4" number="15324" value="[%0!s!] (IWPixmap::decode_iff) Codec 已离开打开状态" />
+<MESSAGE name="IW44Image.need_stop2" number="15325" value="[%0!s!] (IWPixmap::encode_chunk) 须确立一个停止准则。" />
+<MESSAGE name="IW44Image.need_stop" number="15326" value="[%0!s!] (IWBitmap::encode_chunk) 须确立一个停止准则。" />
+<MESSAGE name="IW44Image.param_range2" number="15327" value="[%0!s!] (IWPixmap::parm_dbfrac) 参数出界" />
+<MESSAGE name="IW44Image.param_range" number="15328" value="[%0!s!] (IWBitmap::parm_dbfrac) 参数出界" />
+<MESSAGE name="IW44Image.recent_codec2" number="15329" value="[%0!s!] (IWPixmap::decode_chunk) 文件已用更新的IWCodec压缩。" />
+<MESSAGE name="IW44Image.recent_codec" number="15330" value="[%0!s!] (IWBitmap::decode_chunk) 文件已用更新的IWCodec压缩。" />
+<MESSAGE name="IW44Image.sample_factor" number="15331" value="[%0!s!] (IWMap::image) 未获支持的子样本因子。" />
+<MESSAGE name="IW44Image.wrong_serial2" number="15332" value="[%0!s!] (IWPixmap::decode_chunk) 数据块不含有期待的序号。" />
+<MESSAGE name="IW44Image.wrong_serial" number="15333" value="[%0!s!] (IWBitmap::decode_chunk) 数据块不含有期待的序号。" />
+<MESSAGE name="JB2Image.bad_dict2" number="15400" value="[%0!s!] 损坏的文件：JB2 字典中出现非零图像维数。" />
+<MESSAGE name="JB2Image.bad_dict" number="15401" value="[%0!s!] 形状字典的大小与JB2数据不符。" />
+<MESSAGE name="JB2Image.bad_number" number="15402" value="[%0!s!] (JB2Codec::CodeNum) 数字出界。" />
+<MESSAGE name="JB2Image.bad_numcontext" number="15403" value="[%0!s!] (JB2Codec::CodeNum) 非发的 NumContext" />
+<MESSAGE name="JB2Image.bad_parent_shape" number="15404" value="[%0!s!] JB2Shape 中出现非法母形号。" />
+<MESSAGE name="JB2Image.bad_shape" number="15405" value="[%0!s!] JB2Blit 中出现非法形号。" />
+<MESSAGE name="JB2Image.bad_type" number="15406" value="[%0!s!] 损坏的文件：出现对于形状字典非法的记录类型。" />
+<MESSAGE name="JB2Image.cant_change" number="15407" value="[%0!s!] 字典一旦设定后不能改变。" />
+<MESSAGE name="JB2Image.cant_create" number="15408" value="[%0!s!] 不能为一个未设定大小的JB2Image目标建立bitmap图像。" />
+<MESSAGE name="JB2Image.cant_set" number="15409" value="[%0!s!] 不能在添加形状之后再设定字典。" />
+<MESSAGE name="JB2Image.need_dict" number="15410" value="[%0!s!] JB2 数据需要一个形状字典。" />
+<MESSAGE name="JB2Image.no_start" number="15411" value="[%0!s!] 损坏的文件： 无初始记录。" />
+<MESSAGE name="JB2Image.unknown_type" number="15412" value="[%0!s!] 损坏的文件： 未知记录类型。" />
+<MESSAGE name="JB2Image.zero_dim" number="15413" value="[%0!s!] 损坏的文件：JB2 图像维数为零。" />
+<MESSAGE name="MMRDecoder.bad_codebook" number="15500" value="[%0!s!] 混淆的 MMR codebook" />
+<MESSAGE name="MMRDecoder.bad_data" number="15501" value="[%0!s!] 无效的 G4/MMR 数据" />
+<MESSAGE name="MMRDecoder.bad_header" number="15502" value="[%0!s!] 损坏的 G4/MMR 头" />
+<MESSAGE name="MMRDecoder.cant_process" number="15503" value="[%0!s!] 无法对 G4/MMR 数据进行解压。" />
+<MESSAGE name="MMRDecoder.unrecog_header" number="15504" value="[%0!s!] 不认识 G4/MMR 头" />
+<MESSAGE name="not_implemented_n" number="15600" value="[%0!s!] %1!s! 未实现" />
+<MESSAGE name="not_implemented" number="15700" value="[%0!s!] 未实现" />
+<MESSAGE name="parseoptions.ambiguous" number="15800" value="[%0!s!] 给出的&apos;%1!s!=%2!s!&apos; 与 &apos;%3!s!=%4!s!&apos;是混淆的选择。" />
+<MESSAGE name="parseoptions.bad_install" number="15801" value="[%0!s!] SDK 没有安装好。请重装。" />
+<MESSAGE name="parseoptions.bad_number" number="15802" value="[%0!s!] &apos;%1!s!&apos; 是一个数" />
+<MESSAGE name="parseoptions.bad_value" number="15803" value="[%0!s!] &apos;%1!s!&apos; 不是数也不是布尔值。" />
+<MESSAGE name="parseoptions.cant_inherit" number="15804" value="[%0!s!] %1!s!: 错误出现在 &apos;%3!s!&apos;&#10;&#09;--&gt; 的第 %2!d! 行。无法继承未知的样板&apos;%4!s!&apos;" />
+<MESSAGE name="parseoptions.illegal_profile" number="15805" value="[%0!s!] %1!s!: 错误出现在样板&apos;%3!s!&apos;&#10;&#09;--&gt;的第 %2!d! 行。非法的样板名 &apos;%4!s!&apos;" />
+<MESSAGE name="parseoptions.missing_arg_option" number="15806" value="[%0!s!] %1!s! 选择要求参数。" />
+<MESSAGE name="parseoptions.profile_error" number="15807" value="[%0!s!] %1!s!: 错误出现在样板&apos;%3!s!&apos;&#10;&#09;--&gt; %4!s!的第 %2!d! 行。" />
+<MESSAGE name="parseoptions.unrecog_option_c" number="15808" value="[%0!s!] 不明的选择 -%1!s!" />
+<MESSAGE name="parseoptions.unrecog_option" number="15809" value="[%0!s!] 不明的选择 &apos;%1!s!&apos;" />
+<MESSAGE name="Stat" number="15900" value="[%0!s!] Stat" />
+<MESSAGE name="STOP" number="16000" value="[%0!s!] STOP" />
+<MESSAGE name="TextException.test" number="16100" value="[%0!s!] 测试异常" />
+<MESSAGE name="XMLAnno.bad_color" number="16200" value="[%0!s!] 颜色 %1!s! 不获支持。" />
+<MESSAGE name="XMLAnno.bad_page" number="16201" value="[%0!s!] 得不到指定的页。" />
+<MESSAGE name="XMLAnno.bad_rect" number="16202" value="[%0!s!] 矩形区域的坐标值太少。" />
+<MESSAGE name="XMLAnno.bad_circle" number="16203" value="[%0!s!] 圆形区域的坐标值太少。" />
+<MESSAGE name="XMLAnno.bad_oval" number="16204" value="[%0!s!] 椭圆形区域的坐标值太少。" />
+<MESSAGE name="XMLAnno.unknown_shape" number="16205" value="[%0!s!] 未知的形状 %1!s!" />
+<MESSAGE name="XMLAnno.unknown_border" number="16206" value="[%0!s!] 未知的边界类型 %1!s!" />
+<MESSAGE name="XMLAnno.extra_body" number="16207" value="[%0!s!] 须要恰好一对值 &lt;BODY&gt;&lt;/BODY&gt; " />
+<MESSAGE name="XMLAnno.no_body" number="16208" value="[%0!s!] 没找到坐标对 &lt;BODY&gt;&lt;/BODY&gt; " />
+<MESSAGE name="XMLAnno.map_find" number="16209" value="[%0!s!] 没找到指定的映射 %1!s!" />
+<MESSAGE name="XMLAnno.fail_init" number="16210" value="[%0!s!] 初始化 %1!s! 失败" />
+<MESSAGE name="XMLTags.no_GP" number="16300" value="[%0!s!] 没有从 GP 指针得到保险 " />
+<MESSAGE name="XMLTags.raw_string" number="16301" value="[%0!s!] 从文件范围外找到字符窜 '%1!s!' 。" />
+<MESSAGE name="XMLTags.bad_tag" number="16302" value="[%0!s!] 无终止的标记  %1!s!" />
+<MESSAGE name="XMLTags.bad_PI" number="16303" value="[%0!s!] 无终止的处理指令：%1!s!" />
+<MESSAGE name="XMLTags.bad_comment" number="16304" value="[%0!s!] 无终止的注释：%1!s!" />
+<MESSAGE name="XMLTags.bad_form" number="16305" value="[%0!s!] 正常形成的错误。 太多终止标记。" />
+<MESSAGE name="XMLTags.no_body" number="16306" value="[%0!s!] 没有本体。" />
+<MESSAGE name="ZPCodec.no_encoding" number="16400" value="[%0!s!] ZPCodec 尚未为解码而建立。" />
+<MESSAGE name="ZPCodec.write_error" number="16401" value="[%0!s!] ZPCodec 写出出错" />
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/osi/zh/messages.xml b/share/djvu/osi/zh/messages.xml
new file mode 100644
index 0000000..dfc1d25
--- /dev/null
+++ b/share/djvu/osi/zh/messages.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!DOCTYPE DjVuMessages PUBLIC "-//W3C/DTD DjVuMessages 1.0//EN" "../../../pubtext/DjVuMessages.dtd">
+<!-- List of files to include to get the entire list of messages -->
+<DjVuMessages>
+<HEAD>
+<!-- Message numbers 17000-19999 -->
+<INCLUDE name="../en/djvutools-reference.xml" />
+<!-- Message numbers 10000-16999 -->
+<INCLUDE name="libdjvu++.xml" />
+</HEAD>
+<BODY>
+</BODY>
+</DjVuMessages>
diff --git a/share/djvu/pubtext/DjVuMessages.dtd b/share/djvu/pubtext/DjVuMessages.dtd
new file mode 100644
index 0000000..30e9509
--- /dev/null
+++ b/share/djvu/pubtext/DjVuMessages.dtd
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<!-- Data Type Definition for the message files -->
+
+<!--================ HEAD (Include List) ==================================-->
+
+<!ELEMENT INCLUDE EMPTY>
+<!ATTLIST INCLUDE name CDATA #REQUIRED>
+	<!-- The value of the name attribute must be the name of an XML file
+	     conforming to this DTD -->
+
+<!ELEMENT HEAD ( INCLUDE* )>
+
+<!--================ BODY (Message List) ==================================-->
+
+<!ELEMENT MESSAGE (#PCDATA) >
+<!ATTLIST MESSAGE name CDATA #REQUIRED>
+<!ATTLIST MESSAGE number CDATA #REQUIRED>
+<!ATTLIST MESSAGE value CDATA #REQUIRED>
+
+<!ELEMENT BODY ( MESSAGE* )>
+
+<!--================ Document Structure ==================================-->
+
+<!ELEMENT DjVuMessages ( HEAD? , BODY? )>
+
diff --git a/share/djvu/pubtext/DjVuOCR.dtd b/share/djvu/pubtext/DjVuOCR.dtd
new file mode 100644
index 0000000..6d20cd3
--- /dev/null
+++ b/share/djvu/pubtext/DjVuOCR.dtd
@@ -0,0 +1,72 @@
+<?xml version="1.0" ?>
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % LanguageCode "CDATA">
+    <!-- a language code, as per [RFC1766]-->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!ENTITY % i18n
+ "lang        %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #IMPLIED"
+>
+<!-- lang defaults to "en"; dir defaults to "ltr" (left-to-right) -->
+
+<!ENTITY % Coords "CDATA"> <!-- comma separated list of lengths
+                                alternating x and y values (a total
+                                of four values) -->
+
+<!--================= HIDDEN TEXT LAYER ==================================-->
+
+<!ELEMENT CHARACTER (#PCDATA)>
+<!ATTLIST CHARACTER 
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT WORD ( (CHARACTER+) | (#PCDATA) ) >
+<!ATTLIST WORD 
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT LINE ( (WORD+) | (#PCDATA) ) >
+<!ATTLIST LINE 
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT PARAGRAPH ( (LINE+) | (#PCDATA) ) >
+<!ATTLIST PARAGRAPH 
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT REGION ( (PARAGRAPH+) | (#PCDATA) ) >
+<!ATTLIST REGION
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT PAGECOLUMN ( (REGION+) | (#PCDATA) ) >
+<!ATTLIST PAGECOLUMN
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT HIDDENTEXT (PAGECOLUMN+) >
+<!ATTLIST HIDDENTEXT
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!--================ Document Structure ==================================-->
+
+<!ENTITY % djvuxml.content "HIDDENTEXT?">
+
+<!ELEMENT DjVuXML (%djvuxml.content;)>
+<!ATTLIST DjVuXML
+  %i18n;
+>
+
+
diff --git a/share/djvu/pubtext/DjVuXML-s.dtd b/share/djvu/pubtext/DjVuXML-s.dtd
new file mode 100644
index 0000000..5d70e94
--- /dev/null
+++ b/share/djvu/pubtext/DjVuXML-s.dtd
@@ -0,0 +1,215 @@
+<?xml version="1.0" ?>
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+    <!-- media type, as per [RFC2045]-->
+
+<!ENTITY % LanguageCode "CDATA">
+    <!-- a language code, as per [RFC1766]-->
+
+<!ENTITY % Text "CDATA">
+
+<!ENTITY % URI "CDATA">
+    <!-- a Uniform Resource Identifier,
+        see [URI]
+    -->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!ENTITY % coreattrs
+ "id          ID             #IMPLIED
+  class       CDATA          #IMPLIED
+  title       %Text;         #IMPLIED"
+>
+
+<!ENTITY % i18n
+ "lang        %LanguageCode; #IMPLIED
+  dir         (ltr|rtl)      #IMPLIED"
+>
+
+<!ENTITY % attrs "%coreattrs; %i18n;">
+
+<!ENTITY % Shape "(rect|circle|oval|poly|default)">
+
+<!ENTITY % Coords "CDATA"> <!-- comma separated list of lengths
+                                alternating x and y values -->
+
+<!ENTITY % FrameTarget "CDATA">
+
+<!ENTITY % Color "CDATA">
+  <!-- There are also 16 widely known color names with their RGB values:
+
+      Black  = #000000    Green  = #008000
+      Silver = #C0C0C0    Lime   = #00FF00
+      Gray   = #808080    Olive  = #808000
+      White  = #FFFFFF    Yellow = #FFFF00
+      Maroon = #800000    Navy   = #000080
+      Red    = #FF0000    Blue   = #0000FF
+      Purple = #800080    Teal   = #008080
+      Fuchsia= #FF00FF    Aqua   = #00FFFF
+  -->
+
+<!ENTITY % BorderType
+   "(none|xor|solid|shadowout|shadowin|etchedin|etchedout)">
+
+<!ENTITY % Length "CDATA">
+
+<!ENTITY % block "P">
+
+<!--===================== HIDDEN TEXT LAYER =====================================-->
+
+<!ELEMENT HIDDENTEXT (PAGECOLUMN)+ >
+<!ATTLIST HIDDENTEXT
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT PAGECOLUMN (#PCDATA|REGION)* >
+<!ATTLIST PAGECOLUMN
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT REGION (#PCDATA|PARAGRAPH)* >
+<!ATTLIST REGION
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT PARAGRAPH (#PCDATA|LINE)* >
+<!ATTLIST PARAGRAPH 
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT LINE (#PCDATA|WORD)* >
+<!ATTLIST LINE 
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!ELEMENT WORD (#PCDATA)>
+<!ATTLIST WORD 
+  shape      CDATA      "rect"
+  coords     %Coords;   #IMPLIED
+>
+
+<!--===================== METADATA =====================================-->
+<!ELEMENT METADATA (#PCDATA)>
+<!ATTLIST METADATA 
+  %attrs;
+>
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+     separate document although this isn't yet widely supported -->
+
+<!ELEMENT MAP ( (%block;)+ | (AREA)+ )>
+<!ATTLIST MAP
+  %attrs;
+  name        CDATA          #REQUIRED
+>
+
+<!ELEMENT AREA EMPTY>
+<!ATTLIST AREA
+  %attrs;
+  shape       %Shape;        "rect"
+  coords      %Coords;       #IMPLIED
+  href        %URI;          #IMPLIED
+  nohref      (nohref)       #IMPLIED
+  alt         %Text;         #REQUIRED
+  target      %FrameTarget;  "_self"
+  highlight   %Color;        #IMPLIED
+  bordertype  %BorderType;   "none"
+  bordercolor %Color;        #IMPLIED
+  border      %Length;       #IMPLIED
+  visible     (visible)      #IMPLIED
+>
+
+<!--=================== Text Markup ======================================-->
+
+<!ENTITY % special "IMG | OBJECT | MAP">
+
+<!-- %inline; covers inline or "text-level" elements -->
+<!ENTITY % inline "CDATA | %special;">
+
+<!ENTITY % flow "%block; | %inline;">
+
+<!--==================== OBJECT ======================================-->
+<!--
+  OBJECT is used to embed objects as part of DjVuXML pages 
+  PARAM elements should precede other content. SGML mixed content
+  model technicality precludes specifying this formally ...
+  At most one HIDDENTEXT element may appear embedded in the object. It may appear
+  anywhere after the PARAM elements.
+-->
+
+<!ELEMENT OBJECT ( (PARAM)*, (%flow;)*, HIDDENTEXT?, METADATA?, (%flow;)* ) >
+<!ATTLIST OBJECT
+  %attrs;
+  data        %URI;          #REQUIRED
+  type        %ContentType;  #IMPLIED
+  height      %Length;       #IMPLIED
+  width       %Length;       #IMPLIED
+  usemap      %URI;          #IMPLIED
+>
+
+<!ELEMENT PARAM EMPTY>
+<!ATTLIST PARAM
+  id          ID             #IMPLIED
+  name        CDATA          #REQUIRED
+  value       CDATA          #IMPLIED
+>
+
+<!--===================== IMG ========================================-->
+
+<!ELEMENT IMG ANY>     <!-- currently undefined -->
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT P (%inline;)* >
+<!ATTLIST P
+  %attrs;
+>
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT BODY (%flow;)+ >
+<!ATTLIST BODY
+  %attrs;
+>
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.content "TITLE, BASE?">
+
+<!ELEMENT HEAD (%head.content;)>
+<!ATTLIST HEAD
+  %i18n;
+  profile     %URI;          #IMPLIED
+>
+
+<!-- The TITLE element is not considered part of the flow of text.
+       It should be displayed, for example as the page header or
+       window title. Exactly one title is required per document.
+-->
+
+<!ELEMENT TITLE (#PCDATA)>
+<!ATTLIST TITLE %i18n;>
+
+<!ELEMENT BASE EMPTY>
+<!ATTLIST BASE
+  href        %URI;          #REQUIRED
+>
+
+<!--================ Document Structure ==================================-->
+
+<!ENTITY % djvuxml.content "HEAD?, BODY?">
+
+<!ELEMENT DjVuXML (%djvuxml.content;)>
+<!ATTLIST DjVuXML
+  %i18n;
+>
+
+
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..a7983c6
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,72 @@
+bin_PROGRAMS = bzz c44 cjb2 cpaldjvu csepdjvu ddjvu djvm djvmcvt	\
+ djvudump djvups djvuextract djvumake djvused djvutxt djvuserve
+
+jb2cmp_SOURCES = jb2cmp/classify.cpp jb2cmp/cuts.cpp		\
+ jb2cmp/frames.cpp jb2cmp/patterns.cpp jb2cmp/classify.h	\
+ jb2cmp/mdjvucfg.h jb2cmp/minidjvu.h jb2cmp/patterns.h
+
+AM_CPPFLAGS = -I$(top_srcdir)/libdjvu
+AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+
+DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
+
+bzz_SOURCES = bzz.cpp common.h
+bzz_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+c44_SOURCES = c44.cpp common.h
+c44_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+cjb2_SOURCES = cjb2.cpp jb2tune.cpp common.h jb2tune.h $(jb2cmp_SOURCES)
+cjb2_CPPFLAGS = $(AM_CPPFLAGS) $(TIFF_CFLAGS)
+cjb2_LDADD = $(DJLIB) $(TIFF_LIBS) $(PTHREAD_LIBS)
+
+cpaldjvu_SOURCES = cpaldjvu.cpp jb2tune.cpp common.h jb2tune.h $(jb2cmp_SOURCES)
+cpaldjvu_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+csepdjvu_SOURCES = csepdjvu.cpp jb2tune.cpp common.h jb2tune.h $(jb2cmp_SOURCES)
+csepdjvu_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+ddjvu_SOURCES = ddjvu.cpp tiff2pdf.c tiff2pdf.h
+ddjvu_CPPFLAGS = -I$(top_srcdir)  $(AM_CPPFLAGS) $(TIFF_CFLAGS)
+if HAVE_OS_WIN32
+ddjvu_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO
+endif
+ddjvu_CFLAGS = $(THREAD_CFLAGS)
+ddjvu_LDADD = $(DJLIB) $(TIFF_LIBS) $(PTHREAD_LIBS)
+
+djvm_SOURCES = djvm.cpp common.h
+djvm_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvmcvt_SOURCES = djvmcvt.cpp common.h
+djvmcvt_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvudump_SOURCES = djvudump.cpp common.h
+djvudump_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvuextract_SOURCES = djvuextract.cpp common.h
+djvuextract_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvumake_SOURCES = djvumake.cpp common.h
+djvumake_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvups_SOURCES = djvups.cpp
+djvups_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS)
+djvups_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvused_SOURCES = djvused.cpp common.h
+djvused_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvuserve_SOURCES = djvuserve.cpp common.h
+djvuserve_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvutxt_SOURCES = djvutxt.cpp
+djvutxt_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS)
+djvutxt_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+dist_bin_SCRIPTS = any2djvu djvudigital
+
+dist_man1_MANS = any2djvu.1 bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1	\
+ ddjvu.1 djvm.1 djvmcvt.1 djvu.1 djvudigital.1 djvudump.1		\
+ djvuextract.1 djvumake.1 djvups.1 djvused.1 djvuserve.1 djvutxt.1
+
+EXTRA_DIST = jb2cmp/README tiff2pdf.c.diff
diff --git a/tools/Makefile.in b/tools/Makefile.in
new file mode 100644
index 0000000..21df5ca
--- /dev/null
+++ b/tools/Makefile.in
@@ -0,0 +1,1155 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = bzz$(EXEEXT) c44$(EXEEXT) cjb2$(EXEEXT) \
+	cpaldjvu$(EXEEXT) csepdjvu$(EXEEXT) ddjvu$(EXEEXT) \
+	djvm$(EXEEXT) djvmcvt$(EXEEXT) djvudump$(EXEEXT) \
+	djvups$(EXEEXT) djvuextract$(EXEEXT) djvumake$(EXEEXT) \
+	djvused$(EXEEXT) djvutxt$(EXEEXT) djvuserve$(EXEEXT)
+@HAVE_OS_WIN32_TRUE@am__append_1 = -D__USE_MINGW_ANSI_STDIO
+subdir = tools
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_bin_SCRIPTS) $(top_srcdir)/config/depcomp \
+	$(dist_man1_MANS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(man1dir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_bzz_OBJECTS = bzz.$(OBJEXT)
+bzz_OBJECTS = $(am_bzz_OBJECTS)
+am__DEPENDENCIES_1 =
+bzz_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_c44_OBJECTS = c44.$(OBJEXT)
+c44_OBJECTS = $(am_c44_OBJECTS)
+c44_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_1 = jb2cmp/cjb2-classify.$(OBJEXT) \
+	jb2cmp/cjb2-cuts.$(OBJEXT) jb2cmp/cjb2-frames.$(OBJEXT) \
+	jb2cmp/cjb2-patterns.$(OBJEXT)
+am_cjb2_OBJECTS = cjb2-cjb2.$(OBJEXT) cjb2-jb2tune.$(OBJEXT) \
+	$(am__objects_1)
+cjb2_OBJECTS = $(am_cjb2_OBJECTS)
+cjb2_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__objects_2 = jb2cmp/classify.$(OBJEXT) jb2cmp/cuts.$(OBJEXT) \
+	jb2cmp/frames.$(OBJEXT) jb2cmp/patterns.$(OBJEXT)
+am_cpaldjvu_OBJECTS = cpaldjvu.$(OBJEXT) jb2tune.$(OBJEXT) \
+	$(am__objects_2)
+cpaldjvu_OBJECTS = $(am_cpaldjvu_OBJECTS)
+cpaldjvu_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_csepdjvu_OBJECTS = csepdjvu.$(OBJEXT) jb2tune.$(OBJEXT) \
+	$(am__objects_2)
+csepdjvu_OBJECTS = $(am_csepdjvu_OBJECTS)
+csepdjvu_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_ddjvu_OBJECTS = ddjvu-ddjvu.$(OBJEXT) ddjvu-tiff2pdf.$(OBJEXT)
+ddjvu_OBJECTS = $(am_ddjvu_OBJECTS)
+ddjvu_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_djvm_OBJECTS = djvm.$(OBJEXT)
+djvm_OBJECTS = $(am_djvm_OBJECTS)
+djvm_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvmcvt_OBJECTS = djvmcvt.$(OBJEXT)
+djvmcvt_OBJECTS = $(am_djvmcvt_OBJECTS)
+djvmcvt_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvudump_OBJECTS = djvudump.$(OBJEXT)
+djvudump_OBJECTS = $(am_djvudump_OBJECTS)
+djvudump_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvuextract_OBJECTS = djvuextract.$(OBJEXT)
+djvuextract_OBJECTS = $(am_djvuextract_OBJECTS)
+djvuextract_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvumake_OBJECTS = djvumake.$(OBJEXT)
+djvumake_OBJECTS = $(am_djvumake_OBJECTS)
+djvumake_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvups_OBJECTS = djvups-djvups.$(OBJEXT)
+djvups_OBJECTS = $(am_djvups_OBJECTS)
+djvups_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvused_OBJECTS = djvused.$(OBJEXT)
+djvused_OBJECTS = $(am_djvused_OBJECTS)
+djvused_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvuserve_OBJECTS = djvuserve.$(OBJEXT)
+djvuserve_OBJECTS = $(am_djvuserve_OBJECTS)
+djvuserve_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am_djvutxt_OBJECTS = djvutxt-djvutxt.$(OBJEXT)
+djvutxt_OBJECTS = $(am_djvutxt_OBJECTS)
+djvutxt_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+SCRIPTS = $(dist_bin_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(bzz_SOURCES) $(c44_SOURCES) $(cjb2_SOURCES) \
+	$(cpaldjvu_SOURCES) $(csepdjvu_SOURCES) $(ddjvu_SOURCES) \
+	$(djvm_SOURCES) $(djvmcvt_SOURCES) $(djvudump_SOURCES) \
+	$(djvuextract_SOURCES) $(djvumake_SOURCES) $(djvups_SOURCES) \
+	$(djvused_SOURCES) $(djvuserve_SOURCES) $(djvutxt_SOURCES)
+DIST_SOURCES = $(bzz_SOURCES) $(c44_SOURCES) $(cjb2_SOURCES) \
+	$(cpaldjvu_SOURCES) $(csepdjvu_SOURCES) $(ddjvu_SOURCES) \
+	$(djvm_SOURCES) $(djvmcvt_SOURCES) $(djvudump_SOURCES) \
+	$(djvuextract_SOURCES) $(djvumake_SOURCES) $(djvups_SOURCES) \
+	$(djvused_SOURCES) $(djvuserve_SOURCES) $(djvutxt_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(dist_man1_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INKSCAPE = @INKSCAPE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JPEG_CFLAGS = @JPEG_CFLAGS@
+JPEG_LIBS = @JPEG_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RM = @RM@
+RSVG = @RSVG@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TIFF_CFLAGS = @TIFF_CFLAGS@
+TIFF_LIBS = @TIFF_LIBS@
+TOUCH = @TOUCH@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+version_info = @version_info@
+jb2cmp_SOURCES = jb2cmp/classify.cpp jb2cmp/cuts.cpp		\
+ jb2cmp/frames.cpp jb2cmp/patterns.cpp jb2cmp/classify.h	\
+ jb2cmp/mdjvucfg.h jb2cmp/minidjvu.h jb2cmp/patterns.h
+
+AM_CPPFLAGS = -I$(top_srcdir)/libdjvu
+AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
+bzz_SOURCES = bzz.cpp common.h
+bzz_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+c44_SOURCES = c44.cpp common.h
+c44_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+cjb2_SOURCES = cjb2.cpp jb2tune.cpp common.h jb2tune.h $(jb2cmp_SOURCES)
+cjb2_CPPFLAGS = $(AM_CPPFLAGS) $(TIFF_CFLAGS)
+cjb2_LDADD = $(DJLIB) $(TIFF_LIBS) $(PTHREAD_LIBS)
+cpaldjvu_SOURCES = cpaldjvu.cpp jb2tune.cpp common.h jb2tune.h $(jb2cmp_SOURCES)
+cpaldjvu_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+csepdjvu_SOURCES = csepdjvu.cpp jb2tune.cpp common.h jb2tune.h $(jb2cmp_SOURCES)
+csepdjvu_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+ddjvu_SOURCES = ddjvu.cpp tiff2pdf.c tiff2pdf.h
+ddjvu_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS) $(TIFF_CFLAGS) \
+	$(am__append_1)
+ddjvu_CFLAGS = $(THREAD_CFLAGS)
+ddjvu_LDADD = $(DJLIB) $(TIFF_LIBS) $(PTHREAD_LIBS)
+djvm_SOURCES = djvm.cpp common.h
+djvm_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvmcvt_SOURCES = djvmcvt.cpp common.h
+djvmcvt_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvudump_SOURCES = djvudump.cpp common.h
+djvudump_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvuextract_SOURCES = djvuextract.cpp common.h
+djvuextract_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvumake_SOURCES = djvumake.cpp common.h
+djvumake_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvups_SOURCES = djvups.cpp
+djvups_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS)
+djvups_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvused_SOURCES = djvused.cpp common.h
+djvused_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvuserve_SOURCES = djvuserve.cpp common.h
+djvuserve_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvutxt_SOURCES = djvutxt.cpp
+djvutxt_CPPFLAGS = -I$(top_srcdir) $(AM_CPPFLAGS)
+djvutxt_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+dist_bin_SCRIPTS = any2djvu djvudigital
+dist_man1_MANS = any2djvu.1 bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1	\
+ ddjvu.1 djvm.1 djvmcvt.1 djvu.1 djvudigital.1 djvudump.1		\
+ djvuextract.1 djvumake.1 djvups.1 djvused.1 djvuserve.1 djvutxt.1
+
+EXTRA_DIST = jb2cmp/README tiff2pdf.c.diff
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cpp .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tools/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+bzz$(EXEEXT): $(bzz_OBJECTS) $(bzz_DEPENDENCIES) $(EXTRA_bzz_DEPENDENCIES) 
+	@rm -f bzz$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(bzz_OBJECTS) $(bzz_LDADD) $(LIBS)
+
+c44$(EXEEXT): $(c44_OBJECTS) $(c44_DEPENDENCIES) $(EXTRA_c44_DEPENDENCIES) 
+	@rm -f c44$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(c44_OBJECTS) $(c44_LDADD) $(LIBS)
+jb2cmp/$(am__dirstamp):
+	@$(MKDIR_P) jb2cmp
+	@: > jb2cmp/$(am__dirstamp)
+jb2cmp/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) jb2cmp/$(DEPDIR)
+	@: > jb2cmp/$(DEPDIR)/$(am__dirstamp)
+jb2cmp/cjb2-classify.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+jb2cmp/cjb2-cuts.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+jb2cmp/cjb2-frames.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+jb2cmp/cjb2-patterns.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+
+cjb2$(EXEEXT): $(cjb2_OBJECTS) $(cjb2_DEPENDENCIES) $(EXTRA_cjb2_DEPENDENCIES) 
+	@rm -f cjb2$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(cjb2_OBJECTS) $(cjb2_LDADD) $(LIBS)
+jb2cmp/classify.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+jb2cmp/cuts.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+jb2cmp/frames.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+jb2cmp/patterns.$(OBJEXT): jb2cmp/$(am__dirstamp) \
+	jb2cmp/$(DEPDIR)/$(am__dirstamp)
+
+cpaldjvu$(EXEEXT): $(cpaldjvu_OBJECTS) $(cpaldjvu_DEPENDENCIES) $(EXTRA_cpaldjvu_DEPENDENCIES) 
+	@rm -f cpaldjvu$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(cpaldjvu_OBJECTS) $(cpaldjvu_LDADD) $(LIBS)
+
+csepdjvu$(EXEEXT): $(csepdjvu_OBJECTS) $(csepdjvu_DEPENDENCIES) $(EXTRA_csepdjvu_DEPENDENCIES) 
+	@rm -f csepdjvu$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(csepdjvu_OBJECTS) $(csepdjvu_LDADD) $(LIBS)
+
+ddjvu$(EXEEXT): $(ddjvu_OBJECTS) $(ddjvu_DEPENDENCIES) $(EXTRA_ddjvu_DEPENDENCIES) 
+	@rm -f ddjvu$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(ddjvu_OBJECTS) $(ddjvu_LDADD) $(LIBS)
+
+djvm$(EXEEXT): $(djvm_OBJECTS) $(djvm_DEPENDENCIES) $(EXTRA_djvm_DEPENDENCIES) 
+	@rm -f djvm$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvm_OBJECTS) $(djvm_LDADD) $(LIBS)
+
+djvmcvt$(EXEEXT): $(djvmcvt_OBJECTS) $(djvmcvt_DEPENDENCIES) $(EXTRA_djvmcvt_DEPENDENCIES) 
+	@rm -f djvmcvt$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvmcvt_OBJECTS) $(djvmcvt_LDADD) $(LIBS)
+
+djvudump$(EXEEXT): $(djvudump_OBJECTS) $(djvudump_DEPENDENCIES) $(EXTRA_djvudump_DEPENDENCIES) 
+	@rm -f djvudump$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvudump_OBJECTS) $(djvudump_LDADD) $(LIBS)
+
+djvuextract$(EXEEXT): $(djvuextract_OBJECTS) $(djvuextract_DEPENDENCIES) $(EXTRA_djvuextract_DEPENDENCIES) 
+	@rm -f djvuextract$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvuextract_OBJECTS) $(djvuextract_LDADD) $(LIBS)
+
+djvumake$(EXEEXT): $(djvumake_OBJECTS) $(djvumake_DEPENDENCIES) $(EXTRA_djvumake_DEPENDENCIES) 
+	@rm -f djvumake$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvumake_OBJECTS) $(djvumake_LDADD) $(LIBS)
+
+djvups$(EXEEXT): $(djvups_OBJECTS) $(djvups_DEPENDENCIES) $(EXTRA_djvups_DEPENDENCIES) 
+	@rm -f djvups$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvups_OBJECTS) $(djvups_LDADD) $(LIBS)
+
+djvused$(EXEEXT): $(djvused_OBJECTS) $(djvused_DEPENDENCIES) $(EXTRA_djvused_DEPENDENCIES) 
+	@rm -f djvused$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvused_OBJECTS) $(djvused_LDADD) $(LIBS)
+
+djvuserve$(EXEEXT): $(djvuserve_OBJECTS) $(djvuserve_DEPENDENCIES) $(EXTRA_djvuserve_DEPENDENCIES) 
+	@rm -f djvuserve$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvuserve_OBJECTS) $(djvuserve_LDADD) $(LIBS)
+
+djvutxt$(EXEEXT): $(djvutxt_OBJECTS) $(djvutxt_DEPENDENCIES) $(EXTRA_djvutxt_DEPENDENCIES) 
+	@rm -f djvutxt$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvutxt_OBJECTS) $(djvutxt_LDADD) $(LIBS)
+install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-dist_binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f jb2cmp/*.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bzz.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c44.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjb2-cjb2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjb2-jb2tune.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpaldjvu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csepdjvu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddjvu-ddjvu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddjvu-tiff2pdf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvmcvt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvudump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvuextract.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvumake.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvups-djvups.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvused.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvuserve.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvutxt-djvutxt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jb2tune.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/cjb2-classify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/cjb2-cuts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/cjb2-frames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/cjb2-patterns.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/classify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/cuts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/frames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@jb2cmp/$(DEPDIR)/patterns.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+ddjvu-tiff2pdf.o: tiff2pdf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(ddjvu_CFLAGS) $(CFLAGS) -MT ddjvu-tiff2pdf.o -MD -MP -MF $(DEPDIR)/ddjvu-tiff2pdf.Tpo -c -o ddjvu-tiff2pdf.o `test -f 'tiff2pdf.c' || echo '$(srcdir)/'`tiff2pdf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddjvu-tiff2pdf.Tpo $(DEPDIR)/ddjvu-tiff2pdf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tiff2pdf.c' object='ddjvu-tiff2pdf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(ddjvu_CFLAGS) $(CFLAGS) -c -o ddjvu-tiff2pdf.o `test -f 'tiff2pdf.c' || echo '$(srcdir)/'`tiff2pdf.c
+
+ddjvu-tiff2pdf.obj: tiff2pdf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(ddjvu_CFLAGS) $(CFLAGS) -MT ddjvu-tiff2pdf.obj -MD -MP -MF $(DEPDIR)/ddjvu-tiff2pdf.Tpo -c -o ddjvu-tiff2pdf.obj `if test -f 'tiff2pdf.c'; then $(CYGPATH_W) 'tiff2pdf.c'; else $(CYGPATH_W) '$(srcdir)/tiff2pdf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddjvu-tiff2pdf.Tpo $(DEPDIR)/ddjvu-tiff2pdf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tiff2pdf.c' object='ddjvu-tiff2pdf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(ddjvu_CFLAGS) $(CFLAGS) -c -o ddjvu-tiff2pdf.obj `if test -f 'tiff2pdf.c'; then $(CYGPATH_W) 'tiff2pdf.c'; else $(CYGPATH_W) '$(srcdir)/tiff2pdf.c'; fi`
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+cjb2-cjb2.o: cjb2.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cjb2-cjb2.o -MD -MP -MF $(DEPDIR)/cjb2-cjb2.Tpo -c -o cjb2-cjb2.o `test -f 'cjb2.cpp' || echo '$(srcdir)/'`cjb2.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cjb2-cjb2.Tpo $(DEPDIR)/cjb2-cjb2.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='cjb2.cpp' object='cjb2-cjb2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cjb2-cjb2.o `test -f 'cjb2.cpp' || echo '$(srcdir)/'`cjb2.cpp
+
+cjb2-cjb2.obj: cjb2.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cjb2-cjb2.obj -MD -MP -MF $(DEPDIR)/cjb2-cjb2.Tpo -c -o cjb2-cjb2.obj `if test -f 'cjb2.cpp'; then $(CYGPATH_W) 'cjb2.cpp'; else $(CYGPATH_W) '$(srcdir)/cjb2.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cjb2-cjb2.Tpo $(DEPDIR)/cjb2-cjb2.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='cjb2.cpp' object='cjb2-cjb2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cjb2-cjb2.obj `if test -f 'cjb2.cpp'; then $(CYGPATH_W) 'cjb2.cpp'; else $(CYGPATH_W) '$(srcdir)/cjb2.cpp'; fi`
+
+cjb2-jb2tune.o: jb2tune.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cjb2-jb2tune.o -MD -MP -MF $(DEPDIR)/cjb2-jb2tune.Tpo -c -o cjb2-jb2tune.o `test -f 'jb2tune.cpp' || echo '$(srcdir)/'`jb2tune.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cjb2-jb2tune.Tpo $(DEPDIR)/cjb2-jb2tune.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2tune.cpp' object='cjb2-jb2tune.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cjb2-jb2tune.o `test -f 'jb2tune.cpp' || echo '$(srcdir)/'`jb2tune.cpp
+
+cjb2-jb2tune.obj: jb2tune.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cjb2-jb2tune.obj -MD -MP -MF $(DEPDIR)/cjb2-jb2tune.Tpo -c -o cjb2-jb2tune.obj `if test -f 'jb2tune.cpp'; then $(CYGPATH_W) 'jb2tune.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2tune.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cjb2-jb2tune.Tpo $(DEPDIR)/cjb2-jb2tune.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2tune.cpp' object='cjb2-jb2tune.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cjb2-jb2tune.obj `if test -f 'jb2tune.cpp'; then $(CYGPATH_W) 'jb2tune.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2tune.cpp'; fi`
+
+jb2cmp/cjb2-classify.o: jb2cmp/classify.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-classify.o -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-classify.Tpo -c -o jb2cmp/cjb2-classify.o `test -f 'jb2cmp/classify.cpp' || echo '$(srcdir)/'`jb2cmp/classify.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-classify.Tpo jb2cmp/$(DEPDIR)/cjb2-classify.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/classify.cpp' object='jb2cmp/cjb2-classify.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-classify.o `test -f 'jb2cmp/classify.cpp' || echo '$(srcdir)/'`jb2cmp/classify.cpp
+
+jb2cmp/cjb2-classify.obj: jb2cmp/classify.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-classify.obj -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-classify.Tpo -c -o jb2cmp/cjb2-classify.obj `if test -f 'jb2cmp/classify.cpp'; then $(CYGPATH_W) 'jb2cmp/classify.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/classify.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-classify.Tpo jb2cmp/$(DEPDIR)/cjb2-classify.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/classify.cpp' object='jb2cmp/cjb2-classify.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-classify.obj `if test -f 'jb2cmp/classify.cpp'; then $(CYGPATH_W) 'jb2cmp/classify.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/classify.cpp'; fi`
+
+jb2cmp/cjb2-cuts.o: jb2cmp/cuts.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-cuts.o -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-cuts.Tpo -c -o jb2cmp/cjb2-cuts.o `test -f 'jb2cmp/cuts.cpp' || echo '$(srcdir)/'`jb2cmp/cuts.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-cuts.Tpo jb2cmp/$(DEPDIR)/cjb2-cuts.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/cuts.cpp' object='jb2cmp/cjb2-cuts.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-cuts.o `test -f 'jb2cmp/cuts.cpp' || echo '$(srcdir)/'`jb2cmp/cuts.cpp
+
+jb2cmp/cjb2-cuts.obj: jb2cmp/cuts.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-cuts.obj -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-cuts.Tpo -c -o jb2cmp/cjb2-cuts.obj `if test -f 'jb2cmp/cuts.cpp'; then $(CYGPATH_W) 'jb2cmp/cuts.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/cuts.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-cuts.Tpo jb2cmp/$(DEPDIR)/cjb2-cuts.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/cuts.cpp' object='jb2cmp/cjb2-cuts.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-cuts.obj `if test -f 'jb2cmp/cuts.cpp'; then $(CYGPATH_W) 'jb2cmp/cuts.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/cuts.cpp'; fi`
+
+jb2cmp/cjb2-frames.o: jb2cmp/frames.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-frames.o -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-frames.Tpo -c -o jb2cmp/cjb2-frames.o `test -f 'jb2cmp/frames.cpp' || echo '$(srcdir)/'`jb2cmp/frames.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-frames.Tpo jb2cmp/$(DEPDIR)/cjb2-frames.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/frames.cpp' object='jb2cmp/cjb2-frames.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-frames.o `test -f 'jb2cmp/frames.cpp' || echo '$(srcdir)/'`jb2cmp/frames.cpp
+
+jb2cmp/cjb2-frames.obj: jb2cmp/frames.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-frames.obj -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-frames.Tpo -c -o jb2cmp/cjb2-frames.obj `if test -f 'jb2cmp/frames.cpp'; then $(CYGPATH_W) 'jb2cmp/frames.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/frames.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-frames.Tpo jb2cmp/$(DEPDIR)/cjb2-frames.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/frames.cpp' object='jb2cmp/cjb2-frames.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-frames.obj `if test -f 'jb2cmp/frames.cpp'; then $(CYGPATH_W) 'jb2cmp/frames.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/frames.cpp'; fi`
+
+jb2cmp/cjb2-patterns.o: jb2cmp/patterns.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-patterns.o -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-patterns.Tpo -c -o jb2cmp/cjb2-patterns.o `test -f 'jb2cmp/patterns.cpp' || echo '$(srcdir)/'`jb2cmp/patterns.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-patterns.Tpo jb2cmp/$(DEPDIR)/cjb2-patterns.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/patterns.cpp' object='jb2cmp/cjb2-patterns.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-patterns.o `test -f 'jb2cmp/patterns.cpp' || echo '$(srcdir)/'`jb2cmp/patterns.cpp
+
+jb2cmp/cjb2-patterns.obj: jb2cmp/patterns.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jb2cmp/cjb2-patterns.obj -MD -MP -MF jb2cmp/$(DEPDIR)/cjb2-patterns.Tpo -c -o jb2cmp/cjb2-patterns.obj `if test -f 'jb2cmp/patterns.cpp'; then $(CYGPATH_W) 'jb2cmp/patterns.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/patterns.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) jb2cmp/$(DEPDIR)/cjb2-patterns.Tpo jb2cmp/$(DEPDIR)/cjb2-patterns.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='jb2cmp/patterns.cpp' object='jb2cmp/cjb2-patterns.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cjb2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jb2cmp/cjb2-patterns.obj `if test -f 'jb2cmp/patterns.cpp'; then $(CYGPATH_W) 'jb2cmp/patterns.cpp'; else $(CYGPATH_W) '$(srcdir)/jb2cmp/patterns.cpp'; fi`
+
+ddjvu-ddjvu.o: ddjvu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ddjvu-ddjvu.o -MD -MP -MF $(DEPDIR)/ddjvu-ddjvu.Tpo -c -o ddjvu-ddjvu.o `test -f 'ddjvu.cpp' || echo '$(srcdir)/'`ddjvu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddjvu-ddjvu.Tpo $(DEPDIR)/ddjvu-ddjvu.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ddjvu.cpp' object='ddjvu-ddjvu.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ddjvu-ddjvu.o `test -f 'ddjvu.cpp' || echo '$(srcdir)/'`ddjvu.cpp
+
+ddjvu-ddjvu.obj: ddjvu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ddjvu-ddjvu.obj -MD -MP -MF $(DEPDIR)/ddjvu-ddjvu.Tpo -c -o ddjvu-ddjvu.obj `if test -f 'ddjvu.cpp'; then $(CYGPATH_W) 'ddjvu.cpp'; else $(CYGPATH_W) '$(srcdir)/ddjvu.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddjvu-ddjvu.Tpo $(DEPDIR)/ddjvu-ddjvu.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ddjvu.cpp' object='ddjvu-ddjvu.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ddjvu_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ddjvu-ddjvu.obj `if test -f 'ddjvu.cpp'; then $(CYGPATH_W) 'ddjvu.cpp'; else $(CYGPATH_W) '$(srcdir)/ddjvu.cpp'; fi`
+
+djvups-djvups.o: djvups.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvups_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT djvups-djvups.o -MD -MP -MF $(DEPDIR)/djvups-djvups.Tpo -c -o djvups-djvups.o `test -f 'djvups.cpp' || echo '$(srcdir)/'`djvups.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/djvups-djvups.Tpo $(DEPDIR)/djvups-djvups.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='djvups.cpp' object='djvups-djvups.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvups_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o djvups-djvups.o `test -f 'djvups.cpp' || echo '$(srcdir)/'`djvups.cpp
+
+djvups-djvups.obj: djvups.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvups_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT djvups-djvups.obj -MD -MP -MF $(DEPDIR)/djvups-djvups.Tpo -c -o djvups-djvups.obj `if test -f 'djvups.cpp'; then $(CYGPATH_W) 'djvups.cpp'; else $(CYGPATH_W) '$(srcdir)/djvups.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/djvups-djvups.Tpo $(DEPDIR)/djvups-djvups.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='djvups.cpp' object='djvups-djvups.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvups_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o djvups-djvups.obj `if test -f 'djvups.cpp'; then $(CYGPATH_W) 'djvups.cpp'; else $(CYGPATH_W) '$(srcdir)/djvups.cpp'; fi`
+
+djvutxt-djvutxt.o: djvutxt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvutxt_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT djvutxt-djvutxt.o -MD -MP -MF $(DEPDIR)/djvutxt-djvutxt.Tpo -c -o djvutxt-djvutxt.o `test -f 'djvutxt.cpp' || echo '$(srcdir)/'`djvutxt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/djvutxt-djvutxt.Tpo $(DEPDIR)/djvutxt-djvutxt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='djvutxt.cpp' object='djvutxt-djvutxt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvutxt_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o djvutxt-djvutxt.o `test -f 'djvutxt.cpp' || echo '$(srcdir)/'`djvutxt.cpp
+
+djvutxt-djvutxt.obj: djvutxt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvutxt_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT djvutxt-djvutxt.obj -MD -MP -MF $(DEPDIR)/djvutxt-djvutxt.Tpo -c -o djvutxt-djvutxt.obj `if test -f 'djvutxt.cpp'; then $(CYGPATH_W) 'djvutxt.cpp'; else $(CYGPATH_W) '$(srcdir)/djvutxt.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/djvutxt-djvutxt.Tpo $(DEPDIR)/djvutxt-djvutxt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='djvutxt.cpp' object='djvutxt-djvutxt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(djvutxt_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o djvutxt-djvutxt.obj `if test -f 'djvutxt.cpp'; then $(CYGPATH_W) 'djvutxt.cpp'; else $(CYGPATH_W) '$(srcdir)/djvutxt.cpp'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(dist_man1_MANS)
+	@$(NORMAL_INSTALL)
+	@list1='$(dist_man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f jb2cmp/$(DEPDIR)/$(am__dirstamp)
+	-rm -f jb2cmp/$(am__dirstamp)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR) jb2cmp/$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR) jb2cmp/$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
+	uninstall-man
+
+uninstall-man: uninstall-man1
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dist_binSCRIPTS \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
+	uninstall-man uninstall-man1
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/tools/any2djvu b/tools/any2djvu
new file mode 100755
index 0000000..1ad64c8
--- /dev/null
+++ b/tools/any2djvu
@@ -0,0 +1,233 @@
+#! /bin/bash -f
+
+function copyright()
+{
+    echo "Copyright (C) 2002 David Kreil <D.Kreil@IEEE.Org>"
+    echo "Modified by Barak A. Pearlmutter <bap@debian.org>"
+    echo "         and Yaroslav Halchenko <debian@onerussian.com>"
+    echo "Released under the GNU GPL v2, 21-Oct-2002."
+}
+
+function warranty()
+{
+    echo "This program is distributed in the hope that it will be useful,"
+    echo "but WITHOUT ANY WARRANTY; without even the implied warranty of"
+    echo "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the"
+    echo "GNU General Public License for more details."
+}
+
+function disclaimer()
+{
+    echo "By using this tool you accept the following disclaimer:"
+    echo "  Because the any2djvu service is free of charge, there is no"
+    echo "  warranty of any kind.  In particular, no effort is made to"
+    echo "  prevent anyone from downloading the files submitted to or"
+    echo "  produced by the any2djvu server."
+}
+
+# TO DO:
+#  - error handling
+
+rurl="http://any2djvu.djvuzone.org"
+rcgi="any2djvu.php"
+res=400
+ocr=1
+docformat=2
+
+function warn()
+{
+    echo "Notes:"
+    echo " - Internet connection is required."
+    echo " - Filenames are assumed to require no URL-encoding."
+    echo " - Documents must be PostScript (.ps, .ps.gz) or PDF (.pdf)."
+    echo " - Defaults are: conversion is at 400dpi, with English OCR enabled."
+    echo " - This script should not be used for large scale conversions of"
+    echo "   documents, as it may badly affect and hence endanger the free web"
+    echo "   service to the community."
+    echo " - This software comes with NO WARRANTY."
+}
+
+function format_help()
+{
+    echo "Codes for the formats of the input documents to use with -f"
+    echo "  1 - DjVu Document (for verification or OCR)"
+    echo "  2 - PS/PS.GZ/PDF Document (default)"
+    echo "  3 - Photo/Picture/Icon"
+    echo "  4 - Scanned Document - B&W - <200 dpi"
+    echo "  5 - Scanned Document - B&W - 200-400 dpi"
+    echo "  6 - Scanned Document - B&W - >400 dpi"
+    echo "  7 - Scanned Document - Color/Mixed - <200 dpi"
+    echo "  8 - Scanned Document - Color/Mixed - 200-400 dpi"
+    echo "  9 - Scanned Document - Color/Mixed - >400 dpi"
+}
+
+function usage()
+{
+    echo "Convert files from .ps/.ps.gz/.pdf to .djvu"
+    echo "Usage:	$0 [options] [url] {filename(s)}"
+    echo
+    echo "Options:"
+    echo "  -q          quiet mode: reduce chatter on the screen"
+    echo "  -a          acknowledge internet transmission"
+    echo "  -c          clean after work: remove log file"
+    echo "  -r dpi      resolution in dpi (200/300/400, default: $res)"
+    echo "  -o ocr      perform OCR (0 - no, 1 - yes, default: $ocr)"
+    echo "  -f format   format of input document; invoke -f help for list"
+    echo "  -u url      base URL of server (default: $rurl)"
+    echo "  -p s        CGI script name (default: $rcgi)"
+    echo
+    echo "If no local file is named by the 1st argument the 1st"
+    echo "argument is taken to be an external web-accessible directory and,"
+    echo "the specified files are uploaded from that location."
+    echo
+    echo "Examples:"
+    echo "  cd ~bap/public_html/foo"
+    echo " # uploads from web-accessible directory"
+    echo "  any2djvu http://www.bcl.hamilton.ie/~barak/papers mesh-preprint.ps.gz"
+    echo "  any2djvu http://www.inference.phy.cam.ac.uk/mackay *.ps.gz bar.pdf"
+    echo " # uploads from current directory"
+    echo "  any2djvu b*.pdf"
+    echo "  any2djvu -s -c -r 300 -o 0 bp.ps"
+}
+
+
+while getopts "hacqsr:o:f:u:p:" opt
+  do
+  case "$opt" in
+      h) usage; exit 0 ;;
+      a) DJVU_ONLINE_ACK=1 ;;
+      c) doclean=1 ;;
+      s) echo "option -s is deprecated, please use -q"; silent=1  ;;
+      q) silent=1  ;;
+      r) res="$OPTARG" ;;
+      o) ocr="$OPTARG" ;;
+      f) docformat="$OPTARG" ;;
+      u) rurl="$OPTARG" ;;
+      p) rcgi="$OPTARG" ;;
+      *) usage; exit 2 ;;
+  esac
+done
+
+shift $((OPTIND - 1))
+
+# check resolution
+if [ ${res#[234]} != '00' ]; then
+    echo 'error: -r resolution must be one of: 200, 300, 400'
+    exit 2
+fi
+
+# check OCR option
+if [ ! "x$ocr" == x0 ] && [ ! "x$ocr" == x1 ]; then
+    echo 'error: -o OCR must be 0 or 1'
+    exit 2
+fi
+
+# if help is requested or docformat is not specified right - show help
+if [ "x$docformat" == x'help' ]; then
+    format_help
+    exit 0
+fi
+
+if [ -z "$docformat" ] || [ ! -z "${docformat#[0-9]}" ]; then
+    echo "error: requested document format unknown: $docformat".
+    format_help
+    exit 2
+fi
+
+lurl=''
+if [ ! -e "$1" ]; then	     # if 1st argument is not an existing file
+    lurl="$1"			# assume that it is a URL
+    shift
+fi
+
+#log=`date -u`": "`whoami`'@'`hostname`", pid $$: $0 (cwd "`pwd`")"
+log="`date -u`: `whoami`@`hostname`, pid $$: $0 (cwd `pwd`)"
+[ -z $silent ]  && echo '/-- Started' "$log" >&2
+
+in="$1"
+shift
+if [ -z "$in" ]; then
+    echo "error: no files to convert"
+    usage
+    exit 1
+fi
+
+if [ ! -z $s ]; then
+    copyright
+    disclaimer
+    warn
+fi
+
+if [ -z "$DJVU_ONLINE_ACK" ]; then
+    cat <<EOF
+WARNING!
+
+any2djvu uses an external server which is willing to perform the
+conversion and requires the document transfer over to that server.
+There is a security issue in operating on documents not intended for
+widespread distribution, which could be partially although not
+completely ameliorated by using a secure web connection.
+
+Do you acknowledge and allow the transmission of the document?
+(Type 'yes' to acknowledge. You can define non-empty environment
+ variable DJVU_ONLINE_ACK to avoid seeing this dialog, or use -a
+ command line parameter to any2djvu).
+EOF
+    echo -n "[yes/no]:"
+    read ack
+    if [[ ! "$ack" =~ ^[yY][eE][sS]$ ]]; then
+        warn
+        exit 1
+    fi
+fi
+
+wgetopts=''
+curlopts=''
+shellopts=''
+if [ ! -z $silent ]; then
+    curlopts=' -s '
+    wgetopts=' -q '
+    shellopts=' 1>/dev/null ' # 2>&1
+fi
+
+cgiopts="&docformat=$docformat&resolution=$res&ocr=$ocr&legal=1"
+while [ -n "$in" ]; do
+    b="$in"
+    b="${b%.ps.gz}"
+    b="${b%.ps}"
+    b="${b%.pdf}"
+    b="${b%.PDF}"
+    echo `date -u` Processing $b ...
+    log="$b-any2djvu.log"
+    if [ -z "$lurl" ]; then
+        if [ ! -e "$in" ]; then
+            echo "File $in wasn't found. Conversion stopped"
+            exit 2
+        fi
+        curl $curlopts -F "fupload=@$in" -F submit=Submit               \
+            -F docformat=$docformat -F resolution=$res                  \
+            -F ocr=$ocr -F legal=1 "$rurl/$rcgi"                          \
+            | eval tee "'$log'" $shellopts
+    else
+        wget $wgetopts -O - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
+            | eval tee "'$log'" $shellopts
+    fi
+    l=`egrep 'href=djvu/.*\.djvu' "$log"`
+    l="${l##*href=}"
+    l="${l%%>*}"
+    if [ -z "$l" ]; then
+        echo "error: something got wrong. check log file"
+        exit 1
+    fi
+    wget $wgetopts -O "$b.djvu" "$rurl/$l"
+
+    [ -z "$doclean" ] || rm "$log"
+    [ -z $silent ]  && ls -l "$b.djvu"
+
+    in="$1"
+    shift
+done
+
+log=`date -u`": "`whoami`'@'`hostname`", pid $$: $0 (cwd "`pwd`")"
+
+[ -z $silent ]  && echo '\-- Done' $log >&2
diff --git a/tools/any2djvu.1 b/tools/any2djvu.1
new file mode 100644
index 0000000..5ab8422
--- /dev/null
+++ b/tools/any2djvu.1
@@ -0,0 +1,30 @@
+.TH ANY2DJVU 1 "02/12/2003" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+any2djvu \- Convert .ps/.ps.gz/.pdf to .djvu
+
+.SH SYNOPSIS
+.B any2djvu
+\fIurl {filename(s)}\fR
+.SH DESCRIPTION
+Converts files from .ps/.ps.gz/.pdf to .djvu by running them through
+a web server willing to perform this task.
+.PP
+Invoke with \-h switch for usage information.
+.SH ENVIRONMENT
+Non-empty value of DJVU_ONLINE_ACK acknowledges transmission of the
+documents to the server (so that no warning dialog is displayed).
+.SH EXAMPLES
+any2djvu http://www.bcl.hamilton.ie/~barak/papers mesh-preprint.ps.gz
+.PP
+any2djvu localfile.pdf
+.SH AUTHORS
+David Kreil, Barak A. Pearlmutter, Yaroslav O. Halchenko
+.SH BUGS
+Using a web-based encoder server is a stop-gap measure until better
+encoders enjoy wide free distribution.
+.PP
+There is a security issue in operating on documents not intended for
+widespread distribution, which could be partially although not
+completely ameliorated by using a secure web connection.
+.SH "SEE ALSO"
+The entire djvu suite, eg djvu(1), djview(1), and djvuserver(1).
diff --git a/tools/bzz.1 b/tools/bzz.1
new file mode 100644
index 0000000..49c92d4
--- /dev/null
+++ b/tools/bzz.1
@@ -0,0 +1,145 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH BZZ 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+bzz \- DjVu general purpose compression utility.
+
+.SH SYNOPSIS
+.SS Encoding:
+.BI "bzz \-e" "[blocksize]" " " "inputfile" " " "outputfile"
+.SS Decoding:
+.BI "bzz \-d " "inputfile" " " "outputfile"
+.PP
+
+.SH DESCRIPTION
+The first form of the command line (option 
+.BR \-e )
+compresses the data from file
+.I inputfile 
+and writes the compressed data into 
+.IR outputfile .
+The second form of the command line (option
+.BR \-d )
+decompressed file
+.I inputfile
+and writes the output to
+.IR outputfile .
+
+.SH OPTIONS
+.TP
+.B "\-d"
+Decoding mode.
+.TP
+.BI "\-e" "[blocksize]"
+Encoding mode.
+The optional argument 
+.I blocksize
+specifies the size of the input file blocks processed by the Burrows-Wheeler
+transform expressed in kilobytes.  The default block sizes is 2048
+.SM KB.
+The maximal block size is 4096
+.SM KB.
+Specifying a larger block size usually produces higher compression ratios
+and increases the memory requirements of both the encoder and decoder.
+It is useless to specify a block size that is larger than the
+input file.
+
+.SH ALGORITHMS
+The Burrows-Wheeler transform is performed using a combination of the
+Karp-Miller-Rosenberg and the Bentley-Sedgewick algorithms. This is comparable
+to (Sadakane, DCC 98) with a slightly more flexible ranking scheme. Symbols
+are then ordered according to a running estimate of their occurrence
+frequencies.  The symbol ranks are then coded using a simple fixed tree and
+the ZP binary adaptive coder (Bottou, DCC 98).
+
+The Burrows-Wheeler transform is also used in the well known compressor
+.BR bzip2 .
+The originality of 
+.B bzz
+is the use of the ZP adaptive coder.
+The adaptation noise can cost up to 5 percent in
+file size, but this penalty is usually offset by the benefits of
+adaptation.
+
+.SH PERFORMANCE
+The following table shows comparative results (in bits per character) 
+on the Canterbury Corpus (
+.B http://corpus.canterbury.ac.nz
+). The very good 
+.B bzz
+performance on the spreadsheet file 
+.I excl
+puts the weighted average ahead of much more sophisticated
+compressors such as
+.BR fsmx .
+.ps -2
+
+.TS
+center,box;
+c s s s s s s s s s s s s s
+l c c c c c c c c c c c c c
+l n n n n n n n n n n n n n
+l n n n n n n n n n n n n n
+l n n n n n n n n n n n n n
+l n n n n n n n n n n n n n
+l nfB n nfB n nfB nfB nfB nfB nfB nfB nfB n nfB
+lfB n nfB n nfB n n n n n n n nfB n
+.
+Compression performance
+	text	fax	csrc	excl	sprc	tech	poem\
+	html	lisp	man	play	Weighted	Average
+=
+\0compress\0	3.27	0.97	3.56	2.41	4.21	3.06	3.38	3.68	3.90	4.43	3.51	2.55	3.31
+\0gzip \-9\0	2.85	0.82	2.24	1.63	2.67	2.71	3.23	2.59	2.65	3.31	3.12	2.08	2.53
+\0bzip2 \-9\0	2.27	0.78	2.18	1.01	2.70	2.02	2.42	2.48	2.79	3.33	2.53	1.54	2.23
+\0ppmd\0	2.31	0.99	2.11	1.08	2.68	2.19	2.48	2.38	2.43	3.00	2.53	1.65	2.20
+\0fsmx\0	2.10	0.79	1.89	1.48	2.52	1.84	2.21	2.24	2.29	2.91	2.35	1.63	2.06
+\0bzz\0	2.25	0.76	2.13	0.78	2.67	2.00	2.40	2.52	2.60	3.19	2.52	1.44	2.16
+.TE
+
+
+.PP
+Note that DjVu contributors have several 
+entries in this table.  Program
+.B compress
+was written some time ago by Joe Orost.
+Program
+.B ppmd
+is an improvement of the 
+.SM PPM-C
+method invented by Paul Howard.
+
+.SH CREDITS
+Program 
+.B bzz 
+was written by L\('eon Bottou <leonb@users.sourceforge.net> and
+was then improved by Andrei Erofeev <andrew_erofeev@yahoo.com>, Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR compress (1),
+.BR gzip (1),
+.BR bzip2 (1)
diff --git a/tools/bzz.cpp b/tools/bzz.cpp
new file mode 100644
index 0000000..2dfbfb1
--- /dev/null
+++ b/tools/bzz.cpp
@@ -0,0 +1,183 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+// BZZ -- a frontend for BSByteStream
+
+/** @name bzz
+
+    \begin{description}
+    \item[Compression:]
+    #bzz -e[<blocksize>] <infile> <outfile>#
+    \item[Decompression:]
+    #bzz -d <infile> <outfile>#
+    \end{description}    
+
+    Program bzz is a simple front-end for the Burrows Wheeler encoder
+    implemented in \Ref{BSByteStream.h}.  Although this compression model is
+    not currently used in DjVu files, it may be used in the future for
+    encoding textual data chunks.  Argument #blocksize# is expressed in
+    kilobytes and must be in range 200 to 4096.  The default value is 2048.
+    Arguments #infile# and #outfile# are the input and output filenames. A
+    single dash (#"-"#) can be used to represent the standard input or output.
+
+    @memo
+    General purpose compression/decompression program
+    @author
+    L\'eon Bottou <leonb@research.att.com> -- initial implementation
+*/
+//@{
+//@}
+
+#include "GException.h"
+#include "ByteStream.h"
+#include "BSByteStream.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+#include "common.h"
+
+static const char *program = "(unknown)";
+
+void
+usage(void)
+{
+  DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+          "BZZ --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+          "Compress/decompress <infile> using the Burrows Wheeler\n"
+          "transform and the ZP adaptive binary coder.\n\n"
+          "Usage [encoding]: %s -e[<blocksize>] <infile> <outfile>\n"
+          "Usage [decoding]: %s -d <infile> <outfile>\n"
+          "  Argument <blocksize> must be in range [900..4096] (default 1100).\n"
+          "  Arguments <infile> and <outfile> can be '-' for stdin/stdout.\n"
+          , program, program);
+  exit(1);
+}
+
+int 
+main(int argc, char **argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  G_TRY
+    {
+      if(argc < 2)
+        usage();
+      // Get program name
+      program=dargv[0]=GOS::basename(dargv[0]);
+      // Obtain default mode from program name
+      int blocksize = -1;
+      if (dargv[0] == "bzz")
+        blocksize = 1100;
+      else if (dargv[0] == "unbzz")
+        blocksize = 0;
+      // Parse arguments
+      if (argc>=2 && dargv[1][0]=='-')
+        {
+          if (dargv[1][1]=='d' && dargv[1][2]==0)
+            {
+              blocksize = 0;
+            }
+          else if (dargv[1][1]=='e')
+            {
+              blocksize = 2048;
+              if (dargv[1][2])
+                 blocksize = dargv[1].substr(2, dargv[1].length()).toInt(); //atoi(2+(const char *)dargv[1]);
+            }
+          else 
+            usage();
+          dargv.shift(-1);
+          argc--;
+        }
+      if (blocksize < 0)
+        usage();
+      // Obtain filenames
+      const GURL::Filename::UTF8 inurl((argc>=2)?dargv[1]:GUTF8String("-"));
+      const GURL::Filename::UTF8 outurl((argc>=3)?dargv[2]:GUTF8String("-"));
+      if (argc >= 4)
+        usage();
+      // Action
+      GP<ByteStream> in=ByteStream::create(inurl,"rb");
+      GP<ByteStream> out=ByteStream::create(outurl,"wb");
+      if (blocksize)
+        {
+          GP<ByteStream> gbsb=BSByteStream::create(out, blocksize);
+          gbsb->copy(*in);
+        }
+      else 
+        {
+          GP<ByteStream> gbsb=BSByteStream::create(in);
+          out->copy(*gbsb);
+        }
+    }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
diff --git a/tools/c44.1 b/tools/c44.1
new file mode 100644
index 0000000..4d8b911
--- /dev/null
+++ b/tools/c44.1
@@ -0,0 +1,245 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH C44 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+c44 \- DjVuPhoto encode.
+.
+.SH SYNOPSIS
+.BI "c44 [" "options" "] " "inputfilename" " [" "outputfilename" "]"
+.
+.SH DESCRIPTION
+Produces a DjVuPhoto encoded image.
+The input image file 
+.I inputfilename
+can be either a portable gray-map (\c
+.SM PGM\c
+) or a portable pix-map (\c
+.SM PPM\c
+).
+Input images compressed with
+.SM JPEG
+are also accepted. It is however suggested to only use 
+high quality 
+.SM JPEG
+files (low compression ratio, large size)
+because the wavelet compression will increase the defects
+already present in highly compressed
+.SM JPEG
+files.
+.P
+The program produces a DjVuPhoto file
+.IR outputfilename .
+If the output file name is not specified,
+a default file name will be generated by replacing
+the input file name suffix by suffix 
+.IR djvu .
+.P
+The main design objective for the DjVu wavelets consisted of allowing
+progressive rendering and smooth scrolling of large images with limited memory
+requirements.  Decoding functions process the compressed data and update a
+memory efficient representation of the wavelet coefficients.  Imaging function
+then can quickly render an arbitrary segment of the image using the available
+data.  Both process can be carried out in two threads of execution.  This
+design plays an important role in the DjVu system.  We investigated various
+state-of-the-art wavelet compression schemes.  Although these schemes may
+achieve slightly smaller file sizes, the decoding functions did not even
+approach our requirements.  The
+.SM IW44
+wavelets reach these requirements today and may in the future implement more
+modern refinements if these refinements can be implemented within our
+constraints.
+.
+.SH QUALITY SELECTION OPTIONS
+.
+DjVuPhoto files are logically composed of a sequence of "slices" containing
+successive image refinements.  Slices are grouped in "chunks" defining the
+progressive rendering sequence.  The viewer is able to display an intermediate
+image after processing each chunk.  A typical DjVuPhoto files contains 80 to
+120 slices grouped into 1 to 4 chunks.
+.P
+The quality selection options provide various ways to specify the number of
+chunks and the number of slices per chunk.  The 
+.B c44
+program adds slices to the current chunk until exceeding a target
+number of slices, a target file size, or a target quality specification.
+The following options define targets for each chunk.  The option 
+argument contain several numerical values (one per chunk) separated
+by either commas or pluses.
+.
+.TP
+.BI "-slice " "n" "+...+" "n"
+Specify the number of slices in each chunk.
+The option argument contains plus-separated numerical values (one per chunk)
+indicating the number of slices per chunk.  Option 
+.BR "-slice 74+13+10" ,
+for instance, would be appropriate for compressing a photographic image
+with three progressive refinements.  More quality and more refinements
+can be obtained with option
+.BR "-slice 72+11+10+10" .
+.TP
+.BI "-slice " "n" ",...," "n"
+Specify the cumulative number of slices for each chunk.
+Since the final quality is determined by the total number of slices,
+it is often more convenient to use comma-separated values (one per chunk)
+indicating the cumulative number of slices for each chunk (i.e.\& including
+those encoded in all previous chunks).  The values suggested above
+can also be expressed as
+.B "-slice 74,87,97"
+and
+.BR "-slice 72,83,93,103".
+.TP
+.BI "-size " "n" ",...," "n"
+Specify size targets for each chunk expressed in bytes.
+The option argument can be either a plus-separated list specifying a size
+for each chunk, or a comma separated list specifying cumulative sizes
+for each chunk and all previous chunks.  Size targets are approximates.
+Slices will be added to each chunk until exceeding the specified target.
+.TP
+.BI "-bpp " "n" ",...," "n"
+Specify size targets for each chunk expressed in bits-per-pixel.
+Both comma-separated and plus-separated specifications are accepted.
+Option 
+.B -bpp 0.25,0.5,1
+usually provides good results.
+.TP
+.BI "-percent " "n" ",...," "n"
+Specify size targets for each chunk expressed as a percentage of the
+input file size.  Both comma-separated and plus-separated specifications
+are accepted.  Results can be drastically different according to the
+format of the input image (raw or 
+.SM JPEG
+compressed).
+.TP
+.BI "-decibel " "n" ",...," "n"
+Specify quality targets for each chunk expressed as a comma-separated list of
+increasing decibel values.  Decibel values range from 16 (very low quality) to
+48 (very high quality).  This criterion should not be relied upon when
+re-encoding an image previously compressed by another compression scheme.
+Selecting this option significantly increases the compression time.
+.TP
+.BI "-dbfrac " "frac"
+Indicate that the decibel values specified in option
+.B -decibel
+should be computed by averaging the mean squared errors of only the fraction
+.I frac
+of the most mis-represented blocks of 32 x 32 pixels.  This option is useful
+with composite images containing solid color features (e.g.\& an image with a
+large white border).
+.PP
+Providing no quality specification options automatically selects a default
+quality specification
+.BR "-slice 74,89,99" .
+Multiple quality specification options are allowed.  The program outputs a
+file whose total number of chunks is the largest number of chunks of all
+quality specifications.  Slices are added to each chunk until reaching any of
+the quality target for this chunk.
+.
+.SH OTHER OPTIONS
+The following additional options are supported:
+.TP
+.BI "-dpi " n
+Specify the resolution information encoded into the output file expressed in
+dots per inch. The resolution information encoded in DjVu files determine how
+the decoder scales the image on a particular display.  Meaningful resolutions
+range from 25 to 1200.  The default value, 100 dpi, should be suitable for
+most photographic images.
+.TP
+.BI "-gamma " n
+Specify the gamma correction information encoded into the output file.
+The argument 
+.I n
+specified the gamma value of the device for which the input image was
+designed. The default value is 2.2.  This is appropriate for images 
+designed for a standard computer monitor.
+.TP
+.BI "-mask " pbmfilename
+The design of the 
+.SM IW44
+wavelets allows for compressing partially masked images.
+This option can be used when certain pixels of a background
+image are going to be covered by foreground objects like text or drawings.
+File 
+.I pbmfile 
+must be a 
+.SM PBM 
+file whose size matches the size of the input file.  
+Each black pixel in 
+.I pbmfile 
+means that the value of the corresponding pixel in the input file is
+irrelevant.  The 
+.SM IW44
+encoder will replace the masked pixels by a color value whose coding 
+cost is minimal (see 
+.B http://www.djvuzone.org/djvu/techpapers/mask/index.djvu
+for technical details.)
+.TP
+.BI "-crcbnormal "
+Select normal chrominance encoding. 
+Chrominance information is encoded at the same resolution as the luminance.
+This is the default.
+.TP
+.BI "-crcbhalf "
+Selects half resolution chrominance encoding.  Chrominance information is
+encoded at half the luminance resolution.
+.TP
+.BI "-crcbdelay " n
+This option can be used with 
+.B -crcbnormal
+and
+.B -crcbhalf
+to modify the quality of the chrominance information.
+The option arguments specifies a parameter
+.IR n ,
+expressed in slices, that reduces the bit-rate associated with
+the chrominance.  The default chrominance encoding delay is 
+10 slices.
+.TP
+.BI "-crcbfull "
+Select the highest possible quality for encoding the chrominance information. This
+is equivalent to specifying 
+.BR "-crcbnormal" " and " "-crcbdelay 0" .
+.TP
+.BI "-crcbnone "
+Disable the encoding of the chrominance.  Only the luminance information will
+be encoded. The resulting image will show in shades of gray.
+.
+.SH REMARKS
+The default quality setting of the DjVuLibre version of
+.B c44
+has been increased.  
+It produces larger files with a better quality.  
+Quality can be lowered using the quality selection options!
+.
+.SH BUGS
+The encoder requires more memory than necessary.
+.br
+The rechunking capability is currently broken.
+.
+.SH CREDITS
+This program was written by L\('eon Bottou <leonb@users.sourceforge.net> and
+was then improved by Andrei Erofeev <andrew_erofeev@yahoo.com>, Bill Riemers
+<docbill@sourceforge.net> and many others.
+.
+.SH SEE ALSO
+.BR djvu (1),
+.BR pnm (5),
+.BR cjpeg (1).
diff --git a/tools/c44.cpp b/tools/c44.cpp
new file mode 100644
index 0000000..60be497
--- /dev/null
+++ b/tools/c44.cpp
@@ -0,0 +1,788 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name c44
+
+    {\bf Synopsis}\\
+    \begin{verbatim}
+        c44 [options] pnmfile [djvufile]
+        c44 [options] jpegfile [djvufile]
+    \end{verbatim}
+
+    {\bf Description} ---
+    File #"c44.cpp"# illustrates the use of classes \Ref{IWBitmap} and
+    \Ref{IWPixmap} for compressing and encoding a color image or a gray level
+    image using the DjVu IW44 wavelets.  This is the preferred mode for
+    creating a DjVu image which does not require separate layers for encoding
+    the text and the background images.  The files created by #c44# are
+    legal Photo DjVu files recognized by the DjVu decoder (see program \Ref{ddjvu}).
+
+    {\bf Arguments} ---
+    Argument #pnmfile# or #jpegfile# is the name of the input file.  PGM files
+    are recognized for gray level images; PPM files are recognized for color
+    images.  Popular file formats can be converted to PGM or PPM using the
+    NetPBM package (\URL{http://www.arc.umn.edu/GVL/Software/netpbm.html})
+    or the ImageMagick package (\URL{http://www.wizards.dupont.com/cristy/}).
+
+    Optional argument #djvufile# is the name of the output file.  It is
+    customary to use either suffix #".djvu"#, #".djv"#, #".iw44"# or #".iw4"#.
+    Suffix #".djvu"# emphasizes the fact that IW44 files is seamlessly
+    recognized by the current DjVu decoder.  Suffix #".iw4"# however was
+    required by older versions of the DjVu plugin.  If this argument is
+    omitted, a filename is generated by replacing the suffix of #pnmfile# 
+    or #jpegfile# with suffix #".djvu"#.
+
+    {\bf Quality Specification}---
+    Files produced by the DjVu IW44 Wavelet Encoder are IFF files composed of
+    an arbitrary number of chunks (see \Ref{showiff} and \Ref{IWImage.h})
+    containing successive refinements of the encoded image.  Each chunk is
+    composed of several slices.  A typical file contains a total of 100 slices
+    split between three or four chunks.  Various options provide quality
+    targets (#-decibel#), slicing targets (#-slice#) or file size targets
+    (#-bpp# or #-size#) for each of these refinements.  Chunks are generated
+    until meeting either the decibel target, the file size target, or the
+    slicing target for each chunk.
+    \begin{description}
+    \item[-bpp n,..,n] 
+    Selects a increasing sequence of bitrates for building 
+    progressive IW44 file (in bits per pixel).
+    \item[-size n,..,n] 
+    Selects a increasing sequence of minimal sizes for building 
+    progressive IW44 file (in bytes).
+    \item[-decibel n,..,n]
+    Selects an increasing sequence of luminance error expressed as decibels
+    ranging from 16 (very low quality) to 48 (very high quality).  This
+    criterion should not be used when recoding an image which was already
+    compressed with a lossy compression scheme (such as Wavelets or JPEG)
+    because successive losses of quality accumulate.    
+    \item[-slice n+...+n]
+    Selects an increasing sequence of data slices expressed as integers 
+    ranging from 1 to 140. 
+    \end{description}
+    These options take a target specification list expressed either as a comma
+    separated list of increasing numbers or as a list of numbers separated by
+    character #'+'#.  Both commands below for instance are equivalent:
+    \begin{verbatim}
+    c44 -bpp 0.1,0.2,0.5 inputfile.ppm  outputfile.djvu
+    c44 -bpp 0.1+0.1+0.3 inputfile.ppm  outputfile.djvu
+    \end{verbatim}
+    Both these commands generate a file whose first chunk encodes the image
+    with 0.1 bits per pixel, whose second chunk refines the image to 0.2 bits
+    per pixel and whose third chunk refines the image to 0.5 bits per pixel.
+    In other words, the second chunk provides an extra 0.1 bits per pixel and
+    the third chunk provides an extra 0.3 bits per pixels.
+
+    When no quality specification is provided, program #c44# usually generates
+    a file composed of three progressive refinement chunks whose quality
+    should be acceptable.  The best results however are achieved by precisely
+    tuning the image quality.  As a rule of thumb, #c44# generates an
+    acceptable quality when you specify a size equal to 50% to 75% of the size
+    of a comparable JPEG image.
+
+    {\bf Color Processing Specification} ---
+    Five options control the encoding of the chrominance information of color
+    images.  These options are of course meaningless for processing a gray
+    level image.
+    \begin{description}
+    \item[-crcbnormal]
+    Selects normal chrominance encoding (default).  Chrominance information is
+    encoded at the same resolution as the luminance. 
+    \item[-crcbhalf]
+    Selects half resolution chrominance encoding.  Chrominance information is
+    encoded at half the luminance resolution. 
+    \item[-crcbdelay n]
+    This option can be used with #-crcbnormal# and #-crcbhalf# for specifying
+    an encoding delay which reduces the bitrate associated with the chrominance. The
+    default chrominance encoding delay is 10 slices.
+    \item[-crcbfull]
+    Selects the highest possible quality for encoding the chrominance information. This
+    is equivalent to specifying #-crcbnormal# and #-crcbdelay 0#.
+    \item[-crcbnone]
+    Disables encoding of the chrominance.  Only the luminance information will
+    be encoded. The resulting image will show in shades of gray.
+    \end{description}
+
+    {\bf Advanced Options} ---
+    Program #c44# also recognizes the following options:
+    \begin{description}
+    \item[-dbfrac f]
+    This option alters the meaning of the -decibel option.  The decibel target then
+    addresses only the average error of the specified fraction of the most
+    misrepresented 32x32 pixel blocks.
+    \item[-mask pbmfile] 
+    This option can be used when we know that certain pixels of a background
+    image are going to be covered by foreground objects like text or drawings.
+    File #pbmfile# must be a PBM file whose size matches the size of the input
+    file.  Each black pixel in #pbmfile# means that the value of the corresponding
+    pixel in the input file is irrelevant.  The DjVu IW44 Encoder will replace
+    the masked pixels by a color value whose coding cost is minimal (see
+    \URL{http://www.research.att.com/~leonb/DJVU/mask}).
+    \end{description}
+
+    {\bf Photo DjVu options} ---
+    Photo DjVu images have the additional capability to store the resolution
+    and gamma correction information.
+    \begin{description}
+    \item[-dpi n]  Sets the resolution information for a Photo DjVu image.
+    \item[-gamma n] Sets the gamma correction information for a Photo DjVu image.
+    \end{description}
+
+    {\bf Performance} ---
+    The main design objective for the DjVu wavelets consisted of allowing
+    progressive rendering and smooth scrolling of large images with limited
+    memory requirements.  Decoding functions process the compressed data and
+    update a memory efficient representation of the wavelet coefficients.
+    Imaging function then can quickly render an arbitrary segment of the image
+    using the available data.  Both process can be carried out in two threads
+    of execution.  This design plays an important role in the DjVu system.
+
+    We have investigated various state-of-the-art wavelet compression schemes:
+    although these schemes may achieve slightly smaller file sizes, the
+    decoding functions did not even approach our requirements.  The IW44
+    wavelets reach these requirements today and may in the future implement
+    more modern refinements (such as trellis quantization, bitrate
+    allocation, etc.) if (and only if) these refinements can be implemented
+    within our constraints.
+
+    @memo
+    DjVu IW44 wavelet encoder.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+//@}
+
+#include "GString.h"
+#include "GException.h"
+#include "IW44Image.h"
+#include "DjVuInfo.h"
+#include "IFFByteStream.h"
+#include "GOS.h"
+#include "GBitmap.h"
+#include "GPixmap.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+#include "JPEGDecoder.h"
+#include "common.h"
+
+// command line data
+
+int flag_mask = 0;
+int flag_bpp = 0;
+int flag_size = 0;
+int flag_percent = 0;
+int flag_slice = 0;
+int flag_decibel = 0;
+int flag_crcbdelay = -1;
+int flag_crcbmode = -1;  
+double flag_dbfrac = -1;
+int flag_dpi = -1;
+double flag_gamma = -1;
+int argc_bpp = 0;
+int argc_size = 0;
+int argc_slice = 0;
+int argc_decibel = 0;
+IW44Image::CRCBMode arg_crcbmode = IW44Image::CRCBnormal;
+
+#define MAXCHUNKS 64
+float argv_bpp[MAXCHUNKS];
+int   argv_size[MAXCHUNKS];
+int   argv_slice[MAXCHUNKS];
+float argv_decibel[MAXCHUNKS];
+
+struct C44Global 
+{
+  // Globals that need static initialization
+  // are grouped here to work around broken compilers.
+  GURL pnmurl;
+  GURL iw4url;
+  GURL mskurl;
+  IWEncoderParms parms[MAXCHUNKS];
+}; 
+
+static C44Global& g(void)
+{ 
+  static C44Global g; 
+  return g;
+}
+
+
+// parse arguments
+
+void 
+usage()
+{
+  DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+         "C44 --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+         "Image compression utility using IW44 wavelets\n\n"
+         "Usage: c44 [options] pnm-or-jpeg-file [djvufile]\n"
+         "Options:\n"
+         "    -slice n+...+n   -- select an increasing sequence of data slices\n"
+         "                        expressed as integers ranging from 1 to 140.\n"
+         "    -bpp n,..,n      -- select a increasing sequence of bitrates\n"
+         "                        for building progressive file (in bits per pixel).\n"
+         "    -size n,..,n     -- select an increasing sequence of minimal sizes\n"
+         "                        for building progressive files (expressed in bytes).\n"
+         "    -percent n,..,n  -- selects the percentage of original file size\n"
+         "                        for building progressive file.\n"
+         "    -decibel n,..,n  -- select an increasing sequence of luminance error\n"
+         "                        expressed as decibels (ranging from 16 to 50).\n"
+         "    -dbfrac frac     -- restrict decibel estimation to a fraction of\n"
+         "                        the most misrepresented 32x32 blocks\n"
+         "    -mask pbmfile    -- select bitmask specifying image zone to encode\n"
+         "                        with minimal bitrate. (default none)\n"
+         "    -dpi n           -- sets the image resolution\n"
+         "    -gamma n         -- sets the image gamma correction\n"
+         "    -crcbfull        -- encode chrominance with highest quality\n"
+         "    -crcbnormal      -- encode chrominance with normal resolution (default)\n"
+         "    -crcbhalf        -- encode chrominance with half resolution\n"
+         "    -crcbnone        -- do not encode chrominance at all\n"
+         "    -crcbdelay n     -- select chrominance coding delay (default 10)\n"
+         "                        for -crcbnormal and -crcbhalf modes\n"
+         "\n");
+  exit(1);
+}
+
+
+
+void 
+parse_bpp(const char *q)
+{
+  flag_bpp = 1;
+  argc_bpp = 0;
+  double lastx = 0;
+  while (*q)
+    {
+      char *ptr; 
+      double x = strtod(q, &ptr);
+      if (ptr == q)
+        G_THROW( ERR_MSG("c44.bitrate_not_number") );
+      if (lastx>0 && q[-1]=='+')
+        x += lastx;
+      if (x<=0 || x>24 || x<lastx)
+        G_THROW( ERR_MSG("c44.bitrate_out_of_range") );
+      lastx = x;
+      if (*ptr && *ptr!='+' && *ptr!=',')
+        G_THROW( ERR_MSG("c44.bitrate_comma_expected") );
+      q = (*ptr ? ptr+1 : ptr);
+      argv_bpp[argc_bpp++] = (float)x;
+      if (argc_bpp>MAXCHUNKS)
+        G_THROW( ERR_MSG("c44.bitrate_too_many") );
+    }
+  if (argc_bpp < 1)
+    G_THROW( ERR_MSG("c44.bitrate_no_chunks") );
+}
+
+
+void 
+parse_size(const char *q)
+{
+  flag_size = 1;
+  argc_size = 0;
+  int lastx = 0;
+  while (*q)
+    {
+      char *ptr; 
+      int x = strtol(q, &ptr, 10);
+      if (ptr == q)
+        G_THROW( ERR_MSG("c44.size_not_number") );
+      if (lastx>0 && q[-1]=='+')
+        x += lastx;
+      if (x<lastx)
+        G_THROW( ERR_MSG("c44.size_out_of_range") );
+      lastx = x;
+      if (*ptr && *ptr!='+' && *ptr!=',')
+        G_THROW( ERR_MSG("c44.size_comma_expected") );
+      q = (*ptr ? ptr+1 : ptr);
+      argv_size[argc_size++] = x;
+      if (argc_size>=MAXCHUNKS)
+        G_THROW( ERR_MSG("c44.size_too_many") );
+    }
+  if (argc_size < 1)
+    G_THROW( ERR_MSG("c44.size_no_chunks") );
+}
+
+void 
+parse_slice(const char *q)
+{
+  flag_slice = 1;
+  argc_slice = 0;
+  int lastx = 0;
+  while (*q)
+    {
+      char *ptr; 
+      int x = strtol(q, &ptr, 10);
+      if (ptr == q)
+        G_THROW( ERR_MSG("c44.slice_not_number") );
+      if (lastx>0 && q[-1]=='+')
+        x += lastx;
+      if (x<1 || x>1000 || x<lastx)
+        G_THROW( ERR_MSG("c44.slice_out_of_range") );
+      lastx = x;
+      if (*ptr && *ptr!='+' && *ptr!=',')
+        G_THROW( ERR_MSG("c44.slice_comma_expected") );
+      q = (*ptr ? ptr+1 : ptr);
+      argv_slice[argc_slice++] = x;
+      if (argc_slice>=MAXCHUNKS)
+        G_THROW( ERR_MSG("c44.slice_too_many") );
+    }
+  if (argc_slice < 1)
+    G_THROW( ERR_MSG("c44.slice_no_chunks") );
+}
+
+
+void 
+parse_decibel(const char *q)
+{
+  flag_decibel = 1;
+  argc_decibel = 0;
+  double lastx = 0;
+  while (*q)
+    {
+      char *ptr; 
+      double x = strtod(q, &ptr);
+      if (ptr == q)
+        G_THROW( ERR_MSG("c44.decibel_not_number") );
+      if (lastx>0 && q[-1]=='+')
+        x += lastx;
+      if (x<16 || x>50 || x<lastx)
+        G_THROW( ERR_MSG("c44.decibel_out_of_range") );
+      lastx = x;
+      if (*ptr && *ptr!='+' && *ptr!=',')
+        G_THROW( ERR_MSG("c44.decibel_comma_expected") );
+      q = (*ptr ? ptr+1 : ptr);
+      argv_decibel[argc_decibel++] = (float)x;
+      if (argc_decibel>=MAXCHUNKS)
+        G_THROW( ERR_MSG("c44.decibel_too_many") );
+    }
+  if (argc_decibel < 1)
+    G_THROW( ERR_MSG("c44.decibel_no_chunks") );
+}
+
+
+int 
+resolve_quality(int npix)
+{
+  // Convert ratio specification into size specification
+  if (flag_bpp)
+    {
+      if (flag_size)
+        G_THROW( ERR_MSG("c44.exclusive") );
+      flag_size = flag_bpp;
+      argc_size = argc_bpp;
+      for (int i=0; i<argc_bpp; i++)
+        argv_size[i] = (int)(npix*argv_bpp[i]/8.0+0.5);
+    }
+  // Compute number of chunks
+  int nchunk = 0;
+  if (flag_slice && nchunk<argc_slice)
+    nchunk = argc_slice;
+  if (flag_size && nchunk<argc_size)
+    nchunk = argc_size;
+  if (flag_decibel && nchunk<argc_decibel)
+    nchunk = argc_decibel;
+  // Force default values
+  if (nchunk == 0)
+    {
+#ifdef DECIBELS_25_30_34
+      nchunk = 3;
+      flag_decibel = 1;
+      argc_decibel = 3;
+      argv_decibel[0]=25;
+      argv_decibel[1]=30;
+      argv_decibel[2]=34;
+#else
+      nchunk = 3;
+      flag_slice = 1;
+      argc_slice = 3;
+      argv_slice[0]=74;
+      argv_slice[1]=89;
+      argv_slice[2]=99;
+#endif
+    }
+  // Complete short specifications
+  while (argc_size < nchunk)
+    argv_size[argc_size++] = 0;
+  while (argc_slice < nchunk)
+    argv_slice[argc_slice++] = 0;
+  while (argc_decibel < nchunk)
+    argv_decibel[argc_decibel++] = 0.0;
+  // Fill parm structure
+  for(int i=0; i<nchunk; i++)
+    {
+      g().parms[i].bytes = argv_size[i];
+      g().parms[i].slices = argv_slice[i];
+      g().parms[i].decibels = argv_decibel[i];
+    }
+  // Return number of chunks
+  return nchunk;
+}
+
+
+void
+parse(GArray<GUTF8String> &argv)
+{
+  const int argc=argv.hbound()+1;
+  for (int i=1; i<argc; i++)
+    {
+      if (argv[i][0] == '-')
+        {
+          if (argv[i] == "-percent")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_bpp_arg") );
+              if (flag_bpp || flag_size)
+                G_THROW( ERR_MSG("c44.multiple_bitrate") );
+              parse_size(argv[i]);
+              flag_percent = 1;
+            }
+          else if (argv[i] == "-bpp")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_bpp_arg") );
+              if (flag_bpp || flag_size)
+                G_THROW( ERR_MSG("c44.multiple_bitrate") );
+              parse_bpp(argv[i]);
+            }
+          else if (argv[i] == "-size")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_size_arg") );
+              if (flag_bpp || flag_size)
+                G_THROW( ERR_MSG("c44.multiple_size") );
+              parse_size(argv[i]);
+            }
+          else if (argv[i] == "-decibel")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_decibel_arg") );
+              if (flag_decibel)
+                G_THROW( ERR_MSG("c44.multiple_decibel") );
+              parse_decibel(argv[i]);
+            }
+          else if (argv[i] == "-slice")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_slice_arg") );
+              if (flag_slice)
+                G_THROW( ERR_MSG("c44.multiple_slice") );
+              parse_slice(argv[i]);
+            }
+          else if (argv[i] == "-mask")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_mask_arg") );
+              if (! g().mskurl.is_empty())
+                G_THROW( ERR_MSG("c44.multiple_mask") );
+              g().mskurl = GURL::Filename::UTF8(argv[i]);
+            }
+          else if (argv[i] == "-dbfrac")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_dbfrac_arg") );
+              if (flag_dbfrac>0)
+                G_THROW( ERR_MSG("c44.multiple_dbfrac") );
+              char *ptr;
+              flag_dbfrac = strtod(argv[i], &ptr);
+              if (flag_dbfrac<=0 || flag_dbfrac>1 || *ptr)
+                G_THROW( ERR_MSG("c44.illegal_dbfrac") );
+            }
+          else if (argv[i] == "-crcbnone")
+            {
+              if (flag_crcbmode>=0 || flag_crcbdelay>=0)
+                G_THROW( ERR_MSG("c44.incompatable_chrominance") );
+              flag_crcbdelay = flag_crcbmode = 0;
+              arg_crcbmode = IW44Image::CRCBnone;
+            }
+          else if (argv[i] == "-crcbhalf")
+            {
+              if (flag_crcbmode>=0)
+                G_THROW( ERR_MSG("c44.incompatable_chrominance") );
+              flag_crcbmode = 0;
+              arg_crcbmode = IW44Image::CRCBhalf;
+            }
+          else if (argv[i] == "-crcbnormal")
+            {
+              if (flag_crcbmode>=0)
+                G_THROW( ERR_MSG("c44.incompatable_chrominance") );
+              flag_crcbmode = 0;
+              arg_crcbmode = IW44Image::CRCBnormal;
+            }
+          else if (argv[i] == "-crcbfull")
+            {
+              if (flag_crcbmode>=0 || flag_crcbdelay>=0)
+                G_THROW( ERR_MSG("c44.incompatable_chrominance") );
+              flag_crcbdelay = flag_crcbmode = 0;
+              arg_crcbmode = IW44Image::CRCBfull;
+            }
+          else if (argv[i] == "-crcbdelay")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_crcbdelay_arg") );
+              if (flag_crcbdelay>=0)
+                G_THROW( ERR_MSG("c44.incompatable_chrominance") );
+              char *ptr; 
+              flag_crcbdelay = strtol(argv[i], &ptr, 10);
+              if (*ptr || flag_crcbdelay<0 || flag_crcbdelay>=100)
+                G_THROW( ERR_MSG("c44.illegal_crcbdelay") );
+            }
+          else if (argv[i] == "-dpi")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_dpi_arg") );
+              if (flag_dpi>0)
+                G_THROW( ERR_MSG("c44.duplicate_dpi") );
+              char *ptr; 
+              flag_dpi = strtol(argv[i], &ptr, 10);
+              if (*ptr || flag_dpi<25 || flag_dpi>4800)
+                G_THROW( ERR_MSG("c44.illegal_dpi") );
+            }
+          else if (argv[i] == "-gamma")
+            {
+              if (++i >= argc)
+                G_THROW( ERR_MSG("c44.no_gamma_arg") );
+              if (flag_gamma > 0)
+                G_THROW( ERR_MSG("c44.duplicate_gamma") );
+              char *ptr; 
+              flag_gamma = strtod(argv[i], &ptr);
+              if (*ptr || flag_gamma<=0.25 || flag_gamma>=5)
+                G_THROW( ERR_MSG("c44.illegal_gamma") );
+            }
+          else
+            usage();
+        }
+      else if (g().pnmurl.is_empty())
+        g().pnmurl = GURL::Filename::UTF8(argv[i]);
+      else if (g().iw4url.is_empty())
+        g().iw4url = GURL::Filename::UTF8(argv[i]);
+      else
+        usage();
+    }
+  if (g().pnmurl.is_empty())
+    usage();
+  if (g().iw4url.is_empty())
+    {
+      GURL codebase=g().pnmurl.base();
+      GUTF8String base = g().pnmurl.fname();
+      int dot = base.rsearch('.');
+      if (dot >= 1)
+        base = base.substr(0,dot);
+      const char *ext=".djvu";
+      g().iw4url = GURL::UTF8(base+ext,codebase);
+    }
+}
+
+
+
+GP<GBitmap>
+getmask(int w, int h)
+{
+  GP<GBitmap> msk8;
+  if (! g().mskurl.is_empty())
+    {
+      GP<ByteStream> mbs=ByteStream::create(g().mskurl,"rb");
+      msk8 = GBitmap::create(*mbs);
+      if (msk8->columns() != (unsigned int)w || 
+          msk8->rows()    != (unsigned int)h  )
+        G_THROW( ERR_MSG("c44.different_size") );
+    }
+  return msk8;
+}
+
+
+static void 
+create_photo_djvu_file(IW44Image &iw, int w, int h,
+                       IFFByteStream &iff, int nchunks, IWEncoderParms xparms[])
+{
+  // Prepare info chunk
+  GP<DjVuInfo> ginfo=DjVuInfo::create();
+  DjVuInfo &info=*ginfo;
+  info.width = w;
+  info.height = h;
+  info.dpi = (flag_dpi>0 ? flag_dpi : 100);
+  info.gamma = (flag_gamma>0 ? flag_gamma : 2.2);
+  // Write djvu header and info chunk
+  iff.put_chunk("FORM:DJVU", 1);
+  iff.put_chunk("INFO");
+  info.encode(*iff.get_bytestream());
+  iff.close_chunk();
+  // Write all chunks
+  int flag = 1;
+  for (int i=0; flag && i<nchunks; i++)
+    {
+      iff.put_chunk("BG44");
+      flag = iw.encode_chunk(iff.get_bytestream(), xparms[i]);
+      iff.close_chunk();
+    }
+  // Close djvu chunk
+  iff.close_chunk();
+}
+
+
+int
+main(int argc, char **argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  G_TRY
+    {
+      // Parse arguments
+      parse(dargv);
+      // Check input file
+      GP<ByteStream> gibs=ByteStream::create(g().pnmurl,"rb");
+      ByteStream &ibs=*gibs;
+      char prefix[16];
+      memset(prefix, 0, sizeof(prefix));
+      if (ibs.readall((void*)prefix, sizeof(prefix)) < sizeof(prefix))
+        G_THROW( ERR_MSG("c44.failed_pnm_header") );
+#ifdef DEFAULT_JPEG_TO_HALF_SIZE
+      // Default specification for jpeg files
+      // This is disabled because
+      // -1- jpeg detection is unreliable.
+      // -2- quality is very difficult to predict.
+      if(prefix[0]!='P' &&prefix[0]!='A' && prefix[0]!='F' && 
+	 !flag_mask && !flag_bpp && !flag_size && 
+	 !flag_slice && !flag_decibel)
+        {
+          parse_size("10,20,30,50");
+	  flag_size = flag_percent = 1;
+        }
+#endif
+      // Change percent specification into size specification
+      if (flag_size && flag_percent)
+	for (int i=0; i<argc_size; i++)
+	  argv_size[i] = (argv_size[i]*gibs->size())/ 100;
+      flag_percent = 0;
+      // Load images
+      int w = 0;
+      int h = 0;
+      ibs.seek(0);
+      GP<IW44Image> iw;
+      // Check color vs gray
+      if (prefix[0]=='P' && (prefix[1]=='2' || prefix[1]=='5'))
+        {
+          // gray file
+          GP<GBitmap> gibm=GBitmap::create(ibs);
+          GBitmap &ibm=*gibm;
+          w = ibm.columns();
+          h = ibm.rows();
+          iw = IW44Image::create_encode(ibm, getmask(w,h));
+        }
+      else if (!GStringRep::cmp(prefix,"AT&TFORM",8) || 
+	       !GStringRep::cmp(prefix,"FORM",4))
+        {
+          char *s = (prefix[0]=='F' ? prefix+8 : prefix+12);
+          GP<IFFByteStream> giff=IFFByteStream::create(gibs);
+          IFFByteStream &iff=*giff;
+          const bool color=!GStringRep::cmp(s,"PM44",4);
+          if (color || !GStringRep::cmp(s,"BM44",4))
+            {
+              iw = IW44Image::create_encode(IW44Image::COLOR);
+              iw->decode_iff(iff);
+              w = iw->get_width();
+              h = iw->get_height();
+            }
+          else
+            G_THROW( ERR_MSG("c44.unrecognized") );
+          // Check that no mask has been specified.
+          if (! g().mskurl.is_empty())
+            G_THROW( ERR_MSG("c44.failed_mask") );
+        }
+      else  // just for kicks, try jpeg.
+        {
+          // color file
+          const GP<GPixmap> gipm(GPixmap::create(ibs));
+          GPixmap &ipm=*gipm;
+          w = ipm.columns();
+          h = ipm.rows();
+          iw = IW44Image::create_encode(ipm, getmask(w,h), arg_crcbmode);
+        }
+      // Call destructor on input file
+      gibs=0;
+              
+      // Perform compression PM44 or BM44 as required
+      if (iw)
+        {
+          g().iw4url.deletefile();
+          GP<IFFByteStream> iff =
+	    IFFByteStream::create(ByteStream::create(g().iw4url,"wb"));
+          if (flag_crcbdelay >= 0)
+            iw->parm_crcbdelay(flag_crcbdelay);
+          if (flag_dbfrac > 0)
+            iw->parm_dbfrac((float)flag_dbfrac);
+          int nchunk = resolve_quality(w*h);
+          // Create djvu file
+          create_photo_djvu_file(*iw, w, h, *iff, nchunk, g().parms);
+        }
+    }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  return 0;
+}
diff --git a/tools/cjb2.1 b/tools/cjb2.1
new file mode 100644
index 0000000..9b18da6
--- /dev/null
+++ b/tools/cjb2.1
@@ -0,0 +1,136 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH CJB2 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+cjb2 \- Simple DjVuBitonal encoder.
+
+.SH SYNOPSIS
+.BI "cjb2  [" "options" "] " "inputfile" " " "outputdjvufile"
+
+.SH DESCRIPTION
+This is a simple encoder for bitonal files.
+Argument 
+.I inputfile
+is the name of a 
+.SM PBM
+or bitonal
+.SM TIFF
+file containing a single document image.
+This program produces a DjVuBitonal file named
+.IR outputdjvufile .
+
+The default compression process is lossless: 
+decoding the DjVuBitonal file at full resolution will 
+produce an image exactly identical to the input file.
+Lossy compression is enabled by options
+.BR -losslevel ,
+.BR -lossy ,
+or
+.BR -clean .
+
+.SH OPTIONS
+.TP
+.BI "-dpi " "n"
+Specify the resolution information encoded into the output file expressed in
+dots per inch. The resolution information encoded in DjVu files determine how
+the decoder scales the image on a particular display.  Meaningful resolutions
+range from 25 to 1200.  The default resolution for 
+.SM TIFF
+files is the resolution is the resolution specified by the input file.
+The default resolution for
+.SM PBM
+files is 300 dpi.
+.TP
+.B "-lossless"
+Ensure that the encoded image is pixel-per-pixel equal
+to the initial image. 
+This option is is equivalent to 
+.BR "-losslevel 0" 
+and is the default.
+.TP
+.B "-clean"
+Only remove flyspecks from the input image. 
+This option enables a heuristic algorithm that removes very small marks.  
+Such marks are often causes by noise and dust during the scanning process.
+The threshold mark size is chosen according to the resolution
+specified with option 
+This option is is equivalent to 
+.BR "-losslevel 1" .
+.TP
+.B "-lossy"
+Substitute patterns with small variations.
+In addition to the flyspeck removal heuristic, this option
+enables an algorithm that encodes certain characters
+by simply replicating the shape of a previously encoded character
+with a similar shape.
+This option is is equivalent to 
+.BR "-losslevel 100" .
+.TP
+.BI "-losslevel " "x"
+Specify the aggressiveness of the lossy compression.
+Its argument ranges from 0 to 200. 
+Higher values generate smaller files 
+with more potential distortions.
+Loss level 0 corresponds to lossless encoding.
+Loss level 1 performs image cleaning but does not perform
+character substitution at all.
+Loss level 100 is intended to provide a good compromise.
+Higher loss levels provide marginally better compression
+at the risk of unacceptable character substitutions. 
+.TP
+.B "-verbose"
+Display informational messages while running.
+
+.SH REMARKS
+Lossless encoding is competitive with that of the 
+Lizardtech commercial encoders. 
+.PP
+Lossy encoding has made much progress thanks
+to Ilya Mezhirov from the minidjvu project.
+This also means that the lossy encoding performance
+can change from version to version.
+When lossy compression yields inadequate results,
+simply revert to only using option
+.BR -clean 
+or reduce the parameter of option
+.BR -losslevel .
+.PP
+Two features are still missing:
+.IP "*" 3
+Half-tone detection. Collecting small marks belonging 
+to half-tone patterns would improve compression speed.
+.IP "*" 3
+Multi-page compression. Matching characters on several pages
+would improve the compression ratios for multi-page documents.
+
+.SH CREDITS
+This program was initially written by L\('eon Bottou
+<leonb@users.sourceforge.net> and was improved 
+by Bill Riemers <docbill@sourceforge.net> and many others.
+The pattern matching algorithm for lossy compression
+was contributed by Ilya Mezhirov <ilya@mezhirov.mccme.ru>.
+TIFF input routines are inspired by the ones contributed by 
+R. Keith Dennis <dennis@rkd.math.cornell.edu> and Paul Young.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR pbm (5).
diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp
new file mode 100644
index 0000000..3da3ea8
--- /dev/null
+++ b/tools/cjb2.cpp
@@ -0,0 +1,993 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name cjb2
+
+    {\bf Synopsis}
+    \begin{verbatim}
+        cjb2 [options] <input-pbm-or-tiff>  <output-djvu>
+    \end{verbatim}
+
+    {\bf Description}
+
+    File #"cjb2.cpp"# demonstrates a simple encoder for Bilevel DjVu Images.
+    It is able to perform lossless encoding and limited lossy encoding.  Lots
+    of lossy encoding refinements are missing from this simple implementation.
+    Comments in the code suggest a few improvements.
+
+    Options are:
+    \begin{description}
+    \item[-dpi xxx]     Specify image resolution (default 300).
+    \item[-lossless]    Lossless compression (same as -losslevel 0, default).
+    \item[-clean]       Quasi-lossless compression (same as -losslevel 1).
+    \item[-lossy]       Lossy compression (same as -losslevel 100).
+    \item[-losslevel n] Set loss level (0 to 200)
+    \item[-verbose]     Display additional messages.
+    \end{description}
+    Encoding is lossless unless one or several lossy options are selected.
+    The #dpi# argument mostly affects the cleaning thresholds.
+
+    {\bf Bugs}
+
+    This is not the full-fledged multipage DjVu compressor, but merely a free
+    tool provided with the DjVu Reference Library as a demonstrative example.
+
+    @memo
+    Simple JB2 encoder.
+    @author
+    L\'eon Bottou <leonb@research.att.com>\\
+    Paul Howard <pgh@research.att.com>\\
+    Pascal Vincent <vincentp@iro.umontreal.ca>\\
+    Ilya Mezhirov <ilya@mezhirov.mccme.ru>
+*/
+//@{
+//@}
+
+
+#include "DjVuGlobal.h"
+#include "GException.h"
+#include "GSmartPointer.h"
+#include "GContainer.h"
+#include "ByteStream.h"
+#include "IFFByteStream.h"
+#include "GRect.h"
+#include "GBitmap.h"
+#include "JB2Image.h"
+#include "DjVuInfo.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+#include "jb2tune.h"
+#include "common.h"
+#if HAVE_TIFF
+#include <tiffio.h>
+#endif
+
+// --------------------------------------------------
+// UTILITIES
+// --------------------------------------------------
+
+#ifdef MIN
+#undef MIN
+#endif
+
+inline int 
+MIN(int a, int b) 
+{ 
+  return ( a<b ?a :b); 
+}
+
+#ifdef MAX
+#undef MAX
+#endif
+
+inline int 
+MAX(int a, int b) 
+{ 
+  return ( a>b ?a :b); 
+}
+
+
+
+
+
+
+// --------------------------------------------------
+// CONNECTED COMPONENT ANALYSIS AND CLEANING
+// --------------------------------------------------
+
+// -- A run of black pixels
+struct Run    
+{ 
+  int y;         // vertical coordinate
+  short x1;      // first horizontal coordinate
+  short x2;      // last horizontal coordinate
+  int ccid;      // component id
+};
+
+// -- A component descriptor
+struct CC    
+{
+  GRect bb;      // bounding box
+  int npix;      // number of black pixels
+  int nrun;      // number of runs
+  int frun;      // first run in cc ordered array of runs
+};
+
+
+// -- An image composed of runs
+class CCImage 
+{
+public:
+  int height;            // Height of the image in pixels
+  int width;             // Width of the image in pixels
+  GTArray<Run> runs;     // array of runs
+  GTArray<CC>  ccs;      // Array of component descriptors
+  int nregularccs;       // Number of regular ccs (set by merge_and_split_ccs)
+  int largesize;         // CCs larger than that are special
+  int smallsize;         // CCs smaller than that are special 
+  int tinysize;          // CCs smaller than that may be removed 
+  CCImage();
+  void init(int width, int height, int dpi);
+  void add_single_run(int y, int x1, int x2, int ccid=0);
+  void add_bitmap_runs(const GBitmap &bm, int offx=0, int offy=0, int ccid=0);
+  GP<GBitmap> get_bitmap_for_cc(int ccid) const;
+  GP<JB2Image> get_jb2image() const;
+  void make_ccids_by_analysis();
+  void make_ccs_from_ccids();
+  void erase_tiny_ccs();
+  void merge_and_split_ccs();
+  void sort_in_reading_order(); 
+};
+
+
+// -- Compares runs
+static inline bool
+operator <= (const Run &a, const Run &b)
+{
+  return (a.y<b.y) || (a.y==b.y && a.x1<=b.x1);
+}
+
+
+// -- Constructs CCImage and provide defaults
+CCImage::CCImage()
+  : height(0), width(0), nregularccs(0)
+{
+}
+
+void
+CCImage::init(int w, int h, int dpi)
+{
+  runs.empty();
+  ccs.empty();
+  height = h;
+  width = w;
+  nregularccs = 0;
+  dpi = MAX(200, MIN(900, dpi));
+  largesize = MIN( 500, MAX(64, dpi));
+  smallsize = MAX(2, dpi/150);
+  tinysize = MAX(0, dpi*dpi/20000 - 1);
+}
+
+
+// -- Adds a run to the CCImage
+inline void 
+CCImage::add_single_run(int y, int x1, int x2, int ccid)
+{
+  int index = runs.hbound();
+  runs.touch(++index);
+  Run& run = runs[index];
+  run.y = y;
+  run.x1 = x1;
+  run.x2 = x2;
+  run.ccid = ccid;
+}
+
+
+// -- Adds runs extracted from a bitmap
+void 
+CCImage::add_bitmap_runs(const GBitmap &bm, int offx, int offy, int ccid)
+{
+  // Iterate over rows
+  for (unsigned int y=0; y<bm.rows(); y++)
+    {
+      const unsigned char *row = bm[y];
+      int w = bm.columns();
+      int x = 0;
+      // Iterate over runs
+      while (x < w)
+        {
+          while (x < w  && !row[x]) x++;
+          if (x < w)
+            {
+              int x1 = x;
+              while (x < w && row[x]) x++;
+              add_single_run(offy+y, offx+x1, offx+x-1, ccid);
+            }
+        }
+    }
+}
+
+
+// -- Performs connected component analysis
+void
+CCImage::make_ccids_by_analysis()
+{
+  // Sort runs
+  runs.sort();
+  // Single Pass Connected Component Analysis (with unodes)
+  int n;
+  int p=0;
+  GTArray<int> umap;
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      int y = runs[n].y;
+      int x1 = runs[n].x1 - 1;
+      int x2 = runs[n].x2 + 1;
+      int id = (umap.hbound() + 1);
+      // iterate over previous line runs
+      for(;runs[p].y < y-1;p++);
+      for(;(runs[p].y < y) && (runs[p].x1 <= x2);p++ )
+        {
+          if ( runs[p].x2 >= x1 )
+            {
+              // previous run touches current run
+              int oid = runs[p].ccid;
+              while (umap[oid] < oid)
+                oid = umap[oid];
+              if ((int)id > umap.hbound()) {
+                id = oid;
+              } else if (id < oid) {
+                umap[oid] = id;
+              } else {
+                umap[id] = oid;
+                id = oid;
+              }
+              // freshen previous run id
+              runs[p].ccid = id;
+              // stop if previous run goes past current run
+              if (runs[p].x2 >= x2)
+                break;
+            }
+        }
+      // create new entry in umap
+      runs[n].ccid = id;
+      if (id > umap.hbound())
+        {
+          umap.touch(id);
+          umap[id] = id;
+        }
+    }
+  // Update umap and ccid
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      Run &run = runs[n];
+      int ccid = run.ccid;
+      while (umap[ccid] < ccid)
+      {
+        ccid = umap[ccid];
+      }
+      umap[run.ccid] = ccid;
+      run.ccid = ccid;
+    }
+}
+
+
+// -- Constructs the ``ccs'' array from run's ccids.
+void
+CCImage::make_ccs_from_ccids()
+{
+  int n;
+  Run *pruns = runs;
+  // Find maximal ccid
+  int maxccid = nregularccs-1;
+  for (n=0; n<=runs.hbound(); n++)
+    if (pruns[n].ccid > maxccid)
+      maxccid = runs[n].ccid;
+  // Renumber ccs 
+  GTArray<int> armap(0,maxccid);
+  int *rmap = armap;
+  for (n=0; n<=maxccid; n++)
+    armap[n] = -1;
+  for (n=0; n<=runs.hbound(); n++)
+    if (pruns[n].ccid >= 0)
+      rmap[ pruns[n].ccid ] = 1;
+  int nid = 0;
+  for (n=0; n<=maxccid; n++)
+    if (rmap[n] > 0)
+      rmap[n] = nid++;
+  
+  // Adjust nregularccs (since ccs are renumbered)
+  while (nregularccs>0 && rmap[nregularccs-1]<0)
+    nregularccs -= 1;
+  if (nregularccs>0)
+    nregularccs = 1 + rmap[nregularccs-1];
+  
+  // Prepare cc descriptors
+  ccs.resize(0,nid-1);
+  for (n=0; n<nid; n++)
+    ccs[n].nrun = 0;
+  
+  // Relabel runs
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      Run &run = pruns[n];
+      if (run.ccid < 0) continue;  // runs with negative ccids are destroyed
+      int oldccid = run.ccid;
+      int newccid = rmap[oldccid];
+      CC &cc = ccs[newccid];
+      run.ccid = newccid;
+      cc.nrun += 1;
+    }
+  
+  // Compute positions for runs of cc
+  int frun = 0;
+  for (n=0; n<nid; n++) 
+    {
+      ccs[n].frun = rmap[n] = frun;
+      frun += ccs[n].nrun;
+    }
+
+  // Copy runs
+  GTArray<Run> rtmp;
+  rtmp.steal(runs);
+  Run *ptmp = rtmp;
+  runs.resize(0,frun-1);
+  pruns = runs;
+  for (n=0; n<=rtmp.hbound(); n++)
+    {
+      int id = ptmp[n].ccid;
+      if (id < 0) continue;
+      int pos = rmap[id]++;
+      pruns[pos] = ptmp[n];
+    }
+
+  // Finalize ccs
+  for (n=0; n<nid; n++)
+    {
+      CC &cc = ccs[n];
+      int npix = 0;
+      runs.sort(cc.frun, cc.frun+cc.nrun-1);
+      Run *run = &runs[cc.frun];
+      int xmin = run->x1;
+      int xmax = run->x2;
+      int ymin = run->y;
+      int ymax = run->y;
+      for (int i=0; i<cc.nrun; i++, run++)
+        {
+          if (run->x1 < xmin)  xmin = run->x1;
+          if (run->x2 > xmax)  xmax = run->x2;
+          if (run->y  < ymin)  ymin = run->y;
+          if (run->y  > ymax)  ymax = run->y;
+          npix += run->x2 - run->x1 + 1;
+        }
+      cc.npix = npix;
+      cc.bb.xmin = xmin;
+      cc.bb.ymin = ymin;
+      cc.bb.xmax = xmax + 1;
+      cc.bb.ymax = ymax + 1;
+    }
+}
+
+
+// Removes ccs which are too small.
+void
+CCImage::erase_tiny_ccs()
+{
+  // ISSUE: HALFTONE DETECTION
+  // We should not remove tiny ccs if they are part of a halftone pattern...
+  for (int i=0; i<ccs.size(); i++)
+    {
+      CC& cc = ccs[i];
+      if (cc.npix <= tinysize)
+        {
+          // Mark cc to be erased
+          Run *r = &runs[cc.frun];
+          int nr = cc.nrun;
+          cc.nrun = 0;
+          cc.npix = 0;
+          while (--nr >= 0)
+            (r++)->ccid = -1;
+        }
+    }
+}
+ 
+
+// -- Merges small ccs and split large ccs
+void
+CCImage::merge_and_split_ccs()
+{
+  int ncc = ccs.size();
+  int nruns = runs.size();
+  int splitsize = largesize;
+  if (ncc <= 0) return;
+  // Grid of special components
+  int gridwidth = (width+splitsize-1)/splitsize;
+  nregularccs = ncc;
+  // Set the correct ccids for the runs
+  for (int ccid=0; ccid<ncc; ccid++)
+    {
+      CC* cc = &ccs[ccid];
+      if (cc->nrun <= 0) continue;
+      int ccheight = cc->bb.height();
+      int ccwidth = cc->bb.width();
+      if (ccheight<=smallsize && ccwidth<=smallsize)
+        {
+          int gridi = (cc->bb.ymin+cc->bb.ymax)/splitsize/2;
+          int gridj = (cc->bb.xmin+cc->bb.xmax)/splitsize/2;
+          int newccid = ncc + gridi*gridwidth + gridj;
+          for(int runid=cc->frun; runid<cc->frun+cc->nrun; runid++)
+            runs[runid].ccid = newccid;
+        }
+      else if (ccheight>=largesize || ccwidth>=largesize)
+        {
+          for(int runid=cc->frun; runid<cc->frun+cc->nrun; runid++)
+            {
+              Run& r = runs[runid];
+              int y = r.y;
+              int x_start = r.x1;
+              int x_end = r.x2;
+              int gridi = y/splitsize;
+              int gridj_start = x_start/splitsize;
+              int gridj_end = x_end/splitsize;
+              int gridj_span = gridj_end-gridj_start;
+              int newccid = ncc + gridi*gridwidth + gridj_start;
+              if (! gridj_span)
+                {
+                  r.ccid = newccid;
+                }
+              else // gridj_span>0
+                {
+                  // truncate the current run 
+                  r.ccid = newccid++;
+                  int x = (gridj_start+1)*splitsize;
+                  r.x2 = x-1;
+                  runs.touch(nruns+gridj_span-1);
+                  // append additional runs to the runs array
+                  for(int gridj=gridj_start+1; gridj<gridj_end; gridj++)
+                    {
+                      Run& newrun = runs[nruns++];
+                      newrun.y = y;
+                      newrun.x1 = x;
+                      x += splitsize;
+                      newrun.x2 = x-1;
+                      newrun.ccid = newccid++;
+                    }
+                  // append last run to the run array
+                  Run& newrun = runs[nruns++];
+                  newrun.y = y;
+                  newrun.x1 = x;
+                  newrun.x2 = x_end;
+                  newrun.ccid = newccid++;                      
+                }
+            }
+        }
+    }
+  // Recompute cc descriptors
+  make_ccs_from_ccids();
+}
+
+
+// -- Helps sorting cc
+static int 
+top_edges_descending (const void *pa, const void *pb)
+{
+  if (((CC*) pa)->bb.ymax != ((CC*) pb)->bb.ymax)
+    return (((CC*) pb)->bb.ymax - ((CC*) pa)->bb.ymax);
+  if (((CC*) pa)->bb.xmin != ((CC*) pb)->bb.xmin)
+    return (((CC*) pa)->bb.xmin - ((CC*) pb)->bb.xmin);
+  return (((CC*) pa)->frun - ((CC*) pb)->frun);
+}
+
+
+// -- Helps sorting cc
+static int 
+left_edges_ascending (const void *pa, const void *pb)
+{
+  if (((CC*) pa)->bb.xmin != ((CC*) pb)->bb.xmin)
+    return (((CC*) pa)->bb.xmin - ((CC*) pb)->bb.xmin);
+  if (((CC*) pb)->bb.ymax != ((CC*) pa)->bb.ymax)
+    return (((CC*) pb)->bb.ymax - ((CC*) pa)->bb.ymax);
+  return (((CC*) pa)->frun - ((CC*) pb)->frun);
+}
+
+
+// -- Helps sorting cc
+static int 
+integer_ascending (const void *pa, const void *pb)
+{
+  return ( *(int*)pb - *(int*)pa );
+}
+
+
+// -- Sort ccs in approximate reading order
+void 
+CCImage::sort_in_reading_order()
+{
+  if (nregularccs<2) return;
+  CC *ccarray = new CC[nregularccs];
+  // Copy existing ccarray (but segregate special ccs)
+  int ccid;
+  for(ccid=0; ccid<nregularccs; ccid++)
+    ccarray[ccid] = ccs[ccid];
+  // Sort the ccarray list into top-to-bottom order.
+  qsort (ccarray, nregularccs, sizeof(CC), top_edges_descending);
+  // Subdivide the ccarray list roughly into text lines [LYB]
+  // - Determine maximal top deviation
+  int maxtopchange = width / 40;
+  if (maxtopchange < 32) 
+    maxtopchange = 32;
+  // - Loop until processing all ccs
+  int ccno = 0;
+  int *bottoms = new int[nregularccs];
+  while (ccno < nregularccs)
+    {
+      // - Gather first line approximation
+      int nccno;
+      int sublist_top = ccarray[ccno].bb.ymax-1;
+      int sublist_bottom = ccarray[ccno].bb.ymin;
+      for (nccno=ccno; nccno < nregularccs; nccno++)
+        {
+          if (ccarray[nccno].bb.ymax-1 < sublist_bottom) break;
+          if (ccarray[nccno].bb.ymax-1 < sublist_top - maxtopchange) break;
+          int bottom = ccarray[nccno].bb.ymin;
+          bottoms[nccno-ccno] = bottom;
+          if (bottom < sublist_bottom)
+            sublist_bottom = bottom;
+        }
+      // - If more than one candidate cc for the line
+      if (nccno > ccno + 1)
+        {
+          // - Compute median bottom
+          qsort(bottoms, nccno-ccno, sizeof(int), integer_ascending);
+          int bottom = bottoms[ (nccno-ccno-1)/2 ];
+          // - Compose final line
+          for (nccno=ccno; nccno < nregularccs; nccno++)
+            if (ccarray[nccno].bb.ymax-1 < bottom)
+              break;
+          // - Sort final line
+          qsort (ccarray+ccno, nccno-ccno, sizeof(CC), left_edges_ascending);
+        }
+      // - Next line
+      ccno = nccno;
+    }
+  // Copy ccarray back and renumber the runs
+  for(ccid=0; ccid<nregularccs; ccid++)
+    {
+      CC& cc = ccarray[ccid];
+      ccs[ccid] = cc;
+      for(int r=cc.frun; r<cc.frun+cc.nrun; r++)
+        runs[r].ccid = ccid;
+    }
+  // Free memory
+  delete [] bottoms;
+  delete[] ccarray;
+}
+
+
+// -- Creates a bitmap for a particular component
+GP<GBitmap>   
+CCImage::get_bitmap_for_cc(const int ccid) const
+{
+  const CC &cc = ccs[ccid];
+  const GRect &bb = cc.bb;
+  GP<GBitmap> bits = GBitmap::create(bb.height(), bb.width());
+  const Run *prun = & runs[(int)cc.frun];
+  for (int i=0; i<cc.nrun; i++,prun++)
+    {
+      if (prun->y<bb.ymin || prun->y>=bb.ymax)
+        G_THROW("Internal error (y bounds)");
+      if (prun->x1<bb.xmin || prun->x2>=bb.xmax)
+        G_THROW("Internal error (x bounds)");
+      unsigned char *row = (*bits)[prun->y - bb.ymin];
+      for (int x=prun->x1; x<=prun->x2; x++)
+        row[x - bb.xmin] = 1;
+    }
+  return bits;
+}
+
+
+// -- Creates a JB2Image with the remaining components
+GP<JB2Image> 
+CCImage::get_jb2image() const
+{
+  GP<JB2Image> jimg = JB2Image::create();
+  jimg->set_dimension(width, height);
+  if (runs.hbound() < 0)
+    return jimg;
+  if (ccs.hbound() < 0)
+    G_THROW("Must first perform a cc analysis");
+  // Iterate over CCs
+  for (int ccid=0; ccid<=ccs.hbound(); ccid++)
+    {
+      JB2Shape shape;
+      JB2Blit  blit;
+      shape.parent = -1;
+      shape.bits = get_bitmap_for_cc(ccid);
+      shape.userdata = 0;
+      if (ccid >= nregularccs)
+        shape.userdata |= JB2SHAPE_SPECIAL;
+      blit.shapeno = jimg->add_shape(shape);
+      blit.left = ccs[ccid].bb.xmin;
+      blit.bottom = ccs[ccid].bb.ymin;
+      jimg->add_blit(blit);
+      shape.bits->compress();
+    }
+  // Return
+  return jimg;
+}
+
+
+
+
+// --------------------------------------------------
+// COMPLETE COMPRESSION ROUTINE
+// --------------------------------------------------
+
+struct cjb2opts {
+  int  dpi;
+  int  forcedpi;
+  int  losslevel;
+  bool verbose;
+};
+
+#if HAVE_TIFF
+
+static int 
+is_tiff(ByteStream *ref) 
+{
+  char magic[2];
+  magic[0] = magic[1] = 0;
+  ref->readall((void*)magic, sizeof(magic));
+  ref->seek(0);
+  if(magic[0] == 'I' && magic[1] == 'I')
+    return 1;
+  if(magic[0] == 'M' && magic[1] == 'M')
+    return 1;
+  return 0;
+}
+
+static tsize_t readproc(thandle_t h, tdata_t p, tsize_t s) { 
+  ByteStream *bs = (ByteStream*)h;
+  return (tsize_t) bs->readall((void*)p, (size_t)s);
+}
+
+static tsize_t writeproc(thandle_t, tdata_t, tsize_t) { 
+  return -1; 
+}
+
+static toff_t seekproc(thandle_t h, toff_t offset, int mode) { 
+  ByteStream *bs = (ByteStream*)h;
+  bs->seek((long)offset, mode);
+  return (toff_t)bs->tell(); 
+}
+
+static int closeproc(thandle_t) { 
+  return 0; 
+}
+
+static toff_t sizeproc(thandle_t h) { 
+  ByteStream *bs = (ByteStream*)h;
+  return (toff_t) bs->size(); 
+}
+
+static int mapproc(thandle_t, tdata_t*, toff_t*) { 
+  return -1; 
+}
+
+static void unmapproc(thandle_t, tdata_t, toff_t) { 
+}
+
+static void
+read_tiff(CCImage &rimg, ByteStream *bs, cjb2opts &opts)
+{
+  TIFF *tiff = TIFFClientOpen("libtiff", "rm", (thandle_t)bs,
+                              readproc, writeproc, seekproc,
+                              closeproc, sizeproc, 
+                              mapproc, unmapproc );
+  // bitonal
+  uint16 bps = 0, spp = 0;
+  TIFFGetFieldDefaulted(tiff, TIFFTAG_BITSPERSAMPLE, &bps);
+  TIFFGetFieldDefaulted(tiff, TIFFTAG_SAMPLESPERPIXEL, &spp);
+  if (bps != 1 || spp != 1)
+    G_THROW("Tiff image is not bitonal");
+  // photometric
+  uint16 photo = PHOTOMETRIC_MINISWHITE;
+  TIFFGetFieldDefaulted(tiff, TIFFTAG_PHOTOMETRIC, &photo);
+  // image size
+  uint32 w, h;
+  if (!TIFFGetFieldDefaulted(tiff, TIFFTAG_IMAGEWIDTH, &w) ||
+      !TIFFGetFieldDefaulted(tiff, TIFFTAG_IMAGELENGTH, &h) )
+    G_THROW("Tiff image size is not defined");
+  // resolution
+  float xres, yres;
+  if (TIFFGetFieldDefaulted(tiff, TIFFTAG_XRESOLUTION, &xres) &&
+      TIFFGetFieldDefaulted(tiff, TIFFTAG_YRESOLUTION, &yres) ) 
+    {
+      if (xres != yres)
+        DjVuPrintErrorUTF8( "cjb2: X- and Y-resolution do not match\n");
+      if (! opts.forcedpi)
+        opts.dpi = (int) (xres + yres) / 2;
+    }
+  // init rimg
+  rimg.init(w, h, opts.dpi);
+  // allocate scanline
+  tsize_t scanlinesize = TIFFScanlineSize(tiff);
+  scanlinesize = MAX(scanlinesize,1);
+  unsigned char *scanline = 0;
+  GPBuffer<unsigned char> gscanline(scanline, scanlinesize);
+  // iterate on rows
+  for (int y=0; y<(int)h; y++)
+    {
+      int yy = h - y - 1;
+      if (TIFFReadScanline(tiff, (tdata_t)scanline, y) < 0)
+        G_THROW("Tiff file is corrupted (TIFFReadScanline)");
+      if (photo != PHOTOMETRIC_MINISWHITE)
+        for (int i=0; i<(int)scanlinesize; i++)
+          scanline[i] ^= 0xff;
+      int lastx=0, off=0;
+      unsigned char mask=0, c=0, b=0;
+      for (int x=0; x<(int)w; x++)
+        {
+          if (! mask) 
+            {
+              b = scanline[off++];
+              while (b==c && x+8<(int)w )
+                {
+                  x = x + 8;  // speedup
+                  b = scanline[off++];
+                }
+              mask = 0x80;
+            }
+          if ( (b ^ c) & mask ) 
+            {
+              c ^= 0xff;
+              if (c)
+                lastx = x;
+              else
+                rimg.add_single_run(yy, lastx, x-1);
+            }
+          mask >>= 1;
+        }
+      if (c)
+        rimg.add_single_run(yy, lastx, w-1);
+    }
+  // close
+  TIFFClose(tiff);
+}
+
+#endif // HAVE_TIFF
+
+
+void 
+cjb2(const GURL &urlin, const GURL &urlout, cjb2opts &opts)
+{
+  GP<ByteStream> ibs=ByteStream::create(urlin, "rb");
+  CCImage rimg;
+
+#if HAVE_TIFF
+  if (is_tiff(ibs))
+    read_tiff(rimg, ibs, opts);
+  else
+#endif
+    {
+      GP<GBitmap> input=GBitmap::create(*ibs);
+      rimg.init(input->columns(), input->rows(), opts.dpi);
+      rimg.add_bitmap_runs(*input); 
+    }
+  if (opts.verbose)
+    DjVuFormatErrorUTF8( "%s\t%d", ERR_MSG("cjb2.runs"), 
+                         rimg.runs.size() );
+  
+  // Component analysis
+  rimg.make_ccids_by_analysis(); // obtain ccids
+  rimg.make_ccs_from_ccids();    // compute cc descriptors
+  if (opts.verbose)
+    DjVuFormatErrorUTF8( "%s\t%d", ERR_MSG("cjb2.ccs_before"), 
+                         rimg.ccs.size());
+  if (opts.losslevel > 0) 
+    rimg.erase_tiny_ccs();       // clean
+  rimg.merge_and_split_ccs();    // reorganize weird ccs
+  rimg.sort_in_reading_order();  // sort cc descriptors
+  if (opts.verbose)
+    DjVuFormatErrorUTF8( "%s\t%d", ERR_MSG("cjb2.ccs_after"), 
+                         rimg.ccs.size());
+  
+  // Pattern matching
+  GP<JB2Image> jimg = rimg.get_jb2image();          // get ``raw'' jb2image
+  rimg.runs.empty();                                // save memory
+  rimg.ccs.empty();                                 // save memory
+  if (opts.losslevel>1)
+    tune_jb2image_lossy(jimg, opts.dpi, opts.losslevel);
+  else
+    tune_jb2image_lossless(jimg);
+  if (opts.verbose)
+    {
+      int nshape=0, nrefine=0;
+      for (int i=0; i<jimg->get_shape_count(); i++) {
+        if (!jimg->get_shape(i).bits) continue;
+        if (jimg->get_shape(i).parent >= 0) nrefine++; 
+        nshape++; 
+      }
+      DjVuFormatErrorUTF8( "%s\t%d\t%d", ERR_MSG("cjb2.shapes"), 
+                           nshape, nrefine);
+    }
+  
+  // Code
+  GP<ByteStream> obs=ByteStream::create(urlout, "wb");
+  GP<IFFByteStream> giff=IFFByteStream::create(obs);
+  IFFByteStream &iff=*giff;
+  // -- main composite chunk
+  iff.put_chunk("FORM:DJVU", 1);
+  // -- ``INFO'' chunk
+  GP<DjVuInfo> ginfo=DjVuInfo::create();
+  DjVuInfo &info=*ginfo;
+  info.height = rimg.height;
+  info.width = rimg.width;
+  info.dpi = opts.dpi;
+  iff.put_chunk("INFO");
+  info.encode(*iff.get_bytestream());
+  iff.close_chunk();
+  // -- ``Sjbz'' chunk
+  iff.put_chunk("Sjbz");
+  jimg->encode(iff.get_bytestream());
+  iff.close_chunk();
+  // -- terminate main composite chunk
+  iff.close_chunk();
+  // Finished!
+}
+      
+
+
+
+
+
+// --------------------------------------------------
+// MAIN
+// --------------------------------------------------
+
+void
+usage()
+{
+  DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+         "CJB2 --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+         "Simple DjVuBitonal encoder\n\n"
+         "Usage: cjb2 [options] <input-pbm-or-tiff> <output-djvu>\n"
+         "Options are:\n"
+         " -verbose        Display additional messages.\n"
+         " -dpi <n>        Specify image resolution (default 300).\n"
+         " -clean          Cleanup image by removing small flyspecks.\n"
+         " -lossy          Lossy compression (implies -clean as well)\n"
+         " -losslevel <n>  Loss factor (implies -lossy, default 100)\n"
+         "Encoding is lossless unless a lossy options is selected.\n" );
+  exit(10);
+}
+
+
+int 
+main(int argc, const char **argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  G_TRY
+    {
+      GURL inputpbmurl;
+      GURL outputdjvuurl;
+      cjb2opts opts;
+      // Defaults
+      opts.forcedpi = 0;
+      opts.dpi = 300;
+      opts.losslevel = 0;
+      opts.verbose = false;
+      // Parse options
+      for (int i=1; i<argc; i++)
+        {
+          GUTF8String arg = dargv[i];
+          if (arg == "-dpi" && i+1<argc)
+            {
+              char *end;
+              opts.dpi = opts.forcedpi = strtol(dargv[++i], &end, 10);
+              if (*end || opts.dpi<25 || opts.dpi>1200)
+                usage();
+            }
+          else if (arg == "-losslevel")
+            {
+              char *end;
+              opts.losslevel = strtol(dargv[++i], &end, 10);
+              if (*end || opts.losslevel<0 || opts.losslevel>200)
+                usage();
+            }
+          else if (arg == "-lossless")
+            opts.losslevel = 0;
+          else if (arg == "-lossy")
+            opts.losslevel = 100;
+          else if (arg == "-clean") // almost deprecated
+            opts.losslevel = 1;
+          else if (arg == "-verbose" || arg == "-v")
+            opts.verbose = true;
+          else if (arg[0] == '-' && arg[1])
+            usage();
+          else if (inputpbmurl.is_empty())
+            inputpbmurl = GURL::Filename::UTF8(arg);
+          else if (outputdjvuurl.is_empty())
+            outputdjvuurl = GURL::Filename::UTF8(arg);
+          else
+            usage();
+        }
+      if (inputpbmurl.is_empty() || outputdjvuurl.is_empty())
+        usage();
+      // Execute
+      cjb2(inputpbmurl, outputdjvuurl, opts);
+    }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
diff --git a/tools/common.h b/tools/common.h
new file mode 100644
index 0000000..e28fb58
--- /dev/null
+++ b/tools/common.h
@@ -0,0 +1,84 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+
+#ifndef _COMMON_H
+#define _COMMON_H
+
+#include <locale.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <errno.h>
+
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+# include <mbctype.h>
+#endif
+
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+# define DJVU_LOCALE do {          \
+       setlocale(LC_ALL,"");       \
+       setlocale(LC_NUMERIC,"C");  \
+       _setmbcp(_MB_CP_OEM);       \
+       djvu_programname(argv[0]); } while (0)
+#else
+# define DJVU_LOCALE do {          \
+       setlocale(LC_ALL,"");       \
+       setlocale(LC_NUMERIC,"C");  \
+       djvu_programname(argv[0]); } while (0)
+#endif
+
+#endif
diff --git a/tools/cpaldjvu.1 b/tools/cpaldjvu.1
new file mode 100644
index 0000000..231fa62
--- /dev/null
+++ b/tools/cpaldjvu.1
@@ -0,0 +1,89 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH CPALDJVU 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+cpaldjvu \- DjVuDocument encoder for low-color images.
+
+.SH SYNOPSIS
+.BI "cpaldjvu  [" "options" "] " "inputppmfile" " " "outputdjvufile"
+
+.SH DESCRIPTION
+Program 
+.B cpaldjvu
+is a DjVuDocument encoder for images containing few colors.  It performs best
+on images containing large solid color areas such as screen dumps.
+Compression ratios on such images can be much higher than those achieved by
+.SM GIF
+or
+.SM PNG
+compression.
+
+This program works by first reducing the number of distinct colors to a small
+specified value using a simple color quantization algorithm.  The dominant
+color is encoded into the background layer.  The other colors are encoded into
+the foreground layer.
+
+.SH OPTIONS
+.TP
+.BI "-dpi " "n"
+Specify the resolution information encoded into the output file expressed in
+dots per inch. The resolution information encoded in DjVu files determine how
+the decoder scales the image on a particular display.  Meaningful resolutions
+range from 25 to 6000.  The default value is 300 dpi.
+.TP
+.BI "-colors " "n"
+Specify a maximum number of distinct colors for the color quantization
+algorithm.  process. The default value is 256.  Smaller values can produce
+much smaller files.
+.TP
+.B "-bgwhite"
+Cause the background layer to use the lightest quantified color
+instead of the dominant color.
+.TP
+.B "-verbose"
+Display informational messages while running.
+
+.SH REMARKS
+The color quantization might introduce severe degradation if the image
+contains photographic areas with a large number of very similar colors.
+Color quantization problems might be solved by pre-processing
+the input file with a different quantization program such as
+.BR ppmquant .
+Avoid using the error diffusion dithering algorithm.
+This algorithm generates random dithering patterns that
+might be very costly to encode.
+
+.SH BUGS
+This program should be rewritten as a pre-processor for 
+.BR csepdjvu .
+
+.SH CREDITS
+This program was initially written by L\('eon Bottou
+<leonb@users.sourceforge.net> and was improved by Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR pbm (5),
+.BR ppmquant (1),
+.BR pnmtogif (1),
+.BR pnmtopng (1)
diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp
new file mode 100644
index 0000000..5f2179e
--- /dev/null
+++ b/tools/cpaldjvu.cpp
@@ -0,0 +1,926 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name cpaldjvu
+
+    {\bf Synopsis}
+    \begin{verbatim}
+        cpaldjvu [options] <inputppmfile> <outputdjvufile>
+    \end{verbatim}
+
+    {\bf Description}
+    
+    File #"cpaldjvu.cpp"# demonstrates a simple quasi-lossless compressor for
+    low resolution, low color, images with a reduced number of colors (e.g
+    screendumps).  It simply quantizes the image on a limited number of
+    colors, uses the dominant color to construct a uniform background, then
+    performs lossless jb2 compression for all remaining objects.  
+    
+    Options
+    \begin{description}
+    \item[-colors n]  Maximum number of colors during quantization (default 256)
+    \item[-dpi n]     Resolution written into the output file (default 100).
+    \item[-verbose]   Displays additional messages.
+    \end{description}
+
+    {\bf Remarks}
+
+    This is an interesting alternative to GIF. It performs especially well on
+    screendumps.  Compression ratios can get hurt when there are continuous
+    tone segment in the image.  Demoting such segments from foreground to
+    background is a pretty interesting project.  Dithered segments behave
+    surprisingly well.
+
+    @memo
+    Simple encoder for low resolution, low color images.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+//@}
+
+
+#include "DjVuGlobal.h"
+#include "GException.h"
+#include "GSmartPointer.h"
+#include "GContainer.h"
+#include "ByteStream.h"
+#include "IFFByteStream.h"
+#include "GRect.h"
+#include "GBitmap.h"
+#include "JB2Image.h"
+#include "DjVuPalette.h"
+#include "IW44Image.h"
+#include "DjVuInfo.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+#include "jb2tune.h"
+#include "common.h"
+
+#ifdef MIN
+#undef MIN
+#endif
+#ifdef MAX
+#undef MAX
+#endif
+inline int MIN(int a, int b) { return ( a<b ?a :b); }
+inline int MAX(int a, int b) { return ( a>b ?a :b); }
+
+
+// --------------------------------------------------
+// COLOR CONNECTED COMPONENT ANALYSIS
+// --------------------------------------------------
+
+// -- A run of pixels with the same color
+struct Run    
+{ 
+  short y;       // vertical coordinate
+  short x1;      // first horizontal coordinate
+  short x2;      // last horizontal coordinate
+  short color;   // color id
+  int ccid;      // component id
+};
+
+
+// -- A component descriptor
+struct CC    
+{
+  GRect bb;      // bounding box
+  int npix;      // number of black pixels
+  int nrun;      // number of runs
+  int frun;      // first run in cc ordered array of runs
+  int color;     // color id
+};
+
+
+// -- An image composed of runs
+class CCImage 
+{
+public:
+  int height;            // Height of the image in pixels
+  int width;             // Width of the image in pixels
+  GTArray<Run> runs;     // Array of runs
+  GTArray<CC>  ccs;      // Array of component descriptors
+  int nregularccs;       // Number of regular ccs (set by merge_and_split_ccs)
+  CCImage(int width, int height);
+  void add_single_run(int y, int x1, int x2, int color, int ccid=0);
+  GP<GBitmap> get_bitmap_for_cc(int ccid) const;
+  void make_ccids_by_analysis();
+  void make_ccs_from_ccids();
+  void merge_and_split_ccs(int smallsize, int largesize);
+  void sort_in_reading_order(); 
+  void erase_cc(int ccid);
+};
+
+
+// -- Compares runs
+static inline bool
+operator <= (const Run &a, const Run &b)
+{
+  return (a.y<b.y) || (a.y==b.y && a.x1<=b.x1);
+}
+
+
+// -- Constructs CCImage and provide defaults
+CCImage::CCImage(int width, int height)
+  : height(height), width(width), nregularccs(0)
+{
+}
+
+
+// -- Adds a run to the CCImage
+inline void 
+CCImage::add_single_run(int y, int x1, int x2, int color, int ccid)
+{
+  int index = runs.hbound();
+  runs.touch(++index);
+  Run& run = runs[index];
+  run.y = y;
+  run.x1 = x1;
+  run.x2 = x2;
+  run.color = color;
+  run.ccid = ccid;
+  
+}
+
+
+// -- Performs color connected component analysis
+void
+CCImage::make_ccids_by_analysis()
+{
+  // Sort runs
+  runs.sort();
+  // Single Pass Connected Component Analysis (with unodes)
+  int n;
+  int p=0;
+  GTArray<int> umap;
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      int y = runs[n].y;
+      int x1 = runs[n].x1 - 1;
+      int x2 = runs[n].x2 + 1;
+      int color = runs[n].color;
+      int id = (umap.hbound() + 1);
+      // iterate over previous line runs
+      if (p>0) p--;
+      for(;runs[p].y < y-1;p++);
+      for(;(runs[p].y < y) && (runs[p].x1 <= x2);p++ )
+        {
+          if ( runs[p].x2 >= x1 )
+            {
+              if (runs[p].color == color)
+                {
+                  // previous run touches current run and has same color
+                  int oid = runs[p].ccid;
+                  while (umap[oid] < oid)
+                    oid = umap[oid];
+                  if ((int)id > umap.hbound()) {
+                    id = oid;
+                  } else if (id < oid) {
+                    umap[oid] = id;
+                  } else {
+                    umap[id] = oid;
+                    id = oid;
+                  }
+                  // freshen previous run id
+                  runs[p].ccid = id;
+                }
+              // stop if previous run goes past current run
+              if (runs[p].x2 >= x2)
+                break;
+            }
+        }
+      // create new entry in umap
+      runs[n].ccid = id;
+      if (id > umap.hbound())
+        {
+          umap.touch(id);
+          umap[id] = id;
+        }
+    }
+  // Update umap and ccid
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      Run &run = runs[n];
+      int ccid = run.ccid;
+      while (umap[ccid] < ccid)
+        ccid = umap[ccid];
+      umap[run.ccid] = ccid;
+      run.ccid = ccid;
+    }
+}
+
+
+// -- Constructs the ``ccs'' array from run's ccids.
+void
+CCImage::make_ccs_from_ccids()
+{
+  int n;
+  Run *pruns = runs;
+  // Find maximal ccid
+  int maxccid = -1;
+  for (n=0; n<=runs.hbound(); n++)
+    if (pruns[n].ccid > maxccid)
+      maxccid = runs[n].ccid;
+  GTArray<int> armap(0,maxccid);
+  int *rmap = armap;
+  // Renumber ccs 
+  for (n=0; n<=maxccid; n++)
+    armap[n] = -1;
+  for (n=0; n<=runs.hbound(); n++)
+    if (pruns[n].ccid >= 0)
+      rmap[ pruns[n].ccid ] = 1;
+  int nid = 0;
+  for (n=0; n<=maxccid; n++)
+    if (rmap[n] > 0)
+      rmap[n] = nid++;
+  // Adjust nregularccs (since ccs are renumbered)
+  while (nregularccs>0 && rmap[nregularccs-1]<0)
+    nregularccs -= 1;
+  if (nregularccs>0)
+    nregularccs = 1 + rmap[nregularccs-1];
+  // Prepare cc descriptors
+  ccs.resize(0,nid-1);
+  for (n=0; n<nid; n++)
+    ccs[n].nrun = 0;
+  // Relabel runs
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      Run &run = pruns[n];
+      if (run.ccid < 0) continue;  // runs with negative ccids are destroyed
+      int oldccid = run.ccid;
+      int newccid = rmap[oldccid];
+      CC &cc = ccs[newccid];
+      run.ccid = newccid;
+      cc.nrun += 1;
+    }
+  // Compute positions for runs of cc
+  int frun = 0;
+  for (n=0; n<nid; n++) 
+    {
+      ccs[n].frun = rmap[n] = frun;
+      frun += ccs[n].nrun;
+    }
+  // Copy runs
+  GTArray<Run> rtmp;
+  rtmp.steal(runs);
+  Run *ptmp = rtmp;
+  runs.resize(0,frun-1);
+  pruns = runs;
+  for (n=0; n<=rtmp.hbound(); n++)
+    {
+      int id = ptmp[n].ccid;
+      if (id < 0) continue;
+      int pos = rmap[id]++;
+      pruns[pos] = ptmp[n];
+    }
+  // Finalize ccs
+  for (n=0; n<nid; n++)
+    {
+      CC &cc = ccs[n];
+      int npix = 0;
+      runs.sort(cc.frun, cc.frun+cc.nrun-1);
+      Run *run = &runs[cc.frun];
+      int xmin = run->x1;
+      int xmax = run->x2;
+      int ymin = run->y;
+      int ymax = run->y;
+      cc.color = run->color;
+      for (int i=0; i<cc.nrun; i++, run++)
+        {
+          if (run->x1 < xmin)  xmin = run->x1;
+          if (run->x2 > xmax)  xmax = run->x2;
+          if (run->y  < ymin)  ymin = run->y;
+          if (run->y  > ymax)  ymax = run->y;
+          npix += run->x2 - run->x1 + 1;
+        }
+      cc.npix = npix;
+      cc.bb.xmin = xmin;
+      cc.bb.ymin = ymin;
+      cc.bb.xmax = xmax + 1;
+      cc.bb.ymax = ymax + 1;
+    }
+}
+
+
+// -- Helper for merge_and_split_ccs
+struct Grid_x_Color 
+{
+  short gridi;
+  short gridj;
+  int color;
+};
+
+
+// -- Helper for merge_and_split_ccs
+static inline unsigned int
+hash(const Grid_x_Color &x) 
+{
+  return (x.gridi<<16) ^ (x.gridj<<8) ^ x.color;
+}
+
+
+// -- Helper for merge_and_split_ccs
+static inline bool
+operator==(const Grid_x_Color &x, const Grid_x_Color &y)
+{
+  return (x.gridi==y.gridi) && (x.gridj==y.gridj) && (x.color==y.color);
+}
+
+
+// -- Helper for merge_and_split_ccs
+static int
+makeccid(const Grid_x_Color &x, GMap<Grid_x_Color,int> &map, int &ncc)
+{
+  GPosition p = map.contains(x);
+  if (p) return map[p];
+  return map[x] = ncc++;
+}
+
+
+// -- Merges small ccs of similar color and splits large ccs
+void
+CCImage::merge_and_split_ccs(int smallsize, int largesize)
+{
+  int ncc = ccs.size();
+  int nruns = runs.size();
+  int splitsize = largesize;
+  if (ncc <= 0) return;
+  // Associative map for storing merged ccids
+  GMap<Grid_x_Color,int> map;
+  nregularccs = ncc;
+  // Set the correct ccids for the runs
+  for (int ccid=0; ccid<ccs.size(); ccid++)
+    {
+      CC* cc = &ccs[ccid];
+      if (cc->nrun <= 0) continue;
+      Grid_x_Color key;
+      key.color = cc->color;
+      int ccheight = cc->bb.height();
+      int ccwidth = cc->bb.width();
+      if (ccheight<=smallsize && ccwidth<=smallsize)
+        {
+          key.gridi = (cc->bb.ymin+cc->bb.ymax)/splitsize/2;
+          key.gridj = (cc->bb.xmin+cc->bb.xmax)/splitsize/2;
+          int newccid = makeccid(key, map, ncc);
+          for(int runid=cc->frun; runid<cc->frun+cc->nrun; runid++)
+            runs[runid].ccid = newccid;
+        }
+      else if (ccheight>=largesize || ccwidth>=largesize)
+        {
+          for(int runid=cc->frun; runid<cc->frun+cc->nrun; runid++)
+            {
+              Run *r = & runs[runid];
+              key.gridi = r->y/splitsize;
+              key.gridj = r->x1/splitsize;
+              int gridj_end = r->x2/splitsize;
+              int gridj_span = gridj_end - key.gridj;
+              r->ccid = makeccid(key, map, ncc);
+              if (gridj_span>0)
+                {
+                  // truncate current run 
+                  runs.touch(nruns+gridj_span-1);
+                  r = &runs[runid];
+                  int x = key.gridj*splitsize + splitsize;
+                  int x_end = r->x2;
+                  r->x2 = x-1;
+                  // append additional runs to the runs array
+                  while (++key.gridj < gridj_end)
+                    {
+                      Run& newrun = runs[nruns++];
+                      newrun.y = r->y;
+                      newrun.x1 = x;
+                      x += splitsize;
+                      newrun.x2 = x-1;
+                      newrun.color = key.color;
+                      newrun.ccid = makeccid(key, map, ncc);
+                    }
+                  // append last run to the run array
+                  Run& newrun = runs[nruns++];
+                  newrun.y = r->y;
+                  newrun.x1 = x;
+                  newrun.x2 = x_end;
+                  newrun.color = key.color;
+                  newrun.ccid = makeccid(key, map, ncc);
+                }
+            }
+        }
+    }
+  // Recompute cc descriptors
+  make_ccs_from_ccids();
+}
+
+
+// -- Helps sorting cc
+static int 
+top_edges_descending (const void *pa, const void *pb)
+{
+  if (((CC*) pa)->bb.ymax != ((CC*) pb)->bb.ymax)
+    return (((CC*) pb)->bb.ymax - ((CC*) pa)->bb.ymax);
+  if (((CC*) pa)->bb.xmin != ((CC*) pb)->bb.xmin)
+    return (((CC*) pa)->bb.xmin - ((CC*) pb)->bb.xmin);
+  return (((CC*) pa)->frun - ((CC*) pb)->frun);
+}
+
+
+// -- Helps sorting cc
+static int 
+left_edges_ascending (const void *pa, const void *pb)
+{
+  if (((CC*) pa)->bb.xmin != ((CC*) pb)->bb.xmin)
+    return (((CC*) pa)->bb.xmin - ((CC*) pb)->bb.xmin);
+  if (((CC*) pb)->bb.ymax != ((CC*) pa)->bb.ymax)
+    return (((CC*) pb)->bb.ymax - ((CC*) pa)->bb.ymax);
+  return (((CC*) pa)->frun - ((CC*) pb)->frun);
+}
+
+
+// -- Helps sorting cc
+static int 
+integer_ascending (const void *pa, const void *pb)
+{
+  return ( *(int*)pb - *(int*)pa );
+}
+
+
+// -- Sort ccs in approximate reading order
+void 
+CCImage::sort_in_reading_order()
+{
+  if (nregularccs<2) return;
+  CC *ccarray = new CC[nregularccs];
+  // Copy existing ccarray (but segregate special ccs)
+  int ccid;
+  for(ccid=0; ccid<nregularccs; ccid++)
+    ccarray[ccid] = ccs[ccid];
+  // Sort the ccarray list into top-to-bottom order.
+  qsort (ccarray, nregularccs, sizeof(CC), top_edges_descending);
+  // Subdivide the ccarray list roughly into text lines
+  int maxtopchange = width / 40;
+  if (maxtopchange < 32) 
+    maxtopchange = 32;
+  // - Loop until processing all ccs
+  int ccno = 0;
+  int *bottoms = new int[nregularccs];
+  while (ccno < nregularccs)
+    {
+      // - Gather first line approximation
+      int nccno;
+      int sublist_top = ccarray[ccno].bb.ymax-1;
+      int sublist_bottom = ccarray[ccno].bb.ymin;
+      for (nccno=ccno; nccno < nregularccs; nccno++)
+        {
+          if (ccarray[nccno].bb.ymax-1 < sublist_bottom) break;
+          if (ccarray[nccno].bb.ymax-1 < sublist_top - maxtopchange) break;
+          int bottom = ccarray[nccno].bb.ymin;
+          bottoms[nccno-ccno] = bottom;
+          if (bottom < sublist_bottom)
+            sublist_bottom = bottom;
+        }
+      // - If more than one candidate cc for the line
+      if (nccno > ccno + 1)
+        {
+          // - Compute median bottom
+          qsort(bottoms, nccno-ccno, sizeof(int), integer_ascending);
+          int bottom = bottoms[ (nccno-ccno-1)/2 ];
+          // - Compose final line
+          for (nccno=ccno; nccno < nregularccs; nccno++)
+            if (ccarray[nccno].bb.ymax-1 < bottom)
+              break;
+          // - Sort final line
+          qsort (ccarray+ccno, nccno-ccno, sizeof(CC), left_edges_ascending);
+        }
+      // - Next line
+      ccno = nccno;
+    }
+  // Copy ccarray back and renumber the runs
+  for(ccid=0; ccid<nregularccs; ccid++)
+    {
+      CC& cc = ccarray[ccid];
+      ccs[ccid] = cc;
+      for(int r=cc.frun; r<cc.frun+cc.nrun; r++)
+        runs[r].ccid = ccid;
+    }
+  // Free memory
+  delete [] bottoms;
+  delete[] ccarray;
+}
+
+
+// -- Creates a bitmap for a particular component
+GP<GBitmap>   
+CCImage::get_bitmap_for_cc(const int ccid) const
+{
+  const CC &cc = ccs[ccid];
+  const GRect &bb = cc.bb;
+  GP<GBitmap> bits = GBitmap::create(bb.height(), bb.width());
+  const Run *prun = & runs[(int)cc.frun];
+  for (int i=0; i<cc.nrun; i++,prun++)
+    {
+      if (prun->y<bb.ymin || prun->y>=bb.ymax)
+        G_THROW("Internal error (y bounds)");
+      if (prun->x1<bb.xmin || prun->x2>=bb.xmax)
+        G_THROW("Internal error (x bounds)");
+      unsigned char *row = (*bits)[prun->y - bb.ymin];
+      for (int x=prun->x1; x<=prun->x2; x++)
+        row[x - bb.xmin] = 1;
+    }
+  return bits;
+}
+
+
+// -- Marks cc for deletion
+void 
+CCImage::erase_cc(int ccid)
+{
+  CC &cc = ccs[ccid];
+  Run *r = &runs[cc.frun];
+  int nr = cc.nrun;
+  cc.nrun = 0;
+  cc.npix = 0;
+  while (--nr >= 0)
+    (r++)->ccid = -1;  // will be deleted by make_ccs_from_ccids()
+}
+
+
+
+
+// --------------------------------------------------
+// DEMOTION OF FOREGROUND CCS TO BACKGROUND STATUS
+// --------------------------------------------------
+
+
+// ISSUE: DEMOTION OF CCS (UNIMPLEMENTED) 
+
+// The current code uses a single color for the background layer.  Many large,
+// non matching, ccs however may be better encoded as part of the background
+// layer.  A way to achieve this could be to consider each cc and evaluate the
+// costs of coding it as foreground (does it match other ccs, does it comes
+// with a complex geometry) or background (does its color blend smoothly with
+// the surrounding parts of the background image).  One just needs then to
+// remove the demoted ccs from the mask using CCImage::erase_cc() and
+// recompute the ccs using CCImage::make_ccs_from_ccids().  Defining the
+// compilation symbols BACKGROUND_SUBSAMPLING_FACTOR and
+// PROGRESSIVE_BACKGROUND will enable code for computing the background from
+// the input image and the provided mask.
+
+
+// --------------------------------------------------
+// MAIN COMPRESSION ROUTINE
+// --------------------------------------------------
+
+
+// -- Options for low color compression
+struct cpaldjvuopts
+{
+  int ncolors;
+  int dpi;
+  bool verbose;
+  bool bgwhite;
+};
+
+
+// -- Compresses low color pixmap.
+void 
+cpaldjvu(ByteStream *ibs, GURL &urlout, const cpaldjvuopts &opts)
+{
+  GP<GPixmap> ginput=GPixmap::create(*ibs);
+  int w = ginput->columns();
+  int h = ginput->rows();
+  int dpi = MAX(200, MIN(900, opts.dpi));
+  int largesize = MIN(500, MAX(64, dpi));
+  int smallsize = MAX(2, dpi/150);
+
+  // Compute optimal palette and quantize input pixmap
+  GP<DjVuPalette> gpal=DjVuPalette::create();
+  DjVuPalette &pal=*gpal;
+  GPixel bgcolor;
+  int bgindex = -1;
+  if (! opts.bgwhite)
+    {
+      bgindex = pal.compute_pixmap_palette(*ginput, opts.ncolors);
+      pal.index_to_color(bgindex, bgcolor);
+    }
+  else
+    {
+      bgcolor = GPixel::WHITE;
+      pal.histogram_clear();
+      for (int j=0; j<h; j++)
+        {
+          const GPixel *p = (*ginput)[j];
+          for (int i=0; i<w; i++)
+            if (p[i] != GPixel::WHITE)
+              pal.histogram_add(p[i], 1);
+        }
+      pal.compute_palette(opts.ncolors);
+    }
+  if (opts.verbose)
+    DjVuFormatErrorUTF8( "%s\t%d\t%d\t%d",
+                         ERR_MSG("cpaldjvu.quantizied"), 
+                         w, h, pal.size());
+  if (opts.verbose && !opts.bgwhite)
+    DjVuPrintErrorUTF8("cpaldjvu: background color is #%02x%02x%02x.\n", 
+                       bgcolor.r, bgcolor.g, bgcolor.b);
+  
+  // Fill CCImage with color runs
+  int xruncount=0,yruncount=0;
+  CCImage rimg(w, h);
+  int *line;
+  GPBuffer<int> gline(line,w);
+  int *prevline;
+  GPBuffer<int> gprevline(prevline,w);
+  for (int x=0;x<w;x++)
+  {
+    prevline[x]=bgindex;
+  }
+  for (int y=0; y<h; y++)
+    {
+      int x;
+      const GPixel *row = (*ginput)[y];
+      for(x=0;x<w;x++)
+        {
+          line[x] = pal.color_to_index(row[x]);
+          if (opts.bgwhite && row[x]==GPixel::WHITE)
+            line[x] = bgindex;
+        }
+      for(x=0;x<w;)
+        {
+          int x1 = x;
+          int index = line[x++];
+          while (x<w && line[x]==index) { x++; }
+          if (index != bgindex)
+            {
+              xruncount++;
+              rimg.add_single_run(y, x1, x-1, index);
+            }
+        }
+      for(x=0;x<w;x++)
+        if(prevline[x] != line[x]) yruncount++;
+      gprevline.swap(gline);
+    }
+  ginput = 0; //save memory
+  if (opts.verbose)
+    DjVuFormatErrorUTF8( "%s\t%d", ERR_MSG("cpaldjvu.color_runs"), 
+                         rimg.runs.size());
+
+  // Perform Color Connected Component Analysis
+  rimg.make_ccids_by_analysis();                  // Obtain ccids
+  rimg.make_ccs_from_ccids();                     // Compute cc descriptors
+  if (opts.verbose)
+    DjVuFormatErrorUTF8( "%s\t%d", ERR_MSG("cpaldjvu.ccs_before"), 
+                         rimg.ccs.size());
+  rimg.merge_and_split_ccs(smallsize,largesize);  // Eliminates gross ccs
+  if (opts.verbose)
+    DjVuFormatErrorUTF8( "%s\t%d", ERR_MSG("cpaldjvu.ccs_after"), 
+                         rimg.ccs.size());
+  rimg.sort_in_reading_order();                   // Sort cc descriptors
+  
+  // Create JB2Image and fill colordata
+  GP<JB2Image> gjimg=JB2Image::create();
+  JB2Image &jimg=*gjimg;
+  jimg.set_dimension(w, h);
+  int nccs = rimg.ccs.size();
+  for (int ccid=0; ccid<nccs; ccid++)
+    {
+      JB2Shape shape;
+      JB2Blit  blit;
+      shape.parent = -1;
+      shape.userdata = 0;
+      if (ccid >= rimg.nregularccs)
+        shape.userdata |= JB2SHAPE_SPECIAL;
+      shape.bits = rimg.get_bitmap_for_cc(ccid);
+      shape.bits->compress();
+      CC& cc = rimg.ccs[ccid];
+      blit.shapeno = jimg.add_shape(shape);
+      blit.left = cc.bb.xmin;
+      blit.bottom = cc.bb.ymin;
+      int blitno = jimg.add_blit(blit);
+      pal.colordata.touch(blitno);
+      pal.colordata[blitno] = cc.color;
+    }
+  
+  // Organize JB2Image
+  tune_jb2image_lossless(&jimg);
+  if (opts.verbose)
+    {
+      int nshape=0, nrefine=0;
+      for (int i=0; i<jimg.get_shape_count(); i++) {
+        if (!jimg.get_shape(i).bits) continue;
+        if (jimg.get_shape(i).parent >= 0) nrefine++; 
+        nshape++; 
+      }
+      DjVuFormatErrorUTF8( "%s\t%d\t%d",
+                       ERR_MSG("cpaldjvu.cross_code"), 
+                       nshape, nrefine);
+    }
+  
+  // Create background image
+#ifdef BACKGROUND_SUBSAMPLING_FACTOR
+  // -- we may create the background by masking and subsampling
+  GP<GPixmap> ginputsub=GPixmap::create();
+  GPixmap &inputsub=*ginputsub;
+  GP<GBitmap> mask = jimg.get_bitmap(BACKGROUND_SUBSAMPLING_FACTOR);
+  inputsub.downsample(&input, BACKGROUND_SUBSAMPLING_FACTOR);
+  GP<IW44Image> iwimage=IW44Image::create(inputsub, mask);
+#else
+  // -- but who cares since the background is uniform.
+  GP<GPixmap> ginputsub=GPixmap::create((h+11)/12, (w+11)/12, &bgcolor);
+  GPixmap &inputsub=*ginputsub;
+  GP<IW44Image> iwimage=IW44Image::create_encode(inputsub);
+#endif
+
+  // Assemble DJVU file
+  GP<ByteStream> obs=ByteStream::create(urlout, "wb");
+  GP<IFFByteStream> giff=IFFByteStream::create(obs);
+  IFFByteStream &iff=*giff;
+  // -- main composite chunk
+  iff.put_chunk("FORM:DJVU", 1);
+  // -- ``INFO'' chunk
+  iff.put_chunk("INFO");
+  GP<DjVuInfo> ginfo=DjVuInfo::create();
+  DjVuInfo info=*ginfo;
+  info.height = h;
+  info.width = w;
+  info.dpi = opts.dpi;
+  info.encode(*iff.get_bytestream());
+  iff.close_chunk();
+  // -- ``Sjbz'' chunk
+  iff.put_chunk("Sjbz");
+  jimg.encode(iff.get_bytestream());
+  iff.close_chunk();
+  // -- ``FGbz'' chunk
+  iff.put_chunk("FGbz");
+  pal.encode(iff.get_bytestream());
+  iff.close_chunk();
+  // -- ``BG44'' chunk
+  IWEncoderParms iwparms;
+#ifdef PROGRESSIVE_BACKGROUND
+  // ----- we may use several chunks to enable progressive rendering ...
+  iff.put_chunk("BG44");
+  iwparms.slices = 74;
+  iwimage->encode_chunk(iff, iwparms);
+  iff.close_chunk();
+  iff.put_chunk("BG44");
+  iwparms.slices = 87;
+  iwimage->encode_chunk(iff, iwparms);
+  iff.close_chunk();
+#endif
+  // ----- but who cares when the background is so small.
+  iff.put_chunk("BG44");
+  iwparms.slices = 97;
+  iwimage->encode_chunk(iff.get_bytestream(), iwparms);
+  iff.close_chunk();
+  // -- terminate main composite chunk
+  iff.close_chunk();
+  // Finished!
+}  
+
+
+
+// --------------------------------------------------
+// MAIN
+// --------------------------------------------------
+
+
+void
+usage()
+{
+  DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+         "CPALDJVU --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+         "DjVu encoder for images with few colors\n\n"
+         "Usage: cpaldjvu [options] <inputppmfile> <outputdjvufile>\n"
+         "Options are:\n"
+         "   -colors [2-4096] Maximum number of colors during quantization (default 256).\n"
+         "   -dpi [25-6000]   Resolution written into the output file (default 100).\n"
+         "   -verbose         Displays additional messages.\n"
+         "   -bgwhite         Use the lightest color for background (usually white).\n"
+         );
+  exit(10);
+}
+
+
+int 
+main(int argc, const char **argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  G_TRY
+    {
+      GURL inputppmurl;
+      GURL outputdjvuurl;
+      // Defaults
+      cpaldjvuopts opts;
+      opts.dpi = 100;
+      opts.ncolors = 256;
+      opts.verbose = false;
+      opts.bgwhite = false;
+      // Parse options
+      for (int i=1; i<argc; i++)
+        {
+          GUTF8String arg = dargv[i];
+          if (arg == "-colors" && i+1<argc)
+            {
+              char *end;
+              opts.ncolors = strtol(dargv[++i], &end, 10);
+              if (*end || opts.ncolors<2 || opts.ncolors>4096)
+                usage();
+            }
+          else if (arg == "-dpi" && i+1<argc)
+            {
+              char *end;
+              opts.dpi = strtol(dargv[++i], &end, 10);
+              if (*end || opts.dpi<25 || opts.dpi>6000)
+                usage();
+            }
+          else if (arg == "-verbose" || arg == "-v")
+            opts.verbose = true;
+          else if (arg == "-bgwhite")
+            opts.bgwhite = true;
+          else if (arg[0] == '-' && arg[1])
+            usage();
+          else if (inputppmurl.is_empty())
+            inputppmurl = GURL::Filename::UTF8(arg);
+          else if (outputdjvuurl.is_empty())
+            outputdjvuurl = GURL::Filename::UTF8(arg);
+          else
+            usage();
+        }
+      if (inputppmurl.is_empty() || outputdjvuurl.is_empty())
+        usage();
+      // Load and run
+      GP<ByteStream> ibs=ByteStream::create(inputppmurl,"rb");
+      cpaldjvu(ibs, outputdjvuurl, opts);
+    }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
diff --git a/tools/csepdjvu.1 b/tools/csepdjvu.1
new file mode 100644
index 0000000..17733e5
--- /dev/null
+++ b/tools/csepdjvu.1
@@ -0,0 +1,257 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH CSEPDJVU 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+csepdjvu \- DjVu encoder for separated data files.
+
+.SH SYNOPSIS
+.BI "csepdjvu  [" "options" "] [" "sepfiles" "]... " "outputdjvufile"
+
+.SH DESCRIPTION
+
+This program creates a DjVuDocument file
+.I outputdjvufile
+from separated data files 
+.IR sepfiles .
+It can read separated data from the standard input when given 
+a single dash instead of the separated data file names.  
+This feature is intended for pre-processing programs that
+push separated data into
+.B csepdjvu
+via a pipe.
+
+Each separated data file represents one or more page images.  When the program
+arguments specify multiple pages, all the pages are encoded and saved as a
+bundled multi-page document.  When the program arguments specify a single
+page, the page is encoded and saved as a single page file.
+
+.SH OPTIONS
+.TP
+.BI "-d " "n"
+Specify the resolution information encoded into the output file expressed in
+dots per inch. The resolution information encoded in DjVu files determine how
+the decoder scales the image on a particular display.  Meaningful resolutions
+range from 25 to 6000.  The default value is 300 dpi.
+.TP
+.BI "-q " "n" ",...," "n"
+.TP
+.BI "-q " "n" "+...+" "n"
+Specify the encoding quality of the IW44 encoded background layer.  
+The option argument contain several integers (one per chunk) separated by
+either commas or pluses.  This option is similar to option
+.B -slice
+of program
+.BR c44 .
+Please refer to the 
+.BR c44 (1)
+man page for additional details.
+The default quality specification is
+.BR "-q 72,83,93,103" . 
+
+This option does not apply to uniformly white background that were not specified
+by the separated data but are called for by the DjVu specification.  Such 
+background images always come at the lowest possible resolution and with a
+standard quality setting that ensures the color uniformity.
+.TP
+.B "-t"
+Program 
+.B csepdjvu
+interprets certain comments in the separated file to
+construct a hidden text layer in the DjVu file. This layer
+records the location of each word for hiliting purposes. 
+This option reduces the file size by simply recording the
+location of each line.
+.TP
+.B "-v"
+Display a brief message describing each page.
+.TP
+.B "-vv"
+Display extensive informational messages during encoding.
+
+.SH SEPARATED DATA FILE FORMAT
+
+Each separated data file contains a concatenation of one or more separated
+page images.  Each page is logically represented by a foreground image with a
+transparent color and by a background image visible through the transparent
+pixels.  The data for each separated page image is the concatenation of the
+following data blocks:
+.IP "*" 3
+A foreground image encoded using either 
+the "Color RLE format" or the "Bitonal RLE format".
+These formats are described later in this section.
+.IP "*" 3
+An optional background image encoded as a "Portable Pixmap" (
+.SM PPM
+).  This well known format is summarized later in this section.  The absence
+of a background image simply indicates that a uniformly white background
+should be assumed.
+.IP "*" 3
+An arbitrary number of comment lines starting with character "#" and
+terminated by a linefeed character. Comment lines whose first word starts
+with a capital letter have special meanings documented later in this document.
+.PP
+The dimensions (width and height) of the background image must be obtained by
+rounding up the quotient of the foreground image dimensions by an integer
+reduction factor ranging from 1 to 12.  Assume, for instance, that the width
+of the foreground is 2507 and the reduction factor is 3.  The width of the
+background image will be the integer ratio (2507+2)/3.
+
+.SS Color RLE format
+
+The Color RLE format is a simple run-length encoding scheme for color images
+with a limited number of distinct colors.  The data always begin with a text
+header composed of the two characters "R6", the number of columns, the number
+of rows, and the number of color palette entries.  All numbers are expressed
+in decimal
+.SM ASCII.
+These four items are separated by blank characters (space, tab, carriage
+return, or linefeed) or by comment lines introduced by character "#".  The
+last number is followed by exactly one character which usually is a linefeed
+character.
+
+The header is followed by the color palette containing three bytes per color
+entry.  The bytes represent the red, green, and blue components of the color.
+
+The palette is followed by a collection of four bytes integers (most
+significant bit first) representing runs of pixels with an identical color.
+The twelve upper bits of this integer indicate the index of the run color in
+the palette entry.  The twenty lower bits of the integer indicate the run
+length.  Color indices greater than 0xff0 are reserved.  Color index 0xfff is
+used for transparent runs.  Each row is represented by a sequence of runs
+whose lengths add up to the image width.  Rows are encoded starting with the
+top row and progressing toward the bottom row.
+
+.SS Bitonal RLE format
+
+The Bitonal RLE format is a simple run-length encoding scheme for bitonal
+images.  The data always begin with a text header composed of the two
+characters "R4", the number of columns, and the number of rows.  All numbers
+are expressed in decimal
+.SM ASCII.
+These three items are separated by blank characters (space, tab, carriage
+return, or linefeed) or by comment lines introduced by character "#".  The
+last number is followed by exactly one character which usually is a linefeed
+character.
+
+The rest of the file encodes a sequence of numbers representing the lengths of
+alternating runs of transparent and black pixels.  Lines are encoded starting
+with the top line and progressing toward the bottom line.  Each line starts
+with a white run. The decoder knows that a line is finished when the sum of
+the run lengths for that line is equal to the number of columns in the image.
+Numbers in range 0 to 191 are represented by a single byte in range 0x00 to
+0xbf.  Numbers in range 192 to 16383 are represented by a two byte sequence:
+the first byte, in range 0xc0 to 0xff, encodes the six most significant bits
+of the number, the second byte encodes the remaining eight bits of the
+number. This scheme allows for runs of length zero, which are useful when a
+line starts with a black pixel, and when a very long run (whose length exceeds
+16383) must be split into smaller runs.
+
+.SS Portable Pixmap (PPM) format
+
+The Portable Pixmap format is a well known format for representing color
+images.  Check the
+.BR ppm (1)
+man page for complete information.
+
+The data always begin with a text header composed of the two characters "P6",
+the number of columns, the number of rows, and the maximal value of
+a color component (usually 255).  All numbers are expressed in
+decimal
+.SM ASCII.
+These three items are separated by blank characters (space, tab, carriage
+return, or linefeed) or by comment lines introduced by character "#".  The
+last number is followed by exactly one character which usually is a linefeed
+character.
+
+The rest of the file encodes all the pixels.  Each pixel is represented by
+three bytes representing the red, green and blue component of the pixel.
+Pixels are ordered in left to right, top to bottom.
+
+.SS Comments in separated files
+
+Each page is followed by an arbitrary number of comment lines 
+starting with character "#" and terminated by a linefeed character. 
+Comment lines whose first word starts with a capital letter have 
+special meanings. The following constructs are currently defined:
+.IP "*" 3
+.BI "# T " px ":" py " " dx ":" dy " " w "x" h "+" x "+" y " (" string ")"
+.br
+This constructs indicates that the piece of text
+.I string
+must be associated with an area of size
+.IR w "x" h
+at position 
+.IR x "," y
+relative to the lower left corner of the page.
+The string is UTF-8 encoded. Special characters
+can be escaped as in PostScript using the backslash character.
+Integers
+.IR px ", and " py
+represent the position of the current point on the text baseline
+before the text was drawn. The drawing operation then moves the
+current point by 
+.IR dx ", and " dy
+pixels.
+When such comments are present, 
+.BR csepdjvu 
+produces a hidden text layer for the 
+corresponding pages.
+.IP "*" 3
+.BI "# L " w "x" h "+" x "+" y " (" url ")"
+.br
+This construct indicates that an hyperlink to url
+.I url
+should be associated with area of size
+.IR w "x" h
+at position 
+.IR x "," y "."
+When such comments are present, 
+.BR csepdjvu 
+produces pages with an annotation chunk 
+containing the specified hyperlinks.
+.IP "*" 3
+.BI "# B " count " (" string ") (#" pageno ")"
+.br
+This constructs provides outline information for the document.
+An outline entry entitled
+.I string
+is associated with page
+.IR pageno .
+Integer 
+.I count 
+indicates how many of the following outline entries must
+be attached to the current entry as subentries.
+When such comments are present in the first page
+.BR csepdjvu 
+produces an navigation chunk with 
+the specified outline.
+
+.SH CREDITS
+
+This program was initially written by L\('eon Bottou
+<leonb@users.sourceforge.net> and was improved by Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR ppm (5),
+.BR c44 (1)
diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
new file mode 100644
index 0000000..c312a5a
--- /dev/null
+++ b/tools/csepdjvu.cpp
@@ -0,0 +1,1866 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name csepdjvu
+
+    {\bf Synopsis}
+    \begin{verbatim}
+        csepdjvu <....options-or-separated_files...> <outputdjvufile>
+    \end{verbatim}
+
+    {\bf Description}
+    
+    File #"csepdjvu.cpp"# demonstrates a complete back-end encoder that takes
+    {\em separated files} as input and produces a djvu file as output.
+    Each {\em separated file} contains a concatenation of pages. 
+    Each page contains the following components:
+    \begin{itemize}
+    \item A run-length encoded file representing the foreground.
+          Two kind of run-length encoded files are accepted.
+          The Black-And-White RLE format is described in section
+          \Ref{PNM and RLE file formats}.  The Color RLE format
+          is described below.
+    \item An optional PPM image representing the background.
+          The size (width and height) of the PPM image must be obtained by
+          rounding up the quotient of the foreground image size by
+          an integer reduction factor ranging from 1 to 12.
+    \item An arbitrary number of comment lines starting with 
+          character '#'.
+    \end{itemize}
+    All the provided pages will be converted to Compound DjVu Images.
+    Foreground colors will be encoded using a single solid color per component
+    (see \Ref{DjVu Image files}).  Multiple pages will be gathered into a
+    single bundled file.  Use \Ref{djvmcvt} or \Ref{djvujoin} to create an
+    indirect file.
+    
+    {\bf Options}
+
+    \begin{description}
+    \item[-d n] Resolution written into the output file (default: 300).
+    \item[-q <spec>] Quality level for background (default: 72+11+10+10).
+                     See option #"-slice"# in program \Ref{c44} for details.
+    \item[-v] Displays a brief message per page.
+    \item[-vv] Displays lots of additional messages.
+    \end{description}
+          
+    {\bf Color RLE Images}
+
+    The Color RLE file format is a simple run-length encoding scheme for color
+    images with a limited number of colors. Color RLE files always begin with
+    a text header composed of:
+    - the two characters #"R6"#,
+    - the number of columns in decimal,\\
+    - the number of rows in decimal,\\
+    - the number of palette entries in decimal.\\
+    These four items are separated by blank characters (space, tab, cr, or nl)
+    or by comment lines introduced by character ``\#''.  The last number is
+    followed by exactly one character (usually a nl character).  This header
+    is followed by a palette containing three bytes per color.  The bytes
+    represent the red, green, and blue components of the color.  
+
+    The palette is followed by four bytes integers (MSB first) representing
+    runs.  The twelve upper bits of this integer indicate the index of the run
+    color in the palette entry.  The twenty lower bits of the integer indicate
+    the run length.  Color indices greater than 0xff0 are reserved for pixels
+    belonging to the background layer.  Color index 0xfff is used for
+    transparent runs. Color index 0xffe is used for don't-care runs
+    (i.e. pixels whose values should be taken by smoothly completing the
+    background using the wavelet masking algorithm).  Each row is represented
+    by a sequence of runs whose lengths add up to the image width.  Rows are
+    encoded starting with the top row and progressing towards the bottom row.
+
+    @memo
+    Creates DjVu files from Separated files.
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+//@}
+
+
+#include "DjVuGlobal.h"
+#include "GException.h"
+#include "GSmartPointer.h"
+#include "GContainer.h"
+#include "ByteStream.h"
+#include "IFFByteStream.h"
+#include "GRect.h"
+#include "GBitmap.h"
+#include "JB2Image.h"
+#include "DjVuPalette.h"
+#include "IW44Image.h"
+#include "DjVuInfo.h"
+#include "DjVmDoc.h"
+#include "DjVmNav.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+#include "DjVuText.h"
+#include "BSByteStream.h"
+
+#include "miniexp.h"
+#include "jb2tune.h"
+#include "common.h"
+
+#undef MIN
+#undef MAX
+inline int MIN(int a, int b) { return ( a<b ?a :b); }
+inline int MAX(int a, int b) { return ( a>b ?a :b); }
+
+
+
+// --------------------------------------------------
+// OPTIONS
+// --------------------------------------------------
+
+
+struct csepdjvuopts
+{
+  int dpi;                  // resolution
+  int verbose;              // verbosity level
+  DjVuTXT::ZoneType text;   // level of text detail
+  unsigned char slice[16];  // background quality spec
+  csepdjvuopts();
+};
+
+csepdjvuopts::csepdjvuopts()
+{
+      dpi = 300;
+      verbose = 0;
+      text = DjVuTXT::WORD;
+      slice[0] =  72;
+      slice[1] =  83;      
+      slice[2] =  93;
+      slice[3] = 103;
+      slice[4] =   0;
+}
+
+
+// --------------------------------------------------
+// BUFFERED BYTESTREAM
+// --------------------------------------------------
+
+// -- A bytestream that performs buffering and 
+//    offers a stdio-like interface for parsing files.
+
+class BufferByteStream : public ByteStream 
+{
+public:
+  enum {bufsize=512};
+private:
+  ByteStream &bs;
+  unsigned char buffer[bufsize];
+  int bufpos;
+  int bufend;
+public:
+  BufferByteStream(ByteStream &lbs);
+  size_t read(void *buffer, size_t size);
+  size_t write(const void *buffer, size_t size);
+  virtual long tell(void) const;
+  int eof(void);
+  int unget(int c);
+  inline int get(void);
+  // parsing helpers
+  bool skip(const char *s = " \t\n\r");
+  bool expect(int &c, const char *s); 
+  bool read_integer(int &x);
+  bool read_pair(int &x, int &y);
+  bool read_geometry(GRect &r);
+  bool read_ps_string(GUTF8String &s);
+};
+
+BufferByteStream::BufferByteStream(ByteStream &bs)
+  : bs(bs), bufpos(1), bufend(1)
+{ 
+}
+
+int 
+BufferByteStream::eof(void) // aka. feof
+{
+  if (bufpos < bufend) 
+    return false;
+  bufend = bufpos = 1;
+  bufend += bs.read(buffer+bufend, bufsize-bufend);
+  return (bufend == bufpos);
+}
+
+size_t 
+BufferByteStream::read(void *buf, size_t size)
+{
+  if (size < 1)
+    return 0;
+  if (bufend == bufpos) 
+    {
+      if (size >= bufsize)
+        return bs.read(buf, size);
+      if (eof())
+        return 0;
+    }
+  if (bufpos + (int)size > bufend)
+    size = bufend - bufpos;
+  memcpy(buf, buffer+bufpos, size);
+  bufpos += size;
+  return size;
+}
+
+size_t 
+BufferByteStream::write(const void *, size_t )
+{
+  G_THROW("Cannot write into a BufferByteStream");
+  return 0;
+}
+
+long 
+BufferByteStream::tell(void) const
+{ 
+  return bs.tell() + bufpos - bufend; 
+}
+    
+inline int 
+BufferByteStream::get(void) // aka. getc()
+{
+  if (bufpos < bufend || !eof())
+    return buffer[bufpos++];
+  return EOF;
+}
+
+int  
+BufferByteStream::unget(int c) // aka. ungetc()
+{
+  if (bufpos > 0 && c != EOF) 
+    return buffer[--bufpos] = (unsigned char)c;
+  return EOF;
+}
+
+bool 
+BufferByteStream::expect(int &c, const char *s)
+{
+  c = get();
+  if (strchr(s, c))
+    return true;
+  unget(c);
+  return false;
+}
+
+bool
+BufferByteStream::skip(const char *s)
+{
+  int c;
+  while (expect(c, s)) { }
+  return true;
+}
+
+bool 
+BufferByteStream::read_integer(int &x)
+{
+  x = 0;
+  int c = get();
+  if (c<'0' || c>'9')
+    return false;
+  while (c>='0' && c<='9') 
+    {
+      x = x*10 + c - '0';
+      c = get();
+    }
+  unget(c);
+  return true;
+}
+
+bool 
+BufferByteStream::read_pair(int &x, int &y)
+{
+  int c;
+  x = y = 0;
+  expect(c, "-");
+  if (! read_integer(x)) 
+    return false;
+  if (c == '-') 
+    x = -x;
+  if (! expect(c, ":"))
+    return false;
+  expect(c, "-");
+  if (! read_integer(y)) 
+    return false;
+  if (c == '-')
+    y = -y;
+  return true;
+}
+
+bool 
+BufferByteStream::read_geometry(GRect &r)
+{
+  int x,y,w,h,c;
+  x = y = w = h = 0;
+  if (read_integer(w) && expect(c, "x") && read_integer(h))
+    {
+      if (expect(c,"+-"))
+        {
+          if (c == '+')
+            expect(c,"-");
+          if (! read_integer(x))
+            return false;
+          if (c == '-')
+            x = -x;
+        }
+      if (expect(c,"+-"))
+        {
+          if (c == '+')
+            expect(c,"-");
+          if (! read_integer(y))
+            return false;
+          if (c == '-')
+            y = -y;
+        }
+      r = GRect(x,y,w,h);
+      return true;
+    }
+  return false;
+}
+
+static void
+add_to_string(GUTF8String &s, char *buffer, int len, int &bom)
+{
+  if (!s && !bom && len>=2)
+    {
+      if (buffer[0]==(char)0xfe && buffer[1]==(char)0xff)
+        bom = 0xfeff;
+      if (buffer[0]==(char)0xff && buffer[1]==(char)0xfe)
+        bom = 0xfffe;
+      if (bom)
+        {
+          buffer += 2; 
+          len -= 2;
+        }
+    }
+  if (bom == 0xfeff)
+    for (int i=0; i<len; i+=2)
+      *(uint16_t*)(buffer+i) = ((buffer[i]<<8) | buffer[i+1]);
+  if (bom == 0xfffe)
+    for (int i=0; i<len; i+=2)
+      *(uint16_t*)(buffer+i) = ((buffer[i+1]<<8) | buffer[i]);
+  if (bom)
+    s += GUTF8String((const uint16_t*)buffer, len/2);
+  else
+    s += GUTF8String((const char*)buffer, len);
+}
+
+bool 
+BufferByteStream::read_ps_string(GUTF8String &s)
+{
+  int bom = 0;
+  unsigned int pos = 0;
+  char buffer[512];
+  if (get() != '(') 
+    return false;
+  s = "";
+  for(;;)
+    {
+      int c = get();
+      if (c == '\n' || c == '\r')
+        return false;
+      if (c == ')')
+        break;
+      if (c == '\\')
+        {
+          c = get();
+          switch (c) 
+            {
+            case 'n': 
+              c='\n' ; break;
+            case 'r': 
+              c='\r' ; break;
+            case 't': 
+              c='\t' ; break;
+            case 'b': 
+              c='\b' ; break;
+            case 'f': 
+              c='\f' ; break;
+            default:
+              if (c>='0' && c<='7') 
+                {
+                  int n = 0;
+                  int x = 0;
+                  while (c>='0' && c<='7' && n<3)
+                    {
+                      x = (x * 8) + c - '0';
+                      c = get();
+                      n++;
+                    }
+                  unget(c);
+                  c = x;
+                }
+              break;
+            }
+        }
+      if (c == EOF)
+        return false;
+      if (pos >= (int)sizeof(buffer))
+        {
+          add_to_string(s, buffer, pos, bom);
+          pos = 0;
+        }
+      buffer[pos++] = c;
+    }
+  add_to_string(s, buffer, pos, bom);
+  return true;
+}
+
+// --------------------------------------------------
+// COLOR CONNECTED COMPONENT ANALYSIS
+// --------------------------------------------------
+
+
+// -- A run of pixels with the same color
+struct Run    
+{ 
+  short y;       // vertical coordinate
+  short x1;      // first horizontal coordinate
+  short x2;      // last horizontal coordinate
+  short color;   // color id
+  int ccid;      // component id
+};
+
+
+// -- Compares runs for y-x sorting
+static inline bool
+operator <= (const Run &a, const Run &b)
+{
+  return (a.y<b.y) || (a.y==b.y && a.x1<=b.x1);
+}
+
+
+// -- Color component descriptor
+struct CC    
+{
+  GRect bb;      // bounding box
+  int npix;      // number of black pixels
+  int nrun;      // number of runs
+  int frun;      // first run in cc ordered array of runs
+  int color;     // color id
+};
+
+
+// -- An image composed of runs
+class CRLEImage 
+{
+public:
+  int height;            // Height of the image in pixels
+  int width;             // Width of the image in pixels
+  GP<DjVuPalette> pal;   // Color palette
+  GTArray<Run>    runs;  // Array of runs
+  GTArray<CC>     ccs;   // Array of component descriptors
+  int  nregularccs;      // Number of regular ccs (set by merge_and_split_ccs)
+  char bg_flags;         // Comment flags about background.
+  char fg_flags;         // Comment flags about foreground.
+  CRLEImage(BufferByteStream &bs);
+  GP<GBitmap> get_bitmap_for_cc(int ccid) const;
+  void make_ccids_by_analysis();
+  void make_ccs_from_ccids();
+  void merge_and_split_ccs(int smallsize, int largesize);
+  void sort_in_reading_order(); 
+private:
+  unsigned int read_integer(BufferByteStream &bs);
+  void insert_runs(int y, const short *x1x2color, int nruns);
+};
+
+
+// -- Helper for CRLEImage::CRLEImage(ByteStream &bs)
+unsigned int 
+CRLEImage::read_integer(BufferByteStream &bs)
+{
+  int c, x;
+  while (bs.skip() && bs.expect(c, "#"))
+    {
+      char buffer[256];
+      char *s = buffer;
+      while (c != EOF && c != '\n' && c != '\r')
+        {
+          if (s - buffer < (int)sizeof(buffer) - 1)
+            *s++ = c;
+          c = bs.get();
+        }
+      *s = 0;
+      for(s = buffer; *s; s++)
+        {
+          if (!strncmp(s, "bg-", 3))
+            {
+              if (!strncmp(s+3,"bw",2)   ||
+                  !strncmp(s+3,"gray",4) ||
+                  !strncmp(s+3,"color",5)  )
+                bg_flags = s[3];
+            }
+          if (!strncmp(s, "fg-", 3))
+            {
+              if (!strncmp(s+3,"bw",2)   ||
+                  !strncmp(s+3,"gray",4) ||
+                  !strncmp(s+3,"color",5)  )
+                fg_flags = s[3];
+            }
+        }
+    }
+  if (! bs.read_integer(x) )
+    G_THROW("csepdjvu: corrupted input file (bad file header)");
+  return x;
+}
+
+
+// -- Helper for CRLEImage::CRLEImage(ByteStream &bs)
+void
+CRLEImage::insert_runs(int y, const short *x1x2color, int count)
+{
+  if (count > 0)
+    {
+      int index = runs.lbound() - count;
+      runs.resize(index, runs.hbound());
+      Run *run = &runs[index];
+      while (--count>=0) {
+        run->y     = y;
+        run->x1    = *x1x2color++;
+        run->x2    = *x1x2color++;
+        run->color = *x1x2color++;
+        run->ccid  = 0;
+        run++;
+      }
+      runs.shift(-index);
+    }
+}
+
+
+// -- Constructs CRLEImage from a run lenght encoded file,
+//    making sure that runs are properly sorted.
+CRLEImage::CRLEImage(BufferByteStream &bs)
+  : height(0), width(0), nregularccs(0), bg_flags(0), fg_flags(0)
+{
+  unsigned int magic = bs.read16();
+  width = read_integer(bs);
+  height = read_integer(bs);
+  if (width<1 || height<1)
+    G_THROW("csepdjvu: corrupted input file (bad image size)");
+  // An array for the runs and the buffered data
+  GTArray<short> ax(3*width+3);
+  // File format switch
+  if (magic == 0x5234) // Black&White RLE data
+    {
+      // Skip one character
+      bs.get(); 
+      // Setup palette with one color
+      pal = DjVuPalette::create();
+      static char zeroes[4];
+      GP<ByteStream> gzbs=ByteStream::create_static(zeroes,4);
+      ByteStream &zbs=*gzbs;
+      pal->decode_rgb_entries(zbs, 1);
+      // RLE format
+      int x, c, n;
+      unsigned char p = 0;
+      short *px = ax;
+      n = height - 1;
+      c = 0;
+      while (n >= 0)
+        {
+          if (bs.eof())
+            G_THROW( ByteStream::EndOfFile );
+          x = bs.get();
+          if (x >= 0xc0)
+            x = (bs.get()) + ((x - 0xc0) << 8);
+          if (c+x > width)
+            G_THROW("csepdjvu: corrupted input file (lost RLE sync.)");
+          if (p)
+            {
+              px[0] = c;
+              px[1] = c+x-1;
+              px[2] = 0;
+              px += 3;
+            }
+          c += x;
+          p = 1 - p;
+          if (c >= width)
+            {
+              insert_runs(n, ax, (px-ax)/3);
+              c = 0;
+              p = 0;
+              n -= 1; 
+              px = ax;
+            }
+        }
+    } else if (magic == 0x5236) { // Color-RLE data 
+      // Read ncolors and skip one character.
+      int ncolors = read_integer(bs);
+      bs.get();
+      // Setup palette 
+      if (ncolors<1 || ncolors>4095) 
+        G_THROW("csepdjvu: corrupted input file (bad number of colors)");
+
+      pal = DjVuPalette::create();
+      pal->decode_rgb_entries(bs, ncolors);
+      // RLE format
+      int x, c, n, p;
+      n = height - 1;
+      c = 0;
+      short *px = ax;
+      while (n >= 0)
+        {
+          if (bs.eof())
+            G_THROW( ByteStream::EndOfFile );
+          x  = (bs.get() << 24);
+          x  |= (bs.get() << 16);
+          x  |= (bs.get() << 8);
+          x  |= (bs.get());
+          p = (x >> 20) & 0xfff;
+          x = (x & 0xfffff);
+          if (c+x > width)
+            G_THROW("csepdjvu: corrupted input file (lost RLE sync.)");
+          if (p >= 0 && p < ncolors)
+            {
+              px[0] = c;
+              px[1] = c+x-1;
+              px[2] = p;
+              px += 3;
+            }
+          c += x;
+          if (c >= width)
+            {
+              insert_runs(n, ax, (px-ax)/3);
+              c = 0;
+              p = 0;
+              n -= 1; 
+              px = ax;
+            }
+        }
+    } else { // Unrecognized file
+      G_THROW("csepdjvu: corrupted input file (bad file header)");
+    }
+}
+
+
+// -- Performs color connected component analysis
+//    assuming that runs are already y-x sorted.
+void
+CRLEImage::make_ccids_by_analysis()
+{
+  // runs.sort(); (we know that runs are 
+  // Single Pass Connected Component Analysis (with unodes)
+  int n;
+  int p=0;
+  GTArray<int> umap;
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      int y = runs[n].y;
+      int x1 = runs[n].x1 - 1;
+      int x2 = runs[n].x2 + 1;
+      int color = runs[n].color;
+      int id = (umap.hbound() + 1);
+      // iterate over previous line runs
+      if (p>0) p--;
+      for(;runs[p].y < y-1;p++);
+      for(;(runs[p].y < y) && (runs[p].x1 <= x2);p++ )
+        {
+          if ( runs[p].x2 >= x1 )
+            {
+              if (runs[p].color == color)
+                {
+                  // previous run touches current run and has same color
+                  int oid = runs[p].ccid;
+                  while (umap[oid] < oid)
+                    oid = umap[oid];
+                  if ((int)id > umap.hbound()) {
+                    id = oid;
+                  } else if (id < oid) {
+                    umap[oid] = id;
+                  } else {
+                    umap[id] = oid;
+                    id = oid;
+                  }
+                  // freshen previous run id
+                  runs[p].ccid = id;
+                }
+              // stop if previous run goes past current run
+              if (runs[p].x2 >= x2)
+                break;
+            }
+        }
+      // create new entry in umap
+      runs[n].ccid = id;
+      if (id > umap.hbound())
+        {
+          umap.touch(id);
+          umap[id] = id;
+        }
+    }
+  // Update umap and ccid
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      Run &run = runs[n];
+      int ccid = run.ccid;
+      while (umap[ccid] < ccid)
+        ccid = umap[ccid];
+      umap[run.ccid] = ccid;
+      run.ccid = ccid;
+    }
+}
+
+
+// -- Constructs the ``ccs'' array from run's ccids.
+void
+CRLEImage::make_ccs_from_ccids()
+{
+  int n;
+  Run *pruns = runs;
+  // Find maximal ccid
+  int maxccid = -1;
+  for (n=0; n<=runs.hbound(); n++)
+    if (pruns[n].ccid > maxccid)
+      maxccid = runs[n].ccid;
+  GTArray<int> armap(0,maxccid);
+  int *rmap = armap;
+  // Renumber ccs 
+  for (n=0; n<=maxccid; n++)
+    armap[n] = -1;
+  for (n=0; n<=runs.hbound(); n++)
+    if (pruns[n].ccid >= 0)
+      rmap[ pruns[n].ccid ] = 1;
+  int nid = 0;
+  for (n=0; n<=maxccid; n++)
+    if (rmap[n] > 0)
+      rmap[n] = nid++;
+  // Adjust nregularccs (since ccs are renumbered)
+  while (nregularccs>0 && rmap[nregularccs-1]<0)
+    nregularccs -= 1;
+  if (nregularccs>0)
+    nregularccs = 1 + rmap[nregularccs-1];
+  // Prepare cc descriptors
+  ccs.resize(0,nid-1);
+  for (n=0; n<nid; n++)
+    ccs[n].nrun = 0;
+  // Relabel runs
+  for (n=0; n<=runs.hbound(); n++)
+    {
+      Run &run = pruns[n];
+      if (run.ccid < 0) continue;  // runs with negative ccids are destroyed
+      int oldccid = run.ccid;
+      int newccid = rmap[oldccid];
+      CC &cc = ccs[newccid];
+      run.ccid = newccid;
+      cc.nrun += 1;
+    }
+  // Compute positions for runs of cc
+  int frun = 0;
+  for (n=0; n<nid; n++) 
+    {
+      ccs[n].frun = rmap[n] = frun;
+      frun += ccs[n].nrun;
+    }
+  // Copy runs
+  GTArray<Run> rtmp;
+  rtmp.steal(runs);
+  Run *ptmp = rtmp;
+  runs.resize(0,frun-1);
+  pruns = runs;
+  for (n=0; n<=rtmp.hbound(); n++)
+    {
+      int id = ptmp[n].ccid;
+      if (id < 0) continue;
+      int pos = rmap[id]++;
+      pruns[pos] = ptmp[n];
+    }
+  // Finalize ccs
+  for (n=0; n<nid; n++)
+    {
+      CC &cc = ccs[n];
+      int npix = 0;
+      runs.sort(cc.frun, cc.frun+cc.nrun-1);
+      Run *run = &runs[cc.frun];
+      int xmin = run->x1;
+      int xmax = run->x2;
+      int ymin = run->y;
+      int ymax = run->y;
+      cc.color = run->color;
+      for (int i=0; i<cc.nrun; i++, run++)
+        {
+          if (run->x1 < xmin)  xmin = run->x1;
+          if (run->x2 > xmax)  xmax = run->x2;
+          if (run->y  < ymin)  ymin = run->y;
+          if (run->y  > ymax)  ymax = run->y;
+          npix += run->x2 - run->x1 + 1;
+        }
+      cc.npix = npix;
+      cc.bb.xmin = xmin;
+      cc.bb.ymin = ymin;
+      cc.bb.xmax = xmax + 1;
+      cc.bb.ymax = ymax + 1;
+    }
+}
+
+
+// -- Helper for merge_and_split_ccs
+struct Grid_x_Color 
+{
+  short gridi;
+  short gridj;
+  int color;
+};
+
+
+// -- Helper for merge_and_split_ccs
+static inline unsigned int
+hash(const Grid_x_Color &x) 
+{
+  return (x.gridi<<16) ^ (x.gridj<<8) ^ x.color;
+}
+
+
+// -- Helper for merge_and_split_ccs
+static inline bool
+operator==(const Grid_x_Color &x, const Grid_x_Color &y)
+{
+  return (x.gridi==y.gridi) && (x.gridj==y.gridj) && (x.color==y.color);
+}
+
+
+// -- Helper for merge_and_split_ccs
+static int
+makeccid(const Grid_x_Color &x, GMap<Grid_x_Color,int> &map, int &ncc)
+{
+  GPosition p = map.contains(x);
+  if (p) return map[p];
+  return map[x] = ncc++;
+}
+
+
+// -- Merges small ccs of similar color and splits large ccs
+void
+CRLEImage::merge_and_split_ccs(int smallsize, int largesize)
+{
+  int ncc = ccs.size();
+  int nruns = runs.size();
+  int splitsize = largesize;
+  if (ncc <= 0) return;
+  // Associative map for storing merged ccids
+  GMap<Grid_x_Color,int> map;
+  nregularccs = ncc;
+  // Set the correct ccids for the runs
+  for (int ccid=0; ccid<ccs.size(); ccid++)
+    {
+      CC* cc = &ccs[ccid];
+      if (cc->nrun <= 0) continue;
+      Grid_x_Color key;
+      key.color = cc->color;
+      int ccheight = cc->bb.height();
+      int ccwidth = cc->bb.width();
+      if (ccheight<=smallsize && ccwidth<=smallsize)
+        {
+          key.gridi = (cc->bb.ymin+cc->bb.ymax)/splitsize/2;
+          key.gridj = (cc->bb.xmin+cc->bb.xmax)/splitsize/2;
+          int newccid = makeccid(key, map, ncc);
+          for(int runid=cc->frun; runid<cc->frun+cc->nrun; runid++)
+            runs[runid].ccid = newccid;
+        }
+      else if (ccheight>=largesize || ccwidth>=largesize)
+        {
+          for(int runid=cc->frun; runid<cc->frun+cc->nrun; runid++)
+            {
+              Run *r = & runs[runid];
+              key.gridi = r->y/splitsize;
+              key.gridj = r->x1/splitsize;
+              int gridj_end = r->x2/splitsize;
+              int gridj_span = gridj_end - key.gridj;
+              r->ccid = makeccid(key, map, ncc);
+              if (gridj_span>0)
+                {
+                  // truncate current run 
+                  runs.touch(nruns+gridj_span-1);
+                  r = &runs[runid];
+                  int x = key.gridj*splitsize + splitsize;
+                  int x_end = r->x2;
+                  r->x2 = x-1;
+                  // append additional runs to the runs array
+                  while (++key.gridj < gridj_end)
+                    {
+                      Run& newrun = runs[nruns++];
+                      newrun.y = r->y;
+                      newrun.x1 = x;
+                      x += splitsize;
+                      newrun.x2 = x-1;
+                      newrun.color = key.color;
+                      newrun.ccid = makeccid(key, map, ncc);
+                    }
+                  // append last run to the run array
+                  Run& newrun = runs[nruns++];
+                  newrun.y = r->y;
+                  newrun.x1 = x;
+                  newrun.x2 = x_end;
+                  newrun.color = key.color;
+                  newrun.ccid = makeccid(key, map, ncc);
+                }
+            }
+        }
+    }
+  // Recompute cc descriptors
+  make_ccs_from_ccids();
+}
+
+
+// -- Helps sorting cc
+static int 
+top_edges_descending (const void *pa, const void *pb)
+{
+  if (((CC*) pa)->bb.ymax != ((CC*) pb)->bb.ymax)
+    return (((CC*) pb)->bb.ymax - ((CC*) pa)->bb.ymax);
+  if (((CC*) pa)->bb.xmin != ((CC*) pb)->bb.xmin)
+    return (((CC*) pa)->bb.xmin - ((CC*) pb)->bb.xmin);
+  return (((CC*) pa)->frun - ((CC*) pb)->frun);
+}
+
+
+// -- Helps sorting cc
+static int 
+left_edges_ascending (const void *pa, const void *pb)
+{
+  if (((CC*) pa)->bb.xmin != ((CC*) pb)->bb.xmin)
+    return (((CC*) pa)->bb.xmin - ((CC*) pb)->bb.xmin);
+  if (((CC*) pb)->bb.ymax != ((CC*) pa)->bb.ymax)
+    return (((CC*) pb)->bb.ymax - ((CC*) pa)->bb.ymax);
+  return (((CC*) pa)->frun - ((CC*) pb)->frun);
+}
+
+
+// -- Helps sorting cc
+static int 
+integer_ascending (const void *pa, const void *pb)
+{
+  return ( *(int*)pb - *(int*)pa );
+}
+
+
+// -- Sort ccs in approximate reading order
+void 
+CRLEImage::sort_in_reading_order()
+{
+  if (nregularccs<2) return;
+  CC *ccarray = new CC[nregularccs];
+  // Copy existing ccarray (but segregate special ccs)
+  int ccid;
+  for(ccid=0; ccid<nregularccs; ccid++)
+    ccarray[ccid] = ccs[ccid];
+  // Sort the ccarray list into top-to-bottom order.
+  qsort (ccarray, nregularccs, sizeof(CC), top_edges_descending);
+  // Subdivide the ccarray list roughly into text lines
+  int maxtopchange = width / 40;
+  if (maxtopchange < 32) 
+    maxtopchange = 32;
+  // - Loop until processing all ccs
+  int ccno = 0;
+  int *bottoms = new int[nregularccs];
+  while (ccno < nregularccs)
+    {
+      // - Gather first line approximation
+      int nccno;
+      int sublist_top = ccarray[ccno].bb.ymax-1;
+      int sublist_bottom = ccarray[ccno].bb.ymin;
+      for (nccno=ccno; nccno < nregularccs; nccno++)
+        {
+          if (ccarray[nccno].bb.ymax-1 < sublist_bottom) break;
+          if (ccarray[nccno].bb.ymax-1 < sublist_top - maxtopchange) break;
+          int bottom = ccarray[nccno].bb.ymin;
+          bottoms[nccno-ccno] = bottom;
+          if (bottom < sublist_bottom)
+            sublist_bottom = bottom;
+        }
+      // - If more than one candidate cc for the line
+      if (nccno > ccno + 1)
+        {
+          // - Compute median bottom
+          qsort(bottoms, nccno-ccno, sizeof(int), integer_ascending);
+          int bottom = bottoms[ (nccno-ccno-1)/2 ];
+          // - Compose final line
+          for (nccno=ccno; nccno < nregularccs; nccno++)
+            if (ccarray[nccno].bb.ymax-1 < bottom)
+              break;
+          // - Sort final line
+          qsort (ccarray+ccno, nccno-ccno, sizeof(CC), left_edges_ascending);
+        }
+      // - Next line
+      ccno = nccno;
+    }
+  // Copy ccarray back and renumber the runs
+  for(ccid=0; ccid<nregularccs; ccid++)
+    {
+      CC& cc = ccarray[ccid];
+      ccs[ccid] = cc;
+      for(int r=cc.frun; r<cc.frun+cc.nrun; r++)
+        runs[r].ccid = ccid;
+    }
+  // Free memory
+  delete [] bottoms;
+  delete[] ccarray;
+}
+
+
+// -- Creates a bitmap for a particular component
+GP<GBitmap>   
+CRLEImage::get_bitmap_for_cc(const int ccid) const
+{
+  const CC &cc = ccs[ccid];
+  const GRect &bb = cc.bb;
+  GP<GBitmap> bits = GBitmap::create(bb.height(), bb.width());
+  const Run *prun = & runs[(int)cc.frun];
+  for (int i=0; i<cc.nrun; i++,prun++)
+    {
+      if (prun->y<bb.ymin || prun->y>=bb.ymax)
+        G_THROW("Internal error (y bounds)");
+      if (prun->x1<bb.xmin || prun->x2>=bb.xmax)
+        G_THROW("Internal error (x bounds)");
+      unsigned char *row = (*bits)[prun->y - bb.ymin];
+      for (int x=prun->x1; x<=prun->x2; x++)
+        row[x - bb.xmin] = 1;
+    }
+  return bits;
+}
+
+
+
+// --------------------------------------------------
+// PROCESS BACKGROUND PIXMAP
+// --------------------------------------------------
+
+
+// -- Tries to read a background pixmap
+GP<GPixmap>
+read_background(BufferByteStream &bs, int w, int h, int &bgred)
+{
+  // Skip null bytes (why?)
+  int lookahead;
+  while (! (lookahead = bs.get())) { }
+  bs.unget(lookahead);
+  // Check pixmap
+  if (lookahead != 'P') 
+    return 0;
+  GP<GPixmap> pix = GPixmap::create(bs);
+  // Check background reduction
+  for (bgred=1; bgred<=12; bgred++) 
+    {
+      int subw = (w + bgred - 1) / bgred;
+      int subh = (h + bgred - 1) / bgred;
+      if (subh == (int)pix->rows() && subw == (int)pix->columns())
+        // Found reduction factor
+        return pix;
+    }
+  // Failure
+  G_THROW("Background pixmap size does not match foreground");
+  return 0;
+}
+
+
+// --------------------------------------------------
+// HANDLE COMMENTS IN SEP FILES
+// --------------------------------------------------
+
+class Comments
+{
+public:
+  Comments(int w, int h, const csepdjvuopts &opts);
+  void process_comments(BufferByteStream &bs, int verbose=0);
+  bool parse_comment_line(BufferByteStream &bs);
+  void make_chunks(IFFByteStream &iff);
+  GP<DjVmNav> get_djvm_nav();
+protected:
+  int w;
+  int h;
+  GRectMapper mapper;
+  DjVuTXT::ZoneType detail;
+  int lastx, lasty;
+  int lastdirx, lastdiry;
+  int lastsize[3];
+  struct TxtMark : public GPEnabled {
+    int x,y,dx,dy;
+    int inter;
+    GRect r;
+    GUTF8String s;
+  };
+  GPList<TxtMark> lastline;
+  GP<DjVuTXT> txt;
+  struct LnkMark : public GPEnabled {
+    GRect r;
+    GUTF8String s;
+  };
+  GPList<LnkMark> links;
+  GP<DjVmNav> nav;
+protected:
+  bool allspace(const TxtMark *mark);
+  void textmark(GP<TxtMark> mark);
+  void textflush(void);
+};
+
+Comments::Comments(int w, int h, const csepdjvuopts &opts)
+  : w(w), h(h), detail(opts.text)
+{
+  GRect pagerect(0,0,w,h);
+  mapper.set_input(pagerect);
+  mapper.set_output(pagerect);
+  mapper.mirrory();
+}
+
+void 
+Comments::process_comments(BufferByteStream &bs, int verbose)
+{
+  int c;
+  // Skip null bytes
+  while (! (c = bs.get())) { }
+  // Process comment lines
+  while (c == '#')
+    {
+      const char *message = 0;
+      bs.skip(" \t");
+      G_TRY
+        {
+          if (! parse_comment_line(bs) && verbose > 1)
+            message = "csepdjvu: unrecognized comment '# ";
+          else if (bs.skip(" \t") && bs.expect(c, "\n\r"))
+            bs.unget(c);
+          else if (verbose > 1)
+            message = "csepdjvu: garbage in comments: '";
+        }
+      G_CATCH(ex)
+      {
+        message = 0;
+        GUTF8String str = DjVuMessageLite::LookUpUTF8(ex.get_cause());
+        if (verbose > 1)
+          DjVuPrintErrorUTF8("%s\n",(const char *)str);
+      } 
+      G_ENDCATCH;
+      if (message)
+        DjVuPrintErrorUTF8(message);
+      c = bs.get();
+      while (c != EOF && c != '\r' && c != '\n')
+        {
+          if (message)
+            DjVuPrintErrorUTF8("%c", c);
+          c = bs.get();
+        }
+      if (message)
+        DjVuPrintErrorUTF8("'\n");
+      bs.skip();
+      c = bs.get();
+    }
+  bs.unget(c);
+}
+
+bool
+Comments::parse_comment_line(BufferByteStream &bs)
+{
+  int c = bs.get();
+  // Text comments
+  if (c == 'T')
+    {
+      GP<TxtMark> mark = new TxtMark;
+      if (! (bs.skip(" \t") && bs.read_pair(mark->x,mark->y) &&
+             bs.skip(" \t") && bs.read_pair(mark->dx,mark->dy) &&
+             bs.skip(" \t") && bs.read_geometry(mark->r) &&
+             bs.skip(" \t") && bs.read_ps_string(mark->s) ) )
+        G_THROW("csepdjvu: corrupted file (syntax error in text comment)");
+      if (mark->r.isempty())
+        G_THROW("csepdjvu: corrupted file (empty rectangle in text comment)");
+      textmark(mark);
+      return true;
+    }
+  // Link comments
+  if (c == 'L')
+    {
+      GP<LnkMark> mark = new LnkMark;
+      if (! (bs.skip(" \t") && bs.read_geometry(mark->r) &&
+             bs.skip(" \t") && bs.read_ps_string(mark->s) ) )
+        G_THROW("csepdjvu: corrupted file (syntax error in link comment)");
+      if (mark->r.isempty())
+        G_THROW("csepdjvu: corrupted file (empty rectangle in link comment)");
+      int ymax = h - mark->r.ymin - 1; // reversed in gsdjvu ?
+      int ymin = h - mark->r.ymax - 1; // reversed in gsdjvu ?
+      mark->r.ymax = ymax;
+      mark->r.ymin = ymin;
+      links.append(mark);
+      return true;
+    }
+  // Bookmark comments
+  if (c == 'B')
+    {
+      int count; 
+      GUTF8String url;
+      GUTF8String title;
+      if (! (bs.skip(" \t") && bs.read_integer(count) &&
+             bs.skip(" \t") && bs.read_ps_string(title) &&
+             bs.skip(" \t") && bs.read_ps_string(url) ) )
+        G_THROW("csepdjvu: corrupted file (syntax error in outline comment)");
+      GP<DjVmNav::DjVuBookMark> b = 
+        DjVmNav::DjVuBookMark::create(count, title, url);
+      if (b && ! nav)
+        nav = DjVmNav::create();
+      if (b)
+        nav->append(b);
+      return true;
+    }
+  // Unrecognized
+  bs.unget(c);
+  return false;
+}
+
+static int 
+median3(int *p)
+{
+  if (p[0] > p[1])
+    return MAX(p[1],MIN(p[0],p[2]));
+  else
+    return MIN(p[1],MAX(p[0],p[2]));
+}
+
+static bool 
+allspaces(const GUTF8String &s)
+{
+  bool ok = true;
+  for (int i=0; ok && i<(int)s.length(); i++)
+    if (s[i] != ' ')
+      ok = false;
+  return ok;
+}
+
+void 
+Comments::textmark(GP<TxtMark> mark)
+{
+  // determine direction
+  int dirx = 0;
+  int diry = 0;
+  int size = 0;
+  if (abs(mark->dx) > 8*abs(mark->dy))
+    {
+      dirx = (mark->dx > 0) ? +1 : -1;
+      size = mark->r.height();
+    }
+  else if (abs(mark->dy) > 8*abs(mark->dy))
+    {
+      diry = (mark->dy > 0) ? +1 : -1;
+      size = mark->r.width();
+    }
+  // make mark
+  mark->inter = 0;
+  // flush previous line
+  if (lastline.size())
+    {
+      if (size != lastsize[0])
+        {
+          lastsize[2] = lastsize[1];
+          lastsize[1] = lastsize[0];
+          lastsize[0] = size;
+        }
+      int fontsize = median3(lastsize) + 1;
+      int shx = (mark->x - lastx) * 100 / fontsize;
+      int shy = (mark->y - lasty) * 100 / fontsize;
+      int inter = dirx * shx + diry * shy;
+      if ( (dirx || diry) && (dirx == lastdirx) && (diry == lastdiry) &&
+           (inter > -150) && (inter < 300) && 
+           abs(diry * shx + dirx * shy) < 80 )
+        mark->inter = inter;
+      else
+        textflush();
+    }
+  if (! lastline.size())
+    lastsize[0] = lastsize[1] = lastsize[2] = size;
+  lastline.append(mark);
+  lastdirx = dirx;
+  lastdiry = diry;
+  lastx = mark->x + mark->dx;
+  lasty = mark->y + mark->dy;
+}
+
+void 
+Comments::textflush(void)
+{
+  int size = lastline.size();
+  if (size > 0)
+    {
+      // compute word spacing
+      int i = 0;
+      GTArray<int> inter(0,size-1);
+      for (GPosition p=lastline; p; ++p)
+        inter[i++] = lastline[p]->inter;
+      inter.sort();
+      int wordsep = MAX(10, 2 * inter[(2*size)/3]);
+      // compute word list
+      GP<TxtMark> word;
+      GPList<TxtMark> words;
+	  { // extra nesting for windows
+        for (GPosition p=lastline; p; ++p)
+        {
+          TxtMark *mark = lastline[p];
+          if (word && mark->inter > wordsep) 
+            {
+              if (! allspaces(word->s))
+                words.append(word);
+              word = 0;
+            }
+          if (! word) 
+            {
+              word = mark;
+            } 
+          else 
+            {
+              word->dx += mark->dx;
+              word->dy += mark->dy;
+              word->s += mark->s;
+              word->r.recthull(word->r, mark->r);
+            }
+        }
+	  }
+      if (word)
+        {
+          if (! allspaces(word->s))
+            words.append(word);
+          word = 0;
+        }
+      // create text data
+      int size = words.size();
+      if (size)
+        {
+          DjVuTXT::Zone *lzone = 0;
+          for (GPosition p = words; p; ++p)
+            {
+              word = words[p];
+              mapper.map(word->r);
+              if (! lzone)
+                {
+                  if (! txt)
+                    {
+                      txt = DjVuTXT::create();
+                      txt->page_zone.ztype = DjVuTXT::PAGE;
+                      txt->page_zone.rect = GRect(0,0,w,h);
+                      txt->page_zone.text_start = 0;
+                      txt->page_zone.text_length = 0;
+                    }
+                  lzone = txt->page_zone.append_child();
+                  lzone->ztype = DjVuTXT::LINE;
+                  lzone->text_start = txt->textUTF8.length();
+                  lzone->text_length = 0;
+                }
+              if (detail >= DjVuTXT::WORD)
+                {
+                  DjVuTXT::Zone *wzone = lzone->append_child();
+                  wzone->ztype = DjVuTXT::WORD;
+                  wzone->text_start = txt->textUTF8.length();
+                  txt->textUTF8 += word->s;
+                  wzone->text_length = 
+                    txt->textUTF8.length() - wzone->text_start;
+                  wzone->rect = word->r;
+                  lzone->rect.recthull(lzone->rect, word->r);
+                }
+              else
+                {
+                  if (lzone->text_length > 0) txt->textUTF8 += " ";
+                  txt->textUTF8 += word->s;
+                  lzone->text_length = 
+                    txt->textUTF8.length() - lzone->text_start;
+                  lzone->rect.recthull(lzone->rect, word->r);
+                }
+            }
+        }
+    }
+  lastline.empty();
+}
+
+static int 
+bytestream_fputs(miniexp_io_t *io, const char *s)
+{
+  ByteStream *outbs = (ByteStream*)io->data[0];
+  return (outbs) ? outbs->write((const void*)s, strlen(s)) : -1;
+}
+
+void 
+Comments::make_chunks(IFFByteStream &iff)
+{
+  // Write text chunk
+  textflush();
+  if (txt)
+    {
+      txt->normalize_text();
+      iff.put_chunk("TXTz");
+      {
+        GP<ByteStream> bsb = BSByteStream::create(iff.get_bytestream(), 50);
+        txt->encode(bsb);
+      }
+      iff.close_chunk();
+    }
+  // Create annotation chunk
+  if (links.size() > 0)
+    {
+      iff.put_chunk("ANTz");
+      {
+        GP<ByteStream> bsb = BSByteStream::create(iff.get_bytestream(), 50);
+        miniexp_io_t io;
+        miniexp_io_init(&io);
+        io.fputs = bytestream_fputs;
+        io.data[0] = (void*)(ByteStream*)bsb;
+        minivar_t exor = miniexp_cons(miniexp_symbol("xor"),miniexp_nil);
+        minivar_t zstr = miniexp_string("");
+        for (GPosition p = links; p; ++p)
+          {
+            GP<LnkMark> mark = links[p];
+            minivar_t url = miniexp_string((const char*)(mark->s));
+            minivar_t expr = miniexp_cons(exor, miniexp_nil);
+            minivar_t area;
+            area = miniexp_cons(miniexp_number(mark->r.height()), area);
+            area = miniexp_cons(miniexp_number(mark->r.width()), area);
+            area = miniexp_cons(miniexp_number(mark->r.ymin), area);
+            area = miniexp_cons(miniexp_number(mark->r.xmin), area);
+            area = miniexp_cons(miniexp_symbol("rect"),area);
+            expr = miniexp_cons(area, expr);
+            expr = miniexp_cons(zstr, expr);
+            expr = miniexp_cons(url, expr);
+            expr = miniexp_cons(miniexp_symbol("maparea"), expr);
+            miniexp_pprint_r(&io, expr, 72);
+          }
+      }
+      iff.close_chunk();
+    }
+}
+
+GP<DjVmNav>
+Comments::get_djvm_nav()
+{
+  if (nav && nav->getBookMarkCount() && nav->isValidBookmark())
+    return nav;
+  if (nav)
+    DjVuPrintErrorUTF8("%s", "csepdjvu: corrupted outline comments.\n");
+  return 0;
+}
+
+
+// --------------------------------------------------
+// MAIN COMPRESSION ROUTINE
+// --------------------------------------------------
+
+
+// -- Compresses one page:
+//    - bytestream bs contains the input separated file.
+//    - bytestream obs will receive the output djvu file.
+void 
+csepdjvu_page(BufferByteStream &bs, 
+              GP<ByteStream> obs, 
+              GP<DjVmNav> &nav,
+              const csepdjvuopts &opts)
+{
+  // Read rle data from separation file
+  CRLEImage rimg(bs);
+  int w = rimg.width;
+  int h = rimg.height;
+  if (opts.verbose > 1)
+    DjVuFormatErrorUTF8( "%s\t%d\t%d\t%d\t%d",
+                     ERR_MSG("csepdjvu.summary"), 
+                     w, h, rimg.pal->size(), rimg.runs.size());
+  
+  // Perform Color Connected Component Analysis
+  rimg.make_ccids_by_analysis();                  // Obtain ccids
+  rimg.make_ccs_from_ccids();                     // Compute cc descriptors
+  if (opts.verbose > 1)
+    DjVuFormatErrorUTF8("%s\t%d", ERR_MSG("csepdjvu.analyzed"), 
+                        rimg.ccs.size());
+  
+  // Post-process Color Connected Components
+  int largesize = MIN(500, MAX(64, opts.dpi));
+  int smallsize = MAX(2, opts.dpi/150);
+  rimg.merge_and_split_ccs(smallsize,largesize);  // Eliminates gross ccs
+  if (opts.verbose > 1)
+    DjVuFormatErrorUTF8( "%s\t%d",
+                     ERR_MSG("csepdjvu.merge_split"), 
+                     rimg.ccs.size());
+  rimg.sort_in_reading_order();                   // Sort cc descriptors
+  
+  // Create JB2Image and fill colordata
+  GP<JB2Image> gjimg=JB2Image::create(); 
+  JB2Image &jimg=*gjimg;
+  jimg.set_dimension(w, h);
+  int nccs = rimg.ccs.size();
+  for (int ccid=0; ccid<nccs; ccid++)
+    {
+      JB2Shape shape;
+      JB2Blit  blit;
+      shape.parent = -1;
+      shape.userdata = 0;
+      if (ccid >= rimg.nregularccs)
+        shape.userdata |= JB2SHAPE_SPECIAL;
+      shape.bits = rimg.get_bitmap_for_cc(ccid);
+      shape.bits->compress();
+      CC& cc = rimg.ccs[ccid];
+      blit.shapeno = jimg.add_shape(shape);
+      blit.left = cc.bb.xmin;
+      blit.bottom = cc.bb.ymin;
+      int blitno = jimg.add_blit(blit);
+      rimg.pal->colordata.touch(blitno);
+      rimg.pal->colordata[blitno] = cc.color;
+    }
+  
+  // Organize JB2Image
+  tune_jb2image_lossless(&jimg);
+  if (opts.verbose> 1)
+    {
+      int nshape=0, nrefine=0;
+      for (int i=0; i<jimg.get_shape_count(); i++) 
+        {
+          if (!jimg.get_shape(i).bits) continue;
+          if (jimg.get_shape(i).parent >= 0) nrefine++; 
+          nshape++; 
+        }
+      DjVuFormatErrorUTF8( "%s\t%d\t%d",
+                       ERR_MSG("csepdjvu.cross_code"), 
+                       nshape, nrefine);
+    }
+  
+  // Obtain background image
+  int bgred;
+  GP<GPixmap> bgpix = read_background(bs, w, h, bgred);
+  if (opts.verbose > 1 && bgpix)
+    DjVuFormatErrorUTF8( "%s\t%d", ERR_MSG("csepdjvu.reduction"), bgred);
+
+  // Process comments
+  Comments coms(w, h, opts);
+  coms.process_comments(bs, opts.verbose);
+  
+  // Compute flags for simplifying output format
+  bool white_background = (bgpix ? false : true);
+  bool gray_background = white_background;
+  if (rimg.bg_flags == 'g' || rimg.bg_flags=='b')
+    gray_background = true;
+  bool bitonal = false;
+  if (white_background && rimg.pal->size() == 1) 
+    {
+      GPixel fgcolor;
+      rimg.pal->index_to_color(0, fgcolor);
+      if (fgcolor == GPixel::BLACK)
+        bitonal = true;
+    }
+  if (opts.verbose > 1)
+    {
+      if (bitonal)
+        DjVuWriteError( ERR_MSG("csepdjvu.bilevel") );
+      else if (white_background) 
+        DjVuWriteError( ERR_MSG("csepdjvu.white_bg") );
+      else if (gray_background) 
+        DjVuWriteError( ERR_MSG("csepdjvu.gray_bg") );
+      else 
+        DjVuWriteError( ERR_MSG("csepdjvu.color") );
+    }
+  
+  // Create background image
+  GP<IW44Image> iw;
+  if (! white_background)
+    {
+      /* Perform masked compression */
+      GP<GBitmap> mask = jimg.get_bitmap(bgred);
+      mask->binarize_grays(bgred*bgred-1);
+      IW44Image::CRCBMode mode = IW44Image::CRCBnormal;
+      if (gray_background) mode = IW44Image::CRCBnone;
+      iw = IW44Image::create_encode(*bgpix, mask, mode);
+      bgpix = 0;
+    } 
+  else if (! bitonal) 
+    {
+      /* Compute white background */
+      GPixel bgcolor = GPixel::WHITE;
+      GP<GPixmap> inputsub=GPixmap::create((h+11)/12, (w+11)/12, &bgcolor);
+      iw = IW44Image::create_encode(*inputsub, 0, IW44Image::CRCBnone);
+    }
+  
+  // Assemble DJVU file
+  GP<IFFByteStream> giff=IFFByteStream::create(obs);
+  IFFByteStream &iff=*giff;
+  // -- main composite chunk
+  iff.put_chunk("FORM:DJVU", 1);
+  // -- ``INFO'' chunk
+  iff.put_chunk("INFO");
+  GP<DjVuInfo> ginfo=DjVuInfo::create();
+  DjVuInfo &info=*ginfo;
+  info.height = h;
+  info.width = w;
+  info.dpi = opts.dpi;
+  info.encode(*iff.get_bytestream());
+  iff.close_chunk();
+  // -- ``Sjbz'' chunk
+  iff.put_chunk("Sjbz");
+  jimg.encode(iff.get_bytestream());
+  iff.close_chunk();
+  // -- Color stuff
+  if (! bitonal) 
+    {
+      // -- ``FGbz'' chunk
+      iff.put_chunk("FGbz");
+      rimg.pal->encode(iff.get_bytestream());
+      iff.close_chunk();
+      // -- ``BG44'' chunk
+      IWEncoderParms iwparms;
+      if (white_background) 
+        {
+          iff.put_chunk("BG44");
+          iwparms.slices = 97;
+          iw->encode_chunk(iff.get_bytestream(), iwparms);
+          iff.close_chunk();
+        }
+      else
+        {
+          const unsigned char *slice = opts.slice;
+          while ((iwparms.slices = *slice++))
+            {
+              iff.put_chunk("BG44");
+              iw->encode_chunk(iff.get_bytestream(), iwparms);
+              iff.close_chunk();
+            }
+        }
+    }
+  // -- terminate main composite chunk
+  coms.make_chunks(iff);
+  iff.close_chunk();
+  // -- store outline
+  if (! nav) 
+    nav = coms.get_djvm_nav();
+}  
+
+// -- Checks whether there is another page in the same file
+bool
+check_for_another_page(BufferByteStream &bs, const csepdjvuopts &opts)
+{
+  // Skip null bytes (why?)
+  int lookahead;
+  while (! (lookahead = bs.get())) { }
+  bs.unget(lookahead);
+  // Check next header
+  if (lookahead == 'R') 
+    return true;
+  if (lookahead != EOF) 
+    DjVuPrintErrorUTF8("%s","csepdjvu: found corrupted data\n");
+  return false;
+}
+
+
+// -- Prints usage message
+void
+usage()
+{
+  const char *msg = 
+#ifdef DJVULIBRE_VERSION
+    "CSEPDJVU --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+    "DjVu encoder working with \"separated\" files\n\n"
+    "Usage: csepdjvu <...options_or_separatedfiles...> <outputdjvufile>\n"
+    "Options are:\n"
+    "   -v, -vv    Select verbosity level.\n"
+    "   -d <n>     Set resolution to <n> dpi (default: 300).\n"
+    "   -t         Restricts text information to lines only.\n"
+    "   -q <spec>  Select quality for background (default: 72+11+10+10);\n"
+    "              see option -slice in program c44 for more information.\n"
+    "Each separated files contain one or more pages\n"
+    "Each page is composed of:\n"
+    " (1) a B&W-RLE or Color-RLE image representing the foreground,\n"
+    " (2) an optional PPM image representing the background layer.\n";
+  DjVuPrintErrorUTF8(msg);
+  exit(10);
+}
+
+
+// -- Parsing quality spec (borrowed from c44)
+void 
+parse_slice(const char *q, csepdjvuopts &opts)
+{
+  int count = 0;
+  int lastx = 0;
+  while (*q)
+    {
+      char *ptr; 
+      int x = strtol(q, &ptr, 10);
+      if (ptr == q)
+        G_THROW("csepdjvu: "
+                "illegal quality specification (number expected)");
+      if (lastx>0 && q[-1]=='+')
+        x += lastx;
+      if (x<1 || x>1000 || x<lastx)
+        G_THROW("csepdjvu: "
+                "illegal quality specification (number out of range)");
+      lastx = x;
+      if (*ptr && *ptr!='+' && *ptr!=',')
+        G_THROW("csepdjvu: "
+                "illegal quality specification (comma expected)");        
+      q = (*ptr ? ptr+1 : ptr);
+      if (count+1 >= (int)(sizeof(opts.slice)/sizeof(opts.slice[0])))
+        G_THROW("csepdjvu: "
+                "illegal quality specification (too many chunks)");
+      opts.slice[count++] = x;
+      opts.slice[count] = 0;
+    }
+  if (count < 1)
+    G_THROW("csepdjvu: "
+            "illegal quality specification (no chunks)");
+}
+
+
+// -- Main routine
+int 
+main(int argc, const char **argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  G_TRY
+    {
+      GP<DjVmDoc> gdoc=DjVmDoc::create();
+      GP<DjVmNav> gnav;
+      DjVmDoc &doc=*gdoc;
+      GURL outputurl;
+      GP<ByteStream> goutputpage=ByteStream::create();
+      csepdjvuopts opts;
+      int pageno = 0;
+      // Read outputurl name
+      if (argc < 3) usage();
+      outputurl = GURL::Filename::UTF8(dargv[--argc]);
+      // Process arguments
+      for (int i=1; i<argc; i++)
+        {
+          GUTF8String arg = dargv[i];
+          if (arg == "-v")
+            opts.verbose = 1;
+          else if (arg == "-vv")
+            opts.verbose = 2;
+          else if (arg == "-t")
+            opts.text = DjVuTXT::LINE;
+          else if (arg == "-d" && i+1<argc)
+            {
+              // Specify resolution
+              char *end;
+              opts.dpi = strtol(dargv[++i], &end, 10);
+              if (*end || opts.dpi<25 || opts.dpi>6000)
+                usage();
+            }
+          else if (arg == "-q" && i+1 < argc)
+            {
+              // Specify background quality
+              parse_slice(dargv[++i], opts);
+            }
+          else if (arg == "-l" || arg == "-t" || arg == "-h")
+            {
+              DjVuPrintErrorUTF8("csepdjvu: option %s not yet supported\n",
+                                 (const char *)arg );
+            }
+          else if ((arg == "-j" || arg == "-p") && i+1 < argc)
+            {
+              i += 1;
+              DjVuPrintErrorUTF8("csepdjvu: option %s not yet supported\n",
+                                 (const char *)arg );
+            }
+          else 
+            {
+              // Process separation file
+              GP<ByteStream> fbs = 
+                ByteStream::create(GURL::Filename::UTF8(arg),"rb");
+              BufferByteStream ibs(*fbs);
+              do {
+                char pagename[16];
+                sprintf(pagename, "p%04d.djvu", ++pageno);
+                if (opts.verbose > 1)
+                  DjVuPrintErrorUTF8("%s","--------------------\n");
+                // Compress page 
+                goutputpage=ByteStream::create();
+                ByteStream &outputpage=*goutputpage;
+                csepdjvu_page(ibs, goutputpage, gnav, opts);
+                if (opts.verbose) {
+                  DjVuPrintErrorUTF8("csepdjvu: %d bytes for page %d",
+                                     outputpage.size(), pageno);
+                  if (arg == "-")
+                    DjVuPrintErrorUTF8("%s"," (from stdin)\n");
+                  else
+                    DjVuPrintErrorUTF8(" (from file '%s')\n", 
+                                       (const char*)arg);
+                }
+                // Insert page into document
+                outputpage.seek(0);
+                doc.insert_file(outputpage, DjVmDir::File::PAGE, 
+                                pagename, pagename);
+              } while (check_for_another_page(ibs, opts));
+            }
+        } 
+      // Save file
+      if (pageno == 1 && ! gnav) 
+        {
+          ByteStream &outputpage=*goutputpage;
+          // Save as a single page 
+          outputpage.seek(0);
+          ByteStream::create(outputurl,"wb")->copy(outputpage);
+        }
+      else if (pageno >= 1)
+        {
+          // Save as a bundled file
+          doc.set_djvm_nav(gnav);
+          doc.write(ByteStream::create(outputurl,"wb"));
+        }
+      else 
+        usage();
+    }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
diff --git a/tools/ddjvu.1 b/tools/ddjvu.1
new file mode 100644
index 0000000..306ef7b
--- /dev/null
+++ b/tools/ddjvu.1
@@ -0,0 +1,364 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DDJVU 1 "10/19/2002" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+ddjvu \- Command line DjVu decoder.
+
+.SH SYNOPSIS
+.BI "ddjvu -format=" "fmt" " [" "options" "] [" "djvufile" "] [" "outputfile" "]"
+
+.SH DESCRIPTION
+
+Decode the DjVu file
+.IR "djvufile" ,
+produces the image file
+.IR "outputfile" .
+
+The DjVu data is read from the standard input when argument 
+.IR "djvufile"
+is not specified or when it is equal to a single dash.
+Similarly, the output data is written to the standard output
+when argument 
+.IR "outputfile"
+is not specified or equal to a single dash.
+However a valid output file name is always required when producing a
+TIFF or PDF file.
+
+.SH MAIN OPTIONS
+.TP
+.BI "-format=" "fmt"
+Specify the output file formats.
+The recognized file formats are
+.BR "pbm" ,
+.BR "pgm" ,
+.BR "ppm" ,
+.BR "pnm" ,
+.BR "rle" ,
+.BR "tiff" ,
+and
+.BR "pdf" .
+.RS
+.IP "*" 3
+Formats 
+.BR "pbm" ,
+.BR "pgm" ,
+and
+.BR "ppm"
+respectively produce a Portable Bitmap (PBM),
+Portable Graymap (PGM),
+or Portable Pixmap (PPM) file.
+Format 
+.B "pnm"
+produces a PBM, PGM, or PPM 
+output file according to the color content
+of the output image.
+.IP "*"
+Format
+.B "rle"
+produces a compact run length encoded bitonal file
+that is understood by the DjVuLibre commands
+.BR "cjb2" 
+and 
+.BR "csepdjvu" .
+.IP "*"
+Format
+.B "tiff"
+produces a Tagged Image Format (TIFF) 
+file using lossless compression.
+Enabling lossy JPEG compression (see option 
+.BI "-quality"
+below) often produces much smaller files.
+Commands 
+.BR tiffcp (1)
+and 
+.BR tiffsplit (1)
+are useful for manipulating the resulting 
+TIFF files.
+.IP "*"
+Format
+.B "pdf"
+produces a Portable Document Format (PDF) file.
+Each page in the resulting file is represented
+by an image at the specified resolution,
+using lossless compression.
+Enabling lossy JPEG compression (see option 
+.BI "-quality"
+below) often produces much smaller files.
+An alternate way to produce PDF 
+file consists in first using
+.BR djvups (1)
+and convert the resulting PostScript file to PDF.
+Which method gives better results depends
+on the contents of the DJVU file and on the
+capabilities of the PS to PDF converter.
+.RE
+.TP
+.B ""
+When option
+.B "-format"
+is not specified, 
+the extension of argument
+.I "outputfile"
+has no influence on the default output format.
+Instead the program behavior is modified to 
+ensure backward compatibility with previous 
+versions of 
+.BR "ddjvu" .
+We recommend to always specify the output
+format using this option.
+.TP
+.BI "-page=" "pagespec"
+Specify which pages should be decoded.
+When this option is not specified,
+all pages of the documents are decoded
+and concatenated into the output file.
+The page specification
+.I pagespec 
+contains one or more comma-separated page ranges.
+A page range is either a page number, 
+or two page numbers separated by a dash.
+For instance, specification
+.BR "1-10" 
+outputs pages 1 to 10, and specification
+.BR "1,3,99999-4"
+outputs pages 1 and 3, followed by all the document
+pages in reverse order up to page 4.
+.TP
+.BI "-eachpage"
+When this option is specified, program
+.B ddjvu
+generates one separate file per page
+named by replacing the 
+.B %d
+specification in 
+.I outputfilename
+by the page number 
+in a manner simular to the 
+.BR printf (3)
+function.
+.TP
+.BI "-mode=" "mod"
+Selects which layers of the DjVu image should be rendered.
+Valid rendering modes are 
+.BR "color" ,
+.BR "black" ,
+.BR "mask" ,
+.BR "foreground" ,
+and
+.BR "background" .
+.RS
+.IP "*" 3
+Rendering mode
+.BR "color" 
+is the default mode.
+When the DjVu file is bitonal, bitonal or gray-level output
+is produced depending on the subsampling factor. 
+Otherwise a color image is produced.
+.IP "*"
+Rendering mode
+.B "black"
+is useful to extract a meaningful black and white image.
+bitonal or gray-level output is produced depending 
+on the subsampling factor. 
+.IP "*"
+Rendering modes
+.BR "mask" ,
+.BR "foreground" ,
+and
+.BR "background"
+select specific layers of a DjVu image.
+These modes can fail if the DjVu image does 
+not contain the selected layer.
+.RE
+.TP
+.BI "-skip"
+Instead of aborting when encountering a corrupted page,
+this option causes
+.BR ddjvu
+to simply skip the corrupted page and continue with the next.
+This is useful for processing certain damaged files.
+
+.SH RESOLUTION OPTIONS
+The following options control the resolution of the output image.  
+The default resolution is the native resolution of the DjVu file, 
+equivalent to selecting
+.BR "-1" .
+.TP
+.BI "-" "n"
+Specify an integer sub-sampling factor.  
+The dimensions of the full output image will be 
+.I n
+times smaller than the DjVu image size.
+The legal values for argument
+.I n
+range from 1 to 12.  Option
+.BR -1 ,
+for instance, produces an output image whose resolution
+is equal to the resolution of the input DjVu image file.
+.TP
+.BI "-subsample=" "n"
+This is equivalent to option
+.IR "-n" .
+.TP
+.BI "-scale=" "mag"
+Specify a magnification factor relative to the resolution stored 
+in the DjVu image.  Specifying magnification of 100 produces an image 
+suitable for displaying on a 100 dpi device such as a computer screen.  
+The magnification factor
+.I "mag"
+can also be interpreted as the resolution
+of the output image expressed in dot per inch.
+.TP
+.BI "-size=" "w" "x" "h"
+Specify the size of the full output image.
+Rendering the full DjVu image would create an 
+output image whose width and height would not exceed
+.IR "w"
+and 
+.IR "h" .
+To change the aspect ratio, you must also use option
+.BR "-aspect=no" .
+.TP
+.BI "-aspect=" yesno
+This option indicates whether the image aspect ratio
+should be preserved.  The defaults is to preserve the
+aspect ration. This option permits changes in the aspect ratio
+when used in combination with option
+.BR "-size" .
+
+.SH OTHER OPTIONS
+.TP
+.BI "-verbose"
+Display informational messages describing the 
+structure of the DjVu image and the format
+of the output file.
+.TP
+.BI "-segment=" "w" "x" "h" "+" "x" "+" "y"
+Specify an image segment to render. 
+Program
+.B ddjvu
+conceptually renders the full page using the specified resolution, 
+and then extracts a sub-image of width
+.I w 
+and height
+.IR h ,
+starting at position 
+.IR "" ( x , y )
+relative to the bottom left corner of the page.
+Both operations of course happen simultaneously.  Rendering a small
+sub-image is much faster than rendering the complete image.  
+The output file will always have size
+.IR w x h 
+when this option is specified.
+.TP
+.BI "-quality=" "factor"
+Enables lossy JPEG compression for TIFF and PDF files.
+This option only affects images that cannot be encoded
+using the preferred TIFF/G4 compression.
+Argument 
+.I factor
+is a quantization factor ranging from 25 to 150. 
+See command 
+.BR cjpeg (1)
+for more information on JPEG quantization factors.
+Value 80 is a good starting point.
+.TP 
+.BR "-quality=uncompressed"
+Completely disables compression in TIFF and PDF files.
+Although the resulting files are often huge,
+this is sometimes useful for maximal compatibility
+with hastily written software.
+.TP
+.BR "-quality=deflate"
+Enables DEFLATE compression for TIFF files.
+Images that cannot be encoded using the preferred TIFF/G4 compression
+will be encoded with DEFLATE compression if available.
+Otherwise the more portable PACKBITS compression is used.
+Specifying this option is not necessary for PDF files
+because this is the default behavior.
+
+.SH DEPRECATED OPTIONS
+
+Various options have been maintained to ensure
+backward compatibility with previous versions of
+.BR ddjvu.  
+When option
+.BR -format
+is not specified, 
+the program only decodes the first page of the document
+and the default resolution becomes
+.BR -scale=100 .
+Options 
+.BR -size ,
+.BR -scale ,
+.BR -segment ,
+and
+.BR -page 
+accept an argument separated by a space.
+Options
+.BR -foreground ,
+.BR -background ,
+and
+.BR -black
+are shorthands for the 
+.BI -mode= mod
+option.
+Please do not rely on these features.
+
+
+.SH EXAMPLES
+Command
+.IP "" 3
+.BI "ddjvu -format=tiff " "myfile.djvu" " " "myfile.tif"
+.PP
+decodes all pages and produces a multipage TIFF file.
+
+Command
+.IP "" 3
+.BI "ddjvu -format=ppm -page=1-10 -eachpage -size=100x100 " "myfile.djvu" " thumb%03d.ppm"
+.PP
+produces 100x100 thumbnails for the first ten page of a document 
+and outputs them as PPM files named
+.BR thumb001.ppm
+to 
+.BR thumb010.ppm .
+
+.SH CREDITS
+The new version of this program was written 
+by L\('eon Bottou <leonb@users.sourceforge.net>.
+
+This program includes code derived from program
+.BR tiff2pdf ,
+written by Ross Finlayson and 
+released under a BSD license.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djview (1),
+.BR pnm (5),
+.BR pbm (5),
+.BR pgm (5),
+.BR ppm (5),
+.BR cjpeg (1),
+.BR tiffsplit (1),
+.BR tiffcp (1),
+.BR printf (3)
diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
new file mode 100644
index 0000000..f27f76f
--- /dev/null
+++ b/tools/ddjvu.cpp
@@ -0,0 +1,1225 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+
+/* Program ddjvu has been rewritten to use the ddjvuapi only.
+ * This file should compile both as C and C++. 
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <locale.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#ifdef UNIX
+# include <sys/time.h>
+# include <sys/types.h>
+# include <unistd.h>
+#endif
+#if defined(_WIN32) || defined(__CYGWIN32__)
+# include <io.h>
+#endif
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+# include <mbctype.h>
+#endif
+
+#include "libdjvu/ddjvuapi.h"
+#include "tiff2pdf.h"
+
+
+#if HAVE_PUTC_UNLOCKED
+# undef putc
+# define putc putc_unlocked
+#endif
+
+#if HAVE_TIFF
+# include <tiff.h>
+# include <tiffio.h>
+# include <tiffconf.h>
+#endif
+
+/* Some day we'll redo i18n right. */
+#ifndef i18n
+# define i18n(x) (x)
+# define I18N(x) (x)
+#endif
+
+
+unsigned long 
+ticks(void)
+{
+#ifdef UNIX
+  struct timeval tv;
+  if (gettimeofday(&tv, NULL) >= 0)
+    return (unsigned long)(((tv.tv_sec & 0xfffff)*1000)+(tv.tv_usec/1000));
+#endif
+  return 0;
+}
+
+ddjvu_context_t *ctx;
+ddjvu_document_t *doc;
+
+unsigned long timingdata[4];
+
+double       flag_scale = -1;
+int          flag_size = -1;
+int          flag_aspect = -1;
+int          flag_subsample = -1;
+int          flag_segment = 0;
+int          flag_verbose = 0;
+char         flag_mode = 0;     /* 'c', 'k', 's', 'f','b' */
+char         flag_format = 0;   /* '4','5','6','p','r','t', 'f' */
+int          flag_quality = -1; /* 1-100 jpg, 900 zip, 901 lzw, 1000 raw */
+int          flag_skipcorrupted = 0;
+int          flag_eachpage = 0;
+const char  *flag_pagespec = 0; 
+ddjvu_rect_t info_size;
+ddjvu_rect_t info_segment;
+const char  *programname = 0;
+const char  *inputfilename = 0;
+const char  *outputfilename = 0;
+
+char *pagefilename = 0;
+#if HAVE_TIFF2PDF
+char *tempfilename = 0;
+int tiffd = -1;
+#endif
+#if HAVE_TIFF
+TIFF *tiff = 0;
+#endif
+FILE *fout = 0;
+
+
+
+/* Djvuapi events */
+
+void
+handle(int wait)
+{
+  const ddjvu_message_t *msg;
+  if (!ctx)
+    return;
+  if (wait)
+    msg = ddjvu_message_wait(ctx);
+  while ((msg = ddjvu_message_peek(ctx)))
+    {
+      switch(msg->m_any.tag)
+        {
+        case DDJVU_ERROR:
+          fprintf(stderr,"ddjvu: %s\n", msg->m_error.message);
+          if (msg->m_error.filename)
+            fprintf(stderr,"ddjvu: '%s:%d'\n", 
+                    msg->m_error.filename, msg->m_error.lineno);
+        default:
+          break;
+        }
+      ddjvu_message_pop(ctx);
+    }
+}
+
+
+void 
+die(const char *fmt, ...)
+{
+  /* Handling messages might give a better error message */
+  handle(FALSE);
+  /* Print */
+  va_list args;
+  fprintf(stderr,"ddjvu: ");
+  va_start(args, fmt);
+  vfprintf(stderr, fmt, args);
+  va_end(args);
+  fprintf(stderr,"\n");
+  /* Cleanup */
+#if HAVE_TIFF2PDF
+  if (tiffd >= 0)
+    close(tiffd);
+  if (tempfilename)
+    remove(tempfilename);
+#endif
+  /* Terminates */
+  exit(10);
+}
+
+
+void
+inform(ddjvu_page_t *page, int pageno)
+{
+  if (flag_verbose)
+    {
+      const char *desctype;
+      char *description = ddjvu_page_get_long_description(page);
+      ddjvu_page_type_t type = ddjvu_page_get_type(page);
+      fprintf(stderr,i18n("\n-------- page %d -------\n"), pageno);
+      if (type == DDJVU_PAGETYPE_BITONAL)
+        desctype = i18n("This is a legal Bitonal DjVu image");
+      else if (type == DDJVU_PAGETYPE_PHOTO)
+        desctype = i18n("This is a legal Photo DjVu image");
+      else if (type == DDJVU_PAGETYPE_COMPOUND)
+        desctype = i18n("This is a legal Compound DjVu image");
+      else
+        desctype = i18n("This is a malformed DjVu image");
+      fprintf(stderr,"%s.\n", desctype);
+      if (description)
+        fprintf(stderr,"%s\n", description);
+      if (description)
+        free(description);
+      if (timingdata[0] != timingdata[1])
+	fprintf(stderr,"Decoding time:  %5ld ms\n",
+		timingdata[1] - timingdata[0] );
+    }
+}
+
+
+void
+render(ddjvu_page_t *page, int pageno)
+{
+  ddjvu_rect_t prect;
+  ddjvu_rect_t rrect;
+  ddjvu_format_style_t style;
+  ddjvu_render_mode_t mode;
+  ddjvu_format_t *fmt;
+  int iw = ddjvu_page_get_width(page);
+  int ih = ddjvu_page_get_height(page);
+  int dpi = ddjvu_page_get_resolution(page);
+  ddjvu_page_type_t type = ddjvu_page_get_type(page);
+  char *image = 0;
+  char white = (char)0xFF;
+  int rowsize;
+#if HAVE_TIFF
+  int compression = COMPRESSION_NONE;
+#endif
+  
+  /* Process size specification */
+  prect.x = 0;
+  prect.y = 0;
+  if (flag_size > 0)
+    {
+      prect.w = info_size.w;
+      prect.h = info_size.h;
+    }
+  else if (flag_subsample > 0)
+    {
+      prect.w = (iw + flag_subsample - 1) / flag_subsample;
+      prect.h = (ih + flag_subsample - 1) / flag_subsample;
+    }
+  else if (flag_scale > 0)
+    {
+      prect.w = (unsigned int) (iw * flag_scale) / dpi;
+      prect.h = (unsigned int) (ih * flag_scale) / dpi;
+    }
+  else if (flag_format)
+    {
+      prect.w = iw;
+      prect.h = ih;
+    }
+  else
+    {
+      prect.w = (iw * 100) / dpi;
+      prect.h = (ih * 100) / dpi;
+    }
+  /* Process aspect ratio */
+  if (flag_aspect <= 0)
+    {
+      double dw = (double)iw / prect.w;
+      double dh = (double)ih / prect.h;
+      if (dw > dh) 
+        prect.h = (int)(ih / dw);
+      else
+        prect.w = (int)(iw / dh);
+    }
+
+  /* Process segment specification */
+  rrect = prect;
+  if (flag_segment > 0)
+    {
+      rrect = info_segment;
+      if (rrect.x < 0)
+        rrect.x = prect.w - rrect.w + rrect.x;
+      if (rrect.y < 0)
+        rrect.y = prect.h - rrect.h + rrect.y;
+    }
+
+  /* Process mode specification */
+  mode = DDJVU_RENDER_COLOR;
+  if (flag_mode == 'f')
+    mode = DDJVU_RENDER_FOREGROUND;
+  else if (flag_mode == 'b')
+    mode = DDJVU_RENDER_BACKGROUND;
+  else if (flag_mode == 'c')
+    mode = DDJVU_RENDER_COLOR;
+  else if (flag_mode == 'k')
+    mode = DDJVU_RENDER_BLACK;
+  else if (flag_mode == 's')
+    mode = DDJVU_RENDER_MASKONLY;
+  else if (flag_format == 'r' || flag_format == '4')
+    mode = DDJVU_RENDER_BLACK;
+
+  /* Determine output pixel format and compression */
+  style = DDJVU_FORMAT_RGB24;
+  if (mode==DDJVU_RENDER_BLACK ||
+      mode==DDJVU_RENDER_MASKONLY ||
+      (mode==DDJVU_RENDER_COLOR && type==DDJVU_PAGETYPE_BITONAL))
+    {
+      style = DDJVU_FORMAT_GREY8;
+      if ((int)prect.w == iw && (int)prect.h == ih)
+        style = DDJVU_FORMAT_MSBTOLSB;
+    }
+  switch(flag_format)
+    {
+    case 'f':
+    case 't':
+#if HAVE_TIFF
+      compression = COMPRESSION_NONE;
+      if (flag_quality >= 1000)
+        break;
+# ifdef CCITT_SUPPORT
+      if (style==DDJVU_FORMAT_MSBTOLSB 
+          && TIFFFindCODEC(COMPRESSION_CCITT_T6))
+        compression = COMPRESSION_CCITT_T6;
+# endif
+# ifdef JPEG_SUPPORT
+      if (compression == COMPRESSION_NONE 
+          && style!=DDJVU_FORMAT_MSBTOLSB 
+          && flag_quality>0 && flag_quality<=100
+          && TIFFFindCODEC(COMPRESSION_JPEG))
+        compression = COMPRESSION_JPEG;
+# endif
+# ifdef ZIP_SUPPORT
+      if (compression == COMPRESSION_NONE
+          && (flag_format == 'f' || flag_quality == 900)
+          && TIFFFindCODEC(COMPRESSION_DEFLATE))
+        /* All pdf engines understand deflate. */
+        compression = COMPRESSION_DEFLATE;
+# endif
+# ifdef LZW_SUPPORT
+      if (compression == COMPRESSION_NONE
+          && flag_quality == 901
+          && TIFFFindCODEC(COMPRESSION_LZW))
+        /* Because of patents that are now expired, some versions
+           of libtiff only support lzw decoding and trigger an error
+           condition when trying to encode. Unfortunately we cannot
+           know this in advance and select another compression scheme. */
+        compression = COMPRESSION_LZW;
+# endif
+# ifdef PACKBITS_SUPPORT
+      if (compression == COMPRESSION_NONE 
+          && TIFFFindCODEC(COMPRESSION_PACKBITS))
+        /* This mediocre default produces the most portable tiff files. */
+        compression = COMPRESSION_PACKBITS;
+# endif
+      break;
+#endif      
+    case '4':
+      style = DDJVU_FORMAT_MSBTOLSB; 
+      break;
+    case 'r': 
+    case '5':
+      style = DDJVU_FORMAT_GREY8;    
+      break;
+    case '6':
+      style = DDJVU_FORMAT_RGB24;   
+      break;
+    default:
+      break;
+    }
+  if (! (fmt = ddjvu_format_create(style, 0, 0)))
+    die(i18n("Cannot determine pixel style for page %d"), pageno);
+  ddjvu_format_set_row_order(fmt, 1);
+  /* Allocate buffer */
+  if (style == DDJVU_FORMAT_MSBTOLSB) {
+    white = 0x00;
+    rowsize = (rrect.w + 7) / 8; 
+  } else if (style == DDJVU_FORMAT_GREY8)
+    rowsize = rrect.w;
+  else
+    rowsize = rrect.w * 3; 
+  if (! (image = (char*)malloc(rowsize * rrect.h)))
+    die(i18n("Cannot allocate image buffer for page %d"), pageno);
+
+  /* Render */
+  timingdata[2] = ticks();
+  if (! ddjvu_page_render(page, mode, &prect, &rrect, fmt, rowsize, image))
+    memset(image, white, rowsize * rrect.h);
+  timingdata[3] = ticks();
+  if (flag_verbose)
+    if (timingdata[2] != timingdata[3])
+      fprintf(stderr,"Rendering time: %5ld ms\n",
+	      timingdata[3] - timingdata[2] );
+
+  /* Output */
+  switch (flag_format)
+    {
+      /* -------------- PNM output */
+    default:
+    case '4':
+    case '5':
+    case '6':
+      {
+        int i;
+        char *s = image;
+        if (style == DDJVU_FORMAT_MSBTOLSB) {
+          if (flag_verbose) 
+            fprintf(stderr,i18n("Producing PBM file.\n"));
+          fprintf(fout,"P4\n%d %d\n", rrect.w, rrect.h);
+        } else if (style == DDJVU_FORMAT_GREY8) {
+          if (flag_verbose) 
+            fprintf(stderr,i18n("Producing PGM file.\n"));
+          fprintf(fout,"P5\n%d %d\n255\n", rrect.w, rrect.h);
+        } else {
+          if (flag_verbose) 
+            fprintf(stderr,i18n("Producing PPM file.\n"));
+          fprintf(fout,"P6\n%d %d\n255\n", rrect.w, rrect.h);
+        }
+        for (i=0; i<(int)rrect.h; i++,s+=rowsize)
+          if (fwrite(s, 1, rowsize, fout) < (size_t)rowsize)
+            die(i18n("writing pnm file: %s"), strerror(errno));
+        break;
+      }
+      /* -------------- RLE output */
+    case 'r':
+      {
+        int i;
+        unsigned char *s = (unsigned char *)image;
+        if (flag_verbose)
+          fprintf(stderr,i18n("Producing RLE file.\n"));
+        fprintf(fout,"R4\n%d %d\n", rrect.w, rrect.h);
+        for (i=0; i<(int)rrect.h; i++,s+=rowsize)
+          {
+            int j = 0;
+            int c = 0xff;
+            while (j < (int)rrect.w)
+              {
+                int l = j;
+                while ((j<(int)rrect.w) && ((s[j]^c)<128))
+                  j += 1;
+                c = c ^ 0xff;
+                l = j - l;
+                while (l > 0x3fff) {
+                  putc( 0xff, fout);
+                  putc( 0xff, fout);
+                  putc( 0x00, fout);
+                  l -= 0x3fff;
+                }
+                if (l > 0xbf) {
+                  putc( (l >> 8) + 0xc0, fout);
+                  putc( (l & 0xff), fout);
+                } else {
+                  putc( l, fout);
+                }
+              }
+          }
+        if (ferror(fout))
+          die(i18n("writing rle file: %s"), strerror(errno));
+        break;
+      }
+      /* -------------- TIFF or PDF output */
+    case 't':
+    case 'f':
+      {
+#if HAVE_TIFF
+        int i;
+        char *s = image;
+        TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, (uint32)rrect.w);
+        TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, (uint32)rrect.h);
+        TIFFSetField(tiff, TIFFTAG_XRESOLUTION, 
+		     (float)((dpi*rrect.w+iw/2)/iw));
+        TIFFSetField(tiff, TIFFTAG_YRESOLUTION, 
+		     (float)((dpi*rrect.h+ih/2)/ih));
+        TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+        TIFFSetField(tiff, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+# ifdef CCITT_SUPPORT
+        if (compression != COMPRESSION_CCITT_T6)
+# endif
+# ifdef JPEG_SUPPORT
+          if (compression != COMPRESSION_JPEG)
+# endif
+# ifdef ZIP_SUPPORT
+            if (compression != COMPRESSION_DEFLATE)
+# endif
+              TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, (uint32)64);
+        if (style == DDJVU_FORMAT_MSBTOLSB) {
+          TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, (uint16)1);
+          TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)1);
+          TIFFSetField(tiff, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
+          TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression);
+          TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);
+        } else {
+          TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, (uint16)8);
+          if (style == DDJVU_FORMAT_GREY8) {
+            TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)1);
+            TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression);
+            TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
+          } else {
+            TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)3);
+            TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression);
+# ifdef JPEG_SUPPORT
+            if (compression == COMPRESSION_JPEG) {
+              TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_YCBCR);
+              TIFFSetField(tiff, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+              TIFFSetField(tiff, TIFFTAG_JPEGQUALITY, flag_quality);
+            } else 
+# endif
+              TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+          }
+        }
+        if (flag_verbose) {
+          if (compression == COMPRESSION_NONE)
+            fprintf(stderr,i18n("Producing uncompressed TIFF file.\n"));
+# ifdef CCITT_SUPPORT
+          else if (compression == COMPRESSION_CCITT_T6)
+            fprintf(stderr,i18n("Producing TIFF/G4 file.\n"));
+# endif
+# ifdef JPEG_SUPPORT
+          else if (compression == COMPRESSION_JPEG)
+            fprintf(stderr,i18n("Producing TIFF/JPEG file.\n"));
+# endif
+# ifdef ZIP_SUPPORT
+          else if (compression == COMPRESSION_DEFLATE)
+            fprintf(stderr,i18n("Producing TIFF/DEFLATE file.\n"));
+# endif
+# ifdef PACKBITS_SUPPORT
+          else if (compression == COMPRESSION_PACKBITS)
+            fprintf(stderr,i18n("Producing TIFF/PACKBITS file.\n"));
+# endif
+          else
+            fprintf(stderr,i18n("Producing TIFF file.\n"));
+        }
+        if (rowsize != TIFFScanlineSize(tiff))
+          die("internal error (%d!=%d)", rowsize, (int)TIFFScanlineSize(tiff));
+        for (i=0; i<(int)rrect.h; i++,s+=rowsize)
+          TIFFWriteScanline(tiff, s, i, 0);
+#else
+        die(i18n("TIFF output is not compiled"));
+#endif
+      }
+    }
+
+  /* Free */
+  ddjvu_format_release(fmt);
+  free(image);
+}
+
+
+
+void 
+openfile(int pageno)
+{
+  /* Compute filename */
+  const char *filename = outputfilename;
+  if (flag_eachpage)
+    {
+      sprintf(pagefilename, filename, pageno);
+      filename = pagefilename;
+    }
+  
+  /* Open */
+  if (flag_format == 't') /* tiff file */
+    { 
+#if HAVE_TIFF
+      if (tiff) 
+        {
+          if (! TIFFWriteDirectory(tiff))
+            die(i18n("Problem writing TIFF directory."));
+        }
+      else
+        {
+          if (! strcmp(filename,"-"))
+            die(i18n("TIFF output requires a valid output file name."));
+          if (! (tiff = TIFFOpen(filename, "w")))
+            die(i18n("Cannot open output tiff file '%s'."), filename);
+        }
+#else
+      die(i18n("TIFF output is not compiled"));
+#endif
+    }
+  else if (flag_format == 'f') /* temporary tiff, later converted to pdf */
+    {
+#if HAVE_TIFF2PDF
+      if (tiff) 
+        {
+          if (! TIFFWriteDirectory(tiff))
+            die(i18n("Problem writing directory in temporary TIFF file."));
+        }
+      else
+        {
+          if (! strcmp(filename,"-"))
+            die(i18n("PDF output requires a valid output file name."));
+          if (! (tempfilename = (char*)malloc(strlen(outputfilename) + 8)))
+            die(i18n("Out of memory."));
+          strcpy(tempfilename, outputfilename);
+          strcat(tempfilename, ".XXXXXX");
+          tiff = 0;
+# ifdef _WIN32
+          if (_mktemp(tempfilename))
+            tiff = TIFFOpen(tempfilename,"w");
+# elif HAVE_MKSTEMP
+          if ((tiffd = mkstemp(tempfilename)) >= 0)
+            tiff = TIFFFdOpen(tiffd, tempfilename, "w");
+# else
+          if (mktemp(tempfilename))
+            if ((tiffd = open(tempfilename, O_RDWR|O_CREAT)) >= 0)
+              tiff = TIFFFdOpen(tiffd, tempfilename, "w");
+# endif
+          if (! tiff)
+            die(i18n("Cannot create temporary TIFF file '%s'."), tempfilename);
+        }
+#else
+      die(i18n("PDF output is not compiled"));
+#endif
+    } 
+  else if (! fout) /* file output */
+    {
+      if (! strcmp(filename,"-")) {
+        fout = stdout;
+#if defined(__CYGWIN32__)
+        setmode(fileno(fout), O_BINARY);
+#elif defined(_WIN32)
+        _setmode(_fileno(fout), _O_BINARY);
+#endif
+      } else if (! (fout = fopen(filename, "wb")))
+        die(i18n("Cannot open output file '%s'."), filename);
+    }
+}
+
+void
+closefile(int pageno)
+{
+  /* Do not close when generating a single file */
+  if (pageno > 0 && ! flag_eachpage)
+    return;
+
+  /* Compute filename */
+  const char *filename = outputfilename;
+  if (flag_eachpage && pageno > 0)
+    {
+      sprintf(pagefilename, filename, pageno);
+      filename = pagefilename;
+    }
+
+  /* Close temporary tiff and generate pdf */
+#if HAVE_TIFF2PDF
+  if (tiff && tempfilename)
+    {
+      const char *args[3];
+      if (! TIFFFlush(tiff))
+        die(i18n("Error while flushing TIFF file."));
+      if (flag_verbose)
+        fprintf(stderr,i18n("Converting temporary TIFF to PDF.\n"));
+#ifndef _WIN32
+      if (tiffd >= 0)
+        {
+          int fd = dup(tiffd);
+          TIFFClose(tiff);
+          close(tiffd);
+          tiffd = fd;
+          lseek(tiffd, 0, SEEK_SET);
+          if (! (tiff = TIFFFdOpen(tiffd, tempfilename, "r")))
+            die(i18n("Cannot reopen temporary TIFF file '%s'."), tempfilename);
+        }
+      else
+#endif
+        {
+          TIFFClose(tiff);
+          if (!(tiff = TIFFOpen(tempfilename, "r")))
+            die(i18n("Cannot reopen temporary TIFF file '%s'."), tempfilename);
+        }
+      // Convert
+      if (! (fout = fopen(filename, "wb")))
+        die(i18n("Cannot open output file '%s'."), filename);
+      args[0] = programname;
+      args[1] = "-o";
+      args[2] = filename;
+      if (tiff2pdf(tiff, fout, 3, args) != EXIT_SUCCESS)
+        die(i18n("Error occured while creating PDF file."));
+      TIFFClose(tiff);
+      tiff = 0;
+#ifndef _WIN32
+      close(tiffd);
+      tiffd = -1;
+#endif
+      remove(tempfilename);
+      free(tempfilename);
+      tempfilename = 0;
+    }
+#endif
+  /* Close tiff */
+#if HAVE_TIFF
+  if (tiff)
+    {
+      if (! TIFFFlush(tiff))
+        die(i18n("Error while flushing tiff file."));
+      TIFFClose(tiff);
+      tiff = 0;
+    }
+#endif
+  /* Close fout */
+  if (fout)
+    {
+      if (fflush(fout) < 0)
+        die(i18n("Error while flushing output file: %s"), strerror(errno));
+      fclose(fout);
+      fout = 0;
+    }
+}
+
+
+void
+dopage(int pageno)
+{
+  ddjvu_page_t *page;
+  /* Decode page */
+  timingdata[0] = ticks();
+  if (! (page = ddjvu_page_create_by_pageno(doc, pageno-1)))
+    die(i18n("Cannot access page %d."), pageno);
+  while (! ddjvu_page_decoding_done(page))
+    handle(TRUE);
+  if (ddjvu_page_decoding_error(page))
+    {
+      handle(FALSE);
+      fprintf(stderr,"ddjvu: ");
+      fprintf(stderr,i18n("Cannot decode page %d."), pageno);
+      fprintf(stderr,"\n");
+      if (flag_skipcorrupted)
+        return;
+      else
+        exit(10);
+    }
+  timingdata[1] = ticks();
+  /* Create filename */
+  if (flag_eachpage)
+    {
+      
+    }
+
+
+  /* Render */
+  openfile(pageno);
+  inform(page, pageno);
+  render(page, pageno);
+  ddjvu_page_release(page);
+  closefile(pageno);
+}
+
+
+
+void
+parse_pagespec(const char *s, int max_page, void (*dopage)(int))
+{
+  static const char *err = 
+    I18N("invalid page specification: %s");
+  int spec = 0;
+  int both = 1;
+  int start_page = 1;
+  int end_page = max_page;
+  int pageno;
+  char *p = (char*)s;
+  while (*p)
+    {
+      spec = 0;
+      while (*p==' ')
+        p += 1;
+      if (! *p)
+        break;
+      if (*p>='0' && *p<='9') {
+        end_page = strtol(p, &p, 10);
+        spec = 1;
+      } else if (*p=='$') {
+        spec = 1;
+        end_page = max_page;
+        p += 1;
+      } else if (both) {
+        end_page = 1;
+      } else {
+        end_page = max_page;
+      }
+      while (*p==' ')
+        p += 1;
+      if (both) {
+        start_page = end_page;
+        if (*p == '-') {
+          p += 1;
+          both = 0;
+          continue;
+        }
+      }
+      both = 1;
+      while (*p==' ')
+        p += 1;
+      if (*p && *p != ',')
+        die(i18n(err), s);
+      if (*p == ',')
+        p += 1;
+      if (! spec)
+        die(i18n(err), s);
+      if (end_page <= 0)
+        end_page = 1;
+      if (start_page <= 0)
+        start_page = 1;
+      if (end_page > max_page)
+        end_page = max_page;
+      if (start_page > max_page)
+        start_page = max_page;
+      if (start_page <= end_page)
+        for(pageno=start_page; pageno<=end_page; pageno++)
+          (*dopage)(pageno);
+      else
+        for(pageno=start_page; pageno>=end_page; pageno--)
+          (*dopage)(pageno);
+    }
+  if (! spec)
+    die(i18n(err), s);
+}
+
+
+
+void
+parse_geometry(const char *s, ddjvu_rect_t *r)
+{
+  static const char *fmt = 
+    I18N("syntax error in geometry specification: %s");
+  char *curptr = (char*) s;
+  char *endptr;
+
+  r->w = strtol(curptr, &endptr, 10);
+  if (endptr<=curptr || r->w<=0 || *endptr!='x')
+    die(i18n(fmt), s);
+  curptr = endptr+1;
+  r->h = strtol(curptr, &endptr, 10);
+  if (endptr<=curptr || r->h<=0)
+    die(i18n(fmt), s);
+  curptr = endptr;
+  r->x = 0;
+  r->y = 0;
+  if (curptr[0])
+    {
+      if (curptr[0]=='+')
+        curptr++;
+      else if (curptr[0]!='-')
+        die(i18n(fmt), s);
+      r->x = strtol(curptr, &endptr, 10);
+      curptr = endptr;
+      if (curptr[0])
+        {
+          if (curptr[0]=='+')
+            curptr++;
+          else if (curptr[0]!='-')
+            die(i18n(fmt), s);
+          r->y = strtol(curptr, &endptr, 10);
+          if (endptr[0])
+            die(i18n(fmt), s);
+        }
+    }
+}
+
+
+
+void
+usage()
+{
+#ifdef DJVULIBRE_VERSION
+  fprintf(stderr, "DDJVU --- DjVuLibre-" DJVULIBRE_VERSION "\n");
+#endif
+  fprintf(stderr, "%s",
+    i18n("DjVu decompression utility\n\n"
+         "Usage: ddjvu [options] [<djvufile> [<outputfile>]]\n\n"
+         "Options:\n"
+         "  -verbose          Print various informational messages.\n"
+         "  -format=FMT       Select output format: pbm,pgm,ppm,pnm,rle,tiff.\n"
+         "  -scale=N          Select display scale.\n"
+         "  -size=WxH         Select size of rendered image.\n"
+         "  -subsample=N      Select direct subsampling factor.\n"
+         "  -aspect=no        Authorize aspect ratio changes\n"
+         "  -segment=WxH+X+Y  Select which segment of the rendered image\n"
+         "  -mode=black       Render a meaningful bitonal image.\n"
+         "  -mode=mask        Only render the mask layer.\n"
+         "  -mode=foreground  Only render the foreground layer.\n"
+         "  -mode=background  Only render the background layer.\n"
+         "  -page=PAGESPEC    Select page(s) to be decoded.\n"
+         "  -skip             Skip corrupted pages instead of aborting.\n"
+         "  -eachpage         Produce one file per page (using %d in outputfile).\n"
+         "  -quality=QUALITY  Specify jpeg quality for lossy tiff output.\n"
+         "\n"
+         "If <outputfile> is a single dash or omitted, the decompressed image\n"
+         "is sent to the standard output.  If <djvufile> is a single dash or\n"
+         "omitted, the djvu file is read from the standard input.\n\n" ));
+  exit(1);
+}
+
+
+
+int 
+parse_option(int argc, char **argv, int i)
+{
+  static const char *errarg = 
+    I18N("option '-%s' needs no argument.");
+  static const char *errnoarg = 
+    I18N("option '-%s' needs an argument.");
+  static const char *errbadarg = 
+    I18N("valid arguments for option '-%s' %s.");
+  static const char *errdupl = 
+    I18N("option '%s' specified multiple times.");
+  static const char *errconfl = 
+    I18N("option '%s' conflicts with another option.");
+  
+  char buf[32];
+  const char *s = argv[i];
+  const char *opt = s;
+  const char *arg = strchr(opt, '=');
+  char *end;
+
+  /* Split argument */
+  if (*opt == '-')
+    opt += 1;
+  if (*opt == '-')
+    opt += 1;
+  if (arg) {
+    int l = arg - opt;
+    if (l > (int)sizeof(buf) - 1)
+      l = sizeof(buf) - 1;
+    strncpy(buf, opt, l);
+    buf[l] = 0;
+    opt = buf;
+    arg += 1;
+  }
+
+  /* Legacy options */
+  if (!strcmp(opt, "black") ||
+      !strcmp(opt, "foreground") ||              
+      !strcmp(opt, "background") ) 
+    {
+      arg = opt;
+      opt = "mode";
+    } 
+  else if (!strcmp(opt,"rle"))
+    {
+      arg = opt;
+      opt = "format";
+    }
+  else if (!strcmp(opt,"segment") ||
+           !strcmp(opt,"scale") ||
+           !strcmp(opt,"size") ||
+           !strcmp(opt,"page") ) 
+    {
+      if (!arg && i<argc-1)
+        if (argv[i+1][0]>='0' && argv[i+1][0]<='9')
+          arg = argv[++i];
+    }
+  else if (strtol(opt,&end,10) && !*end)
+    {
+      arg = opt;
+      opt = "subsample";
+    }
+  /* Parse options */
+  if (!strcmp(opt,"v") ||
+      !strcmp(opt,"verbose"))
+    {
+      if (arg) 
+        die(i18n(errarg), opt);
+      flag_verbose = 1;
+    }
+  else if (!strcmp(opt,"skip"))
+    {
+      if (arg) 
+        die(i18n(errarg), opt);
+      flag_skipcorrupted = 1;
+    }
+  else if (! strcmp(opt,"eachpage"))
+    {
+      if (arg) 
+        die(i18n(errarg), opt);
+      flag_eachpage = 1;
+    }
+  else if (!strcmp(opt,"scale"))
+    {
+      if (!arg) 
+        die(i18n(errnoarg), opt);
+      if (flag_subsample>=0 || flag_scale>=0 || flag_size>=0)
+        die(i18n(errconfl), s);
+      flag_scale = strtol(arg, &end, 10);
+      if (*end == '%')
+        end++;
+      if (*end || flag_scale<1 || flag_scale>999)
+        die(i18n(errbadarg), opt, i18n("range from 1% to 999%"));
+    }
+  else if (!strcmp(opt,"aspect"))
+    {
+      if (flag_aspect >= 0)
+        die(i18n(errdupl), opt);
+      if (!arg || !strcmp(arg,"no"))
+        flag_aspect = 1;
+      else if (!strcmp(arg,"yes"))
+        flag_aspect = 0;
+      else
+        die(i18n(errbadarg), opt, i18n("are 'yes' or 'no'"));
+    }
+  else if (!strcmp(opt,"size"))
+    {
+      if (!arg) 
+        die(i18n(errnoarg), opt);
+      if (flag_subsample>=0 || flag_scale>=0 || flag_size>=0)
+        die(i18n(errconfl), s);
+      parse_geometry(arg, &info_size);
+      if (info_size.x || info_size.y)
+        die(i18n(errbadarg), opt, i18n("have the form <width>x<height>"));
+      flag_size = 1;
+    }
+  else if (!strcmp(opt,"subsample"))
+    {
+      if (!arg) 
+        die(i18n(errnoarg), opt);
+      if (flag_subsample>=0 || flag_scale>=0 || flag_size>=0)
+        die(i18n(errconfl), s);
+      flag_subsample = strtol(arg, &end, 10);
+      if (*end || flag_subsample<1)
+        die(i18n(errbadarg),opt,i18n("are positive integers"));
+    }
+  else if (!strcmp(opt,"segment"))
+    {
+      if (!arg) 
+        die(i18n(errnoarg), opt);
+      if (flag_segment)
+        die(i18n(errdupl), opt);
+      parse_geometry(arg, &info_segment);
+      flag_segment = 1;
+    }
+  else if (!strcmp(opt,"format"))
+    {
+      if (!arg) 
+        die(i18n(errnoarg), opt);
+      if (flag_format)
+        die(i18n(errdupl), opt);
+      if (!strcmp(arg,"pbm"))
+        flag_format='4';
+      else if (!strcmp(arg,"pgm"))
+        flag_format='5';
+      else if (!strcmp(arg,"ppm"))
+        flag_format='6';
+      else if (!strcmp(arg,"pnm"))
+        flag_format='p';
+      else if (!strcmp(arg,"rle"))
+        flag_format='r';
+      else if (!strcmp(arg,"tiff") || !strcmp(arg,"tif"))
+        flag_format='t';
+      else if (!strcmp(arg,"pdf"))
+        flag_format='f';
+      else
+        die(i18n(errbadarg),opt,i18n("are: pbm,pgm,ppm,pnm,rle,tiff,pdf"));
+    }
+  else if (!strcmp(opt,"mode"))
+    {
+      if (!arg) 
+        die(i18n(errnoarg), opt);
+      if (flag_mode)
+        die(i18n(errdupl), opt);
+      if (!strcmp(arg,"color") )
+        flag_mode = 'c';
+      else if (!strcmp(arg,"black"))
+        flag_mode = 'k';
+      else if (!strcmp(arg,"mask") || !strcmp(arg,"stencil"))
+        flag_mode = 's';
+      else if (!strcmp(arg,"foreground") || !strcmp(arg,"fg"))
+        flag_mode = 'f';
+      else if (!strcmp(arg,"background") || !strcmp(arg,"bg"))
+        flag_mode = 'b';
+      else
+        die(i18n(errbadarg),opt,i18n("are: color,black,mask,fg,bg"));
+    }
+  else if (! strcmp(opt, "page") ||
+           ! strcmp(opt, "pages") )
+    {
+      if (!arg) 
+        die(i18n(errnoarg), opt);
+      if (flag_pagespec)
+        die(i18n(errdupl), opt);
+      flag_pagespec = arg;
+    }
+  else if (!strcmp(opt,"quality") ||
+           !strcmp(opt,"jpeg") )
+    {
+      if (flag_quality >= 0)
+        die(i18n(errdupl), opt);
+      else if (!arg) 
+        flag_quality = 100;
+      else if (!strcmp(arg,"deflate") || !strcmp(arg,"zip"))
+        flag_quality = 900;
+      else if (!strcmp(arg,"lzw"))
+        flag_quality = 901;
+      else if (!strcmp(arg,"uncompressed") || !strcmp(arg,"raw"))
+        flag_quality = 1000;
+      else
+        {
+          flag_quality = strtol(arg,&end,10);
+          if (*end || flag_quality<25 || flag_quality>150)
+            die(i18n(errbadarg),opt,i18n("an integer between 25 and 150"));
+        }
+    }
+  else if (! strcmp(opt, "help"))
+    {
+      usage();
+    }
+  else
+    {
+      die(i18n("Invalid option '%s'. Try 'ddjvu --help'."), s);
+    }
+  return i;
+}
+
+
+int
+check_eachpage(const char *s)
+{
+  const char *p = s;
+  int hasd = 0;
+  int size = 0;
+  char c;
+  while ((c = *s++))
+    if (c == '%')
+      {
+        c = *s++;
+        if (c == '%')
+          continue;
+        if (hasd)
+          return 0;
+        if (c == '-' || c == '+' || c == ' ')
+          c = *s++;
+        while (c >= '0' && c <= '9')
+          {
+            size = 10 * size + c - '0';
+            c = *s++;
+          }
+        if (c != 'd')
+          return 0;
+        hasd = 1;
+      }
+  if (size == 0)
+    size = 30;
+  if (hasd == 1 && size>0 && size<1000)
+    return size + s - p;
+  return 0;
+}
+
+
+int
+main(int argc, char **argv)
+{
+  int i;
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+  _setmbcp(_MB_CP_OEM);
+#endif
+  /* Parse options */
+  for (i=1; i<argc; i++)
+    {
+      char *s = argv[i];
+      if (s[0] == '-' && s[1] != 0)
+        i = parse_option(argc, argv, i);
+      else if (!inputfilename)
+        inputfilename = s;
+      else if (! outputfilename)
+        outputfilename = s;
+      else
+        usage();
+    }
+
+  /* Defaults */
+  if (! inputfilename)
+    inputfilename = "-";
+  if (! outputfilename)
+    outputfilename = "-";
+  if (! flag_pagespec)
+    flag_pagespec = (flag_format) ? "1-$" : "1";
+  if (flag_eachpage)
+    {
+      int sz = check_eachpage(outputfilename);
+      if (! sz)
+        die(i18n("Flag -eachpage demands a '%%d' specification in the output file name."));
+      pagefilename = (char*)malloc(sz);
+      if (! pagefilename)
+        die(i18n("Out of memory"));
+    }
+  
+  /* Create context and document */
+  programname = argv[0];
+  if (! (ctx = ddjvu_context_create(programname)))
+    die(i18n("Cannot create djvu context."));
+  if (! (doc = ddjvu_document_create_by_filename(ctx, inputfilename, TRUE)))
+    die(i18n("Cannot open djvu document '%s'."), inputfilename);
+  while (! ddjvu_document_decoding_done(doc))
+    handle(TRUE);
+  if (ddjvu_document_decoding_error(doc))
+    die(i18n("Cannot decode document."));
+  
+  /* Process all pages */
+  i = ddjvu_document_get_pagenum(doc);
+  parse_pagespec(flag_pagespec, i, dopage);
+
+  /* Close output file */
+  closefile(0);
+
+  /* Release */
+  if (doc)
+    ddjvu_document_release(doc);
+  if (ctx)
+    ddjvu_context_release(ctx);
+  return 0;
+}
diff --git a/tools/djvm.1 b/tools/djvm.1
new file mode 100644
index 0000000..e5f4202
--- /dev/null
+++ b/tools/djvm.1
@@ -0,0 +1,88 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVM 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvm \- Manipulate bundled multi-page DjVu documents.
+
+.SH SYNOPSIS
+.SS Creating a bundled document:
+.BI "djvm -c[reate] " "doc.djvu" " " "page1.djvu" " ... " "pageN.djvu"
+.SS Inserting:
+.BI "djvm -i[nsert] " "doc.djvu" " " "page.djvu" " [" "pagenum" "]"
+.SS Removing:
+.BI "djvm -d[elete] " "doc.djvu" " " "pagenum"
+.SS Listing:
+.BI "djvm -l[ist] " "doc.djvu"
+
+.SH DESCRIPTION
+This program creates or modifies a bundled multi-page DjVu document.
+Multi-page bundled documents can be used directly or converted
+to indirect document using command
+.BR djvmcvt .
+
+.SH OPTIONS
+.TP
+.B -c[reate]
+Create a bundled DjVu document named
+.I doc.djvu
+by collecting files
+.I page1.djvu
+to 
+.IR pageN.djvu .
+.TP
+.B -i[nsert]
+Modify the bundled DjVu document named
+.I doc.djvu
+by inserting file
+.I page.djvu
+as page
+.IR pagenum .
+Omitting argument
+.I pagenum
+means that the page should be appended at the end of the document.
+File 
+.I page.djvu
+also can be a multi-page DjVu document.
+All pages will be inserted at the specified location.
+.TP
+.B -d[elete]
+Remove page
+.I pagenum
+from the bundled multi-page DjVu document
+.IR doc.djvu .
+.TP
+.B -l[ist]
+List all component files in the multi-page DjVu document
+.IR doc.djvu .
+
+.SH CREDITS
+This program was initially written by Andrei Erofeev
+<andrew_erofeev@yahoo.com> and was improved by Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvmcvt (1)
+
diff --git a/tools/djvm.cpp b/tools/djvm.cpp
new file mode 100644
index 0000000..2e2e266
--- /dev/null
+++ b/tools/djvm.cpp
@@ -0,0 +1,314 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name djvm
+
+    {\bf Synopsis}\\
+    \begin{verbatim}
+        djvm [options] <djvu_doc_name> [djvufiles] [pagenum]
+    \end{verbatim}
+
+    {\bf Description} ---
+    File #"djvm.cpp"# and program #djvm# illustrate how class \Ref{DjVuDocEditor}
+    can be used to create and modify DjVu multipage documents. The program
+    demonstrates how to pack several DjVu single-page files together,
+    how to remove pages from a multipage document or how to insert new.
+    
+    {\bf Arguments} ---
+    Depending on the task to be performed, the number and types of arguments
+    differ:
+    \begin{itemize}
+       \item To create a new document
+
+             #djvm -c[reate] <doc.djvu> <page_1.djvu> ... <page_n.djvu>#
+
+	     This will package pages represented by files #<page_1.djvu>#
+	     ... #<page_n.djvu># into #BUNDLED# multipage DjVu document
+	     #<doc.djvu># (see \Ref{DjVuDocument} for the explanation of
+	     the #BUNDLED# format). The specified page files may include other
+	     files (by means of #INCL# chunks). They will also be packed
+	     into the document.
+
+       \item To insert a page
+
+       	     #djvm -i[nsert] <doc.djvu> <page.djvu> [<page_num>]#
+
+	     This will insert page represented by file #<page.djvu># into
+	     document #<doc.djvu># as page number #<page_num># (page
+	     numbering starts from #1#). Negative or missing #<page_num>#
+	     means to append the page.
+
+	     The #<page.djvu># file can actually be another
+	     multipage DjVu document. In this cases, all pages from that
+	     document will be inserted into #<doc.djvu># starting from
+	     page #<page_num>#.
+
+       \item To delete a page
+
+             #djvm -d[elete] <doc.djvu> <page_num>#
+
+	     This will remove page number #<page_num># from document
+	     #<doc.djvu>#. If there is only one page left in #<doc.djvu>#
+	     after deletion, it will automatically be converted to a
+	     single page DjVu file format. Page numbering starts from #1#.
+
+       \item To view document contents
+
+             #djvm -l[ist] <doc.djvu>#
+
+	     This will list all files composing the given document #<doc.djvu>#.
+	     The files list includes the names of page files plus names
+	     of any files included into the page files by means of
+	     #INCL# chunk.
+    \end{itemize}
+
+    @memo
+    DjVu multipage documents creator.
+    @author
+    Andrei Erofeev <eaf@geocities.com>
+*/
+//@{
+//@}
+
+#include "GException.h"
+#include "DjVuDocEditor.h"
+#include "GOS.h"
+#include "DjVuMessage.h"
+#include "common.h"
+
+static const char * progname;
+
+static void
+usage(void)
+{
+   DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+           "DJVM --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+           "DjVu multipage document manipulation utility\n"
+           "\n"
+           "Usage:\n"
+           "   To compose a multipage document:\n"
+           "      %s -c[reate] <doc.djvu> <page_1.djvu> ... <page_n.djvu>\n"
+           "      where <doc.djvu> is the name of the BUNDLED document to be\n"
+           "      created, <page_n.djvu> are the names of the page files to\n"
+           "      be packed together.\n"
+           "\n"
+           "   To insert a new page into an existing document:\n"
+           "      %s -i[nsert] <doc.djvu> <page.djvu> [<page_num>]\n"
+           "      where <doc.djvu> is the name of the BUNDLED DjVu document to be\n"
+           "      modified, <page.djvu> is the name of the single-page DjVu document\n"
+           "      file to be inserted as page <page_num> (page numbers start from 1).\n"
+           "      Negative or omitted <page_num> means to append the page.\n"
+           "      <page.djvu> can be another multipage DjVu document, in which case\n"
+           "      all pages of that document will be inserted into <doc.djvu>\n"
+           "      starting starting at page <page_num>\n"
+           "\n"
+           "   To delete a page from an existing document:\n"
+           "      %s -d[elete] <doc.djvu> <page_num>\n"
+           "      where <doc.djvu> is the name of the docyment to be modified\n"
+           "      and <page_num> is the number of the page to be deleted\n"
+           "\n"
+           "   To list document contents:\n"
+           "      %s -l[ist] <doc.djvu>\n"
+           "\n"
+           "Pages being inserted may reference other files by means of INCL chunks.\n"
+           "Moreover, files shared between pages will be stored into the document\n"
+           "only once.\n"
+           "\n", progname, progname, progname, progname );
+}
+
+static void
+create(GArray<GUTF8String> &argv)
+      // djvm -c[reate] <doc.djvu> <page_1.djvu> ... <page_n.djvu>
+      // doc.djvu will be overwritten
+{
+   const int argc=argv.hbound()+1;
+   if (argc<4) { usage(); exit(1); }
+
+      // Initialize the DjVuDocEditor class
+   GP<DjVuDocEditor> doc=DjVuDocEditor::create_wait();
+
+      // Insert pages
+   GList<GURL> list;
+   for(int i=3;i<argc;i++)
+      list.append(GURL::Filename::UTF8(argv[i]));
+   doc->insert_group(list);
+
+   const GURL::Filename::UTF8 url(argv[2]);
+      // Save in BUNDLED format
+   doc->save_as(url, true);
+}
+
+static void
+insert(GArray<GUTF8String> &argv)
+      // djvm -i[nsert] <doc.djvu> <page.djvu> <page_num>
+{
+   const int argc=argv.hbound()+1;
+   if (argc!=4 && argc!=5) { usage(); exit(1); }
+
+      // Initialize DjVuDocEditor class
+   const GURL::Filename::UTF8 url(argv[2]);
+   GP<DjVuDocEditor> doc=DjVuDocEditor::create_wait(url);
+
+      // Insert page
+   int page_num=-1;
+   if (argc==5) page_num=atoi(argv[4])-1;
+   doc->insert_page(GURL::Filename::UTF8(argv[3]), page_num);
+
+      // Save the document
+   doc->save();
+}
+
+static void
+del(GArray<GUTF8String> &argv)
+      // djvm -d[elete] <doc.djvu> <page_num>
+{
+   const int argc=argv.hbound()+1;
+   if (argc!=4) { usage(); exit(1); }
+
+      // Initialize DjVuDocEditor class
+   const GURL::Filename::UTF8 url(argv[2]);
+   GP<DjVuDocEditor> doc=DjVuDocEditor::create_wait(url);
+
+      // Delete the page
+   int page_num=atoi(argv[3])-1;
+   if (page_num<0)
+   {
+     DjVuPrintErrorUTF8("%s","Page number must be positive.\n");
+     exit(1);
+   }
+   doc->remove_page(page_num);
+
+      // Save the document
+   doc->save();
+}
+
+static void
+list(GArray<GUTF8String> &argv)
+      // djvm -l[ist] <doc.djvu>
+{
+   const int argc=argv.hbound()+1;
+   if (argc!=3) { usage(); exit(1); }
+
+   const GURL::Filename::UTF8 url(argv[2]);
+   GP<DjVmDoc> doc=DjVmDoc::create();
+   doc->read(url);
+   
+   GP<DjVmDir> dir=doc->get_djvm_dir();
+   if (dir)
+   {
+      GPList<DjVmDir::File> files_list=dir->get_files_list();
+      printf("Size     Type        Name\n");
+      printf("--------------------------\n");
+      for(GPosition pos=files_list;pos;++pos)
+      {
+	 GP<DjVmDir::File> file=files_list[pos];
+	 printf("%6d   ", file->size);
+	 if (file->is_page())
+	 {
+	    char buffer[128];
+	    sprintf(buffer, "PAGE #%d", file->get_page_num()+1);
+	    printf("%s", buffer);
+	    for(int i=strlen(buffer);i<9;i++)
+	       putchar(' ');
+	 } else if (file->is_include())
+         {
+	    printf("%s", "INCLUDE  ");
+	 } else if (file->is_shared_anno())
+         {
+	    printf("%s", "SHARED_ANNO  ");
+	 }else if (file->is_thumbnails())
+         {
+	    printf("%s", "THUMBNAIL");
+	 } else
+         {
+           printf("%s", "UNKNOWN  ");
+         }
+	 printf("   %s\n", (const char *) file->get_save_name());
+      }
+   }
+}
+
+int
+main(int argc, char ** argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  progname=dargv[0]=GOS::basename(dargv[0]);
+   
+   G_TRY {
+      if (argc<2) { usage(); exit(1); }
+      if (!dargv[1].cmp("-c", 2)) create(dargv);
+      else if (!dargv[1].cmp("-i", 2)) insert(dargv);
+      else if (!dargv[1].cmp("-d", 2)) del(dargv);
+      else if (!dargv[1].cmp("-l", 2)) list(dargv);
+      else { usage(); exit(1); }
+   } G_CATCH(exc) {
+      exc.perror();
+      exit(1);
+   } G_ENDCATCH;
+   return 0; 
+}
+
diff --git a/tools/djvmcvt.1 b/tools/djvmcvt.1
new file mode 100644
index 0000000..12db7eb
--- /dev/null
+++ b/tools/djvmcvt.1
@@ -0,0 +1,65 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVMCVT 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvmcvt \- Convert multi-page DjVu documents.
+
+.SH SYNOPSIS
+.SS Creating a bundled document:
+.BI "djvmcvt -b[undled] " "docin.djvu" " " "docout.djvu"
+.SS Creating an indirect document:
+.BI "djvmcvt -i[ndirect] " "docin.djvu" " " "dir" " " "index.djvu"
+
+.SH DESCRIPTION
+This program converts any multi-page DjVu document 
+to either the bundled or indirect multi-page format.
+The input file
+.I docin.djvu
+must be either the file name of a bundled document 
+or the index file of an indirect document.
+
+.SH OPTIONS
+.TP
+.B -b[undled]
+Create a bundled multi-page DjVu document named
+.IR docout.djvu .
+.TP
+.B -i[ndirect]
+Create an indirect multi-page DjVu document.
+All the files composing the indirect document
+will be stored into directory 
+.IR dir .
+The index file will be named
+.IR index.djvu .
+
+.SH CREDITS
+This program was initially written by Andrei Erofeev
+<andrew_erofeev@yahoo.com> and was improved by Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvmcvt (1)
+
diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp
new file mode 100644
index 0000000..004bc40
--- /dev/null
+++ b/tools/djvmcvt.cpp
@@ -0,0 +1,227 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name djvmcvt
+
+    {\bf Synopsis}\\
+    \begin{verbatim}
+        djvmcvt -b[undled] <doc_in.djvu> <doc_out.djvu>
+
+	or
+	
+	djvmcvt -i[ndirect] <doc_in.djvu> <dir_out> <idx_fname.djvu>
+    \end{verbatim}
+
+    {\bf Description} ---
+    File #"djvmcvt.cpp"# and the program #djvmcvt# serve the purpose of
+    convertion of obsolete DjVu documents into the new formats. The program
+    can also read documents in the new formats, so you can use it to
+    perform conversion between #BUNDLED# and #INDIRECT# formats. This is a
+    simple illustration of the capabilities of \Ref{DjVuDocument} class.
+
+    As a matter of fact, there are two ways to make conversion between
+    different formats:
+    \begin{enumerate}
+       \item If the input format is one of obsolete formats (#OLD_BUNDLED#
+             or #OLD_INDEXED#) then the conversion can be done by
+	     \Ref{DjVuDocument} only.
+       \item If the input format is one of new formats (#BUNDLED# or
+             #INDIRECT#) then the best candidate to perform conversion
+	     is \Ref{DjVmDoc} class. It will do it at the lowest possible
+	     with the least expenses.
+    \end{enumerate}
+    
+    {\bf Arguments} ---
+    Depending on the output format, the number and types of arguments
+    differ. The second argument though (#<doc_in.djvu>#) is the same in both
+    cases, and depending on the format of input document, it means:
+    \begin{itemize}
+       \item {\bf OLD_BUNDLED} format: just name of the document
+       \item {\bf OLD_INDEXED} format: name of any page of the document
+       \item {\bf BUNDLED} format: name of the document
+       \item {\bf INDIRECT} format: name of the top-level file with the
+             list of all pages of the document.
+    \end{itemize}.
+
+    So, in order to do conversion choose one of syntaxes below:
+    \begin{itemize}
+       \item To create a new {\em BUNDLED} document
+
+             #djvmcvt -b[undled] <doc_in.djvu> <doc_out.djvu>#
+
+	     This will read the document referenced by #<doc_in.djvu># as
+	     descrived above, will convert it into the #BUNDLED#
+	     format and will save the results into the #<doc_out.djvu># file.
+	     
+       \item To create a new {\em INDIRECT} document
+
+             #djvmcvt -i[ndirect] <doc_in.djvu> <dir_out> <idx_fname.djvu>#
+
+	     This will read the input document referenced by #<doc_in.djvu>#
+	     as described above, will convert it into the #INDIRECT#
+	     format and will save it into the #<dir_out># directory. Since
+	     DjVu multipage documents in the #INDIRECT# formats are
+	     represented by a bunch of files, you have to specify a directory
+	     name where all of the files will be saved. In addition to these
+	     files the program will also create a top-level file named
+	     #<idx_fname.djvu># with the list of all pages and components
+	     composing the given DjVu document. Whenever you need to open
+	     this document later, open this top-level file.
+    \end{itemize}
+	     
+    @memo
+    DjVu multipage document converter.
+    @author
+    Andrei Erofeev <eaf@geocities.com>
+*/
+
+
+#include "DjVuDocument.h"
+#include "DjVmDoc.h"
+#include "ByteStream.h"
+#include "GOS.h"
+#include "DjVuMessage.h"
+#include "debug.h"
+#include "common.h"
+
+static const char * progname;
+
+static void Usage(void)
+{
+   DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+     "DJVMCVT --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+     "DjVu multipage document conversion utility\n"
+     "\n"
+     "Usage:\n"
+     "\n"
+     "  To convert any DjVu multipage document into the new BUNDLED format:\n"
+     "	  %s -b[undled] <doc_in.djvu> <doc_out.djvu>\n"
+     "	  where <doc_out.djvu> is the name of the output file.\n"
+     "\n"
+     "  To convert any DjVu multipage document into the new INDIRECT format:\n"
+     "	  %s -i[ndirect] <doc_in.djvu> <dir_out> <idx_fname.djvu>\n"
+     "	  where <dir_out> is the name of the output directory, and\n"
+     "	  <idx_fname.djvu> is the name of the top-level document index file.\n"
+     "\n"
+     "The <doc_in.djvu> specifies the document to be converted.\n"
+     "For OLD_BUNDLED and BUNDLED formats, this is the name of the document file.\n"
+     "For INDIRECT format, this is the name of the top-level index file.\n"
+     "For OLD_INDEXED format, this is the name of any page file.\n"
+     "\n", progname, progname);
+}
+
+static void
+do_bundled(GArray<GUTF8String> &argv)
+      // <progname> -b[undled] <file_in> <file_out>
+{
+   const int argc=argv.hbound()+1;
+   if (argc!=4) { Usage(); exit(1); }
+   const GURL::Filename::UTF8 url2(argv[2]);
+   const GURL::Filename::UTF8 url3(argv[3]);
+   GP<DjVuDocument> doc = DjVuDocument::create_wait(url2);
+   GP<ByteStream> str=ByteStream::create(url3, "wb");
+   doc->write(str);
+}
+
+static void
+do_indirect(GArray<GUTF8String> &argv)
+      // <progname> -i[ndirect] <file_in> <dir_out> <idx_fname>
+{
+   const int argc=argv.hbound()+1;
+   if (argc!=5) { Usage(); exit(1); }
+   const GURL::Filename::UTF8 url2(argv[2]);
+   GP<DjVuDocument> doc = DjVuDocument::create_wait(url2);
+   const GURL::Filename::UTF8 url3(argv[3]);
+   doc->expand(url3, argv[4]);
+}
+
+int 
+main(int argc, char ** argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  progname=dargv[0]=GOS::basename(dargv[0]);
+
+  if (argc<2) { Usage(); exit(1); }
+
+   bool bundled=true;
+   G_TRY {
+      if (!dargv[1].cmp("-b", 2)) bundled=true;
+      else if (!dargv[1].cmp("-i", 2)) bundled=false;
+      else { Usage(); exit(1); }
+
+      if (bundled) do_bundled(dargv);
+      else do_indirect(dargv);
+   } G_CATCH(exc) {
+      DjVuPrintErrorUTF8("%s\n", exc.get_cause());
+      exit(1);
+   } G_ENDCATCH;
+
+   exit(0);
+#ifdef _WIN32
+   return 0;
+#endif
+}
diff --git a/tools/djvu.1 b/tools/djvu.1
new file mode 100644
index 0000000..614234d
--- /dev/null
+++ b/tools/djvu.1
@@ -0,0 +1,375 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVU 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+DjVu \- DjVu and DjVuLibre.
+
+.SH INTRODUCTION
+
+Although the Internet has given us a worldwide infrastructure on which to
+build the universal library, much of the world knowledge, history, and
+literature is still trapped on paper in the basements of the world's
+traditional libraries. Many libraries and content owners are in the process of
+digitizing their collections.  While many such efforts involve the painstaking
+process of converting paper documents to computer-friendly form, such as
+.SM SGML
+based formats, the high cost of such conversions limits their
+extent. Scanning documents, and distributing the resulting images
+electronically is not only considerably cheaper, but also more faithful to the
+original document because it preserves its visual aspect.
+.PP
+Despite the quickly improving speed of network connections and computers, the
+number of scanned document images accessible on the Web today is relatively
+small. There are several reasons for this.
+.PP
+The first reason is the relatively high cost of scanning anything else but
+unbound sheets in black and white. This problem is slowly going away with the
+appearance of fast and low-cost color scanners with sheet feeders.
+.PP
+The second reason is that long-established image compression standards and
+file formats have proved inadequate for distributing scanned documents at high
+resolution, particularly color documents.  Not only are the file sizes and
+download times impractical, the decoding and rendering times are also
+prohibitive.  A typical magazine page scanned in color at 100 dpi in
+.SM JPEG
+would typically occupy 100
+.SM KB
+to 200
+.SM KB
+, but the text would be hardly readable: insufficient for screen viewing and
+totally unacceptable for printing. The same page at 300 dpi would have
+sufficient quality for viewing and printing, but the file size would be 300
+.SM KB
+to 1000
+.SM KB
+at best, which is impractical for remote access. Another major problem is that
+a fully decoded 300 dpi color images of a letter-size page occupies 24
+.SM MB
+of memory and easily causes disk swapping.
+.PP
+The third reason is that digital documents are more than just a collection of
+individual page images. Pages in a scanned documents have a natural serial
+order. Special provision must be made to ensure that flipping pages be
+instantaneous and effortless so as to maintain a good user experience. Even
+more important, most existing document formats force users to download the
+entire document first before displaying a chosen page.  However, users often
+want to jump to individual pages of the document without waiting for the
+entire document to download.  Efficient browsing requires efficient random
+page access, fast sequential page flipping, and quick rendering. This can be
+achieved with a combination of advanced compression, pre-fetching,
+pre-decoding, caching, and progressive rendering. DjVu decomposes each page
+into multiple components (text, backgrounds, images, libraries of common
+shapes...)  that may be shared by several pages and downloaded on demand.  All
+these requirements call for a very sophisticated but parsimonious control
+mechanism to handle on-demand downloading, pre-fetching, decoding, caching,
+and progressive rendering of the page images.  What is being considered here
+is not just a document image compression technique, but a whole platform for
+document delivery.
+.PP
+DjVu is an image compression technique, a document format, and a software
+platform for delivering documents images over the Internet that fulfills the
+above requirements.
+
+.SH DJVU IMAGE COMPRESSION
+
+The DjVu image compression is based on three technologies:
+.SS DjVuPhoto
+DjVuPhoto, also known as
+.SM IW44,
+is a wavelet-based continuous-tone image
+compression technique with progressive decoding/rendering.  It is best used
+for encoding photographic images in colors or in shades of gray.  Images are
+typically half the size as
+.SM JPEG
+for the same distortion.
+.SS DjVuBitonal
+DjVuBitonal, also known as
+.SM JB2,
+is a bitonal image compression that takes
+advantage of repetitions of nearly identical shapes on the page (such as
+characters) to efficiently compress text images.  It is best used to compress
+black and white images representing text and simple drawings.  A typical
+300 dpi page in DjVuBitonal occupies 5 to 25
+.SM KB
+(3 to 8 times better than
+.SM TIFF-G4
+or
+.SM PDF
+).
+.SS DjVuDocument
+DjVuDocument is a compression technique specifically designed for color
+digital documents images containing both pictures and text, such as a page of
+a magazine.  DjVuDocument represents images into separately compressed layers.
+The foreground layer is usually compressed with DjVu Bitonal and contains the
+text and drawings.  The background layer is usually compressed with DjVuPhoto
+and contains the background texture and the pictures at lower resolution.
+
+.SH DJVU DOCUMENT DELIVERY PLATFORM
+
+The DjVu technology is designed from the ground up to support the efficient
+delivery of digital documents over the Internet.  It provides various ways to
+deal with multi-page documents, and various ways to enrich the content with
+hyper-links, meta-data, searchable text, etc.
+
+.SS MIME types
+The DjVu format has an official MIME type of
+.BR image/vnd.djvu ,
+which is the preferred content-type to be given by http servers for
+DjVu files.  Unofficial mime types used historically are
+.B image/x.djvu
+and
+.BR image/x-djvu ,
+which may still be encountered.  Ideally, clients should be configured
+to handle all three.  (For web server configuration help, see
+.BR http://www.djvuzone.org/support/tutorial/chapter-authoring1.html .)
+
+.SS Bundled multi-page documents
+Bundled multi-page DjVu document uses a single file to represent the entire
+document.  This single file contains all the pages as well as ancillary
+information (e.g. the page directory, data shared by several pages,
+thumbnails, etc.).  Using a single file format is very convenient for storing
+documents or for sending email attachments.
+.PP
+When you type the
+.SM URL
+of a multi-page document, the DjVu browser plugin starts
+downloading the whole file, but displays the first page as soon as it is
+available.  You can immediately navigate to other pages using the DjVu
+toolbar.  Suppose however that the document is stored on a remote web server.
+You can easily access the first page and see that this is not the document you
+wanted.  Although you will never display the other pages the browser is
+transferring data for these pages and is wasting the bandwidth of your server
+(and the bandwidth of the Internet too).  You could also see the summary of the
+document on the first page and jump to page 100.  But page 100 cannot be
+displayed until data for pages 1 to 99 has been received.  You may have to
+wait for the transmission of unnecessary page data.  This second problem (the
+unnecessary wait) can be solved using the ``byte serving'' options of the
+.SM HTTP/1.1
+protocol.  This option has to be supported by the web server, the
+proxies, the caches and the browser.  Byte serving however does not solve the
+first problem (the waste of bandwidth).
+.SS Indirect multi-page documents
+Indirect multi-page DjVu documents solve both problems.  An indirect
+multi-page DjVu document is composed of several files.  The main file is named
+the index file.  You can browse a document using the
+.SM URL
+of the index file, just like you do with a bundled multi-page document.  The
+index file however is very small.  It simply contains the document directory
+and the
+.SM URLs
+of secondary files containing the page data.  When you browse an indirect
+multi-page document, the browser only accesses data for the pages you are
+viewing.  This can be done at a reasonable speed because the browser maintains
+a cache of pages and sometimes pre-fetches a few pages ahead of the current
+page.  This model uses the web serving bandwidth much more effectively.  It
+also eliminates unnecessary delays when jumping ahead to pages located
+anywhere in a long document.
+.SS Annotations
+Every DjVu image optionally includes so-called annotation chunks.  The
+annotation chunk is often used to define hyper-links to other document pages or
+to arbitrary web pages.  Annotation chunks can also be used for other purposes
+such as setting the initial viewing mode of a page, defining highlighted zones, or
+storing arbitrary meta-data about the page or the document.
+.SS Hidden text
+Every DjVu image optionally includes a hidden text layer that associated
+graphical features with the corresponding text.  The hidden text layer is
+usually generated by running an Optical Character Recognition software.  This
+textual information provides for indexing DjVu documents and copying/pasting
+text from DjVu page images.
+.SS Thumbnails
+DjVu documents sometimes contain pre-computed page thumbnails.
+.SS Outline
+DjVu documents sometimes contain a navigation chunk
+containing an outline, that is, a hierarchical 
+table of contents with pointers to the corresponding
+document pages.
+
+.SH DJVUZONE AND DJVULIBRE
+
+The DjVu technology was initially created by a few researchers in AT&T Labs
+between 1995 and 1999.  Lizardtech, Inc. (
+.B http://www.lizardtech.com
+) then obtained a commercial license from AT&T and continued
+the development.  They have now a variety of solutions for producing
+and distributing documents using the DjVu technology.
+.PP
+The DjVuZone web site (
+.B http://www.djvuzone.org
+) is managed by the few AT&T Labs researchers who created the
+DjVu technology in the first place.  We promote the DjVu technology
+by providing an independent source of information about DjVu.
+.PP
+Understanding how little room there is for a proprietary document format,
+Lizardtech released the DjVu Reference Library under the
+.SM GNU
+Public License in December 2000.  This library entirely defines the
+compression format and the elementary codecs.  Six month later, Lizardtech
+released an updated DjVu Reference Library as well as the source code of the
+Unix viewer.
+.PP
+These two releases form the basis of our initial DjVuLibre software.  We
+modified the build system to comply with the expectations of the open source
+community.  Various bugs and portability issues have been fixed.  We also
+tried to make it simpler to use and install, while preserving the essential
+structure of the Lizardtech releases.
+.PP
+The DjVuLibre software contains the following components:
+.TP
+.BR bzz (1)
+A general purpose compression command line program.  Many internal DjVu data
+structures are compressed using this technique.
+.TP
+.BR c44 (1)
+A DjVuPhoto command line encoder. This state-of-the-art wavelet compressor
+produces DjVuPhoto images from PPM or JPEG images.
+.TP
+.BR cjb2 (1)
+A DjVuBitonal command line encoder. This soft-pattern-matching compressor
+produces DjVuBitonal images from PBM images.  It can encode images without loss,
+or introduce small changes in order to improve the compression ratio.  The
+lossless encoding mode is competitive with that of the Lizardtech commercial
+encoders.
+.TP
+.BR cpaldjvu (1)
+A DjVuDocument command line encoder for images with few colors.  This encoder
+is well suited to compressing images with a small number of distinct colors
+(e.g. screen-shots).  The dominant color is encoded by the background layer.
+The other colors are encoded by the foreground layer.
+.TP
+.BR csepdjvu (1)
+A DjVuDocument command line encoder for separated images.  This encoder takes
+a file containing pre-segmented foreground and background images and produces
+a DjVuDocument image.
+.TP
+.BR ddjvu (1)
+A command line decoder for DjVu images.  This program produces a
+.SM PNM
+image representing any segment of any page of a DjVu document at any
+resolution.
+.TP
+.BR djview (1)
+A stand-alone viewer for DjVu images.  This sophisticated viewer displays DjVu
+documents.  It implements document navigation as well as fast zooming and
+panning.
+.TP
+.BR nsdejavu (1)
+A web browser plugin for viewing DjVu images.  This small plugin allows for
+viewing DjVu documents from web browsers.  It internally uses djview to
+perform the actual work.
+.TP
+.BR djvups (1)
+A command line tool for converting DjVu documents into
+PostScript .
+.TP
+.BR djvm (1)
+A command line tool for manipulating bundled multi-page DjVu documents.  This
+program is often used to collect individual pages and produce a bundled
+document.
+.TP
+.BR djvmcvt (1)
+A command line tool for converting bundled documents to indirect documents and
+conversely.
+.TP
+.BR djvused (1)
+A powerful command line tool for manipulating multi-page documents, creating
+or editing annotation chunks, creating or editing hidden text layers,
+pre-computing thumbnail images, and more...
+.TP
+.BR djvutxt (1)
+A command line tool to extract the hidden text from DjVu documents.
+.TP
+.BR djvudump (1)
+A command line tool for inspecting DjVu files and displaying their internal
+structure.
+.TP
+.BR djvuextract (1)
+A command line tool for dis-assembling DjVu image files.
+.TP
+.BR djvumake (1)
+A command line tool for assembling DjVu image files.
+.TP
+.BR djvuserve (1)
+A
+.SM CGI
+program for generating indirect multi-page DjVu documents
+on the fly.
+.TP
+.BR djvutoxml "(1), " djvuxmlparser (1)
+Command line tools to edit DjVu metadata as XML files.
+
+.SH DJVU ENCODERS AND ANY2DJVU
+
+DjVuLibre comes with a variety of specialized encoders,
+.BR c44 (1)
+for photographic images,
+.BR cjb2 (1)
+for bitonal images, and
+.BR cpaldjvu (1)
+for images with few distinct colors.
+Although these encoders perform well in their specialized domain,
+they cannot handle complex tasks involving segmentation and
+multipage encoding.
+
+The Lizardtech commercial products
+.BR "" "(see " "http://www.lizardtech.com/solutions/document" )
+can perform these complex encoding tasks
+
+
+Another solution is provided by the compression server at
+.BR "" ( "http://any2djvu.djvuzone.org" ).
+This machine uses pre-lizardtech prototype encoders from AT&T Labs and
+performs almost as well as the commercial Lizardtech encoders.  Please note
+that the Any2DjVu compression server comes with no guarantee, that
+nothing is done to ensure that your documents will remain confidential, and
+that there is only one computer working for the whole planet.
+
+.SH CREDITS
+
+Numerous people have contributed to the DjVu source code during the
+last five years.  Please submit a sourceforge bug report to update the
+following list.
+.IP "" 3
+Yoshua Bengio,
+L\('eon Bottou,
+Chakradhar Chandaluri,
+Regis M\. Chaplin,
+Ming Chen,
+Parag Deshmukh,
+Royce Edwards,
+Andrew Erofeev,
+Praveen Guduru,
+Patrick Haffner,
+Paul G\. Howard,
+Orlando Keise,
+Yann Le Cun,
+Artem Mikheev,
+Florin Nicsa,
+Joseph M\. Orost,
+Steven Pigeon,
+Bill Riemers,
+Patrice Simard,
+Jeffery Triggs,
+Luc Vincent,
+Pascal Vincent.
diff --git a/tools/djvudigital b/tools/djvudigital
new file mode 100755
index 0000000..a5b7d1b
--- /dev/null
+++ b/tools/djvudigital
@@ -0,0 +1,373 @@
+#!/bin/sh
+#C--------------------------------------------------------------------
+#C- DjVuLibre-3.5
+#C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+#C- Copyright (c) 2001  AT&T
+#C-
+#C- This software is subject to, and may be distributed under, the
+#C- GNU General Public License, either Version 2 of the license,
+#C- or (at your option) any later version. The license should have
+#C- accompanied the software or you may obtain a copy of the license
+#C- from the Free Software Foundation at http://www.fsf.org .
+#C-
+#C- This program is distributed in the hope that it will be useful,
+#C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+#C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#C- GNU General Public License for more details.
+#C-
+#C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+#C- Lizardtech Software.  Lizardtech Software has authorized us to
+#C- replace the original DjVu(r) Reference Library notice by the following
+#C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+#C-
+#C-  ------------------------------------------------------------------
+#C- | DjVu (r) Reference Library (v. 3.5)
+#C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+#C- | The DjVu Reference Library is protected by U.S. Pat. No.
+#C- | 6,058,214 and patents pending.
+#C- |
+#C- | This software is subject to, and may be distributed under, the
+#C- | GNU General Public License, either Version 2 of the license,
+#C- | or (at your option) any later version. The license should have
+#C- | accompanied the software or you may obtain a copy of the license
+#C- | from the Free Software Foundation at http://www.fsf.org .
+#C- |
+#C- | The computer code originally released by LizardTech under this
+#C- | license and unmodified by other parties is deemed "the LIZARDTECH
+#C- | ORIGINAL CODE."  Subject to any third party intellectual property
+#C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+#C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+#C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+#C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+#C- | General Public License.   This grant only confers the right to 
+#C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+#C- | the extent such infringement is reasonably necessary to enable 
+#C- | recipient to make, have made, practice, sell, or otherwise dispose 
+#C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+#C- | any greater extent that may be necessary to utilize further 
+#C- | modifications or combinations.
+#C- |
+#C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+#C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+#C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+#C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#C- +------------------------------------------------------------------
+#C--------------------------------------------------------------------
+
+# Step 1 -- utilities
+
+usage()
+{
+    cat 1>&2 <<\END
+Usage:  djvudigital [options] inputfile [outputfile]
+More information is displayed by typing
+    djvudigital --help
+END
+    exit 10
+}
+
+getarg()
+{
+        echo "$1" | sed -e 's/^[^=]*=//'
+}
+
+getargs()
+{
+        echo "$1" | sed -e 's/^[^=]*=//' -e 's/,/ /g'
+}
+
+pathexpand()
+{
+    tmpvar="$PATH"
+    tmpdir=
+    while [ -n "$tmpvar" ]
+    do
+      IFS=':' read tmpdir tmpvar <<EOF
+$tmpvar
+EOF
+      test -x $tmpdir/$1 && echo $tmpdir/$1
+    done
+}
+
+checkps2utf8()
+{
+    if [ -z "$djvutext" ] 
+    then
+        djvutext=no
+        if ( "$gsdjvu" 2>&1 -dNODISPLAY -c '(ps2utf8.ps) runlibfile quit' | \
+              grep -q WRITESYSTEMDICT )
+        then
+            djvutext="/tmp/dj$$.ps"
+            trap "rm 2>/dev/null $djvutext" 0
+            cat > $djvutext <<\EOF
+(ps2utf8.ps) runlibfile currentglobal /setglobal load true setglobal 
+.ps2utf8 begin /onpage { } bind def /onfont { pop pop pop } bind def
+/onmark { pop pop pop pop currentx currenty currentpoint 
+.djvutextmark } bind def end exec
+EOF
+        fi
+    fi
+    test "$djvutext" != no && test -r "$djvutext"  
+}
+
+
+# Step 1 -- locate gsdjvu executable
+
+gsdjvu=
+for gs in ${GSDJVU} `pathexpand gs` `pathexpand gsdjvu`
+do
+  if [ -z "$gsdjvu" ] && ( "$gs" -h 2>&1 | grep -q djvusep )
+  then
+     gsdjvu="$gs"
+  fi
+done
+
+if [ -z "$gsdjvu" ]
+then
+    cat 1>&2 <<\EOF
+djvudigital: cannot locate suitable ghostscript executable.
++--------------------------------------------------------------------+
+| DjVuDigital relies on a special ghostscript device driver, but     |
+| could not find a ghostscript executable that implement this driver.|
+| Please visit http://djvu.sourceforge.net/gsdjvu.html.              |
++--------------------------------------------------------------------+
+EOF
+    exit 10
+fi
+
+
+# Step 2 -- locate csepdjvu executable
+
+csepdjvu=
+for cs in ${CSEPDJVU} `pathexpand csepdjvu` `pathexpand msepdjvu`
+do
+  if [ -z "$csepdjvu" ] && ( "$cs" -h 2>&1 | grep -q quality )
+  then
+      csepdjvu="$cs"
+  fi
+done
+
+if [ -z "$csepdjvu" ]
+then
+    cat 1>&2 <<\EOF
+djvudigital: cannot locate csepdjvu executable.
++--------------------------------------------------------------------+
+| DjVuDigital was not able to locate the djvulibre tool "csepdjvu".   |
+| Please make sure that the djvulibre tools are properly installed.  |
++--------------------------------------------------------------------+
+EOF
+    exit 10
+fi
+
+
+# Step 3 -- process arguments
+
+gsarg0="-sDEVICE=djvusep -dNOPAUSE -dBATCH -dSAFER"
+gsarg1=
+gsarg2=
+csepargs=
+dpi="300"
+gsprinted="-dPrinted"
+gsepsf="-dEPSCrop"
+gsverbosity=
+csepverbosity='-v'
+djvutext=
+infile=
+outfile=
+run=
+sepfile=
+
+for n
+do
+  case $n in 
+      --*) 
+          ;;
+      -*)  
+          n="-$n" 
+          ;;
+  esac
+  case $n in
+      --help)
+          man djvudigital
+          exit 10
+          ;;
+      --check)
+          echo 1>&2 "Using: $gsdjvu"
+          echo 1>&2 "  and: $csepdjvu"
+          exit 0
+          ;;
+      --dpi=[0-9]*)
+          dpi="`getarg $n`"
+          ;;
+      --verbose|--v)
+          gsverbosity=''
+          csepverbosity='-vv'
+          ;;
+      --dryrun)
+          run=echo
+          ;;
+      --sepfile)
+          sepfile=yes
+          ;;
+      --quiet|--q)
+          gsverbosity='-q'
+          csepverbosity=''
+          ;;
+      --psrotate=0)
+          gsarg2="-c << /Orientation 0 >> setpagedevice"
+          ;;
+      --psrotate=90)
+          gsarg2="-c << /Orientation 3 >> setpagedevice"
+          ;;
+      --psrotate=180)
+          gsarg2="-c << /Orientation 2 >> setpagedevice"
+          ;;
+      --psrotate=270)
+          gsarg2="-c << /Orientation 1 >> setpagedevice"
+          ;;
+      --epsf=no)
+          gsepsf=
+          ;;
+      --epsf=ignore)
+          gsepsf="-dNOEPS"
+          ;;
+      --epsf=fit)
+          gsepsf="-dEPSFitPage"
+          ;;
+      --epsf=crop)
+          gsepsf="-dEPSCrop"
+          ;;
+      --words)
+          if checkps2utf8; then
+            gsarg0="$gsarg0 -dDELAYBIND -dWRITESYSTEMDICT"
+            gsarg1="-f $djvutext"
+          else
+            gsarg0="$gsarg0 -dProvideUnicode -dExtractText"
+          fi
+          ;;
+      --lines)
+          if checkps2utf8; then 
+            gsarg0="$gsarg0 -dDELAYBIND -dWRITESYSTEMDICT"
+            gsarg1="-f $djvutext"
+          else
+            gsarg0="$gsarg0 -dProvideUnicode -dExtractText"
+          fi
+          csepargs="$csepargs -t"
+          ;;
+      --pdf=screen)
+          gsprinted="-dPrinted=false"
+          ;;
+      --pdf=printed)
+          gsprinted="-dPrinted=true"
+          ;;
+      --exact-color)
+          gsarg0="-dUseCIEColor $gsarg0"
+          ;;
+      --threshold=*)
+          gsarg0=" -dThreshold=`getarg $n` $gsarg0"
+          ;;
+      --bg-subsample=*)
+          gsarg0=" -dBgSubsample=`getarg $n` $gsarg0"
+          ;;
+      --bg-slices=*)
+          csepargs=" -q `getarg $n` $csepargs"
+          ;;
+      --fg-colors=*)
+          gsarg0=" -dFgColors=`getarg $n` $gsarg0"
+          ;;
+      --fg-image-colors=*)
+          gsarg0=" -dFgImgColors=`getarg $n` $gsarg0"
+          ;;
+      --gsarg=*)
+          gsarg0=" `getargs $n` $gsarg0"
+          ;;
+      --cseparg=*)
+          csepargs="$csepargs `getargs $n`"
+          ;;
+      -*)
+          usage
+          ;;
+      *)
+          if [ -z "$infile" ] ; then
+              infile=$n
+          elif [ -z "$outfile" ] ; then
+              outfile=$n
+          else
+              usage
+          fi
+          ;;
+  esac
+done
+
+
+# Step 4 -- check input filename
+
+if [ -z "$infile" ] ; then
+    usage
+elif [ ! -r "$infile" -a -z "$run" ]; then
+    echo "djvudigital: cannot open $infile for reading" 1>&2
+    exit 10
+fi
+
+if [ -z "$outfile" ]
+then
+    outfile="$infile"
+    for ext in gz GZ ps PS eps EPS pdf PDF
+    do
+       case "$outfile" in
+         *.$ext)
+            outfile=`basename "$outfile" .$ext`
+            ;;
+       esac
+    done
+    if [ "$sepfile" = "yes" ] 
+    then
+      outfile="$outfile.sep"
+    else
+      outfile="$outfile.djvu"
+    fi
+fi
+
+# Step 5 -- execute command
+
+if [ "$csepverbosity" != "" -o "$gsverbosity" != "-q" ] 
+then
+    test -z "$run" && echo "DJVUDIGITAL --- DjVuLibre-3.5"
+fi
+
+if [ "$sepfile" = "yes" ] 
+then
+  backend="$outfile"
+else
+  backend="|$csepdjvu -d "'"'"$dpi"'"'
+  backend="$backend $csepverbosity $csepargs - "'"'"$outfile"'"'
+fi
+
+
+case "$infile" in
+    *.gz|*.GZ)
+        if test -z "$run" ; then
+          gzip -d -c "$infile" | \
+          $gsdjvu "-r$dpi" $gsverbosity $gsprinted $gsepsf \
+            "-sOutputFile=$backend" $gsarg0 $gsarg1 $gsarg2 -_ -c quit
+        else
+          echo -n gzip -d -c '"'"$infile"'"' '|' ""
+          echo -n $gsdjvu "-r$dpi" $gsverbosity $gsprinted $gsepsf ""
+          echo -n "-sOutputFile=""'""$backend""'" ""
+          echo -n $gsarg0 $gsarg1 $gsarg2 -_ -c quit
+          echo
+        fi
+        ;;
+    *)
+        if test -z "$run" ; then
+          $gsdjvu "-r$dpi" $gsverbosity $gsprinted $gsepsf \
+            "-sOutputFile=$backend" $gsarg0 $gsarg1 $gsarg2 \
+            -f "$infile" -c quit
+        else
+          echo -n $gsdjvu "-r$dpi" $gsverbosity $gsprinted $gsepsf ""
+          echo -n "-sOutputFile=""'""$backend""'" ""
+          echo -n $gsarg0 $gsarg1 $gsarg2 -f '"'"$infile"'"' -c quit
+          echo
+        fi
+        ;;
+esac
diff --git a/tools/djvudigital.1 b/tools/djvudigital.1
new file mode 100644
index 0000000..9308118
--- /dev/null
+++ b/tools/djvudigital.1
@@ -0,0 +1,249 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUDIGITAL 1 "1/31/2004" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+djvudigital \- creates DjVu files from PS or PDF files.
+
+.SH SYNOPSIS
+.BI "djvudigital  [" "options" "] " "inputfile" " [" "outputfile" "]"
+
+.SH DESCRIPTION
+This program creates a DjVu file
+from the PostScript
+.BR "" "(" ".ps" "),"
+GZipped PostScript
+.BR "" "(" ".ps.gz" "),"
+Encapsulated PostScript
+.BR "" "(" ".eps" "),"
+or Portable Document Format 
+.BR "" "(" ".pdf" ")"
+file
+.IR inputfile .
+
+The output file name is either given by argument
+.I outputfile
+or generated by replacing the input file name 
+suffixes by the DjVu suffix
+.BR "" "(" ".djvu" ")."
+
+.SH PREREQUISITES
+
+This program depends on a specific GhostScript driver.
+If your GhostScript program does not provide this driver,
+please check
+.BR http://djvu.sourceforge.net/gsdjvu.html .
+
+.SH OPTIONS
+.TP
+.BR "--verbose" ", " "-v"
+Displays more informational messages while
+converting the file.
+.TP
+.BR "--quiet" ", " "-q"
+Do not display informational messages while
+converting the file.
+.TP
+.BI "--dpi=" "resolution"
+Specify the desired resolution to 
+.I resolution
+dots per inch.
+The default is 300 dpi.
+.TP
+.BI "--psrotate=" "angle"
+Rotate the PostScript file by 
+.I angle
+degrees clockwise. 
+Only the values
+.BR 0 ", " 90 ", " 180 ", and " 270
+are supported.  
+This option only applies to PostScript files.
+PDF files are always converted according to
+their native orientation.
+.TP
+.BI "--epsf=" "disposition"
+Specify how to handle Encapsulated PostScript files. 
+Argument
+.I disposition
+can take the values
+.BR crop ", " fit ", and " ignore "."
+The default disposition
+.B crop
+creates a DjVu file whose size matches the bounding box of 
+the Encapsulated PostScript file. Value
+.B fit
+rescales the graphics to the default page size. 
+Value
+.B ignore
+disables all Encapsulated PostScript specific code.
+This option requires Ghostscript 7.07 or better.
+.TP
+.BI "--exact-color"
+Enables a more accurate rendering of the colors.
+This option requires GhostScript 6.52 or better.
+.TP
+.BI "--threshold=" "thres"
+Specify a threshold for the foreground/background separation code.
+Acceptable values of
+.I thres
+range from 0 to 100. Larger values place more 
+information into the foreground layer.
+The default threshold value is 80.
+.TP
+.BI "--bg-subsample=" "sub"
+Specify the background subsampling ratio.
+Argument 
+.I sub
+must be an integer between 1 and 6.
+The default value is 3.
+.TP
+.BI "--bg-slices=" "n" "+...+" "n"
+Specify the encoding quality of the background layer. 
+The syntax for the argument is similar to that described for the
+.B -slice
+option of command
+.BR c44 .
+The default is
+.BR 72+11+10+10 .
+.TP
+.BI "--fg-colors=" ncolors
+Specify the maximum number of distinct colors in the foreground layer.
+Argument 
+.I ncolors
+can take integer values between 1 and 4000.
+The default value is 256.
+.TP
+.BI "--fg-image-colors=" ncolors
+Specify the maximum number of distinct colors in an image for 
+considering encoding it into the foreground layer.
+Argument 
+.I ncolors
+can take integer values between 1 and 4000.
+The default value is 256.
+.TP
+.BI "--words"
+Extract the text from the PostScript code and
+incorporates this information into the DjVu file.
+This option records the location of every word.
+.TP
+.BI "--lines"
+Extract the text from the PostScript code and
+incorporates this information into the DjVu file.
+This option saves a few bytes by only recording the 
+location of each line.
+.TP
+.BI "--gsarg=" arg1 "[," arg2 ",...," argN "]"
+Insert extra arguments on the GhostScript command line.
+.TP
+.BI "--cseparg=" arg1 "[," arg2 ",...," argN "]"
+Insert extra arguments on the command line of
+program
+.BR csepdjvu " or " msepdjvu "."
+.TP
+.BI "--sepfile"
+Produces a separated data file instead of a DjVu file. Program
+.BR csepdjvu 
+can then convert the separated data file into a DjVu file.
+.TP
+.BI "--check"
+Display the names of the two auxiliary programs found by
+.BR djvudigital ,
+namely a suitable ghostscript interpreter and a suitable backend encoder.
+See the next two section for details.
+.TP
+.BI "--dryrun"
+Simply display the ghostscript command line generated by
+.BR djvudigital
+without running it.
+No output file is produced
+.TP
+.BI "--help"
+Display the manual page for 
+.BR djvudigital .
+.PP
+
+.SH GHOSTSCRIPT ISSUES
+
+Program
+.B djvudigital 
+internally relies on a specific Ghostscript driver named
+.BR djvusep .
+This driver analyzes the logical structure of the sequence
+of PostScript rendering commands and decides to execute 
+each command into either the foreground or the background layer.
+The GhostScript driver produces a separated data file 
+that is then compressed using the DjVuLibre program
+.BR csepdjvu .
+
+Before processing the input file, program
+.B djvudigital
+searches a Ghostscript executable providing the
+.B djvusep
+driver. The search starts with the file specified
+by the environment variable
+.B GSDJVU
+and continues with command line executables named
+.BR gs " and " gsdjvu "."
+
+The DjVuLibre source code contains instruction
+to compile such a GhostScript executable.
+More information can be obtained from
+.BR http://djvu.sourceforge.net/gsdjvu.html .
+
+.SH CSEPDJVU ISSUES
+
+The output of the
+.B djvusep
+GhostScript driver must be processed by 
+the DjVuLibre program
+.BR csepdjvu .
+This program can also be replaced by the 
+the proprietary Lizardtech program
+.BR msepdjvu .
+Before processing the input file, program
+.B djvudigital
+searches such an executable.
+The search starts with the file specified
+by the environment variable
+.B CSEPDJVU
+and continues with command line executables named
+.BR msepdjvu " and " csepdjvu "."
+
+.SH CREDITS
+
+The first version of this converter was written 
+by L\('eon Bottou <leonb@users.sourceforge.net>
+in AT&T Labs.  The DjVuLibre version is derived 
+from code graciously released by Lizardtech in 
+January 2004.
+
+.SH BUGS
+
+Program
+.B djvudigital
+can only process input files that GhostScript can process properly.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR csepdjvu (1),
+.BR c44 (1),
+.BR gs (1),
+.BR gzip (1)
diff --git a/tools/djvudump.1 b/tools/djvudump.1
new file mode 100644
index 0000000..e39a318
--- /dev/null
+++ b/tools/djvudump.1
@@ -0,0 +1,57 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUDUMP 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvudump \- Display internal structure of DjVu files.
+
+.SH SYNOPSIS
+.BI "djvudump [-o " "outputfile" "] " "djvufiles" "..."
+
+.SH DESCRIPTION
+Program 
+.B djvudump 
+prints an indented representation of the chunk structure of any DjVu files.
+Each line represent contains a chunk ID followed by the chunk size.  Lines are
+indented in order to reflect the hierarchical structure of the IFF files.  The
+page identifier is printed between curly braces when a bundled multi-page DjVu
+document is recognized.  Additional information about each chunk is provided
+when
+.B djvudump
+recognizes the chunk name and knows how to summarize the 
+chunk data.  
+
+.SH REMARKS
+This program is in fact able to describe any file complying with the
+Electronic Arts IFF 85 specification.  This includes a number of graphical and
+sound file formats.
+
+.SH CREDITS
+This program was written by L\('eon Bottou <leonb@users.sourceforge.net> and
+was then improved by Andrei Erofeev <andrew_erofeev@yahoo.com>, Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1)
+
diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp
new file mode 100644
index 0000000..89bb7b8
--- /dev/null
+++ b/tools/djvudump.cpp
@@ -0,0 +1,189 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name djvuinfo
+
+    {\bf Synopsis}
+    \begin{verbatim}
+        djvudump <... iff_file_names ...>
+    \end{verbatim}
+
+    {\bf Description} --- File #"djvudump.cpp"# uses the facilities
+    provided by \Ref{IFFByteStream.h} to display an indented
+    representation of the chunk structure of an ``EA IFF 85'' file.
+    Each line represent contains a chunk ID followed by the chunk
+    size.  Additional information about the chunk is provided when
+    program #djvuinfo.cpp# recognizes the chunk name and knows how to
+    summarize the chunk data.  Furthermore, page identifiers are
+    printed between curly braces when #djvudump# recognizes a bundled
+    multipage document.  Lines are indented in order to reflect the
+    hierarchical structure of the IFF files.
+
+    {\bf Example}
+    \begin{verbatim}
+    % djvuinfo graham1.djvu 
+    graham1.djvu:
+      FORM:DJVU [32553] 
+        INFO [5]            2325x3156, version 20, 300 dpi, gamma 2.2
+	ANTa [34]	    Page annotation
+	INCL [11]	    Indirection chunk (document.dir)
+        Sjbz [17692]        JB2 data, no header
+        BG44 [2570]         #1 - 74 slices - v1.2 (color) - 775x1052
+        FG44 [1035]         #1 - 100 slices - v1.2 (color) - 194x263
+        BG44 [3048]         #2 - 10 slices 
+        BG44 [894]          #3 - 4 slices 
+        BG44 [7247]         #4 - 9 slices 
+    \end{verbatim}
+
+    {\bf References} ---
+    EA IFF 85 file format specification:\\
+    \URL{http://www.cica.indiana.edu/graphics/image_specs/ilbm.format.txt}
+    or \URL{http://www.tnt.uni-hannover.de/soft/compgraph/fileformats/docs/iff.pre}
+
+    @memo
+    Prints the structure of an IFF file.
+xxx
+    @author
+    L\'eon Bottou <leonb@research.att.com>
+*/
+//@{
+//@}
+
+#include "DjVuDumpHelper.h"
+#include "ByteStream.h"
+#include "GException.h"
+#include "GOS.h"
+#include "GString.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+#include "common.h"
+
+const char *outputfile = 0;
+FILE *outputf = stdout;
+
+void
+display(const GURL &url)
+{
+   DjVuDumpHelper helper;
+   GP<ByteStream> ibs = ByteStream::create(url, "rb");
+   GP<ByteStream> obs = helper.dump(ibs);
+   GUTF8String str;
+   size_t size = obs->size();
+   char *buf = str.getbuf(obs->size());
+   obs->seek(0);
+   obs->readall(buf, size);
+   GNativeString ns = str;
+   fputs((const char*)ns, outputf);
+}
+
+
+void
+usage()
+{
+  DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+          "DJVUDUMP --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+          "Describes DjVu and IFF85 files\n\n"
+          "Usage: djvudump [-o outputfile] <iff_filenames>\n" );
+  exit(1);
+}
+
+int 
+main(int argc, char **argv)
+{
+  DJVU_LOCALE;
+  // get output file name
+  if (argc>2 && !strcmp(argv[1],"-o"))
+    {
+      outputfile = argv[2];
+      argv += 2;
+      argc -= 2;
+    }
+  // convert iff file name
+  GArray<GUTF8String> dargv(0, argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  if (argc <= 1)
+    usage();
+  if (outputfile && !(outputf = fopen(outputfile,"w")))
+    {
+      DjVuPrintErrorUTF8("djvudump: Cannot open output file.\n");
+      exit(1);
+    }
+  G_TRY
+    {
+      for (int i=1; i<argc; i++)
+        {
+        const GURL::Filename::UTF8 url(dargv[i]);
+        display(url);
+        }
+    }
+  G_CATCH(ex)
+  {
+      ex.perror();
+      exit(1);
+  }
+  G_ENDCATCH;
+  return 0;
+}
+
diff --git a/tools/djvuextract.1 b/tools/djvuextract.1
new file mode 100644
index 0000000..48b800d
--- /dev/null
+++ b/tools/djvuextract.1
@@ -0,0 +1,71 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUEXTRACT 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvuextract \- Extract chunks from DjVu image files.
+
+.SH SYNOPSIS
+.BI "djvuextract [-page=" "pagenum" "] " "djvufile" " [" "chkid" "=" "filename" "]..." 
+
+.SH DESCRIPTION
+Program
+.B djvuextract
+extracts raw chunk data from a DjVu file
+.IR djvufile .
+These chunks can then be re-assembled into DjVu files
+using program
+.BR djvumake .
+
+Option 
+.B -page
+can be used to specify a particular page.
+Otherwise the first page of the document is assumed.
+Each remaining argument specifies that the raw data 
+associated with all the chunks named
+.I chkid 
+will be concatenated into the file named
+.IR filename .
+Chunks named 
+.B BG44
+and 
+.B FG44
+are handled slightly differently:
+the program generates legal
+.SM IW44
+files instead of simply saving the
+raw data.
+
+See the man page 
+.BR djvumake (1)
+for related information.
+
+.SH CREDITS
+This program was written by L\('eon Bottou <leonb@users.sourceforge.net> and
+was then improved by Andrei Erofeev <andrew_erofeev@yahoo.com>, Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvumake (1)
diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp
new file mode 100644
index 0000000..24220c5
--- /dev/null
+++ b/tools/djvuextract.cpp
@@ -0,0 +1,275 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name djvuextract
+
+    {\bf Synopsis}
+    \begin{verbatim}
+    djvuextract <djvufile> [-page=<page>] [Sjbz=<maskout>] [FG44=<fgout>] [BG44=<bgout>]
+    \end{verbatim}
+    
+    {\bf Description}\\
+    Program #djvuextract# analyzes the DjVu file
+    #<djvufile># and saves the various layers into the specified files.
+    The reverse operation can be achieved using program \Ref{djvumake}.
+    \begin{itemize}
+    \item When option #Sjbz=<maskout># is specified, the foreground mask is
+      saved into file #<maskout># as JB2 data. This data file can be read
+      using function \Ref{JB2Image::decode} in class \Ref{JB2Image}.
+    \item When option #FG44=<fgout># is specified, the foreground color image
+      is saved into file #<fgout># as IW44 data.  This data file can be processed
+      using programs \Ref{d44}.
+    \item When option #BG44=<bgout># is specified, the background color image
+      is saved into file #<bgout># as IW44 data.  This data file can be processed
+      using programs \Ref{d44}.
+    \item Optionally one can provide a #-page# option to select a given
+      page from the document, if it's a multipage document. The page numbers
+      start from #1#.
+    \end{itemize}
+    This commands also supports #"Smmr"# chunks for G4/MMR encoded masks,
+    #"FGjp"# and #"BGjp"# for JPEG encoded color layers, and finally #"FG2k"#
+    and #"BG2k"# for JPEG-2000 encoded color layers.
+
+    @memo
+    Extract components from DjVu files.
+    @author
+    L\'eon Bottou <leonb@research.att.com> - Initial implementation\\
+    Andrei Erofeev <eaf@geocities.com> - Multipage support */
+//@{
+//@}
+
+#include "GException.h"
+#include "ByteStream.h"
+#include "IFFByteStream.h"
+#include "DjVuDocument.h"
+#include "DjVuFile.h"
+#include "GOS.h"
+#include "DjVuMessage.h"
+#include "common.h"
+
+struct DejaVuInfo
+{
+  unsigned char width_hi, width_lo;
+  unsigned char height_hi, height_lo;
+  char version;
+} djvuinfo;
+
+struct PrimaryHeader {
+  unsigned char serial;
+  unsigned char slices;
+} primary;
+
+struct SecondaryHeader {
+  unsigned char major;
+  unsigned char minor;
+  unsigned char xhi, xlo;
+  unsigned char yhi, ylo;
+} secondary;
+
+
+static void
+extract_chunk(GP<ByteStream> ibs, const GUTF8String &id, GP<ByteStream> out)
+{
+  ibs->seek(0);
+  GP<IFFByteStream> giff=IFFByteStream::create(ibs);
+  IFFByteStream &iff=*giff;
+  GUTF8String chkid;
+  if (! iff.get_chunk(chkid))
+    G_THROW("Malformed DJVU file");
+  if (chkid != "FORM:DJVU" && chkid != "FORM:DJVI" )
+    G_THROW("This is not a layered DJVU file");
+  
+
+  // Special case for FG44 and BG44
+  if (id == "BG44" || id == "FG44")
+    {
+      // Rebuild IW44 file
+      GP<IFFByteStream> giffout=IFFByteStream::create(out);
+      IFFByteStream &iffout=*giffout;
+      int color_bg = -1;
+      while (iff.get_chunk(chkid))
+        {
+          if (chkid == id)
+            {
+              GP<ByteStream> gtemp=ByteStream::create();
+              ByteStream &temp=*gtemp;
+              temp.copy(*iff.get_bytestream());
+              temp.seek(0);
+              if (temp.readall((void*)&primary, sizeof(primary))<sizeof(primary))
+                G_THROW("Cannot read primary header in BG44 chunk");
+              if (primary.serial == 0)
+                {
+                  if (temp.readall((void*)&secondary, sizeof(secondary))<sizeof(secondary))
+                    G_THROW("Cannot read secondary header in BG44 chunk");
+                  color_bg = ! (secondary.major & 0x80);
+                  iffout.put_chunk(color_bg ? "FORM:PM44" : "FORM:BM44");
+                }
+              if (color_bg < 0)
+                G_THROW("IW44 chunks are not in proper order");
+              temp.seek(0);
+              iffout.put_chunk(color_bg ? "PM44" : "BM44");
+              iffout.copy(temp);
+              iffout.close_chunk();
+            }
+          iff.close_chunk();
+        }
+    }
+  else
+    {
+      // Just concatenates all matching chunks
+      while (iff.get_chunk(chkid))
+        {
+          if (chkid == id)
+            out->copy(*iff.get_bytestream());
+          iff.close_chunk();
+        }
+    }
+}
+
+
+void 
+usage()
+{
+  DjVuPrintErrorUTF8("%s",
+#ifdef DJVULIBRE_VERSION
+          "DJVUEXTRACT --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+          "Extracts components of a DjVu file\n"
+          "\n"
+          "Usage:\n"
+	  "   djvuextract <djvufile> [-page=<num>] {...<chunkid>=<file>...} \n");
+  exit(1);
+}
+
+
+int
+main(int argc, char **argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  G_TRY
+    {
+      int i;
+
+      // Process page number
+      int page_num=0;
+      for(i=1;i<argc;i++)
+	 if (!dargv[i].cmp("-page=", 6))
+           {
+              page_num = dargv[i].substr(6,dargv[i].length()).toInt() - 1; // atoi(6+(const char *)dargv[i]) - 1;
+             for(int j=i;j<argc-1;j++) 
+               dargv[j]=dargv[j+1];
+             argc--;
+             break;
+           } 
+      if (page_num<0)
+        {
+          DjVuPrintErrorUTF8("%s", "Invalid page number\n");
+          usage();
+        }
+      
+      // Check that chunk names are legal
+      if (argc<=2)
+        usage();
+      for (i=2; i<argc; i++)
+        if (IFFByteStream::check_id(dargv[i]) || dargv[i][4]!='=' || dargv[i][5]==0)
+          usage();
+
+      // Decode
+      const GURL::Filename::UTF8 url1(dargv[1]);
+      GP<DjVuDocument> doc=DjVuDocument::create_wait(url1);
+      if (! doc->wait_for_complete_init() || ! doc->is_init_ok())
+        G_THROW("Decoding failed. Nothing can be done.");        
+      GP<DjVuFile> file=doc->get_djvu_file(page_num);
+      GP<ByteStream> pibs = file->get_djvu_bytestream(false, false);
+      // Extract required chunks
+      for (i=2; i<argc; i++)
+        {
+          GP<ByteStream> gmbs=ByteStream::create();
+          const GUTF8String chunkid=dargv[i].substr(0,4);
+          extract_chunk(pibs, chunkid, gmbs);
+          ByteStream &mbs=*gmbs;
+          if (mbs.size() == 0)
+            {
+              DjVuPrintErrorUTF8("  %s --> not found!\n", (const char *)dargv[i]);
+            }
+          else
+            {
+              const GURL::Filename::UTF8 url((const char *)dargv[i].substr(5,-1));
+              GP<ByteStream> obs=ByteStream::create(url,"wb");
+              mbs.seek(0);
+              obs->copy(mbs);
+              DjVuPrintErrorUTF8("  %s --> \"%s\" (%d bytes)\n", 
+                      (const char *)dargv[i], (const char *)dargv[i]+5, mbs.size());
+            }
+        }
+    }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  return 0;
+}
diff --git a/tools/djvumake.1 b/tools/djvumake.1
new file mode 100644
index 0000000..a39dd4d
--- /dev/null
+++ b/tools/djvumake.1
@@ -0,0 +1,244 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUMAKE 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvumake \- Assemble DjVu image files.
+
+.SH SYNOPSIS
+.BI "djvumake " "djvufile" " [" "chkid" "=" "argument" "]..." 
+
+.SH DESCRIPTION
+Program
+.B djvumake
+assembles a single-page DjVu file 
+.I djvufile
+by copying or creating chunks according to the provided arguments. 
+Supported arguments are as follows:
+.TP
+.BI INFO= w , h , dpi
+Create the initial information chunk.  Arguments 
+.IR w ", " h ", and " dpi
+describe the width, height and resolution of the image.  All arguments
+may be omitted.  The default resolution is 300 dpi.  The default width
+and height will be retrieved from the first mask chunk specified in the
+command line options.
+.TP
+.BI Sjbz= jb2file
+Create a 
+.SM JB2 
+foreground mask chunk.  File 
+.I jb2file
+may contain raw JB2 data, 
+or be a DjVu file containing JB2 data
+such as those produced by program
+.BR cjb2 .
+.TP
+.BI Smmr= mmrfile
+Create a
+.SM MMR/G4 
+foreground mask chunk.  File 
+.I mmrfile
+may contain raw MMR data or be a DjVu file 
+containing MMR data.
+.TP
+.BI BG44= iw44file "[:" n "]"
+Create one or more 
+.SM IW44 
+background chunks.  File 
+.I iw44file 
+must contain
+.SM IW44 
+data.
+Such files can be obtained by compressing the background image
+with program 
+.B c44
+and extracting the raw 
+.SM IW44 
+data using program
+.BR djvuextract .
+The optional argument
+.I n
+indicates the number of chunks to copy from the IW44 file.
+Omitting the number of chunks copies all available chunks.
+.TP
+.BI BGjp= jpegfile
+Create a 
+.SM JPEG
+encoded background chunk.
+File 
+.I jpegfile
+must contain 
+.SM JPEG 
+encoded data.
+.TP
+.BI BG2k= jpegfile
+Create a 
+.SM JPEG-2000 
+background chunk.
+File
+.I jpegfile
+must contain 
+.SM JPEG-2000
+encoded data.
+The DjVu decoder does not yet display
+files containing JPEG-2000 data.
+.TP
+.BI FGbz=( filename |{# color [: x , y , w , h ]})
+Create a foreground color chunk describing one solid
+color for each
+.SM JB2
+encoded mark. 
+The argument can be the name
+.I filename
+of a file containing the raw data.
+Such files are best created using program
+.BR djvuextract (1).
+Alternatively the argument could describe a sequence of color zones.
+Each color zone specifies a color name
+.IR color ,
+and optionally the coordinates
+.IR x , y , w , h
+of a rectangle.
+Each mark receives the color of the last color zone
+whose rectangle intersects the bounding box of the mark.
+The mark is painted black if its bounding box does not
+intersect one of the zones.
+The rectangle coordinates are expressed in pixels
+with the origin at the bottom left corner of the page.
+The full page is assumed when no rectangle 
+coordinates are specified.
+Color names can be specified with exactly 
+six hexadecimal digits, e.g. 
+.BR FGbz=#FF8080 ,
+or by one of the following sixteen HTML color names 
+defined by the W3C, e.g.
+.BR FGbz=#red .
+.br
+.TS
+center,box;
+lfB lfB lfB lfB
+lfB lfB lfB lfB
+lfB lfB lfB lfB
+lfB lfB lfB lfB
+. 
+aqua	black	blue	fuchsia
+gray	green	lime	maroon
+navy	olive	purple	red
+silver	teal	white	yellow
+.TE
+.TP
+.BI FG44= iw44file
+Create a 
+.SM IW44 
+foreground color chunk.  
+File 
+.I iw44file 
+must contain 
+.SM IW44 
+data.
+Such files can be obtained by compressing the background image
+with command 
+.B c44
+and extracting the raw 
+.SM IW44 
+data using program
+.BR djvuextract .
+Only the first chunk is copied.
+.TP
+.BI FGjp= jpegfile
+Create a 
+.SM JPEG
+foreground color chunk.
+.TP
+.BI FG2k= jpegfile
+Create a
+.SM JPEG-2000
+foreground color chunk.
+The DjVu decoder does not yet display
+files containing JPEG-2000 data.
+.TP
+.BI INCL= fileid
+Create a DjVu3 include chunk pointing to the component file named 
+.IR fileid .
+The resulting file should then be included into a 
+multipage document using command 
+.BR djvm .
+.TP
+.BI Djbz= jb2file
+Create a 
+.SM JB2 
+shape dictionary.  File 
+.I jb2file
+must contain raw JB2 data
+describing a JB2 dictionary.
+.TP 
+.BI PPM= ppmfile
+Create a
+.SM IW44
+background chunk and a 
+.SM IW44 
+foreground color chunk 
+by masking and subsampling the 
+.SM PPM
+file
+.IR ppmfile.
+
+Assume, for instance, that we have a 
+.SM PPM 
+image 
+.B myimage.ppm
+and an identically sized
+.SM PBM
+bitonal image 
+.B mymask.pbm
+whose black pixels indicate which pixels belong to the foreground.  
+Such a bitonal file might have been obtained by thresholding 
+or color-keying the 
+.SM PPM 
+image. We can then produce a DjVuDocument image using the
+following two commands:
+.IP "" 3
+.B cjb2 mymask.pbm mymask.djvu
+.br
+.B djvumake my.djvu Sjbz=mymask.djvu PPM=myimage.ppm
+.br
+.br
+.PP
+The DjVu specification documents in the directory
+.B doc
+of the DjVuLibre distribution provide the
+authoritative information about the composition 
+of a legal DjVu image file.
+
+.SH CREDITS
+This program was written by L\('eon Bottou <leonb@users.sourceforge.net> and
+was then improved by Andrei Erofeev <andrew_erofeev@yahoo.com>, Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvuextract (1),
+.BR cjb2 (1),
+.BR c44 (1)
diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp
new file mode 100644
index 0000000..0e94532
--- /dev/null
+++ b/tools/djvumake.cpp
@@ -0,0 +1,1270 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+/** @name djvumake
+
+    {\bf Synopsis}
+    \begin{verbatim}
+       % djvumake <djvufile> [...<arguments>...]
+    \end{verbatim}
+
+    {\bf Description}
+
+    This command assembles a single-page DjVu file by copying or creating
+    chunks according to the provided <arguments>. Supported syntaxes for
+    <arguments> are as follows:
+    \begin{tabular}{ll}
+    {#INFO=<w>,<h>,<dpi>#} &
+      Creates the initial ``INFO'' chunk.  Arguments #w#, #h# and #dpi#
+      describe the width, height and resolution of the image.  All arguments
+      may be omitted.  The default resolution is 300 dpi.  The default width
+      and height will be retrieved from the first mask chunk specified in the
+      command line options.\\
+      {#Sjbz=<jb2file>#} &
+      Creates a JB2 mask chunk.  File #jb2file# may
+      contain raw JB2 data or be a DjVu file containing JB2 data, such as the
+      files produced by \Ref{cjb2}.\\
+      {#Smmr=<mmrfile>] #} &
+      Creates a mask chunk containing MMR/G4 data.  File #mmrfile#
+      may contain raw MMR data or be a DjVu file containing MMR data.\\
+      {#BG44=<iw44file>:<n>#} &
+      Creates one or more IW44 background chunks.  File #iw44file# must be an
+      IW44 file such as the files created by \Ref{c44}.  The optional argument
+      #n# indicates the number of chunks to copy from the IW44 file.\\
+      {#BGjp=<jpegfile>#} &
+      Creates a JPEG background chunk.\\
+      {#BG2k=<jpegfile>#} &
+      Creates a JPEG-2000 background chunk.\\
+      {#FG44=<iw44file>#} &
+      Creates one IW44 foreround chunks.  File #iw44file# must be an
+      IW44 file such as the files created by \Ref{c44}.  Only the first
+      chunk will be copied.\\
+      {FGbz=(bzzfile|\{#color1[:x,y,w,h]\})}
+      Creates a chunk containing colors for each JB2 encoded object.
+      Such chunks are created using class \Ref{DjVuPalette}.
+      See program \Ref{cpaldjvu} for an example.\\
+      {#FGjp=<jpegfile>#} &
+      Creates a JPEG foreground chunk.\\
+      {#FG2k=<jpegfile>#} &
+      Creates a JPEG-2000 foreground chunk.\\
+      {#INCL=<fileid>#} &
+      Creates an include chunk pointing to <fileid>.
+      The resulting file should then be included into a 
+      multipage document.\\
+      {#PPM=<ppmfile>#} (psuedo-chunk) &
+      Create IW44 foreground and background chunks
+      by masking and subsampling PPM file #ppmfile#.
+      This is used by program \Ref{cdjvu}.\\
+      {#chunk=<rawdatafile>#} &
+      Creates the specified chunk with the specified raw data.
+    \end{tabular}
+
+    Let us assume now that you have a PPM image #"myimage.ppm"# and a PBM
+    bitonal image #"mymask.pbm"# whose black pixels indicate which pixels
+    belong to the foreground.  Such a bitonal file may be obtained by
+    thresholding, although more sophisticated techniques can give better
+    results.  You can then generate a Compound DjVu File by typing:
+    \begin{verbatim}
+       % cjb2 mymask.pbm mymask.djvu
+       % djvumake mycompound.djvu Sjbz=mymask.djvu PPM=myimage.ppm
+    \end{verbatim}
+
+    @memo
+    Assemble DjVu files.
+    @author
+    L\'eon Bottou <leonb@research.att.com> \\
+    Patrick Haffner <haffner@research.att.com>
+*/
+//@{
+//@}
+
+#include "GString.h"
+#include "GException.h"
+#include "DjVuImage.h"
+#include "MMRDecoder.h"
+#include "IFFByteStream.h"
+#include "JB2Image.h"
+#include "IW44Image.h"
+
+#include "GPixmap.h"
+#include "GBitmap.h"
+#include "GContainer.h"
+#include "GRect.h"
+#include "DjVuMessage.h"
+
+#include "common.h"
+
+int flag_contains_fg      = 0;
+int flag_contains_bg      = 0;
+int flag_contains_stencil = 0;
+int flag_contains_incl    = 0;
+int flag_fg_needs_palette = 0;
+
+struct DJVUMAKEGlobal 
+{
+  // Globals that need static initialization
+  // are grouped here to work around broken compilers.
+  GP<ByteStream> jb2stencil;
+  GP<ByteStream> mmrstencil;
+  GP<JB2Image> stencil;
+  GP<JB2Dict> dictionary;
+  GTArray<GRect> colorzones;
+  GP<ByteStream> colorpalette;
+};
+
+static DJVUMAKEGlobal& g(void)
+{
+  static DJVUMAKEGlobal g;
+  return g;
+}
+
+int w = -1;
+int h = -1;
+int dpi = 300;
+int blit_count = -1;
+
+// -- Display brief usage information
+
+void 
+usage()
+{
+  DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+         "DJVUMAKE --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+         "Utility for manually assembling DjVu files\n\n"
+         "Usage: djvumake djvufile ...arguments...\n"
+         "\n"
+         "The arguments describe the successive chunks of the DJVU file.\n"
+         "Possible arguments are:\n"
+         "\n"
+         "   INFO=w[,[h[,[dpi]]]]     --  Create the initial information chunk\n"
+         "   Sjbz=jb2file             --  Create a JB2 mask chunk\n"
+         "   Djbz=jb2file             --  Create a JB2 shape dictionary\n"
+         "   Smmr=mmrfile             --  Create a MMR mask chunk\n"
+         "   BG44=[iw4file][:nchunks] --  Create one or more IW44 background chunks\n"
+         "   BGjp=jpegfile            --  Create a JPEG background chunk\n"
+         "   BG2k=jpeg2000file        --  Create a JP2K background chunk\n"
+         "   FG44=iw4file             --  Create an IW44 foreground chunk\n"
+         "   FGbz=bzzfile             --  Create a foreground color chunk from a file\n"
+         "   FGbz={#color:x,y,w,h}    --  Create a foreground color chunk from zones\n"
+         "   FGjp=jpegfile            --  Create a JPEG foreground image chunk\n"
+         "   FG2k=jpeg2000file        --  Create a JP2K foreground image chunk\n"
+         "   INCL=fileid              --  Create an INCL chunk\n"
+         "   chunk=rawdatafile        --  Create the specified chunk from the raw data file\n"
+         "   PPM=ppmfile              --  Create IW44 foreground and background chunks\n"
+         "                                by masking and subsampling a PPM file.\n"
+         "\n"
+         "You may omit the specification of the information chunk. An information\n"
+         "chunk will be created using the image size of the first mask chunk\n"
+         "This program is sometimes able  to issue a warning when you are building an\n"
+         "incorrect djvu file.\n"
+         "\n");
+  exit(1);
+}
+
+// -- Obtain image size from mmr chunk
+
+void
+analyze_mmr_chunk(const GURL &url)
+{
+  if (!g().mmrstencil || !g().mmrstencil->size())
+    {
+      GP<ByteStream> gbs=ByteStream::create(url,"rb");
+      ByteStream &bs=*gbs;
+      g().mmrstencil = ByteStream::create();
+      // Check if file is an IFF file
+      char magic[4];
+      memset(magic,0,sizeof(magic));
+      bs.readall(magic,sizeof(magic));
+      if (!GStringRep::cmp(magic,"AT&T",4))
+        bs.readall(magic,sizeof(magic));
+      if (GStringRep::cmp(magic,"FORM",4))
+        {
+          // Must be a raw file
+          bs.seek(0);
+          g().mmrstencil->copy(bs);
+        }
+      else
+        {
+          // Search Smmr chunk
+          bs.seek(0);
+          GUTF8String chkid;
+          GP<IFFByteStream> giff=IFFByteStream::create(gbs);
+          IFFByteStream &iff=*giff;
+          if (iff.get_chunk(chkid)==0 || chkid!="FORM:DJVU")
+            G_THROW("Expecting a DjVu file!");
+          for(; iff.get_chunk(chkid); iff.close_chunk())
+            if (chkid=="Smmr") { g().mmrstencil->copy(bs); break; }
+        }
+      // Check result
+      g().mmrstencil->seek(0);
+      if (!g().mmrstencil->size())
+        G_THROW("Could not find MMR data");
+      // Decode
+      g().stencil = MMRDecoder::decode(g().mmrstencil);
+      int jw = g().stencil->get_width();
+      int jh = g().stencil->get_height();
+      if (w < 0) w = jw;
+      if (h < 0) h = jh;
+      if (jw!=w || jh!=h)
+        DjVuPrintErrorUTF8("djvumake: mask size (%s) does not match info size\n", (const char *)url);
+    }
+}
+
+
+// -- Obtain shape dictionary
+
+void 
+analyze_djbz_chunk(GP<ByteStream> gbs)
+{
+  if (g().dictionary)
+    G_THROW("Duplicate Djbz dictionary");
+  g().dictionary = JB2Dict::create();
+  g().dictionary->decode(gbs);
+}
+
+void 
+analyze_djbz_chunk(const GURL &url)
+{
+  GP<ByteStream> gbs = ByteStream::create(url, "rb");
+  analyze_djbz_chunk(gbs);
+}
+
+
+// -- Obtain image size and blit count from jb2 chunk
+
+GP<JB2Dict> 
+provide_shared_dict( void* )
+{
+  return(g().dictionary);
+}
+
+void 
+analyze_jb2_chunk(const GURL &url)
+{
+  if (!g().jb2stencil || !g().jb2stencil->size())
+    {
+      GP<ByteStream> gbs=ByteStream::create(url,"rb");
+      ByteStream &bs=*gbs;
+      g().jb2stencil = ByteStream::create();
+      // Check if file is an IFF file
+      char magic[4];
+      memset(magic,0,sizeof(magic));
+      bs.readall(magic,sizeof(magic));
+      if (!GStringRep::cmp(magic,"AT&T",4))
+        bs.readall(magic,sizeof(magic));
+      if (GStringRep::cmp(magic,"FORM",4))
+        {
+          // Must be a raw file
+          bs.seek(0);
+          g().jb2stencil->copy(bs);
+        }
+      else
+        {
+          // Search Sjbz chunk
+          bs.seek(0);
+          GUTF8String chkid;
+          GP<IFFByteStream> giff=IFFByteStream::create(gbs);
+          IFFByteStream &iff=*giff;
+          if (iff.get_chunk(chkid)==0 || chkid!="FORM:DJVU")
+            G_THROW("Expecting a DjVu file!");
+          for(; iff.get_chunk(chkid); iff.close_chunk())
+            if (chkid=="Sjbz") { g().jb2stencil->copy(bs); break; }
+        }
+      // Check result
+      g().jb2stencil->seek(0);
+      if (!g().jb2stencil->size())
+        G_THROW("Could not find JB2 data");
+      // Decode
+      g().stencil=JB2Image::create();
+      g().stencil->decode(g().jb2stencil,&provide_shared_dict,NULL);
+      int jw = g().stencil->get_width();
+      int jh = g().stencil->get_height();
+      if (w < 0) 
+        w = jw;
+      if (h < 0) 
+        h = jh;
+      if (blit_count < 0) 
+        blit_count = g().stencil->get_blit_count();
+      if (jw!=w || jh!=h)
+        DjVuPrintErrorUTF8("djvumake: mask size (%s) does not match info size\n", (const char *)url);
+    }
+}
+
+// -- Load dictionary from an INCL chunk
+
+void
+analyze_incl_chunk(const GURL &url)
+{
+  GP<ByteStream> gbs = ByteStream::create(url,"rb");
+  char buffer[24];
+  memset(buffer, 0, sizeof(buffer));
+  gbs->read(buffer,sizeof(buffer));
+  char *s = buffer;
+  if (!strncmp(s, "AT&T", 4))
+    s += 4;
+  if (strncmp(s, "FORM", 4) || strncmp(s+8, "DJVI", 4))
+    G_THROW("Expecting a valid FORM:DJVI chunk in the included file");
+  gbs->seek(0);
+  GP<IFFByteStream> giff=IFFByteStream::create(gbs);
+  GUTF8String chkid;
+  giff->get_chunk(chkid); // FORM:DJVI
+  for(; giff->get_chunk(chkid); giff->close_chunk())
+    if (chkid=="Djbz") 
+      analyze_djbz_chunk(giff->get_bytestream());
+}
+
+void
+check_for_shared_dict(GArray<GUTF8String> &argv)
+{
+  const int argc=argv.hbound()+1;
+  for (int i=2; i<argc; i++)
+    if (!argv[i].cmp("INCL=",5))
+      analyze_incl_chunk(GURL::Filename::UTF8(5+(const char *)argv[i]));
+    else if (!argv[i].cmp("Djbz=", 5))
+      analyze_djbz_chunk(GURL::Filename::UTF8(5+(const char *)argv[i]));
+}
+
+
+
+// -- Create info chunk from specification or mask
+
+void
+create_info_chunk(IFFByteStream &iff, GArray<GUTF8String> &argv)
+{
+  const int argc=argv.hbound()+1;
+  // Process info specification
+  for (int i=2; i<argc; i++)
+    if (!argv[i].cmp("INFO=",5))
+      {
+        int   narg = 0;
+        const char *ptr = 5+(const char *)argv[i];
+        while (*ptr)
+          {
+            if (*ptr != ',')
+              {
+                int x = strtol((char *)ptr, (char **)&ptr, 10);
+                switch(narg)
+                  {
+                  case 0: 
+                    w = x; break;
+                  case 1: 
+                    h = x; break;
+                  case 2: 
+                    dpi = x; break;
+                  default:  
+                    G_THROW("djvumake: incorrect 'INFO' chunk specification\n");
+                  }
+              }
+            narg++;
+            if (*ptr && *ptr++!=',')
+              G_THROW("djvumake: comma expected in 'INFO' chunk specification\n");
+          }
+          break;
+      }
+  if (w>0 && (w<=0 || w>=32768))
+    G_THROW("djvumake: incorrect width in 'INFO' chunk specification\n");
+  if (h>0 && (h<=0 || h>=32768))
+    G_THROW("djvumake: incorrect height in 'INFO' chunk specification\n");
+  if (dpi>0 && (dpi<25 || dpi>6000))
+    G_THROW("djvumake: incorrect dpi in 'INFO' chunk specification\n");
+  // Search first mask chunks if size is still unknown
+  if (h<0 || w<0)
+    {
+      for (int i=2; i<argc; i++)
+        if (!argv[i].cmp("Sjbz=",5))
+          {
+            analyze_jb2_chunk(GURL::Filename::UTF8(5+(const char *)argv[i]));
+            break;
+          }
+        else if (!argv[i].cmp("Smmr=",5))
+          {
+            analyze_mmr_chunk(GURL::Filename::UTF8(5+(const char *)argv[i]));
+            break;
+          }
+    }
+  
+  // Check that we have everything
+  if (w<0 || h<0)
+    G_THROW("djvumake: cannot determine image size\n");
+  // write info chunk
+  GP<DjVuInfo> ginfo=DjVuInfo::create();
+  DjVuInfo &info=*ginfo;
+  info.width = w;
+  info.height = h;
+  info.dpi = dpi;
+  iff.put_chunk("INFO");
+  info.encode(*iff.get_bytestream());
+  iff.close_chunk();
+}
+
+
+// -- Create MMR mask chunk
+
+void 
+create_mmr_chunk(IFFByteStream &iff, const char *chkid, const GURL &url)
+{
+  analyze_mmr_chunk(url);
+  g().mmrstencil->seek(0);
+  iff.put_chunk(chkid);
+  iff.copy(*g().mmrstencil);
+  iff.close_chunk();
+}
+
+
+// -- Create FGbz palette chunk
+
+void 
+create_fgbz_chunk(IFFByteStream &iff)
+{
+  int nzones = g().colorzones.size();
+  int npalette = g().colorpalette->size() / 3;
+  GP<DjVuPalette> pal = DjVuPalette::create();
+  g().colorpalette->seek(0);
+  pal->decode_rgb_entries(*g().colorpalette, npalette);
+  pal->colordata.resize(0,blit_count-1);
+  for (int d=0; d<blit_count; d++)
+    {
+      JB2Blit *blit = g().stencil->get_blit(d);
+      const JB2Shape &shape = g().stencil->get_shape(blit->shapeno);
+      GRect brect(blit->left, blit->bottom, shape.bits->columns(), shape.bits->rows());
+      int index = nzones;
+      for (int i=0; i<nzones; i++)
+        {
+          GRect zrect = g().colorzones[i];
+          if (zrect.isempty() || zrect.intersect(brect, zrect))
+            index = i;
+        }
+      if (index >= npalette)
+        G_THROW("create_fgbz_chunk: internal error");
+      pal->colordata[d] = index;
+    }
+  iff.put_chunk("FGbz");
+  pal->encode(iff.get_bytestream());
+  iff.close_chunk();
+}
+
+// -- Create JB2 mask chunk
+
+void 
+create_jb2_chunk(IFFByteStream &iff, const char *chkid, const GURL &url)
+{
+  analyze_jb2_chunk(url);
+  g().jb2stencil->seek(0);
+  iff.put_chunk(chkid);
+  iff.copy(*g().jb2stencil);
+  iff.close_chunk();
+}
+
+
+// -- Create inclusion chunk
+
+void 
+create_incl_chunk(IFFByteStream &iff, const char *chkid, const char *fileid)
+{
+  iff.put_chunk("INCL");
+  iff.write(fileid, strlen(fileid));
+  iff.close_chunk();
+}
+
+
+// -- Create chunk by copying file contents
+
+void 
+create_raw_chunk(IFFByteStream &iff, const GUTF8String &chkid, const GURL &url)
+{
+  iff.put_chunk(chkid);
+  GP<ByteStream> ibs=ByteStream::create(url,"rb");
+  iff.copy(*ibs);
+  iff.close_chunk();
+}
+
+
+// -- Internal headers for IW44
+
+struct PrimaryHeader {
+  unsigned char serial;
+  unsigned char slices;
+} primary;
+
+struct SecondaryHeader {
+  unsigned char major;
+  unsigned char minor;
+  unsigned char xhi, xlo;
+  unsigned char yhi, ylo;
+} secondary;
+
+// -- Create and check FG44 chunk
+
+void 
+create_fg44_chunk(IFFByteStream &iff, const char *ckid, const GURL &url)
+{
+  GP<ByteStream> gbs=ByteStream::create(url,"rb");
+  GP<IFFByteStream> gbsi=IFFByteStream::create(gbs);
+  IFFByteStream &bsi=*gbsi;
+  GUTF8String chkid;
+  bsi.get_chunk(chkid);
+  if (chkid != "FORM:PM44" && chkid != "FORM:BM44")
+    G_THROW("djvumake: FG44 file has incorrect format (wrong IFF header)");
+  bsi.get_chunk(chkid);
+  if (chkid!="PM44" && chkid!="BM44")
+    G_THROW("djvumake: FG44 file has incorrect format (wring IFF header)");
+  GP<ByteStream> gmbs=ByteStream::create();
+  ByteStream &mbs=*gmbs;
+  mbs.copy(*bsi.get_bytestream());
+  bsi.close_chunk();  
+  if (bsi.get_chunk(chkid))
+    DjVuPrintErrorUTF8("%s","djvumake: FG44 file contains more than one chunk\n");
+  bsi.close_chunk();  
+  mbs.seek(0);
+  if (mbs.readall((void*)&primary, sizeof(primary)) != sizeof(primary))
+    G_THROW("djvumake: FG44 file is corrupted (cannot read primary header)");    
+  if (primary.serial != 0)
+    G_THROW("djvumake: FG44 file is corrupted (wrong serial number)");
+  if (mbs.readall((void*)&secondary, sizeof(secondary)) != sizeof(secondary))
+    G_THROW("djvumake: FG44 file is corrupted (cannot read secondary header)");    
+  int iw = (secondary.xhi<<8) + secondary.xlo;
+  int ih = (secondary.yhi<<8) + secondary.ylo;
+  int red;
+  for (red=1; red<=12; red++)
+    if (iw==(w+red-1)/red && ih==(h+red-1)/red)
+      break;
+  flag_contains_fg = red;
+  if (red>12)
+    DjVuPrintErrorUTF8("%s","djvumake: FG44 subsampling is not in [1..12] range\n");
+  mbs.seek(0);
+  iff.put_chunk(ckid);
+  iff.copy(mbs);
+  iff.close_chunk();
+}
+
+
+
+// -- Create and check BG44 chunk
+
+void 
+create_bg44_chunk(IFFByteStream &iff, const char *ckid, GUTF8String filespec)
+{
+  static GP<IFFByteStream> bg44iff;
+  if (! bg44iff)
+    {
+      if (flag_contains_bg)
+        DjVuPrintErrorUTF8("%s","djvumake: Duplicate BGxx chunk\n");
+      int i=filespec.rsearch(':');
+      for (int j=i+1; i>0 && j<(int)filespec.length(); j++)
+        if (filespec[j] < '0' || filespec[j] > '9')
+          i = -1;
+      if (!i)
+        G_THROW("djvumake: no filename specified in first BG44 specification");
+      GUTF8String filename=(i<0)?filespec:GUTF8String(filespec, i);
+      const GURL::Filename::UTF8 url(filename);
+      const GP<ByteStream> gbs(ByteStream::create(url,"rb"));
+      if(!gbs)
+      {
+        G_THROW("djvumake: no such file as"+filename);
+      }
+      bg44iff = IFFByteStream::create(gbs);
+      GUTF8String chkid;
+      bg44iff->get_chunk(chkid);
+      if (chkid != "FORM:PM44" && chkid != "FORM:BM44")
+        G_THROW("djvumake: BG44 file has incorrect format (wrong IFF header)");        
+      if (i>=0)
+        filespec = i+1+(const char *)filespec;
+      else 
+        filespec = "99";
+    }
+  else
+    {
+      if (filespec.length() && filespec[0]!=':')
+        G_THROW("djvumake: filename specified in BG44 refinement");
+      filespec = 1+(const char *)filespec;
+    }
+  const char *s=filespec;
+  int nchunks = strtol((char *)s, (char **)&s, 10);
+  if (nchunks<1 || nchunks>99)
+    G_THROW("djvumake: invalid number of chunks in BG44 specification");    
+  if (*s)
+    G_THROW("djvumake: invalid BG44 specification (syntax error)");
+  
+  int flag = (nchunks>=99);
+  GUTF8String chkid;
+  while (nchunks-->0 && bg44iff->get_chunk(chkid))
+    {
+      if (chkid!="PM44" && chkid!="BM44")
+        {
+          DjVuPrintErrorUTF8("%s","djvumake: BG44 file contains unrecognized chunks (fixed)\n");
+          nchunks += 1;
+          bg44iff->close_chunk();
+          continue;
+        }
+      GP<ByteStream> gmbs=ByteStream::create();
+      ByteStream &mbs=*gmbs;
+      mbs.copy(*(bg44iff->get_bytestream()));
+      bg44iff->close_chunk();  
+      mbs.seek(0);
+      if (mbs.readall((void*)&primary, sizeof(primary)) != sizeof(primary))
+        G_THROW("djvumake: BG44 file is corrupted (cannot read primary header)\n");    
+      if (primary.serial == 0)
+        {
+          if (mbs.readall((void*)&secondary, sizeof(secondary)) != sizeof(secondary))
+            G_THROW("djvumake: BG44 file is corrupted (cannot read secondary header)\n");    
+          int iw = (secondary.xhi<<8) + secondary.xlo;
+          int ih = (secondary.yhi<<8) + secondary.ylo;
+          int red;
+          for (red=1; red<=12; red++)
+            if (iw==(w+red-1)/red && ih==(h+red-1)/red)
+              break;
+          flag_contains_bg = red;
+          if (red>12)
+            DjVuPrintErrorUTF8("%s","djvumake: BG44 subsampling is not in [1..12] range\n");
+        }
+      mbs.seek(0);
+      iff.put_chunk(ckid);
+      iff.copy(mbs);
+      iff.close_chunk();
+      flag = 1;
+    }
+  if (!flag)
+    DjVuPrintErrorUTF8("%s","djvumake: no more chunks in BG44 file\n");
+}
+
+
+
+// -- Forward declarations
+
+void processForeground(const GPixmap* image, const JB2Image *mask,
+                       GPixmap& subsampled_image, GBitmap& subsampled_mask);
+void processBackground(const GPixmap* image, const JB2Image *mask,
+                       GPixmap& subsampled_image, GBitmap& subsampled_mask);
+
+
+// -- Create both foreground and background by masking and subsampling
+
+void 
+create_masksub_chunks(IFFByteStream &iff, const GURL &url)
+{
+  // Check and load pixmap file
+  if (!g().stencil)
+    G_THROW("The use of a raw ppm image requires a stencil");
+  GP<ByteStream> gibs=ByteStream::create(url, "rb");
+  ByteStream &ibs=*gibs;
+  GP<GPixmap> graw_pm=GPixmap::create(ibs);
+  GPixmap &raw_pm=*graw_pm;
+  if ((int) g().stencil->get_width() != (int) raw_pm.columns())
+    G_THROW("Stencil and raw image have different widths!");
+  if ((int) g().stencil->get_height() != (int) raw_pm.rows())
+    G_THROW("Stencil and raw image have different heights!");
+  // Encode foreground
+  {
+    GP<GPixmap> gfg_img=GPixmap::create();
+    GPixmap &fg_img=*gfg_img;
+    GP<GBitmap> fg_mask=GBitmap::create();
+    processForeground(&raw_pm, g().stencil, fg_img, *fg_mask);
+    GP<IW44Image> fg_pm = IW44Image::create_encode(fg_img, fg_mask, IW44Image::CRCBfull);
+    IWEncoderParms parms[8];
+    iff.put_chunk("FG44");
+    parms[0].slices = 100;
+    fg_pm->encode_chunk(iff.get_bytestream(), parms[0]);
+    iff.close_chunk();
+  }
+  // Encode backgound 
+  {
+    GP<GPixmap> gbg_img=GPixmap::create();
+    GPixmap &bg_img=*gbg_img;
+    GP<GBitmap> bg_mask=GBitmap::create();
+    processBackground(&raw_pm, g().stencil, bg_img, *bg_mask);
+    GP<IW44Image> bg_pm = IW44Image::create_encode(bg_img, bg_mask, IW44Image::CRCBnormal);
+    IWEncoderParms parms[4];
+    parms[0].bytes = 10000;
+    parms[0].slices = 74;
+    iff.put_chunk("BG44");
+    bg_pm->encode_chunk(iff.get_bytestream(), parms[0]);
+    iff.close_chunk();
+    parms[1].slices = 84;
+    iff.put_chunk("BG44");
+    bg_pm->encode_chunk(iff.get_bytestream(), parms[1]);
+    iff.close_chunk();
+    parms[2].slices = 90;
+    iff.put_chunk("BG44");
+    bg_pm->encode_chunk(iff.get_bytestream(), parms[2]);
+    iff.close_chunk();
+    parms[3].slices = 97;
+    iff.put_chunk("BG44");
+    bg_pm->encode_chunk(iff.get_bytestream(), parms[3]);
+    iff.close_chunk();
+  }
+}
+
+
+
+const char *
+parse_color_name(const char *s, char *rgb)
+{
+  static struct { 
+    const char *name; 
+    unsigned char r, g, b; 
+  } stdcols[] = { 
+    {"aqua",    0x00, 0xFF, 0xFF},
+    {"black",   0x00, 0x00, 0x00},
+    {"blue",    0x00, 0x00, 0xFF},
+    {"fuchsia", 0xFF, 0x00, 0xFF},
+    {"gray",    0x80, 0x80, 0x80},
+    {"green",   0x00, 0x80, 0x00},
+    {"lime",    0x00, 0xFF, 0x00},
+    {"maroon",  0x80, 0x00, 0x00},
+    {"navy",    0x00, 0x00, 0x80},
+    {"olive",   0x80, 0x80, 0x00},
+    {"purple",  0x80, 0x00, 0x80},
+    {"red",     0xFF, 0x00, 0x00},
+    {"silver",  0xC0, 0xC0, 0xC0},
+    {"teal",    0x00, 0x80, 0x80},
+    {"white",   0xFF, 0xFF, 0xFF},
+    {"yellow",  0xFF, 0xFF, 0x00},
+    {0}
+  };
+  // potential color names
+  int len = 0;
+  while (s[len] && s[len]!=':' && s[len]!='#')
+    len += 1;
+  GUTF8String name(s, len);
+  name = name.downcase();
+  for (int i=0; stdcols[i].name; i++)
+    if (name == stdcols[i].name)
+      {
+        rgb[0] = stdcols[i].r;
+        rgb[1] = stdcols[i].g;
+        rgb[2] = stdcols[i].b;
+        return s+len;
+      }
+  // potential hex specifications
+  unsigned int r,g,b;
+  if (sscanf(s,"%2x%2x%2x",&r,&g,&b) == 3)
+    {
+      rgb[0] = r;
+      rgb[1] = g;
+      rgb[2] = b;
+      return s+6;
+    }
+  G_THROW("Unrecognized color name in FGbz chunk specification");
+  return 0; // win
+}
+
+
+void
+parse_color_zones(const char *s)
+{
+  bool fullpage = false;
+  int zones = 0;
+  g().colorzones.empty();
+  g().colorpalette = ByteStream::create();
+  // zones
+  while (s[0] == '#')
+    {
+      char rgb[3];
+      GRect rect;
+      s = parse_color_name(s+1, rgb);
+      if (s[0] == ':')
+        {
+          int c[4];
+          for (int i=0; i<4; i++)
+            {
+              char *e = 0;
+              c[i] = strtol(s+1, &e, 10);
+              if (e <= s || (i>=2 && c[i]<0) || (i<3 && e[0]!=','))
+                G_THROW("Invalid coordinates in FGbz chunk specification");
+              s = e;
+            }
+          rect = GRect(c[0],c[1],c[2],c[3]);
+        }
+      if (rect.isempty())
+        fullpage = true;
+      g().colorpalette->writall(rgb, 3);
+      g().colorzones.touch(zones);
+      g().colorzones[zones] = rect;
+      zones++;
+    }
+  if (s[0])
+    G_THROW("Syntax error in FGbz chunk specification");
+  // add extra black palette entry
+  if (! fullpage)
+    {
+      char rgb[3] = {0,0,0};
+      g().colorpalette->writall(rgb, 3);
+    }
+}
+
+
+
+// -- Main
+
+int
+main(int argc, char **argv)
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+  G_TRY
+    {
+      // Print usage when called without enough arguments
+      if (argc <= 2)
+        usage();
+      // Open djvu file
+      remove(dargv[1]);
+      GP<IFFByteStream> giff = 
+        IFFByteStream::create(ByteStream::create(GURL::Filename::UTF8(dargv[1]),"wb"));
+      IFFByteStream &iff=*giff;
+      // Create header
+      iff.put_chunk("FORM:DJVU", 1);
+      // Check if shared dicts are present
+      check_for_shared_dict(dargv);
+      // Create information chunk
+      create_info_chunk(iff, dargv);
+      // Parse all arguments
+      for (int i=2; i<argc; i++)
+        {
+          if (!dargv[i].cmp("INFO=",5))
+            {
+              if (i>2)
+                DjVuPrintErrorUTF8("%s","djvumake: 'INFO' chunk should appear first (ignored)\n");
+            }
+          else if (!dargv[i].cmp("Sjbz=",5))
+            {
+              if (flag_contains_stencil)
+                DjVuPrintErrorUTF8("%s","djvumake: duplicate stencil chunk\n");
+              create_jb2_chunk(iff, "Sjbz", GURL::Filename::UTF8(5+(const char *)dargv[i]));
+              flag_contains_stencil = 1;
+              if (flag_fg_needs_palette && blit_count >= 0)
+                create_fgbz_chunk(iff);
+              flag_fg_needs_palette = 0;
+            }
+          else if (!dargv[i].cmp("Smmr=",5))
+            {
+              create_mmr_chunk(iff, "Smmr", 
+			       GURL::Filename::UTF8(5+(const char *)dargv[i]));
+              if (flag_contains_stencil)
+                DjVuPrintErrorUTF8("%s","djvumake: duplicate stencil chunk\n");
+              flag_contains_stencil = 1;
+            }
+          else if (!dargv[i].cmp("FGbz=",5))
+            {
+              const char *c = 5 + (const char*)dargv[i];
+              if (flag_contains_fg)
+                DjVuPrintErrorUTF8("%s","djvumake: duplicate 'FGxx' chunk\n");
+              if (c[0] != '#')
+                {
+                  create_raw_chunk(iff, "FGbz", GURL::Filename::UTF8(c));
+                }
+              else
+                {
+                  parse_color_zones(c);
+                  if (flag_contains_stencil && blit_count >= 0)
+                    create_fgbz_chunk(iff);
+                  else
+                    flag_fg_needs_palette = 1;
+                }
+              flag_contains_fg = 1;
+            }
+          else if (!dargv[i].cmp("FG44=",5))
+            {
+              if (flag_contains_fg)
+                DjVuPrintErrorUTF8("%s","djvumake: duplicate 'FGxx' chunk\n");
+              create_fg44_chunk(iff, "FG44", 
+				GURL::Filename::UTF8(5+(const char *)dargv[i]));
+            }
+          else if (!dargv[i].cmp("BG44=",5))
+            {
+              create_bg44_chunk(iff, "BG44", 5+(const char *)dargv[i]);
+            }
+          else if (!dargv[i].cmp("BGjp=",5) ||
+                   !dargv[i].cmp("BG2k=",5)  )
+            {
+              if (flag_contains_bg)
+                DjVuPrintErrorUTF8("%s","djvumake: Duplicate BGxx chunk\n");
+              GUTF8String chkid = dargv[i].substr(0,4);
+              create_raw_chunk(iff, chkid, GURL::Filename::UTF8(5+(const char *)dargv[i]));
+              flag_contains_bg = 1;
+            }
+          else if (!dargv[i].cmp("FGjp=",5) ||  !dargv[i].cmp("FG2k=",5))
+            {
+              if (flag_contains_fg)
+                DjVuPrintErrorUTF8("%s","djvumake: duplicate 'FGxx' chunk\n");
+              GUTF8String chkid = dargv[i].substr(0,4);
+              create_raw_chunk(iff, chkid, GURL::Filename::UTF8(5+(const char *)dargv[i]));
+              flag_contains_fg = 1;
+            }
+          else if (!dargv[i].cmp("INCL=",5))
+            {
+              create_incl_chunk(iff, "INCL", GURL::Filename::UTF8(5+(const char *)dargv[i]).fname());
+              flag_contains_incl = 1;
+            }
+          else if (!dargv[i].cmp("PPM=",4))
+            {
+              if (flag_contains_bg || flag_contains_fg)
+                DjVuPrintErrorUTF8("%s","djvumake: Duplicate 'FGxx' or 'BGxx' chunk\n");
+              create_masksub_chunks(iff, GURL::Filename::UTF8(4+(const char *)dargv[i]));
+              flag_contains_bg = 1;
+              flag_contains_fg = 1;
+            }
+          else if (dargv[i].length() > 4 && dargv[i][4] == '=')
+            {
+              GNativeString chkid = dargv[i].substr(0,4);
+              if (chkid != "TXTz" && chkid != "TXTa" 
+                  && chkid != "ANTz" && chkid != "ANTa"
+                  && chkid != "Djbz" )
+                DjVuPrintErrorUTF8("djvumake: creating chunk of unknown type ``%s''.\n",
+                                   (const char*)chkid);
+              create_raw_chunk(iff, chkid, GURL::Filename::UTF8(5+(const char *)dargv[i]));
+            }
+          else 
+            {
+              DjVuPrintErrorUTF8("djvumake: illegal argument : ``%s'' (ignored)\n", 
+                                 (const char *)dargv[i]);
+            }
+        }
+      // Common cases for missing chunks
+      if (flag_contains_stencil)
+        {
+          if (flag_contains_bg && ! flag_contains_fg)
+            {  
+              DjVuPrintErrorUTF8("%s","djvumake: generating black FGbz chunk\n");
+              g().colorzones.empty();
+              g().colorpalette = ByteStream::create();
+              char rgb[3] = {0,0,0};
+              g().colorpalette->writall(rgb, 3);
+              create_fgbz_chunk(iff);
+              flag_contains_fg = 1;
+            }
+          if (flag_contains_fg && !flag_contains_bg)
+            {
+              DjVuPrintErrorUTF8("%s","djvumake: generating white BG44 chunk\n");
+              GPixel bgcolor = GPixel::WHITE;
+              GP<GPixmap> inputsub=GPixmap::create((h+11)/12, (w+11)/12, &bgcolor);
+              GP<IW44Image> iw = IW44Image::create_encode(*inputsub, 0, IW44Image::CRCBnone);
+              IWEncoderParms iwparms;
+              iff.put_chunk("BG44");
+              iwparms.slices = 97;
+              iw->encode_chunk(iff.get_bytestream(), iwparms);
+              iff.close_chunk();
+              flag_contains_bg = 1;
+            }
+        }
+      // Close
+      iff.close_chunk();
+      // Sanity checks
+      if (flag_contains_stencil)
+        {
+          // Compound or Bilevel
+          if (flag_contains_bg && ! flag_contains_fg)
+            DjVuPrintErrorUTF8("%s","djvumake: djvu file contains a BGxx chunk but no FGxx chunk\n");
+          if (flag_contains_fg && ! flag_contains_bg)
+            DjVuPrintErrorUTF8("%s","djvumake: djvu file contains a FGxx chunk but no BGxx chunk\n");
+        }
+      else if (flag_contains_bg)
+        {
+          // Photo DjVu Image
+          if (flag_contains_bg!=1)
+            DjVuPrintErrorUTF8("%s","djvumake: photo djvu image has subsampled BGxx chunk\n"); 
+          if (flag_fg_needs_palette)
+            DjVuPrintErrorUTF8("%s","djvumake: could not generate FGbz chunk, as stencil is not available\n");
+          else if (flag_contains_fg)
+            DjVuPrintErrorUTF8("%s","djvumake: photo djvu file contains FGxx chunk\n");            
+        }
+      else
+        DjVuPrintErrorUTF8("%s","djvumake: djvu file contains neither Sxxx nor BGxx chunks\n");
+    }
+  G_CATCH(ex)
+    {
+      remove(dargv[1]);
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  return 0;
+}
+
+
+////////////////////////////////////////
+// MASKING AND SUBSAMPLING
+////////////////////////////////////////
+
+
+// -- Returns a dilated version of a bitmap with the same size
+
+static GP<GBitmap> 
+dilate8(const GBitmap *p_bm)
+{
+  const GBitmap& bm = *p_bm;
+  GP<GBitmap> p_newbm = GBitmap::create(bm.rows(),bm.columns(),1);
+  GBitmap& newbm = *p_newbm;
+  int nrows = bm.rows();
+  int ncols = bm.columns();
+  for(int y=0; y<nrows; y++)
+    {
+      const unsigned char *bmrow = bm[y];
+      unsigned char *nbmprow = (y-1>=0) ? newbm[y-1] : 0;
+      unsigned char *nbmrow = newbm[y];
+      unsigned char *nbmnrow = (y+1<nrows) ? newbm[y+1] : 0;
+      for(int x=0; x<ncols; x++)
+        {
+          if(bmrow[x]) 
+            {
+              // Set all the 8-neighborhood to black
+              if (nbmprow)
+                {
+                  nbmprow[x-1]=1;
+                  nbmprow[x]=1;
+                  nbmprow[x+1]=1;
+                }
+              nbmrow[x-1]=1;
+              nbmrow[x]=1;
+              nbmrow[x+1]=1;
+              if (nbmnrow)
+                {
+                  nbmnrow[x-1]=1;
+                  nbmnrow[x]=1;
+                  nbmnrow[x+1]=1;
+                }
+            }
+        }
+    }
+  return p_newbm;
+}
+
+// -- Returns a smaller eroded version of a bitmap
+
+static GP<GBitmap> 
+erode8(const GBitmap *p_bm)
+{
+  const GBitmap& bm = *p_bm;
+  int newnrows = bm.rows()-2;
+  int newncolumns = bm.columns()-2;
+  if(newnrows<=0 || newncolumns<=0) // then return an empty GBitmap 
+    return GBitmap::create();
+  GP<GBitmap> p_newbm = GBitmap::create(newnrows,newncolumns); 
+  GBitmap& newbm = *p_newbm;
+  for(int y=0; y<newnrows; y++)
+    {
+      for(int x=0; x<newncolumns; x++)
+        {
+          // Check if there's a white pixel in the 8-neighborhood
+          if(   !( bm[y  ][x] && bm[y  ][x+1] && bm[y  ][x+2]
+                && bm[y+1][x] && bm[y+1][x+1] && bm[y+1][x+2]
+                && bm[y+2][x] && bm[y+2][x+1] && bm[y+2][x+2]))
+            newbm[y][x] = 0; // then set current to white
+          else
+            newbm[y][x] = 1; // else set current to black
+        }
+    }
+  return p_newbm;
+}
+
+
+// -- Returns a smaller eroded version of a jb2image
+
+GP<JB2Image> 
+erode8(const JB2Image *im)
+{
+  int i;
+  GP<JB2Image> newim = JB2Image::create();
+  newim->set_dimension(im->get_width(),im->get_height());
+  for(i=0; i<im->get_shape_count(); i++)
+    {
+      const JB2Shape &shape = im->get_shape(i);
+      JB2Shape newshape;
+      newshape.parent = shape.parent;
+      if (shape.bits) 
+        newshape.bits = erode8(shape.bits);
+      else
+        newshape.bits = 0;
+      newim->add_shape(newshape);
+    }
+  for(i=0; i<im->get_blit_count(); i++)
+    {
+      const JB2Blit* blit = im->get_blit(i);
+      JB2Blit newblit;
+      newblit.bottom = blit->bottom + 1;
+      newblit.left = blit->left + 1;
+      newblit.shapeno = blit->shapeno;
+      newim->add_blit(newblit);
+    }
+  return newim;
+}
+
+
+// Subsamples only the pixels of <image> that are not masked (<mask>).  This
+// call resizes and fills the resulting <subsampled_image> and
+// <subsampled_mask>.  Their dimension is the dimension of the original
+// <image> divided by <gridwidth> and rounded to the superior integer.  For
+// each square grid (gridwidth times gridwidth) of the subsampling mesh that
+// contains at least <minpixels> non-masked pixels, their value is averaged to
+// give the value of the corresponding <subsampled_image> pixel, and the
+// <subsampled_mask> is cleared at this position.  If <inverted_mask> is true,
+// then pixels are considered to be masked when mask==0
+ 
+
+static void
+maskedSubsample(const GPixmap* img,
+                const GBitmap *p_mask,
+                GPixmap& subsampled_image,
+                GBitmap& subsampled_mask,
+                int gridwidth, int inverted_mask, 
+                int minpixels=1
+                )
+{
+  const GPixmap& image= *img;
+  const GBitmap& mask = *p_mask;
+  int imageheight = image.rows();
+  int imagewidth = image.columns();
+  // compute the size of the resulting subsampled image
+  int subheight = imageheight/gridwidth;
+  if(imageheight%gridwidth)
+    subheight++;
+  int subwidth = imagewidth/gridwidth;
+  if(imagewidth%gridwidth)
+    subwidth++;
+  // set the sizes unless in incremental mode
+  subsampled_image.init(subheight, subwidth);
+  subsampled_mask.init(subheight, subwidth);
+  // go subsampling
+  int row, col;  // row and col in the subsampled image
+  int posx, posxend, posy, posyend; // corresponding square in the original image
+  for(row=0, posy=0; row<subheight; row++, posy+=gridwidth)
+    {
+      GPixel* subsampled_image_row = subsampled_image[row]; // row row of subsampled image
+      unsigned char* subsampled_mask_row = subsampled_mask[row]; // row row of subsampled mask
+      posyend = posy+gridwidth;
+      if(posyend>imageheight)
+        posyend = imageheight;
+      for(col=0, posx=0; col<subwidth; col++, posx+=gridwidth) 
+        {
+          posxend = posx+gridwidth;
+          if(posxend>imagewidth)
+            posxend = imagewidth;
+          int count = 0;
+          int r = 0;
+          int g = 0;
+          int b = 0;
+          for(int y=posy; y<posyend; y++)
+            {
+              const unsigned char* mask_y = mask[y]; // Row y of the mask
+              for(int x=posx; x<posxend; x++)
+                {
+                  unsigned char masked = (inverted_mask ? !mask_y[x] :mask_y[x]);
+                  if(!masked)
+                    {
+                      GPixel p = image[y][x];
+                      r += p.r;
+                      g += p.g;
+                      b += p.b;
+                      count ++;
+                    }
+                }
+            }
+          /* minpixels pixels are enough to give the color */
+          /* so set it, and do not mask this point */
+          if(count >= minpixels)   
+            {
+              GPixel p;
+              p.r = r/count;
+              p.g = g/count;
+              p.b = b/count;
+              subsampled_image_row[col] = p;
+              subsampled_mask_row[col] = 0;
+            } 
+          else /* make it bright red and masked */ 
+            {
+              subsampled_image_row[col] = GPixel::RED;
+              subsampled_mask_row[col] = 1;
+            }
+        }
+    }
+}
+
+
+// -- Computes foreground image and mask
+
+void 
+processForeground(const GPixmap* image, const JB2Image *mask,
+                  GPixmap& subsampled_image, GBitmap& subsampled_mask)
+{
+  GP<JB2Image> eroded_mask = erode8(mask);
+  maskedSubsample(image, eroded_mask->get_bitmap(), 
+                  subsampled_image, subsampled_mask, 
+                  6, 1);   // foreground subsample is 6 (300dpi->50dpi)
+}
+
+
+// -- Computes background image and mask
+
+void 
+processBackground(const GPixmap* image, const JB2Image *mask,
+                  GPixmap& subsampled_image, GBitmap& subsampled_mask)
+{
+  GP<GBitmap> b = mask->get_bitmap();
+  b = dilate8(b);
+  b = dilate8(b);
+  maskedSubsample(image, b, subsampled_image, subsampled_mask, 3, 0);
+}
+
+
diff --git a/tools/djvups.1 b/tools/djvups.1
new file mode 100644
index 0000000..18e5eb5
--- /dev/null
+++ b/tools/djvups.1
@@ -0,0 +1,275 @@
+.\" Copyright (c) 2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUPS 1 "01/18/2003" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+djvups \- Convert DjVu documents to PostScript.
+
+.SH SYNOPSIS
+.BI "djvups  [" "options" "] [" "djvufile" "] [" "outputfile" "]"
+
+.SH DESCRIPTION         
+This program decodes DjVu file 
+.IR djvufile ,  
+and generates a PostScript file named
+.IR outputfile .
+The DjVu data is read from the standard input when argument 
+.IR "djvufile"
+is not specified or when it is equal to a single dash.
+Similarly, the output data is written to the standard output
+when argument 
+.IR "outputfile"
+is not specified or equal to a single dash.
+
+PostScript printers have various capabilities.
+Investigate options 
+.B -level
+and
+.B -gray
+for obtaining the best results.
+
+.SH OPTIONS
+.TP
+.BI -help
+Prints the list of recognized options.
+.TP
+.BI -verbose
+Displays a progress bar.
+.TP
+.BI -page= pagespec
+Specify the document pages to be converted.
+The page specification
+.I pagespec 
+contains one or more comma-separated page ranges.
+A page range is either a page number, 
+or two page numbers separated by a dash.
+Specification
+.BR 1-10 ,
+for instance, prints pages 1 to 10.
+Specification
+.BR 1,3,99999-4
+prints pages 1 and 3, followed by all the document
+pages in reverse order up to page 4.
+.TP
+.BI -format=ps
+Produce a PostScript file. 
+This is the default.
+.TP
+.BI -format=eps
+Produce an Encapsulated PostScript file.
+Encapsulated PostScript files are suitable for
+embedding images into other documents.
+Encapsulated PostScript file can only contain 
+a single page. Setting this option
+overrides the options
+.BR -copies ,
+.BR -orientation ,
+.BR -zoom ,
+.BR -cropmarks ,
+and
+.BR -booklet .
+.TP
+.BI -copies= n
+Specify the number of copies to print.
+.TP
+.BI -orientation= orient
+Specify whether pages should be printed using
+the
+.BR auto ,
+.BR portrait ,
+or
+.B landscape 
+orientation.
+.TP
+.BI -mode= modespec
+Specify how pages should be decoded.
+The default mode,
+.BR color ,
+renders all the layers of the DjVu documents.
+Mode 
+.BR black
+only renders the foreground layer mask.  This mode does not work with
+DjVuPhoto images because these files have no foreground layer
+mask.
+Modes
+.BR foreground 
+and
+.BR background
+only render the foreground layer or the background layer 
+of a DjVuDocument image.
+.TP
+.BI -zoom= zoomspec
+Specify a zoom factor
+.IR zoomspec .
+The default zoom factor, 
+.BR auto ,
+scales the image to fit the page.
+Argument
+.I zoomspec
+also can be a number in range 
+.BR 25
+to
+.BR 2400 
+representing a magnification percentage
+relative to the original size of the document.
+.TP
+.BI -frame= yesno
+Specifying 
+.BR yes
+causes the generation of a thin gray border
+representing the boundaries of the document pages.
+The default is
+.BR no .
+.TP
+.BI -cropmarks= yesno
+Specifying 
+.BR yes
+causes the generation of crop marks
+indicating where pages should be cut.
+The default is
+.BR no .
+.TP
+.BI -level= languagelevel
+Select the language level of the generated PostScript.
+.IR languagelevel . 
+Valid language levels are 
+.BR 1 ,
+.BR 2 ,
+and
+.BR 3 .
+Level 
+.B 3 
+produces the most compact and fast printing PostScript files.
+Some of these files however require a very modern printer.
+Level
+.B 2 
+is the default value.
+The generated PostScript files are almost as compact
+and work with all but the oldest PostScript printers.
+Level
+.B 1
+can be used as a last resort option.
+.TP
+.BI -color= yesno
+The default value,
+.BR yes ,
+generates a color PostScript file.
+Specifying value
+.BR no
+converts the image to gray scale.
+The resulting PostScript file is smaller
+and marginally more portable.
+.TP
+.BI -gray
+This option is equivalent to option
+.BR -color=no 
+and is provided for convenience.
+.TP
+.BI -colormatch= yesno
+The default value,
+.BR yes ,
+generates a PostScript file using
+device independent colors in compliance
+with the 
+.SM sRGB
+specification.
+Modern printers then produce colors that match
+the original as well as possible.  
+Specifying value
+.B no
+generates a PostScript file using device dependent colors.  
+This is sometimes useful with older printers.
+You can then use option
+.BR -gamma 
+to tune the output colors.
+.TP
+.BI -gamma= gammaspec
+Specify a gamma correction factor for the device dependent PostScript colors.
+Argument 
+.I gammaspec
+must be in range
+.B 0.3
+to
+.BR 5.0 .
+Gamma correction normally pertains to cathodic screens only.  
+It gets meaningful for printers because several models
+interpret device dependent RGB colors by emulating the color
+response of a cathodic tube.  
+.TP
+.BI -booklet= opt
+Turns the booklet printing mode on.
+The booklet mode prints two pages on each side
+in a way suitable for making a booklet by folding
+the sheets. Option
+.I opt
+can take values
+.B no
+for disabling the booklet mode,
+.B yes
+for enabling the recto/verso booklet mode, and
+.B recto
+or
+.B verso
+to print only one side of each sheet.
+.TP
+.BI -bookletmax= max
+Specifies the maximal number of pages per booklet.
+A single printout might then be composed of several 
+booklets. Argument
+.I max
+is rounded up to the next multiple of 4. 
+Specifying 
+.B 0
+sets no maximal number of pages
+and ensures that the printout will produce
+a single booklet.  This is the default.
+.TP
+.BI -bookletalign= align
+Specifies a positive or negative offset 
+applied  to the verso of each sheet.  
+Argument 
+.I align
+is expressed in points 
+(one point is 1/72th of an inch, or 0.352 millimeter)
+This is useful with certain printers to ensure that 
+both recto and verso are properly aligned.  The default
+value is of course
+.BR 0 .
+.TP
+.BI -bookletfold= base[+incr]
+Specifies the extra margin left  between both pages
+on a single sheet.  The base value
+.I base
+is expressed in points (one point is 1/72th of an inch, 
+or 0.352 millimeter). This margin is incremented for 
+each outer sheet by value
+.I incr
+expressed in millipoints. The default value is 
+.BR 18+200 .
+
+.SH CREDITS
+This program was written by L\('eon Bottou <leonb@users.sourceforge.net>,
+Andrei Erofeev <andrew_erofeev@yahoo.com>, and Florin Nicsa.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR ddjvu (1).
+.BR djview (1)
diff --git a/tools/djvups.cpp b/tools/djvups.cpp
new file mode 100644
index 0000000..0415079
--- /dev/null
+++ b/tools/djvups.cpp
@@ -0,0 +1,301 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "libdjvu/ddjvuapi.h"
+
+#if defined(_WIN32) || defined(__CYGWIN32__)
+# include <io.h>
+#endif
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+# include <mbctype.h>
+#endif
+
+/* Some day we'll redo i18n right. */
+#ifndef i18n
+# define i18n(x) (x)
+# define I18N(x) (x)
+#endif
+
+bool verbose = false;
+bool tryhelp = false;
+ddjvu_context_t *ctx;
+ddjvu_document_t *doc;
+ddjvu_job_t *job;
+
+void
+progress(int p)
+{
+  if (verbose)
+    {
+      int i=0;
+      char buffer[52];
+      for (; p>0; p-=2)
+        buffer[i++]='#';
+      for (; i<50;)
+        buffer[i++]=' ';
+      buffer[i] = 0;
+      fprintf(stderr,"\r[%s]",buffer);
+    }        
+}
+
+void
+handle(int wait)
+{
+  const ddjvu_message_t *msg;
+  if (!ctx)
+    return;
+  if (wait)
+    msg = ddjvu_message_wait(ctx);
+  while ((msg = ddjvu_message_peek(ctx)))
+    {
+      switch(msg->m_any.tag)
+        {
+        case DDJVU_ERROR:
+          if (verbose)
+            fprintf(stderr,"\n");
+          fprintf(stderr,"djvups: %s\n", msg->m_error.message);
+          if (msg->m_error.filename)
+            fprintf(stderr,"djvups: '%s:%d'\n", 
+                    msg->m_error.filename, msg->m_error.lineno);
+          if (tryhelp)
+            fprintf(stderr,"djvups: %s\n", i18n("Try option --help."));
+          exit(10);
+        case DDJVU_PROGRESS:
+          if (verbose)
+            progress(msg->m_progress.percent);
+          break;
+        default:
+          break;
+        }
+      ddjvu_message_pop(ctx);
+    }
+}
+
+void 
+die(const char *fmt, ...)
+{
+  /* Handling messages might give a better error message */
+  tryhelp = true;
+  handle(FALSE);
+  /* Print */
+  va_list args;
+  fprintf(stderr,"ddjvu: ");
+  va_start(args, fmt);
+  vfprintf(stderr, fmt, args);
+  va_end(args);
+  fprintf(stderr,"\n");
+  /* Terminates */
+  exit(10);
+}
+
+const char *options[] = {
+  I18N("-verbose"),
+  I18N("-page=<pagelists>                   (default: print all)"),
+  I18N("-format=<ps|eps>                    (default: ps)"),
+  I18N("-level=<1|2|3>                      (default: 2)"),
+  I18N("-orient=<auto|portrait|landscape>   (default: auto)"),
+  I18N("-mode=<color|bw|fore|back>          (default: color)"),
+  I18N("-zoom=<auto|25...2400)              (default: auto)"),
+  I18N("-color=<yes|no>                     (default: yes)"),
+  I18N("-gray                               (same as -color=no)"),
+  I18N("-colormatch=<yes|no>                (default: yes)"),
+  I18N("-gamma=<0.3...5.0>                  (default: 2.2)"),
+  I18N("-copies=<1...999999>                (default: 1)"),
+  I18N("-frame=<yes|no>                     (default: no)"),
+  I18N("-cropmarks=<yes|no>                 (default: no)"),
+#ifdef THIS_THING_DOES_NOT_WORK_WITH_UTF8_STRINGS
+  I18N("-text=<yes|no>                      (default: no)"),
+#endif
+  I18N("-booklet=<no|recto|verso|yes>       (default: no)"),
+  I18N("-bookletmax=<n>                     (default: 0)"),
+  I18N("-bookletalign=<n>                   (default: 0)"),
+  I18N("-bookletfold=<n>[+<m>]              (default: 18+200)"),
+  NULL };
+
+
+void
+usage(void)
+{
+  int i;
+#ifdef DJVULIBRE_VERSION
+  fprintf(stderr, "DJVUPS --- DjVuLibre-" DJVULIBRE_VERSION "\n");
+#endif
+  fprintf(stderr, "%s\n",
+          i18n("DjVu to PostScript conversion utility\n\n"
+               "Usage: djvups [<options>] [<infile.djvu> [<outfile.ps>]]\n"
+               "Options:\n  -help"));
+  for(i=0; options[i]; i++)
+    fprintf(stderr, "  %s\n", i18n(options[i]));
+  fprintf(stderr,"\n");
+  exit(1);
+}
+
+int 
+check_option(char *s)
+{
+  int i;
+  for (i=0; options[i]; i++)
+    {
+      int n = 0;
+      const char *p = options[i];
+      while (p[n] && p[n]!='=' && p[n]!=' ')
+        n += 1;
+      if (p[n]=='=' && !strncmp(s, p, n+1))
+        return 1;
+      if (p[n]!='=' && !strncmp(s, p, n) && !s[n])
+        return 1;        
+    }
+  // compatibility aliases 
+  if (!strcmp(s,"-grayscale") ||
+      !strncmp(s,"-pages=",7) ||
+      !strncmp(s,"-orientation=",13) ||
+      !strncmp(s,"-srgb=",6) )
+    return 1;
+  return 0;
+}
+
+int
+main(int argc, char **argv)
+{
+
+  int i;
+  int optc = 0;
+  char **optv;
+  const char *infile = 0;
+  const char *outfile = 0;
+  FILE *fout;
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+  _setmbcp(_MB_CP_OEM);
+#endif
+  /* Sort options */
+  if (! (optv = (char**)malloc(argc*sizeof(char*))))
+    die(i18n("Out of memory"));
+  for (i=1; i<argc; i++)
+    {
+      char *s = argv[i];
+      if (s[0]=='-' && s[1]=='-')
+        s = s+1;
+      if (!strcmp(s,"-verbose"))
+        verbose = true;
+      else if (check_option(s))
+        optv[optc++] = s;
+      else if (s[0]=='-' && s[1])
+        usage();
+      else if (s[0] && !infile)
+        infile = s;
+      else if (s[0] && !outfile)
+        outfile = s;
+      else
+        die(i18n("Incorrect arguments. Try option --help."));
+    }
+  if (! infile)
+    infile = "-";
+  if (! outfile)
+    outfile = "-";
+  /* Open document */
+  if (! (ctx = ddjvu_context_create(argv[0])))
+    die(i18n("Cannot create djvu context."));
+  if (! (doc = ddjvu_document_create_by_filename(ctx, infile, TRUE)))
+    die(i18n("Cannot open djvu document '%s'."), infile);
+  while (! ddjvu_document_decoding_done(doc))
+    handle(TRUE);
+  /* Open output file */
+  if (! strcmp(outfile,"-")) 
+    {
+      fout = stdout;
+#if defined(__CYGWIN32__)
+      setmode(fileno(fout), O_BINARY);
+#elif defined(_WIN32)
+      _setmode(_fileno(fout), _O_BINARY);
+#endif
+    } 
+  else if (! (fout = fopen(outfile, "wb")))
+    die(i18n("Cannot open output file '%s'."), outfile);
+  /* Create printing job */
+  if (! (job = ddjvu_document_print(doc, fout, optc, optv)))
+    die(i18n("Cannot create PostScript conversion job."));
+  /* Wait until completion and cleanup */
+  while (! ddjvu_job_done(job))
+    handle(TRUE);
+  if (verbose)
+    fprintf(stderr,"\n");
+  /* Make sure we get error messages */
+  tryhelp = false;
+  if (ddjvu_job_error(job))
+    handle(FALSE);
+  if (ddjvu_job_error(job))
+    die(i18n("PostScript conversion job failed."));
+  /* Close */
+  fclose(fout);
+  if (job)
+    ddjvu_job_release(job);
+  if (doc)
+    ddjvu_document_release(doc);
+  if (ctx)
+    ddjvu_context_release(ctx);
+  return 0;
+}
diff --git a/tools/djvused.1 b/tools/djvused.1
new file mode 100644
index 0000000..160fa41
--- /dev/null
+++ b/tools/djvused.1
@@ -0,0 +1,938 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUSED 1 "5/22/2005" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvused \- Multi-purpose DjVu document editor.
+
+.SH SYNOPSIS
+.BI "djvused [" "options" "] " "djvufile"
+
+
+.SH DESCRIPTION
+Program
+.B djvused 
+is a powerful command line tool for manipulating multi-page documents,
+creating or editing annotation chunks, creating or editing hidden text layers, 
+pre-computing thumbnail images, and more.  
+The program first reads the DjVu document
+.I djvufile
+and executes a number of djvused commands.
+
+Djvused commands can be read from a specific file (when option
+.B -f
+is specified), read from the command line (when option
+.B -e
+is specified), or read from the standard input (the default).
+
+.SH OPTIONS
+.TP
+.BI "-v"
+Cause 
+.B djvused 
+to print a command line prompt before reading commands
+and a brief message describing how each command was executed.
+This option is very useful for debugging djvused scripts
+and also for interactively entering djvused commands on
+the standard input.
+.TP
+.BI "-f " "scriptfile"
+Cause
+.B djvused
+to read commands from file
+.IR scriptfile .
+.TP
+.BI "-e " "command"
+Cause
+.B djvused
+to execute the commands specified by the option argument
+.IR commands .
+It is advisable to surround the djvused commands by single
+quotes in order to prevent unwanted shell expansion.
+.TP
+.BI "-s"
+Cause 
+.B djvused
+to save the file 
+.I djvufile
+after executing the specified commands.
+This is similar to executing command
+.B save
+immediately before terminating the program.
+.TP
+.BI "-u"
+Cause
+.B djvused
+to print hidden text and annotations as UTF-8 
+instead of encoding non-ASCII characters with octal escape sequences
+for maximal portability. This option is convenient for 
+manually editing or viewing the djvused output.
+This option also causes the emission of an UTF-8 BOM under Windows.
+.TP
+.BI "-n"
+Cause 
+.B djvused 
+to disregard save commands.
+This is useful for debugging djvused scripts
+without overwriting files on your disk.
+
+.SH DJVUSED EXAMPLES
+There are many ways to use program
+.BR djvused .
+The following examples illustrate 
+some common uses of this program.
+
+.SS Obtaining the size of a page
+Command 
+.B size 
+outputs the width and height of the selected pages
+using a
+.SM HTML
+friendly syntax. 
+For instance, the following command prints the size 
+of page
+.I 3
+of document
+.IR myfile.djvu .
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -e 'select 3; size'"
+.PP
+
+.SS Extracting the hidden text
+Command
+.B print-pure-txt
+outputs the text associated with a page or a document.
+For instance, the following shell command outputs the text
+for the entire document.  Lines and pages are delimited
+by the usual control characters.
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -e 'print-pure-txt'"
+.PP
+Command
+.B print-txt
+produces a more extensive output describing the structure
+and the location of the text components.  The syntax of this
+output is described later in this man page.  For instance, 
+the following shell command outputs extended text information
+for page 
+.I 3 
+of document
+.IR myfile.djvu .
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -e 'select 3; print-txt'"
+.PP
+
+.SS Extracting the annotations
+Annotation data can be extracted using command 
+.BR print-ant .
+The syntax of the annotation data is described later in this man page.
+For instance, the following shell command outputs the annotation data
+for the first page of document
+.BR myfile.djvu .
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -e 'select 1; print-ant'"
+.PP
+Command 
+.B print-ant
+only prints the annotations stored in the selected component file.
+Command
+.B print-merged-ant
+also retrieves annotations from all the component files 
+referenced by the current page (using 
+.SM INCL
+chunks) and prints the merged information.
+
+.SS Dumping/restoring annotations and text
+Three commands,
+.BR "output-txt" ", " "output-ant" ", and " "output-all" ","
+produce djvused scripts.  For instance, the following shell command
+produces a djvused script,
+.IR myfile.dsed ,
+that recreates all the text and annotation data
+in document
+.IR myfile.djvu .
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -e 'output-all' > " "myfile.dsed"
+.PP
+Script
+.I myfile.dsed
+is a text file that can be easily edited.  The following shell command
+then recreates the text and annotation information in file
+.IR myfile.djvu .
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -f " "myfile.dsed" " -s"
+
+.SS Extracting a page
+Both commands
+.B save-page
+and
+.B save-page-with
+create a DjVu file representing the selected component file of a
+document.  The following shell command, for instance, creates a file
+.I p05.djvu
+containing page
+.I 5
+of document
+.IR myfile.djvu .
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -e 'select 5; save-page " "p05.djvu" "'"
+.PP
+Each page of a document might import data from 
+another component file using the so-called inclusion (
+.SM INCL
+) chunks.  Command
+.B save-page
+then produces a file with unresolved references to imported data.  
+Such a file should then be made part of a multi-page document
+containing the required data in other component files.
+On the other hand, command 
+.B save-page-with
+copies all the imported data into the output file.
+This file is directly usable. Yet collecting several
+such files into a multi-page document might lead
+to useless data replication.
+
+.SS Pre-computing thumbnails
+Commands 
+.B set-thumbnails
+constructs thumbnails that can be later displayed by
+DjVu viewers.  The following shell command, for instance,
+computes thumbnails of size 
+.IR 64 x 64
+pixels for all pages of file
+.IR myfile.djvu .
+.IP "" 3
+.BI "djvused " "myfile.djvu" " -e 'set-thumbnails 64' -s"
+
+.SH DJVUSED COMMANDS
+Command lines might contain zero, one, or more djvused commands and an
+optional comment.  Multiple djvused commands must be separated by a
+semicolon character ';'.  Comments are introduced by the '#' character
+and extend until the end of the command line.
+
+.SS Selection commands
+Multi-page DjVu documents are composed of a number of component files.
+Most component files describe a specific page of a document.  Some
+component files contain information shared by several pages such as
+shared image data, shared annotations or thumbnails.  Many djvused
+commands operate on selected component files.  All component files are
+initially selected.  The following commands are useful for changing
+the selection.
+.TP
+.BI "n"
+Print the total number of pages in the document.
+.TP
+.BI "ls"
+List all component files in the document.  Each line contains an
+optional page number, a letter describing the component file type, the
+size of the component file, and identifier of the component file.
+Component file type letters
+.BR P ", " I ", " A ", and " T 
+respectively stand for page data, shared image data, shared annotation
+data, and thumbnail data.  Page numbers are only listed for component
+files containing page data.  
+When it is set, the optional page title (see command
+.B "set-page-title"
+below) is displayed after the component file identifier.
+.TP
+.BI "select [" "fileid" "]"
+Select the component file identified by argument
+.IR fileid .
+Argument 
+.I fileid
+must be either a page number or a component file identifier.
+The
+.B select
+command selects all component files
+when the argument
+.I fileid
+is omitted.
+.TP
+.BI "select-shared-ant"
+Select a component file containing shared annotations.  
+Only one such component file is supported by the current DjVu software. 
+This component file usually contains annotations pertaining to the 
+whole document as opposed to specific pages.  An error message 
+is displayed if there is no such component file.
+.TP
+.BI "create-shared-ant"
+Create and select a component file containing shared annotations.
+This command only selects the shared annotation component file if such
+a component file already exists.  Otherwise it creates a new shared
+annotation component file and makes sure that it is imported by all
+pages in the document.
+.TP
+.BI "showsel"
+Shows the currently selected component files
+with the same format as command
+.BR ls .
+
+.SS Text and annotation commands
+.TP
+.BI "print-pure-txt"
+Print the text stored in the hidden text layer of the selected pages.
+A similar capability is offered by program
+.BR djvutxt .
+Structural information is sometimes represented by control characters.
+Text from different pages is delimited by form feed characters
+("\\f").  Lines are delimited by newline characters ("\\n").  Columns,
+regions, and paragraphs are sometimes delimited by vertical tab
+("\\013"), group separators ("\\035") and unit separators ("\\037")
+respectively.
+.TP
+.BI "print-txt"
+Prints extensive hidden text information for the selected pages.
+This information describes the structure of the text on the 
+document page and locates the structural elements in the page image.
+The syntax of this output is described later in this man page.
+.TP
+.BI "remove-txt"
+Remove the hidden text information from the selected component files.
+For instance, executing commands
+.BR "select" " and " "remove-txt"
+removes all hidden text information from the DjVu document.
+.TP
+.BI "set-txt [" "djvusedtxtfile" "]"
+Insert hidden text information into the selected pages.
+The optional argument
+.I djvusedtxtfile
+names a file containing the hidden text information.
+This file must contain data similar to what is produced
+by command
+.BR print-txt . 
+When the optional argument is omitted, the
+program reads the hidden text information from the djvused script
+until reaching an end-of-file or a line containing a single period.
+.TP
+.BI "output-txt"
+Prints a djvused script that reconstructs the hidden text
+information for the selected pages.  This script can later
+be edited and executed by invoking program
+.B djvused
+with option
+.BR -f .
+.TP
+.BI "print-ant"
+Prints the annotations of the selected component file.
+The annotation data is represented using a simple syntax
+described later in this document.
+.TP
+.BI "print-merged-ant"
+Merge the annotations stored in the selected component files
+with the annotations imported from other component files such
+as the shared annotation component file..
+The annotation data is represented using a simple syntax
+described later in this document.
+.TP
+.BI "remove-ant"
+Remove the annotation information from the selected component files.
+For instance, executing commands
+.BR "select" " and " "remove-ant"
+removes all annotation information from the DjVu document.
+.TP
+.BI "set-ant [" "djvusedantfile" "]"
+Insert annotations into the selected component file.
+The optional argument
+.I djvusedantfile
+names a file containing the annotation data.
+This file must contain data similar to what is produced
+by command
+.BR print-ant . 
+When the optional argument is omitted, the
+program reads the annotation data from the djvused script itself
+until reaching an end-of-file or a line containing a single period.
+.TP
+.BI "output-ant"
+Print a djvused script that reconstructs the annotation
+information for the selected pages.  This script can later
+be edited and executed by invoking program
+.B djvused
+with option
+.BR -f .
+.TP
+.BI "print-meta"
+Print the metadata part of the annotations for the selected component file.
+This command displays a subset of the information printed by command
+.B print-ant
+using a different syntax.  metadata are organized as key\-value pairs.
+Each printed line contains the key name such as
+.BR "author" ", " "title" ",etc.,"
+followed by a tab character ("\\t") and
+a double-quoted string representing the 
+.SM UTF-8
+encoded metadata value.
+.TP
+.BI "remove-meta"
+Remove the metadata part of the annotations of 
+the selected component files.
+.TP
+.BI "set-meta [" "djvusedmetafile" "]"
+Set the metadata part of the annotations of the selected component file.
+The remaining part of the annotations is left unchanged.
+The optional argument
+.I djvusedmetafile
+names a file containing the metadata.
+This file must contain data similar to what is produced
+by command
+.BR print-meta . 
+When the optional argument is omitted, the
+program reads the annotation data from the djvused script itself
+until reaching an end-of-file or a line containing a single period.
+.TP
+.BI "print-xmp"
+Print the XMP metadata string contained in 
+the annotation chunk of the selected component file.
+This command displays in fact a subset of the 
+information printed by command
+.BR print-ant .
+.TP
+.BI "remove-xmp"
+Removes the XMP tag from the annotation chunk of the selected component file.
+.TP
+.BI "set-xmp [" "xmpfile" "]"
+Set the XMP metadata part of the annotations of the selected component file.
+The remaining part of the annotations is left unchanged.
+The optional argument
+.I xmpfile
+names a file containing the XMP metadata in a format 
+similar to that produced
+by command
+.BR print-xmp . 
+When the optional argument is omitted, the
+program reads the XMP annotation data from the djvused script itself
+until reaching an end-of-file or a line containing a single period.
+.TP
+.BI "output-all"
+Print a djvused script that reconstructs both the hidden text and the
+annotation information for the selected pages.  This script can later
+be edited and executed by invoking program
+.B djvused
+with option
+.BR -f .
+.PP
+.SS Outline/bookmarks commands
+.TP
+.BI "print-outline"
+Print the outline of the document.
+Nothing is printed if the document contains no outline.
+.TP
+.BI "remove-outline"
+Removes the outline from the document.
+.TP
+.BI "set-outline [" djvusedoutlinefile "]"
+Insert outline information into the document.
+The optional argument
+.I djvusedoutlinefile
+names a file containing the outline information.
+This file must contain data similar to what is produced
+by command
+.BR print-outline . 
+When the optional argument is omitted, the
+program reads the hidden text information from the djvused script
+until reaching an end-of-file or a line containing a single period.
+.PP
+.SS Thumbnail commands
+.TP
+.BI "set-thumbnails " "sz"
+Compute thumbnails of size
+.IR sz x sz
+pixels and insert them into the document.
+DjVu viewers can later display these thumbnails very
+efficiently without need to download the data for
+each page.  Typical thumbnail size range 
+from 48 to 128 pixels.
+.TP
+.BI "remove-thumbnails"
+Remove the pre-computed thumbnails from the DjVu document.
+New thumbnails can then be computed using command
+.BR set-thumbnails .
+
+.SS Save commands
+The above commands only modify the memory image of the DjVu document.
+The following commands provide means to save the modified data
+into the file system.
+.TP
+.BI "save"
+Save the modified DjVu document back into the input file
+.I djvufile
+specified by the arguments of the program 
+.BR djvused .
+Nothing is done if the DjVu file was not modified.
+Passing option
+.B -s
+program
+.B djvused 
+is equivalent to executing command
+.B save
+before exiting the program.
+.TP
+.BI "save-bundled " "filename"
+Save the current DjVu document as a bundled 
+multi-page DjVu document named 
+.IR filename .
+A similar capability is offered by program
+.BR djvmcvt .
+.TP
+.BI "save-indirect " "filename"
+Save the current DjVu document as an indirect
+multi-page DjVu document.  The index file of the
+indirect document will be named 
+.BR filename .
+All other files composing the indirect document
+will be saved into the same directory as the
+index file.
+A similar capability is offered by program
+.BR djvmcvt .
+.TP
+.BI "save-page " "filename"
+Save the selected component file into DjVu file
+.IR filename .
+The selected component file might import data from 
+another component file using the so-called inclusion (
+.SM INCL
+) chunks.  This command then produces a file with unresolved
+references to imported data.  Such a file should then be made part of
+a multi-page document containing the required data in other component
+files.
+.TP
+.BI "save-page-with " "filename"
+Save the selected component file into DjVu file
+.IR filename .
+All data imported from other component files is copied into the output
+file as well.  This command always produces a usable DjVu file.  On
+the other hand, collecting several such files into a multi-page
+document might lead to useless data replication.
+
+.SS Miscellaneous commands
+.TP
+.BI "help"
+Display a help message listing all commands supported by
+.BR djvused .
+.TP
+.BI "dump"
+Display the 
+.SM EA IFF 85
+structure of the document or of the selected component file.
+A similar capability is offered by program
+.BR djvudump .
+.TP
+.BI "size"
+Display the width and the height of the selected pages.  The
+dimensions of each page are displayed using a syntax suitable for
+direct insertion into the
+.SM <EMBED...></EMBED>
+tags. This command also displays the default page orientation
+when it is different from zero.
+.TP
+.BI "set-rotation [+-]" "rot"
+Changes the default orientation of the selected pages.
+The orientation is expressed as an integer in range 0..3
+representing a number of 90 degree counter-clockwise rotations.
+When the argument is preceded by a sign
+.BR "+" " or " "-" ","
+argument
+.I rot
+counts how many additional 90 degree counter-clockwise rotations
+should be applied to the page. Otherwise, argument
+.I rot
+represents the desired absolute page orientation.
+Only DjVu pages can be rotated.
+Pages represented as a raw IW44 image cannot be rotated.
+.TP
+.BI "set-dpi " "dpi"
+Sets the resolution of the page image in dots per inche.
+Argument
+.I dpi
+should be in range 25..6000.
+.TP
+.BI "set-page-title " "title"
+Sets a page title for the selected page.
+When page titles are available, recent versions 
+of the DjVuLibre viewers display these page
+titles instead of page numbers and also 
+accept them in page selection options.
+Command
+.B "ls"
+can be used to see both the page titles and page identifiers.
+To unset a page title, simply make it equal to the page identifier.
+
+.SH DJVUSED FILE FORMATS
+
+Djvused uses a simple parenthesized syntax to represent
+both annotations and hidden text.
+.IP "*" 3
+This syntax is the native syntax used by DjVu for storing annotations.
+Program
+.B djvused
+simply compresses the annotation data using the
+.BR bzz (1)
+algorithm.
+.IP "*" 3
+This syntax differs from the native syntax used by DjVu for
+storing the hidden text.  Program 
+.B djvused
+performs the translations between the compact binary representation
+used by DjVu and the easily modifiable parenthesized syntax.
+.PP
+
+.SS General syntax
+Djvused files are
+.SM ASCII
+text files.  The legal characters in djvused files are 
+the printable 
+.SM ASCII 
+characters and the space, tab, cr, and nl characters.
+Using other characters has undefined results.
+
+Djvused files are composed of a sequence of expressions separated by
+blank characters (space, tab, cr, or nl).  There are four kind of
+expressions, namely integers, symbols, strings and lists.
+.IP Integers:
+Integer numbers are represented by one or more digits,
+with the usual interpretation.
+.IP Symbols:
+Symbols, or identifiers, are sequences of printable ascii characters
+representing a name or a keyword.  Acceptable characters are the alpha-numeric
+characters, the underscore "_", the minus character "-", and the hash
+character "#".  Names should not begin with a digit or a minus character.
+.IP Strings:
+Strings denote an arbitrary sequence of bytes,
+usually interpreted as a sequence of 
+.SM UTF-8
+encoded characters.  Strings in djvused files are similar to strings in the C
+language.  They are surrounded by double quote characters.  Certain sequences
+of characters starting with a backslash ("\\") have a special meaning.  
+A backslash followed by letter
+"a", "b", "t", "n", "v", "f", "r", "\\", and \"
+stands for the ascii character BEL(007), BS(008), HT(009),
+LF(010), VT(011), FF(012), CR(013), BACKSLASH(134) 
+and DOUBLEQUOTE(042) respectively.
+A backslash followed by one to three digits stands for the byte 
+whose octal code is expressed by the digits.  
+All other backslash sequences are illegal.
+All non printable ascii characters must be escaped.
+.IP Lists:
+Lists are sequence of expressions separated by blanks and surrounded by
+parentheses.  All expressions types are acceptable within a list, including
+sub-lists.
+
+.SS Hidden text syntax
+The building blocks of the hidden text syntax are lists
+representing each structural component of the hidden text.
+Structural components have the following form:
+.IP "" 3
+.BI "(" "type" " " "xmin" " " "ymin" " " "xmax" " " "ymax" " ... )"
+.PP
+
+The symbol
+.I type
+must be one of 
+.BR page ", " column ", " region ", " para ", " line ", " word ", or " char ,
+listed here by decreasing order of importance.  
+The integers
+.IR xmin ", " ymin ", " xmax ", and " ymax
+represent the coordinates of a rectangle indicating the position of the
+structural component in the page.  Coordinates are measured in pixels and have
+their origin at the bottom left corner of the page.  The remaining expressions
+in the list either is a single string representing the encoded text associated
+with this structural component, or is a sequence of structural components with
+a lesser type.
+.PP
+The hidden text for each page is simply represented by
+a single structural element of type
+.BR page .
+Various level of structural information are acceptable.  For instance, the
+page level component might only specify a page level string, or might only
+provide a list of lines, or might provide a full hierarchy down to the
+individual characters.
+
+.SS Outline/Bookmark syntax
+The outline syntax is a single list of the form
+.IP "" 3
+.BI "(bookmarks ...)"
+.PP
+The first element of the list is symbol
+.BR bookmarks .
+The subsequent elements are lists representing
+the toplevel outline entries.
+Each outline entry is represented by
+a list with the following form:
+.IP "" 3
+.BI "(" title " " url " ... )"
+.PP
+The string 
+.I title
+is the title of the outline entry.
+The destination string
+.I url
+can be either an arbitrary percent encoded
+.SM URL,
+or composed of the hash character ("#")
+followed by a page name or number,
+or composed of the question mark character ("?")
+followed by cgi-style arguments interpreted by the djvu viewer.
+The remaining expressions in the list
+describe subentries of this outline entry.
+
+.SS Annotation syntax
+Annotations are represented by a sequence of annotation expressions.
+The following annotation expressions are recognized:
+.TP
+.BI "(background " color ")"
+Specify the color of the viewer area surrounding the DjVu image.
+Colors are represented with the X11 hexadecimal syntax
+.BR #RRGGBB .
+For instance, 
+.B #000000
+is black and
+.B #FFFFFF
+is white.
+.TP
+.BI "(zoom " zoomvalue ")"
+Specify the initial zoom factor of the image.
+Argument
+.I zoomvalue
+can be one of
+.BR stretch ", " one2one ", " width ", " page ", "
+or composed of the letter
+.B d
+followed by a number in range 1 to 999 representing a zoom factor
+(such as in
+.BR d300 " or " d150
+for instance.)
+.TP
+.BI "(mode " modevalue ")"
+Specify the initial display mode of the image.
+Argument
+.I modevalue
+is one of
+.BR color ", " bw ", " fore ", or " back "."
+.TP
+.BI "(align " horzalign " " vertalign ")"
+Specify how the image should be aligned on the viewer surface.
+By default the image is located in the center.  
+Argument 
+.I horzalign
+can be one of
+.BR left ", " center ", or " right "."
+Argument 
+.I vertalign
+can be one of
+.BR top ", " center ", or " bottom "."
+.TP
+.BI "(maparea " url " " comment " " area " ...)"
+Define an hyper-link for the specified destination.
+.RS
+.PP
+Argument
+.I url
+can have one of the following forms:
+.IP "" 3
+.I href
+.br
+.BI "(url " href " " target ")" 
+.br
+.PP
+where 
+.I href
+is a string representing the destination and 
+.I target 
+is a string representing the target frame for the hyper-link,
+as defined by the 
+.SM HTML
+anchor tag
+.SM <A>.
+The destination string
+.I href
+can be either an arbitrary percent encoded
+.SM URL,
+or composed of the hash character ("#")
+followed by a page name or number,
+or composed of the question mark character ("?")
+followed by cgi-style arguments interpreted by the djvu viewer.
+Page numbers may be prefixed with an optional sign 
+to represent a page displacement.  
+For instance the strings
+.B """#-1""" 
+and 
+.B """#+1"""
+can be used to access the previous page and 
+the next page.
+
+Argument 
+.I comment 
+is a string that might be displayed by the viewer 
+when the user moves the mouse over the hyper-link.
+
+Argument
+.I area
+defines the shape and the location of the hyperlink.
+The following forms are recognized:
+.IP "" 3
+.BI "(rect " xmin " " ymin " " width " " height ")"
+.br
+.BI "(oval " xmin " " ymin " " width " " height ")"
+.br
+.BI "(poly " x0 " " y0 " " x1 " " y1 " ... )"
+.br
+.BI "(text " xmin " " ymin " " width " " height ")"
+.br
+.BI "(line " x0 " " y0 " " x1 " " y1 ")"
+.PP
+All parameters are numbers representing coordinates.  
+Coordinates are measured in pixels and have their origin 
+at the bottom left corner of the page.
+
+The remaining expressions in the
+.B maparea
+list represent the visual effect associated with
+the hyper-link. 
+
+A first set of options defines how borders
+are drawn for 
+.BR rect ", " oval ", " polygon ", or " text 
+hyperlink areas.
+.IP "" 3
+.BI "(none)"
+.br
+.BI "(xor)"
+.br
+.BI "(border " color ")"
+.br
+.BI "(shadow_in [" thickness "])"
+.br
+.BI "(shadow_out [" thickness "])"
+.br
+.BI "(shadow_ein [" thickness "])"
+.br
+.BI "(shadow_eout [" thickness "])"
+.PP
+where parameter 
+.I color
+has syntax
+.B #RRGGBB
+as described above,
+and parameter thickness is an integer in range 1 to 32.
+The last four border options are only supported for 
+.B rect
+hyperlink areas. 
+Although the border mode defaults to   
+.BR (xor) ,
+it is wise to always specify the border mode.
+Border options do not apply to 
+.B line 
+areas.
+
+When a border option is specified, the border 
+becomes visible when the user moves the mouse 
+over the hyperlink. The border may be made
+always visible by using the following option:
+.IP "" 3
+.B (border_avis)
+.PP
+The following two options may be used with 
+.B rect
+hyperlink areas.
+The complete area will be highlighted using the 
+specified color at the specified opacity (0-100, default 50).
+.IP "" 3
+.BI "(hilite " color ")"
+.br
+.BI "(opacity " op ")"
+.PP
+This is often used with an empty 
+.SM URL 
+for simply emphasizing a specific
+segment of an image.
+.PP
+The following three options may be used with line areas to 
+specify an optional ending arrow, the line width and color.
+The default is a black line with width 1 and without arrow.
+.IP "" 3
+.B "(arrow)"
+.br
+.BI "(width " w ")"
+.br
+.BI "(lineclr " color ")"
+.PP
+Finally the following three options can be used with text areas.
+The default background color is transparent. 
+The default text color is black.
+The 
+.B pushpin
+option indicates that the text is symbolized by a small pushpin icon.
+Clicking the icon reveals the text.
+.IP "" 3
+.BI "(backclr " bkcolor ")"
+.br
+.BI "(textclr " txtcolor ")"
+.br
+.BI "(pushpin)"
+.PP
+
+.RE
+.TP
+.BI "(metadata ... (" key " " value ") ... )"
+Define metadata entries.
+Each entry is identified by a symbol
+.I key
+representing the nature of the meta data entry.
+The string
+.I value
+represents
+the value associated with the corresponding key.
+Two sets of keys are noteworthy:
+keys borrowed from the BibTex bibliography system,
+and keys borrowed from the PDF DocInfo metadata.
+BibTex keys are always expressed in lowercase, such as
+.BR year ", " booktitle ", " editor ", " author ", etc.."
+DocInfo keys start with an uppercase letter, such as
+.BR Title ", " Author ", " Subject ", " Creator ", "
+.BR Produced ", " Trapped ", "
+.BR CreationDate ", and " ModDate "."
+The values associated with the last two keys
+should be dates expressed according to RFC 3339.
+
+.SH LIMITATIONS
+The current version of program 
+.B djvused
+only supports selecting one component file
+or all component files.  There is no way to
+select only a few component files.
+
+.SH CREDITS
+This program was initially written by L\('eon Bottou
+<leonb@users.sourceforge.net> and was improved by Yann Le Cun
+<profshadoko@users.sourceforge.net>, Florin Nicsa, Bill Riemers
+<docbill@sourceforge.net> and many others.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvutxt (1),
+.BR djvmcvt (1),
+.BR djvudump (1),
+.BR bzz (1),
+Emacs djvused front end \fBdjvu.el\fR on
+.SM GNU Elpa
+repository.
diff --git a/tools/djvused.cpp b/tools/djvused.cpp
new file mode 100644
index 0000000..dffb0f1
--- /dev/null
+++ b/tools/djvused.cpp
@@ -0,0 +1,2380 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+
+#include "IW44Image.h"
+#include "GOS.h"
+#include "GString.h"
+#include "DjVuDocEditor.h"
+#include "DjVuDumpHelper.h"
+#include "BSByteStream.h"
+#include "DjVuText.h"
+#include "DjVuAnno.h"
+#include "DjVuInfo.h"
+#include "IFFByteStream.h"
+#include "DataPool.h"
+#include "DjVuPort.h"
+#include "DjVuFile.h"
+#include "DjVmNav.h"
+#include "common.h"
+
+static bool modified = false;
+static bool verbose = false;
+static bool save = false;
+static bool nosave = false;
+static bool utf8 = false;
+
+static unsigned char utf8bom[] = { 0xef, 0xbb, 0xbf };
+
+struct DJVUSEDGlobal 
+{
+  // Globals that need static initialization
+  // are grouped here to work around broken compilers.
+  GUTF8String djvufile;
+  GP<ByteStream> cmdbs;
+  GP<DjVuDocEditor> doc;
+  GPList<DjVmDir::File> selected;
+  GP<DjVuFile> file;
+  GUTF8String fileid;
+};
+
+static DJVUSEDGlobal& g(void)
+{
+  static DJVUSEDGlobal g;
+  return g;
+}
+
+static GUTF8String 
+ToNative(GUTF8String s)
+{
+  if (utf8)
+    return s;
+  // fake the damn GUTF8/GNative type check
+  GNativeString n = s;
+  return GUTF8String((const char*)n);
+}
+
+
+
+// --------------------------------------------------
+// PARSING BYTESTREAM
+// --------------------------------------------------
+
+// -- A bytestream that performs buffering and 
+//    offers a stdio-like interface for reading files.
+
+class ParsingByteStream : public ByteStream 
+{
+private:
+  enum { bufsize=512 };
+  const GP<ByteStream> &gbs;
+  ByteStream &bs;
+  unsigned char buffer[bufsize];
+  int  bufpos;
+  int  bufend;
+  bool goteof;
+  ParsingByteStream(const GP<ByteStream> &gbs);
+  int getbom(int c);
+public:
+  static GP<ParsingByteStream> create(const GP<ByteStream> &gbs) 
+  { return new ParsingByteStream(gbs); }
+  size_t read(void *buffer, size_t size);
+  size_t write(const void *buffer, size_t size);
+  long int tell() const;
+  int eof();
+  int unget(int c);
+  inline int get();
+  int get_spaces(bool skipseparator=false);
+  GUTF8String get_token(bool skipseparator=false, bool compat=false);
+  const char *get_error_context(int c=EOF);
+};
+
+ParsingByteStream::ParsingByteStream(const GP<ByteStream> &xgbs)
+  : gbs(xgbs),bs(*gbs), bufpos(1), bufend(1), goteof(false)
+{ 
+}
+
+int 
+ParsingByteStream::eof() // aka. feof
+{
+  if (bufpos < bufend) 
+    return false;
+  if (goteof)
+    return true;
+  bufend = bufpos = 1;
+  while (bs.read(buffer+bufend,1) && ++bufend<(int)bufsize)
+    if (buffer[bufend-1]=='\r' || buffer[bufend-1]=='\n')
+      break;
+  if (bufend == bufpos)
+    goteof = true;
+  return goteof;
+}
+
+size_t 
+ParsingByteStream::read(void *buf, size_t size)
+{
+  if (size < 1)
+    return 0;
+  if (bufend == bufpos) 
+    {
+      if (size >= bufsize)
+        return bs.read(buf, size);
+      if (eof())
+        return 0;
+    }
+  if (bufpos + (int)size > bufend)
+    size = bufend - bufpos;
+  memcpy(buf, buffer+bufpos, size);
+  bufpos += size;
+  return size;
+}
+
+size_t 
+ParsingByteStream::write(const void *, size_t )
+{
+  G_THROW("Cannot write() into a ParsingByteStream");
+  return 0;
+}
+
+long int
+ParsingByteStream::tell() const
+{ 
+  G_THROW("Cannot tell() a ParsingByteStream");
+  return 0;
+}
+
+int 
+ParsingByteStream::getbom(int c)
+{
+  int i = 0;
+  while (c == utf8bom[i++])
+    {
+      if (i >= 3)
+        i = 0;
+      if (bufpos < bufend || !eof())
+        c = buffer[bufpos++];
+    }
+  while (--i > 0)
+    {
+      unget(c);
+      c = utf8bom[i-1];
+    }
+  return c;
+}
+
+inline int 
+ParsingByteStream::get() // like getc() skipping bom.
+{
+  int c = EOF;
+  if (bufpos < bufend || !eof())
+    c = buffer[bufpos++];
+  if (c == utf8bom[0])
+    return getbom(c);
+  return c;
+}
+
+
+int  
+ParsingByteStream::unget(int c) // like ungetc()
+{
+  if (bufpos > 0 && c != EOF) 
+    return buffer[--bufpos] = (unsigned char)c;
+  return EOF;
+}
+
+int
+ParsingByteStream::get_spaces(bool skipseparator)
+{
+   int c = get();
+   while (c==' ' || c=='\t' || c=='\r' 
+          || c=='\n' || c=='#' || c==';' )
+     {
+       if (c == '#')
+         do { c=get(); } while (c!=EOF && c!='\n' && c!='\r');
+       if (!skipseparator && (c=='\n' || c=='\r' || c==';'))
+         break;
+       c = get();
+     }
+   return c;
+}
+  
+const char *
+ParsingByteStream::get_error_context(int c)
+{
+  static char buffer[22];
+  unget(c);
+  int len = read((void*)buffer, sizeof(buffer)-1);
+  buffer[(len>0)?len:0] = 0;
+  for (int i=0; i<len; i++)
+    if (buffer[i]=='\n')
+      buffer[i] = 0;
+  return buffer;
+}
+
+GUTF8String
+ParsingByteStream::get_token(bool skipseparator, bool compat)
+{
+  GUTF8String str;
+  int c = get_spaces(skipseparator);
+  if (c == EOF)
+    {
+      return str;
+    }
+  if (!skipseparator && (c=='\n' || c=='\r' || c==';'))
+    {
+      unget(c);
+      return str;
+    }
+  if (c != '\"' && c != '\'') 
+    {
+      while (c!=' ' && c!='\t' && c!='\r' && c!=';'
+             && c!='\n' && c!='#' && c!=EOF)
+        {
+          str += c;
+          c = get();
+        }
+      unget(c);
+    }
+  else 
+    {
+      int delim = c;
+      c = get();
+      while (c != delim && c!=EOF) 
+        {
+          if (c == '\\') 
+            {
+              c = get();
+              if (compat && c!='\"')
+                {
+                  str += '\\';
+                }
+              else if (c>='0' && c<='7')
+                {
+                  int x = 0;
+                  { // extra nesting for windows
+                    for (int i=0; i<3 && c>='0' && c<='7'; i++) 
+                    {
+                      x = x * 8 + c - '0';
+                      c = get();
+                    }
+                  }
+                  unget(c);
+                  c = x;
+                }
+              else 
+                {
+                  const char *tr1 = "tnrbfva";
+                  const char *tr2 = "\t\n\r\b\f\013\007";
+                  { // extra nesting for windows
+                    for (int i=0; tr1[i]; i++)
+                    {
+                      if (c == tr1[i])
+                        c = tr2[i];
+                    }
+                  }
+                }
+            }
+          if (c != EOF)
+            str += c;
+          c = get();
+        }
+    }
+  return str;
+}
+
+
+// --------------------------------------------------
+// COMMANDS
+// --------------------------------------------------
+
+
+static void
+vprint(const char *fmt, ... )
+#ifdef __GNUC__
+  __attribute__ ((format (printf, 1, 2)));
+static void
+vprint(const char *fmt, ... )
+#endif
+{
+  if (verbose)
+    {
+      GUTF8String msg("");
+      va_list args;
+      va_start(args, fmt);
+      msg.vformat(fmt, args);
+      fprintf(stderr,"djvused: %s\n", (const char*)ToNative(msg));
+    }
+}
+
+static void
+verror(const char *fmt, ... )
+#ifdef __GNUC__
+  __attribute__ ((format (printf, 1, 2)));
+static void
+verror(const char *fmt, ... )
+#endif
+{
+  GUTF8String msg;
+  va_list args;
+  va_start(args, fmt);
+  msg.vformat(fmt, args);
+  G_THROW((const char*)ToNative(msg));
+}
+
+static void
+get_data_from_file(const char *cmd, ParsingByteStream &pbs, ByteStream &out)
+{
+  GUTF8String fname = pbs.get_token();
+
+  if (! fname)
+    {
+      vprint("%s: enter data and terminate with a period on a single line", cmd);
+      int c = pbs.get_spaces(true);
+      pbs.unget(c);
+      char skip[4];
+      char term0[4] = "\n.\n";
+      char term1[4] = "\r.\r";
+      char *s = skip;
+      int state = 1;
+      while (state < 3) 
+        {
+          c = pbs.get();
+          if (c == EOF)
+            break;
+          if ( c == term0[state] || c == term1[state] )
+            {
+              state += 1;
+              *s++ = c;
+            }
+          else
+            {
+              { // extra nesting for windows
+                for (char *m=skip; m<s; m++)
+                  out.write8(*m);
+              }
+              s = skip;
+              state = 0;
+              if (c == '\n')
+                pbs.unget(c);
+              else if (c != EOF)
+                out.write8(c);
+            }
+        }
+      pbs.unget(c);
+    }
+  else
+    {
+      GP<ByteStream> in=ByteStream::create(GURL::Filename::UTF8(fname),"rb");
+      out.copy(*in);
+    }
+}
+
+static bool
+char_unquoted(unsigned char c, bool eightbit)
+{
+  if (eightbit && c>=0x80)
+    return true;
+  if (c==0x7f || c=='\"' || c=='\\')
+    return false;
+  if (c>=0x20 && c<0x7f)
+    return true;
+  return false;
+}
+
+static void
+print_c_string(const char *data, int length, ByteStream &out, bool eightbit)
+{
+  out.write("\"",1);
+  while (*data && length>0) 
+    {
+      int span = 0;
+      while (span<length && char_unquoted(data[span],eightbit))
+        span++;
+      if (span > 0) 
+        {
+          out.write(data, span);
+          data += span;
+          length -= span;
+        }
+      else
+        {
+          char buf[5];
+          static const char *tr1 = "\"\\tnrbf";
+          static const char *tr2 = "\"\\\t\n\r\b\f";
+          sprintf(buf,"\\%03o", (int)(((unsigned char*)data)[0]));
+          { // extra nesting for windows
+            for (int i=0; tr2[i]; i++)
+              if (*(char*)data == tr2[i])
+                buf[1] = tr1[i];
+          }
+          if (buf[1]<'0' || buf[1]>'3')
+            buf[2] = 0;
+          out.write(buf, ((buf[2]) ? 4 : 2));
+          data += 1;
+          length -= 1;
+        }
+    }
+  out.write("\"",1);
+}
+
+void
+command_ls(ParsingByteStream &)
+{
+  int pagenum = 0;
+  GPList<DjVmDir::File> lst = g().doc->get_djvm_dir()->get_files_list();
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p) 
+    {
+      GP<DjVmDir::File> f = lst[p];
+      if (f->is_page())
+        fprintf(stdout,"%4d P ", ++pagenum);
+      else if (f->is_include())
+        fprintf(stdout,"     I ");
+      else if (f->is_thumbnails())
+        continue;
+      else if (f->is_shared_anno())
+        fprintf(stdout,"     A ");
+      else
+        fprintf(stdout,"     ? ");
+      GUTF8String id = f->get_load_name();
+      fprintf(stdout,"%8d  %s", f->size, (const char*)ToNative(id));
+      GUTF8String name = f->get_save_name();
+      if (name != id)
+        fprintf(stdout," F=%s", (const char*)ToNative(name));
+      GUTF8String title = f->get_title();
+      if (title != id && f->is_page())
+        fprintf(stdout," T=%s", (const char*)ToNative(title));
+      fprintf(stdout,"\n");
+    }
+  }
+  if (g().doc->get_thumbnails_num() == g().doc->get_pages_num())
+    fprintf(stdout,"     T %8s  %s\n", "", "<thumbnails>");
+}
+
+void
+command_n(ParsingByteStream &)
+{
+  int pagenum = 0;
+  GPList<DjVmDir::File> lst = g().doc->get_djvm_dir()->get_files_list();
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p) 
+    {
+      GP<DjVmDir::File> f = lst[p];
+      if (f->is_page())
+        ++pagenum;
+    }
+  }
+  fprintf(stdout,"%d\n", pagenum); 
+}
+
+void
+command_dump(ParsingByteStream &)
+{
+  GP<DataPool> pool;
+  // Need to be modified to handle "selected" list.
+  if (g().file)
+    pool = g().file->get_djvu_data(false, false);
+  else
+    pool = g().doc->get_init_data_pool();
+  DjVuDumpHelper helper;
+  GP<ByteStream> bs = helper.dump(pool);
+  size_t size = bs->size();
+  GUTF8String str;
+  char *buf = str.getbuf(size);
+  bs->seek(0);
+  bs->readall(buf, size);
+  GUTF8String ns = ToNative(str);
+  GP<ByteStream> obs=ByteStream::create("w");
+  obs->writall((const char*)ns, ns.length());
+}
+
+static void
+print_size(const GP<DjVuFile> &file)
+{
+  GP<DjVuInfo> info = file->info;
+  if (! info)
+    {
+      const GP<ByteStream> pbs(file->get_djvu_bytestream(false, false));
+      const GP<IFFByteStream> iff(IFFByteStream::create(pbs));
+      GUTF8String chkid;
+      if (! iff->get_chunk(chkid))
+        verror("Selected file contains no data");
+      if (chkid == "FORM:DJVU")
+        {
+          while (iff->get_chunk(chkid) && chkid!="INFO")
+            iff->close_chunk();
+          if (chkid == "INFO")
+            { 
+              info = DjVuInfo::create();
+              info->decode(*iff->get_bytestream());
+            }
+        }
+      else if (chkid == "FORM:BM44" || chkid == "FORM:PM44")
+        {
+          while (iff->get_chunk(chkid) && chkid!="BM44" && chkid!="PM44")
+            iff->close_chunk();
+          if (chkid=="BM44" || chkid=="PM44")
+            {
+              GP<IW44Image> junk=IW44Image::create_decode(IW44Image::COLOR);
+              junk->decode_chunk(iff->get_bytestream());
+              fprintf(stdout,"width=%d height=%d\n", 
+                      junk->get_width(), junk->get_height());
+            }
+        }
+    }
+  if (info)
+    {
+      fprintf(stdout,"width=%d height=%d", info->width, info->height);
+      if (info->orientation)
+        fprintf(stdout, " rotation=%d", info->orientation);
+      fprintf(stdout,"\n");
+    }
+}
+
+
+void
+command_size(ParsingByteStream &)
+{
+  GPList<DjVmDir::File> &lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p)
+    {
+      if (lst[p]->is_page())
+        {
+          GUTF8String fileid = g().doc->page_to_id(lst[p]->get_page_num());
+          const GP<DjVuFile> f = g().doc->get_djvu_file(fileid);
+          print_size(f);
+        }
+    }
+  }
+}
+
+static void
+select_all(void)
+{
+  g().file = 0;
+  g().fileid = "";
+  g().selected = g().doc->get_djvm_dir()->get_files_list();
+}
+
+static void
+select_clear(void)
+{
+  g().file = 0;
+  g().fileid = "<all>";
+  g().selected.empty();
+}
+
+static void
+select_add(GP<DjVmDir::File> frec)
+{
+  GPosition selp = g().selected;
+  GPList<DjVmDir::File> all = g().doc->get_djvm_dir()->get_files_list();
+  GPosition allp = all;
+  while (allp)
+    {
+      if (all[allp] == frec)
+        break;
+      if ( selp && all[allp] == g().selected[selp])
+        ++ selp;
+      ++ allp;
+    }
+  if (allp && (!selp || all[allp] != g().selected[selp]))
+    {
+      g().selected.insert_before(selp, frec);
+      if (! g().file)
+        {
+          g().fileid = frec->get_load_name();
+          g().file = g().doc->get_djvu_file(g().fileid);
+        }
+      else
+        {
+          g().fileid = "<multiple>";
+          g().file = 0;
+        }
+    }
+}
+
+void
+command_select(ParsingByteStream &pbs)
+{
+  GUTF8String pagid = pbs.get_token();
+  // Case of NULL
+  if (pagid == "") 
+    {
+      select_all();
+      vprint("select: selecting entire document");
+      return;
+    } 
+  // Case of a single page number
+  if (pagid.is_int())
+    {
+      int pageno = atoi(pagid);
+      GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->page_to_file(pageno-1);
+      if (!frec)
+        verror("page \"%d\" not found", pageno);
+      select_clear();
+      select_add(frec);
+      vprint("select: selecting \"%s\"", (const char*)ToNative(g().fileid));
+      return;
+    }
+  // Case of a single file id
+  GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->id_to_file(pagid);
+  if (!frec)
+    frec = g().doc->get_djvm_dir()->name_to_file(pagid);
+  if (!frec)
+    frec = g().doc->get_djvm_dir()->title_to_file(pagid);
+  if (!frec)
+    verror("page \"%s\" not found", (const char*)ToNative(pagid));
+  select_clear();
+  select_add(frec);
+  vprint("select: selecting \"%s\"", (const char*)ToNative(g().fileid));
+}  
+
+void
+command_select_shared_ant(ParsingByteStream &)
+{
+  GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+  if (! frec)
+    verror("select-shared-ant: no shared annotation file"); 
+  select_clear();
+  select_add(frec);
+  vprint("select-shared-ant: selecting shared annotation");
+}
+
+void
+command_create_shared_ant(ParsingByteStream &)
+{
+  GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+  if (! frec)
+    {
+      vprint("create-shared-ant: creating shared annotation file");
+      g().doc->create_shared_anno_file();
+      frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+      if (!frec) G_THROW("internal error");
+    }
+  select_clear();
+  select_add(frec);
+  vprint("select-shared-ant: selecting shared annotation");
+}
+
+void
+command_showsel(ParsingByteStream &)
+{
+  int pagenum = 0;
+  GPList<DjVmDir::File> &lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p) 
+    {
+      GP<DjVmDir::File> f = lst[p];
+      if (f->is_page())
+        fprintf(stdout,"%4d P ", ++pagenum);
+      else if (f->is_include())
+        fprintf(stdout,"     I ");
+      else if (f->is_thumbnails())
+        fprintf(stdout,"     T ");
+      else if (f->is_shared_anno())
+        fprintf(stdout,"     A ");
+      else
+        fprintf(stdout,"     ? ");
+      GUTF8String id = f->get_load_name();
+      fprintf(stdout,"%8d  %s", f->size, (const char*)ToNative(id));
+      GUTF8String name = f->get_save_name();
+      if (name != id)
+        fprintf(stdout," F=%s", (const char*)ToNative(name));
+      GUTF8String title = f->get_title();
+      if (title != id && f->is_page())
+        fprintf(stdout," T=%s", (const char*)ToNative(title));
+      fprintf(stdout,"\n");
+    }
+  }
+  if (g().doc->get_thumbnails_num() == g().doc->get_pages_num())
+    fprintf(stdout,"     T %8s  %s\n", "", "<thumbnails>");
+}
+
+void
+command_set_page_title(ParsingByteStream &pbs)
+{
+  if (! g().file)
+    verror("must select a single page first");
+  GUTF8String fname = pbs.get_token();
+  if (! fname)
+    verror("must provide a name");
+  GPList<DjVmDir::File> &lst = g().selected;
+  GPosition pos = lst;
+  if (! lst[pos]->is_page())
+    verror("component file is not a page");
+  g().doc->set_file_title(g().fileid, fname);
+  vprint("set-page-title: modified \"%s\"", (const char*)ToNative(g().fileid));
+  modified = true;
+}
+
+GP<DjVuInfo> decode_info(GP<DjVuFile> file)
+{
+  GP<DjVuInfo> info = file->info;
+  if (! info)
+    {
+      const GP<ByteStream> pbs(file->get_djvu_bytestream(false, false));
+      const GP<IFFByteStream> iff(IFFByteStream::create(pbs));
+      GUTF8String chkid;
+      if (! iff->get_chunk(chkid))
+        return 0;
+      if (chkid == "FORM:DJVU")
+        {
+          while (iff->get_chunk(chkid) && chkid!="INFO")
+            iff->close_chunk();
+          if (chkid == "INFO")
+            {
+              info = DjVuInfo::create();
+              info->decode(*iff->get_bytestream());
+            }
+        }
+      file->info = info;
+    }
+  return info;
+}
+
+bool
+set_rotation(GP<DjVuFile> file, int rot, bool relative)
+{
+  // decode info
+  GP<DjVuInfo> info = decode_info(file);
+  if (! info)
+    return false;
+  if (relative)
+    rot += info->orientation;
+  info->orientation = rot & 3;
+  file->set_modified(true);
+  modified = true;
+  return true;
+}
+
+void
+command_set_rotation(ParsingByteStream &pbs)
+{
+  GUTF8String rot = pbs.get_token();
+  if (! rot.is_int())
+    verror("usage: set-rotation [+-]<rot>");
+  int rotation = rot.toInt();
+  bool relative = (rot[0]=='+' || rot[0]=='-');
+  if (! relative)
+    if (rotation < 0 || rotation > 3)
+      verror("absolute rotation must be in range 0..3");
+  int rcount = 0;
+  if (g().file)
+    {
+      GUTF8String id = g().fileid;
+      if (set_rotation(g().file, rotation, relative))
+        rcount += 1;
+    }
+  else
+    {
+      GPList<DjVmDir::File> &lst = g().selected;
+      for (GPosition p=lst; p; ++p)
+        {
+          GUTF8String id = lst[p]->get_load_name();
+          const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+          if (set_rotation(f, rotation, relative))
+            rcount += 1;
+        }
+    }
+  vprint("rotated %d pages", rcount);
+}
+
+bool
+set_dpi(GP<DjVuFile> file, int dpi)
+{
+  // decode info
+  GP<DjVuInfo> info = decode_info(file);
+  if (! info)
+    return false;
+  info->dpi = dpi;
+  file->set_modified(true);
+  modified = true;
+  return true;
+}
+
+void
+command_set_dpi(ParsingByteStream &pbs)
+{
+  GUTF8String sdpi = pbs.get_token();
+  if (! sdpi.is_int())
+    verror("usage: set-dpi <dpi>");
+  int dpi = sdpi.toInt();
+  if (dpi < 25 || dpi > 6000)
+    verror("resolution should be in range 25..6000dpi");
+  int rcount = 0;
+  if (g().file)
+    {
+      GUTF8String id = g().fileid;
+      if (set_dpi(g().file, dpi))
+        rcount += 1;
+    }
+  else
+    {
+      GPList<DjVmDir::File> &lst = g().selected;
+      for (GPosition p=lst; p; ++p)
+        {
+          GUTF8String id = lst[p]->get_load_name();
+          const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+          if (set_dpi(f, dpi))
+            rcount += 1;
+        }
+    }
+  vprint("set dpi on %d pages", rcount);
+}
+
+
+#define DELMETA     1
+#define DELXMP      8
+#define CHKCOMPAT   2
+#define EIGHTBIT    4
+
+static bool
+filter_ant(GP<ByteStream> in, 
+           GP<ByteStream> out, 
+           int flags)
+{
+  int c;
+  int plevel = 0;
+  bool copy = true;
+  bool unchanged = true;
+  bool compat = false;
+  GP<ByteStream> mem;
+  GP<ParsingByteStream> inp;
+
+  if (flags & CHKCOMPAT)
+    {
+      mem = ByteStream::create();
+      mem->copy(*in);
+      mem->seek(0);
+      char c;
+      int state = 0;
+      while (!compat && mem->read(&c,1)>0)
+          {
+            switch(state)
+              {
+              case 0:
+                if (c == '\"')
+                  state = '\"';
+                break;
+              case '\"':
+                if (c == '\"')
+                  state = 0;
+                else if (c == '\\')
+                  state = '\\';
+                else if ((unsigned char)c<0x20 || c==0x7f)
+                  compat = true;
+                break;
+              case '\\':
+                if (!strchr("01234567tnrbfva\"\\",c))
+                  compat = true;
+                state = '\"';
+                break;
+              }
+          }
+      mem->seek(0);
+      inp = ParsingByteStream::create(mem);
+    }
+  else
+    {
+      inp = ParsingByteStream::create(in);
+    }
+  
+  while ((c = inp->get()) != EOF)
+    if (c!=' ' && c!='\t' && c!='\r' && c!='\n')
+      break;
+  inp->unget(c);
+  while ((c = inp->get()) != EOF)
+    {
+      if (plevel == 0)
+        if (c !=' ' && c!='\t' && c!='\r' && c!='\n')
+          copy = true;
+      if (c == '\"')
+        {
+          inp->unget(c);
+          GUTF8String token = inp->get_token(false, compat);
+          if (copy)
+	    print_c_string(token, token.length(), *out, !!(flags & EIGHTBIT));
+          if (compat)
+            unchanged = false;
+        }
+      else if (c == '(')
+        {
+          while ((c = inp->get()) != EOF)
+            if (c!=' ' && c!='\t' && c!='\r' && c!='\n')
+              break;
+          inp->unget(c);
+          if ((flags & DELMETA) && plevel==0 && c=='m')
+            {
+              GUTF8String token = inp->get_token();
+              if (token == "metadata")
+                copy = unchanged = false;
+              if (copy) {
+                out->write8('(');
+                out->write((const char*)token, token.length());
+              }
+            }
+          if ((flags & DELXMP) && plevel==0 && c=='x')
+            {
+              GUTF8String token = inp->get_token();
+              if (token == "xmp")
+                copy = unchanged = false;
+              if (copy) {
+                out->write8('(');
+                out->write((const char*)token, token.length());
+              }
+            }
+          else if (copy) 
+            out->write8('(');
+          plevel += 1;
+        }
+      else if (c == ')')
+        {
+          if (copy) 
+            out->write8(c);
+          if ( --plevel < 0)
+            plevel = 0;
+        }
+      else if (copy)
+        out->write8(c);
+    }
+  return !unchanged;
+}
+
+static bool
+print_ant(GP<IFFByteStream> iff, 
+          GP<ByteStream> out, 
+          int flags=CHKCOMPAT)
+{
+  GUTF8String chkid;
+  bool changed = false;
+  if (utf8)
+    flags |= EIGHTBIT;
+  while (iff->get_chunk(chkid))
+    {
+      if (chkid == "ANTa") 
+        {
+          changed = filter_ant(iff->get_bytestream(), out, flags);
+        }
+      else if (chkid == "ANTz") 
+        {
+          GP<ByteStream> bsiff = 
+	    BSByteStream::create(iff->get_bytestream());
+          changed = filter_ant(bsiff, out, flags);
+        }
+      iff->close_chunk();
+    }
+  return changed;
+}
+
+void
+command_print_ant(ParsingByteStream &)
+{
+  if (!g().file)
+    verror("you must first select a single page");
+  GP<ByteStream> out=ByteStream::create("w");
+  GP<ByteStream> anno = g().file->get_anno();
+  if (! (anno && anno->size())) return;
+  GP<IFFByteStream> iff=IFFByteStream::create(anno);
+  print_ant(iff, out);
+  out->write8('\n');
+}
+
+void
+command_print_merged_ant(ParsingByteStream &)
+{
+  if (!g().file)
+    verror("you must first select a single page");
+  GP<ByteStream> out=ByteStream::create("w");
+  GP<ByteStream> anno = g().file->get_merged_anno();
+  if (! (anno && anno->size())) return;
+  GP<IFFByteStream> iff=IFFByteStream::create(anno);
+  print_ant(iff, out);
+  out->write8('\n');
+}
+
+
+static void
+modify_ant(const GP<DjVuFile> &f, 
+           const char *newchunkid,
+           const GP<ByteStream> newchunk )
+{
+  const GP<ByteStream> anno(ByteStream::create());
+  if (newchunkid && newchunk && newchunk->size())
+    {
+      const GP<IFFByteStream> out(IFFByteStream::create(anno));
+      newchunk->seek(0);
+      out->put_chunk(newchunkid);
+      out->copy(*newchunk);
+      out->close_chunk();
+    }
+  f->anno = anno;
+  if (! anno->size())
+    f->remove_anno();
+  f->set_modified(true);
+  modified = true;
+}
+
+void
+file_remove_ant(const GP<DjVuFile> &f, const char *id)
+{
+  if (!f) return;
+  modify_ant(f, 0, 0);
+  vprint("remove_ant: modified \"%s\"", id);
+}
+
+void
+command_remove_ant(ParsingByteStream &)
+{
+  GPList<DjVmDir::File> & lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p)
+    {
+      GUTF8String id = lst[p]->get_load_name();
+      const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+      file_remove_ant(f, id);
+    }
+  }
+}
+
+void
+command_set_ant(ParsingByteStream &pbs)
+{
+  if (! g().file)
+    verror("must select a single page first");
+  const GP<ByteStream> ant = ByteStream::create();
+  {
+    const GP<ByteStream> dsedant = ByteStream::create();
+    get_data_from_file("set-ant", pbs, *dsedant);
+    dsedant->seek(0);
+    GP<ByteStream> bsant = BSByteStream::create(ant,100);
+    filter_ant(dsedant, bsant, EIGHTBIT);
+    bsant = 0;
+  }
+  modify_ant(g().file, "ANTz", ant);
+  vprint("set-ant: modified \"%s\"", (const char*)ToNative(g().fileid));
+}
+
+static void
+print_meta(IFFByteStream &iff, ByteStream &out)
+{
+  GUTF8String chkid;  
+  while (iff.get_chunk(chkid))
+    {
+      bool ok = false;
+      GP<DjVuANT> ant=DjVuANT::create();
+      if (chkid == "ANTz") {
+          GP<ByteStream> bsiff=BSByteStream::create(iff.get_bytestream());
+          ant->decode(*bsiff);
+          ok = true;
+      } else if (chkid == "ANTa") {
+        ant->decode(*iff.get_bytestream());
+        ok = true;
+      }
+      if (ok)
+        {
+          { // extra nesting for windows
+            for (GPosition pos=ant->metadata; pos; ++pos)
+            { 
+              GUTF8String tmp;
+              tmp=ant->metadata.key(pos);
+              out.writestring(tmp); 
+              out.write8('\t');
+              tmp=ant->metadata[pos];
+              print_c_string((const char*)tmp, tmp.length(), out, utf8);
+              out.write8('\n');
+            }
+          }
+        }
+      iff.close_chunk();
+    }
+}
+
+void 
+command_print_meta(ParsingByteStream &)
+{
+  if (! g().file )
+    {
+      GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+      if (frec)
+        {
+          vprint("print-meta: implicitly selecting shared annotations");
+          select_clear();
+          select_add(frec);
+        }
+    }
+  if ( g().file )
+    {
+      GP<ByteStream> out=ByteStream::create("w");
+      GP<ByteStream> anno = g().file->get_anno();
+      if (! (anno && anno->size())) return;
+      GP<IFFByteStream> iff=IFFByteStream::create(anno); 
+      print_meta(*iff,*out);
+    }
+}
+
+
+static bool
+modify_meta(const GP<DjVuFile> &f,
+            GMap<GUTF8String,GUTF8String> *newmeta)
+{
+  bool changed = false;
+  GP<ByteStream> newant = ByteStream::create();
+  if (newmeta && !newmeta->isempty())
+    {
+      newant->writestring(GUTF8String("(metadata"));
+      { // extra nesting for windows
+        for (GPosition pos=newmeta->firstpos(); pos; ++pos)
+        {
+          GUTF8String key = newmeta->key(pos); 
+          GUTF8String val = (*newmeta)[pos];
+          newant->write("\n\t(",3);
+          newant->writestring(key);
+          newant->write(" ",1);
+          print_c_string((const char*)val, val.length(),
+                         *newant, true);
+          newant->write(")",1);
+        }
+      }
+      newant->write(" )\n",3);
+      changed = true;
+    }
+  GP<ByteStream> anno = f->get_anno();
+  if (anno && anno->size()) 
+    {
+      GP<IFFByteStream> iff=IFFByteStream::create(anno);
+      if (print_ant(iff, newant, DELMETA|CHKCOMPAT|EIGHTBIT))
+        changed = true;
+    }
+  const GP<ByteStream> newantz=ByteStream::create();
+  if (changed)
+    {
+      newant->seek(0);
+      { 
+        GP<ByteStream> bzz = BSByteStream::create(newantz,100); 
+        bzz->copy(*newant); 
+        bzz = 0;
+      }
+      newantz->seek(0);
+      modify_ant(f, "ANTz", newantz);
+    }
+  return changed;
+}
+
+void
+file_remove_meta(const GP<DjVuFile> &f, const char *id)
+{
+  if (modify_meta(f, 0))
+    vprint("remove_meta: modified \"%s\"", id);
+}
+
+void 
+command_remove_meta(ParsingByteStream &)
+{
+   GPList<DjVmDir::File> &lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p)
+    {
+      GUTF8String id = lst[p]->get_load_name();
+      const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+      file_remove_meta(f, id);
+    }
+  }
+}
+
+void
+command_set_meta(ParsingByteStream &pbs)
+{
+  // get metadata
+  GP<ByteStream> metastream = ByteStream::create();
+  get_data_from_file("set-meta", pbs, *metastream);
+  metastream->seek(0);
+  // parse metadata
+  GMap<GUTF8String,GUTF8String> metadata;
+  GP<ParsingByteStream> inp = ParsingByteStream::create(metastream);
+  int c;
+  while ( (c = inp->get_spaces(true)) != EOF )
+    {
+      GUTF8String key, val;
+      inp->unget(c);
+      key = inp->get_token();
+      c = inp->get_spaces(false);
+      if (c == '\"') {
+        inp->unget(c);
+        val = inp->get_token();
+      } else {
+        while (c!='\n' && c!='\r' && c!=EOF) {
+          val += c;
+          c = inp->get();
+        }
+      }
+      if (key.length()>0 && val.length()>0)
+        metadata[key] = val;
+    }
+  // possibly select shared annotations.
+  if (! g().file)
+    {
+      GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+      if (frec)
+        {
+          vprint("set-meta: implicitly selecting shared annotations.");
+        }
+      else if (metadata.size() > 0)
+        {
+          vprint("set-meta: implicitly creating and selecting shared annotations.");
+          g().doc->create_shared_anno_file();
+          frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+        }
+      if (frec)
+        {
+          select_clear();
+          select_add(frec);
+        }
+    }
+  // set metadata
+  if (g().file && modify_meta(g().file, &metadata))
+    vprint("set-meta: modified \"%s\"", 
+           (const char*)ToNative(g().fileid));
+}
+
+static void
+print_xmp(IFFByteStream &iff, ByteStream &out)
+{
+  GUTF8String chkid;  
+  while (iff.get_chunk(chkid))
+    {
+      bool ok = false;
+      GP<DjVuANT> ant=DjVuANT::create();
+      if (chkid == "ANTz") {
+          GP<ByteStream> bsiff=BSByteStream::create(iff.get_bytestream());
+          ant->decode(*bsiff);
+          ok = true;
+      } else if (chkid == "ANTa") {
+        ant->decode(*iff.get_bytestream());
+        ok = true;
+      }
+      if (ok && ant->xmpmetadata.length()>0)
+        {
+          out.writestring(ant->xmpmetadata);
+          out.write8('\n');
+        }
+      iff.close_chunk();
+    }
+}
+
+void 
+command_print_xmp(ParsingByteStream &)
+{
+  if (! g().file )
+    {
+      GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+      if (frec)
+        {
+          vprint("print-xmp: implicitly selecting shared annotations");
+          select_clear();
+          select_add(frec);
+        }
+    }
+  if ( g().file )
+    {
+      GP<ByteStream> out=ByteStream::create("w");
+      GP<ByteStream> anno = g().file->get_anno();
+      if (! (anno && anno->size())) return;
+      GP<IFFByteStream> iff=IFFByteStream::create(anno); 
+      print_xmp(*iff,*out);
+    }
+}
+
+static bool
+modify_xmp(const GP<DjVuFile> &f, GUTF8String *newxmp)
+{
+  bool changed = false;
+  GP<ByteStream> newant = ByteStream::create();
+  if (newxmp && newxmp->length() > 0)
+    {
+      newant->writestring(GUTF8String("(xmp "));
+      print_c_string((const char*)(*newxmp), newxmp->length(), *newant, true);
+      newant->write(" )\n",3);
+      changed = true;
+    }
+  GP<ByteStream> anno = f->get_anno();
+  if (anno && anno->size()) 
+    {
+      GP<IFFByteStream> iff=IFFByteStream::create(anno);
+      if (print_ant(iff, newant, DELXMP|CHKCOMPAT|EIGHTBIT))
+        changed = true;
+    }
+  const GP<ByteStream> newantz=ByteStream::create();
+  if (changed)
+    {
+      newant->seek(0);
+      { 
+        GP<ByteStream> bzz = BSByteStream::create(newantz,100); 
+        bzz->copy(*newant); 
+        bzz = 0;
+      }
+      newantz->seek(0);
+      modify_ant(f, "ANTz", newantz);
+    }
+  return changed;
+}
+
+void
+file_remove_xmp(const GP<DjVuFile> &f, const char *id)
+{
+  if (modify_xmp(f, 0))
+    vprint("remove_xmp: modified \"%s\"", id);
+}
+
+void 
+command_remove_xmp(ParsingByteStream &)
+{
+  GPList<DjVmDir::File> &lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p)
+      {
+        GUTF8String id = lst[p]->get_load_name();
+        const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+        file_remove_xmp(f, id);
+      }
+  }
+}
+
+void 
+command_set_xmp(ParsingByteStream &pbs)
+{
+  // get xmpmetadata
+  GP<ByteStream> metastream = ByteStream::create();
+  get_data_from_file("set-meta", pbs, *metastream);
+  metastream->seek(0);
+  // read xmpmetadata
+  int size = metastream->size();
+  char *buffer = new char[size+1];
+  metastream->readall(buffer,size);
+  buffer[size] = 0;
+  GUTF8String xmpmetadata(buffer);
+  delete [] buffer;
+  // possibly select shared annotations.
+  if (! g().file)
+    {
+      GP<DjVmDir::File> frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+      if (frec)
+        {
+          vprint("set-xmp: implicitly selecting shared annotations.");
+        }
+      else if (xmpmetadata.length() > 0)
+        {
+          vprint("set-xmp: implicitly creating and selecting shared annotations.");
+          g().doc->create_shared_anno_file();
+          frec = g().doc->get_djvm_dir()->get_shared_anno_file();
+        }
+      if (frec)
+        {
+          select_clear();
+          select_add(frec);
+        }
+    }
+  // set metadata
+  if (g().file && modify_xmp(g().file, &xmpmetadata))
+    vprint("set-xmp: modified \"%s\"", 
+           (const char*)ToNative(g().fileid));
+}
+
+
+
+
+
+struct  zone_names_struct
+{ 
+  const char *name;
+  DjVuTXT::ZoneType ztype;
+  char separator;
+};
+
+static zone_names_struct* zone_names() {
+  static zone_names_struct xzone_names[] = 
+  {
+    { "page",   DjVuTXT::PAGE,      0 },
+    { "column", DjVuTXT::COLUMN,    DjVuTXT::end_of_column },
+    { "region", DjVuTXT::REGION,    DjVuTXT::end_of_region },
+    { "para",   DjVuTXT::PARAGRAPH, DjVuTXT::end_of_paragraph },
+    { "line",   DjVuTXT::LINE,      DjVuTXT::end_of_line },
+    { "word",   DjVuTXT::WORD,      ' ' },
+    { "char",   DjVuTXT::CHARACTER, 0 },
+    { 0, (DjVuTXT::ZoneType)0 ,0 }
+  };
+  return xzone_names;
+};
+
+GP<DjVuTXT>
+get_text(const GP<DjVuFile> &file)
+{ 
+  GUTF8String chkid;
+  const GP<ByteStream> bs(file->get_text());
+  if (bs) 
+    {
+      long int i=0;
+      const GP<IFFByteStream> iff(IFFByteStream::create(bs));
+      while (iff->get_chunk(chkid))
+        {
+          i++;
+          if (chkid == GUTF8String("TXTa")) 
+            {
+              GP<DjVuTXT> txt = DjVuTXT::create();
+              txt->decode(iff->get_bytestream());
+              return txt;
+            }
+          else if (chkid == GUTF8String("TXTz")) 
+            {
+              GP<DjVuTXT> txt = DjVuTXT::create();
+              GP<ByteStream> bsiff=BSByteStream::create(iff->get_bytestream());
+              txt->decode(bsiff);
+              return txt;
+            }
+          iff->close_chunk();
+        }
+    }
+  return 0;
+}
+
+void
+print_txt_sub(const GP<DjVuTXT> &txt, DjVuTXT::Zone &zone, 
+	      const GP<ByteStream> &out, int indent)
+{
+  // Indentation
+  if (indent)
+    {
+      out->write("\n",1);
+      static const char spaces[] = "                        ";
+      if (indent > (int)sizeof(spaces))
+        indent = sizeof(spaces);
+      out->write(spaces, indent);
+    }
+  // Zone header
+  int zinfo;
+  for (zinfo=0; zone_names()[zinfo].name; zinfo++)
+    if (zone.ztype == zone_names()[zinfo].ztype)
+      break;
+  GUTF8String message = "(bogus";
+  if (zone_names()[zinfo].name)
+    message.format("(%s %d %d %d %d", zone_names()[zinfo].name,
+                   zone.rect.xmin, zone.rect.ymin, 
+                   zone.rect.xmax, zone.rect.ymax);
+  out->write((const char*)message, message.length());
+  // Zone children
+  if (zone.children.isempty()) 
+    {
+      const char *data = txt->textUTF8.getbuf() + zone.text_start;
+      int length = zone.text_length;
+      if (data[length-1] == zone_names()[zinfo].separator)
+        length -= 1;
+      out->write(" ",1);
+      print_c_string(data, length, *out, utf8);
+    }
+  else
+    {
+      for (GPosition pos=zone.children; pos; ++pos)
+        print_txt_sub(txt, zone.children[pos], out, indent + 1);
+    }
+  // Finish
+  out->write(")",1);
+  if (!indent)
+    out->write("\n", 1);
+}
+
+void
+print_txt(const GP<DjVuTXT> &txt, const GP<ByteStream> &out)
+{
+  if (txt)
+    print_txt_sub(txt, txt->page_zone, out, 0);
+}
+
+void
+command_print_txt(ParsingByteStream &)
+{
+  const GP<ByteStream> out = ByteStream::create("w");
+  GPList<DjVmDir::File> &lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p)
+      if (lst[p]->is_page())
+      {
+        GUTF8String id = lst[p]->get_load_name();
+        const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+        const GP<DjVuTXT> txt(get_text(f));
+        if (txt)
+          print_txt(txt, out);
+        else
+          out->write("(page 0 0 0 0 \"\")\n",18);
+      }
+  }
+}
+
+void
+command_print_pure_txt(ParsingByteStream &)
+{
+  const GP<ByteStream> out = ByteStream::create("w");
+  GP<DjVuTXT> txt;
+  GPList<DjVmDir::File> &lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p)
+    {
+      GUTF8String id = lst[p]->get_load_name();
+      const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+      if ((txt = get_text(f)))
+        {
+          GUTF8String ntxt = txt->textUTF8;
+          out->write((const char*)ntxt, ntxt.length());
+        }
+      out->write("\f",1);
+    }
+  }
+}
+
+static void
+modify_txt(const GP<DjVuFile> &f, 
+           const char *newchunkid,
+           const GP<ByteStream> newchunk )
+{
+  const GP<ByteStream> text(ByteStream::create());
+  if (newchunkid && newchunk && newchunk->size())
+    {
+      const GP<IFFByteStream> out(IFFByteStream::create(text));
+      newchunk->seek(0);
+      out->put_chunk(newchunkid);
+      out->copy(*newchunk);
+      out->close_chunk();
+    }
+  f->text = text;
+  if (! text->size())
+    f->remove_text();
+  f->set_modified(true);
+  modified = true;
+}
+
+void
+file_remove_txt(const GP<DjVuFile> &f, const char *id)
+{
+  if (! f) return;
+  modify_txt(f, 0, 0);
+  vprint("remove-txt: modified \"%s\"", id);
+}
+
+void
+command_remove_txt(ParsingByteStream &)
+{
+  GPList<DjVmDir::File> &lst = g().selected;
+  { // extra nesting for windows
+    for (GPosition p=lst; p; ++p)
+    {
+      GUTF8String id = lst[p]->get_load_name();
+      const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+      file_remove_txt(f, id);
+    }
+  }
+}
+
+void
+construct_djvutxt_sub(ParsingByteStream &pbs, 
+                      const GP<DjVuTXT> &txt, DjVuTXT::Zone &zone,
+                      int mintype, bool exact)
+{
+  int c;
+  GUTF8String token;
+  // Get zone type
+  c = pbs.get_spaces(true);
+  if (c != '(')
+    verror("syntax error in txt data: expecting '(',\n\tnear '%s'", 
+           pbs.get_error_context(c) );
+  token = pbs.get_token(true);
+  int zinfo;
+  for (zinfo=0; zone_names()[zinfo].name; zinfo++)
+    if (token == zone_names()[zinfo].name)
+      break;
+  if (! zone_names()[zinfo].name)
+    verror("Syntax error in txt data: undefined token '%s',\n\tnear '%s'",
+           (const char*)ToNative(token), pbs.get_error_context());
+  zone.ztype = zone_names()[zinfo].ztype;
+  if (zone.ztype<mintype || (exact && zone.ztype>mintype))
+    verror("Syntax error in txt data: illegal zone token '%s',\n\tnear '%s'",
+           (const char*)ToNative(token), pbs.get_error_context());           
+  // Get zone rect
+  GUTF8String str;
+  str = pbs.get_token(true);
+  if (!str || !str.is_int()) 
+    nerror: verror("Syntax error in txt data: number expected,\n\tnear '%s%s'",
+                   (const char*)ToNative(str), pbs.get_error_context());  
+  zone.rect.xmin = atoi(str);
+  str = pbs.get_token(true);
+  if (!str || !str.is_int()) 
+    goto nerror;
+  zone.rect.ymin = atoi(str);
+  str = pbs.get_token(true);
+  if (!str || !str.is_int()) 
+    goto nerror;
+  zone.rect.xmax = atoi(str);
+  str = pbs.get_token(true);
+  if (!str || !str.is_int()) 
+    goto nerror;
+  zone.rect.ymax = atoi(str);
+  if (zone.rect.xmin > zone.rect.xmax) 
+    {
+      int tmp = zone.rect.xmin; 
+      zone.rect.xmin=zone.rect.xmax; 
+      zone.rect.xmax=tmp; 
+    }
+  if (zone.rect.ymin > zone.rect.ymax)
+    {
+      int tmp = zone.rect.ymin; 
+      zone.rect.ymin=zone.rect.ymax; 
+      zone.rect.ymax=tmp; 
+    }
+  // Continue processing
+  c = pbs.get_spaces(true);
+  pbs.unget(c);
+  if (c == '"') 
+    {
+      // This is a terminal
+      str = pbs.get_token(true);
+      zone.text_start = txt->textUTF8.length();
+      zone.text_length = str.length();
+      txt->textUTF8 += str;
+      
+    }
+  else 
+    {
+      // This is a non terminal
+      while (c != ')')
+        {
+          if (c != '(')
+            verror("Syntax error in text data: expecting subzone,\n\tnear '%s'",
+                   pbs.get_error_context() );
+          DjVuTXT::Zone *nzone = zone.append_child();
+          construct_djvutxt_sub(pbs, txt, *nzone, zone.ztype+1, false);
+          c = pbs.get_spaces(true);
+          pbs.unget(c);
+        }
+    }
+  // Skip last parenthesis
+  c = pbs.get_spaces(true);
+  if (c != ')')
+    verror("Syntax error in text data: missing parenthesis,\n\tnear '%s'",
+           pbs.get_error_context(c) );
+}
+
+GP<DjVuTXT>
+construct_djvutxt(ParsingByteStream &pbs)
+{
+  GP<DjVuTXT> txt(DjVuTXT::create());
+  int c = pbs.get_spaces(true);
+  if (c == EOF)
+    return 0;
+  pbs.unget(c);
+  construct_djvutxt_sub(pbs, txt, txt->page_zone, DjVuTXT::PAGE, true);
+  if (pbs.get_spaces(true) != EOF)
+    verror("Syntax error in txt data: garbage after data");
+  txt->normalize_text();
+  if (! txt->textUTF8)
+    return 0;
+  return txt;
+}
+
+void
+command_set_txt(ParsingByteStream &pbs)
+{
+  if (! g().file)
+    verror("must select a single page first");
+  const GP<ByteStream> txtbs(ByteStream::create());
+  get_data_from_file("set-txt", pbs, *txtbs);
+  txtbs->seek(0);
+  GP<ParsingByteStream> txtpbs(ParsingByteStream::create(txtbs));
+  const GP<DjVuTXT> txt(construct_djvutxt(*txtpbs));
+  GP<ByteStream> txtobs=ByteStream::create();
+  if (txt)
+    {
+      const GP<ByteStream> bsout(BSByteStream::create(txtobs,1000));
+      txt->encode(bsout);
+    }
+  txtobs->seek(0);
+  modify_txt(g().file, "TXTz", txtobs);
+  vprint("set-txt: modified \"%s\"", (const char*)ToNative(g().fileid));
+}
+
+void
+output(const GP<DjVuFile> &f, const GP<ByteStream> &out, 
+       int flag, const char *id=0, int pageno=0)
+{
+  if (f)
+    {
+      const GP<ByteStream> ant(ByteStream::create());
+      const GP<ByteStream> txt(ByteStream::create());
+      char pagenumber[16];
+      sprintf(pagenumber," # page %d", pageno);
+      if (flag & 1) 
+        { 
+          const GP<ByteStream> anno(f->get_anno());
+          if (anno && anno->size()) 
+            {
+              const GP<IFFByteStream> iff(IFFByteStream::create(anno)); 
+              print_ant(iff, ant); 
+              ant->seek(0); 
+            }
+        }
+      if (flag & 2)
+        { 
+          print_txt(get_text(f),txt); 
+          txt->seek(0); 
+        }
+      if (id && ant->size() + txt->size())
+        {
+          static const char msg1[] = "# ------------------------- \nselect \0";
+          static const char msg2[] = "\n\0";
+          out->write(msg1, strlen(msg1));
+          print_c_string(id, strlen(id), *out, utf8);
+          if (pageno > 0) out->write(pagenumber, strlen(pagenumber));
+          out->write(msg2, strlen(msg2));
+        }
+      if (ant->size()) 
+        {
+          out->write("set-ant\n", 8);
+          out->copy(*ant);
+          out->write("\n.\n", 3);
+        }
+      if (txt->size()) 
+        {
+          out->write("set-txt\n", 8);
+          out->copy(*txt);
+          out->write("\n.\n", 3);
+        }
+    }
+}
+
+void
+command_output_ant(ParsingByteStream &)
+{
+  const GP<ByteStream> out = ByteStream::create("w");
+  if (g().file) 
+    {
+      output(g().file, out, 1);
+    }
+  else 
+    {
+      const char *pre = "select; remove-ant\n";
+      out->write(pre, strlen(pre));
+      GPList<DjVmDir::File> &lst = g().selected;
+      { // extra nesting for windows
+        for (GPosition p=lst; p; ++p)
+        {
+          int pageno = lst[p]->get_page_num();
+          GUTF8String id = lst[p]->get_load_name();
+          const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+          output(f, out, 1, id, pageno+1);
+        }
+      }
+    }
+}
+
+void
+command_output_txt(ParsingByteStream &)
+{
+  const GP<ByteStream> out = ByteStream::create("w");
+  if (g().file) 
+    {
+      output(g().file, out, 2);
+    }
+  else 
+    {
+      const char *pre = "select; remove-txt\n";
+      out->write(pre, strlen(pre));
+      GPList<DjVmDir::File> &lst = g().selected;
+      { // extra nesting for windows
+        for (GPosition p=lst; p; ++p)
+        {
+          int pageno = lst[p]->get_page_num();
+          GUTF8String id = lst[p]->get_load_name();
+          const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+          output(f, out, 2, id, pageno+1);
+        }
+      }
+    }
+}
+
+void
+command_output_all(ParsingByteStream &)
+{
+  const GP<ByteStream> out = ByteStream::create("w");
+  if (g().file) 
+    {
+      output(g().file, out, 3);
+    }
+  else 
+    {
+      const char *pre = "select; remove-ant; remove-txt\n";
+      out->write(pre, strlen(pre));
+      GPList<DjVmDir::File> &lst = g().selected;
+      { // extra nesting for windows
+        for (GPosition p=lst; p; ++p)
+        {
+          int pageno = lst[p]->get_page_num();
+          GUTF8String id = lst[p]->get_load_name();
+          const GP<DjVuFile> f(g().doc->get_djvu_file(id));
+          output(f, out, 3, id, pageno+1);
+        }
+      }
+    }
+}
+
+void
+print_outline_sub(const GP<DjVmNav> &nav, int &pos, int count, 
+                  const GP<ByteStream> &out, int indent)
+{
+  GUTF8String str;
+  GP<DjVmNav::DjVuBookMark> entry;
+  while (count > 0 && pos < nav->getBookMarkCount())
+    {
+      out->write("\n",1);
+      { // extra nesting for windows
+        for (int i=0; i<indent; i++)
+          out->write(" ",1);
+      }
+      nav->getBookMark(entry, pos++);
+      out->write("(",1);
+      str = entry->displayname;
+      print_c_string(str, str.length(), *out, utf8);
+      out->write("\n ",2);
+      { // extra nesting for windows
+        for (int i=0; i<indent; i++)
+          out->write(" ",1);
+      }
+      str = entry->url;
+      print_c_string(str, str.length(), *out, utf8);
+      print_outline_sub(nav, pos, entry->count, out, indent+1);
+      out->write(" )",2);
+      count--;
+    }
+}
+
+void
+command_print_outline(ParsingByteStream &pbs)
+{
+  GP<DjVmNav> nav = g().doc->get_djvm_nav();
+  if (nav)
+    {
+      int pos = 0;
+      int count = nav->getBookMarkCount();
+      if (count > 0)
+        {
+          const GP<ByteStream> out = ByteStream::create("w");
+          out->write("(bookmarks",10);
+          print_outline_sub(nav, pos, count, out, 1);
+          out->write(" )\n", 3);
+        }
+    }
+}
+
+void
+construct_outline_sub(ParsingByteStream &pbs, GP<DjVmNav> nav, int &count)
+{
+  int c;
+  GUTF8String name, url;
+  GP<DjVmNav::DjVuBookMark> mark;
+  if ((c = pbs.get_spaces(true)) != '\"')
+    verror("Syntax error in outline: expecting name string,\n\tnear '%s'.",
+           pbs.get_error_context(c) );    
+  pbs.unget(c);
+  name = pbs.get_token();
+  if ((c = pbs.get_spaces(true)) != '\"')
+    verror("Syntax error in outline: expecting url string,\n\tnear '%s'.",
+           pbs.get_error_context(c) );    
+  pbs.unget(c);
+  url = pbs.get_token();
+  mark = DjVmNav::DjVuBookMark::create(0, name, url);
+  nav->append(mark);
+  count += 1;
+  while ((c = pbs.get_spaces(true)) == '(')
+    construct_outline_sub(pbs, nav, mark->count);
+  if (c != ')')
+    verror("Syntax error in outline: expecting ')',\n\tnear '%s'.",
+           pbs.get_error_context(c) );    
+}
+
+GP<DjVmNav>
+construct_outline(ParsingByteStream &pbs)
+{
+  GP<DjVmNav> nav(DjVmNav::create());
+  int c = pbs.get_spaces(true);
+  int count = 0;
+  if (c == EOF)
+    return 0;
+  if (c!='(')
+    verror("Syntax error in outline data: expecting '(bookmarks'");
+  if (pbs.get_token()!="bookmarks")
+    verror("Syntax error in outline data: expecting '(bookmarks'");    
+  while ((c = pbs.get_spaces(true)) == '(')
+    construct_outline_sub(pbs, nav, count);
+  if (c != ')')
+    verror("Syntax error in outline: expecting parenthesis,\n\tnear '%s'.",
+           pbs.get_error_context(c) );
+  if (pbs.get_spaces(true) != EOF)
+    verror("Syntax error in outline: garbage after last ')',\n\tnear '%s'",
+           pbs.get_error_context(c) );
+  if (nav->getBookMarkCount() < 1)
+    return 0;
+  if (!nav->isValidBookmark())
+    verror("Invalid outline data!");
+  return nav;
+}
+
+void
+command_set_outline(ParsingByteStream &pbs)
+{
+  const GP<ByteStream> outbs(ByteStream::create());
+  get_data_from_file("set-outline", pbs, *outbs);
+  outbs->seek(0);
+  GP<ParsingByteStream> outpbs(ParsingByteStream::create(outbs));
+  GP<DjVmNav> nav(construct_outline(*outpbs));
+  if (g().doc->get_djvm_nav() != nav)
+    {
+      g().doc->set_djvm_nav(nav);
+      modified = true;
+    }
+}
+
+void
+command_remove_outline(ParsingByteStream &pbs)
+{
+  if (g().doc->get_djvm_nav())
+    {
+      g().doc->set_djvm_nav(0);
+      modified = true;
+    }
+}
+
+static bool
+callback_thumbnails(int page_num, void *)
+{
+  vprint("set-thumbnails: processing page %d", page_num+1);
+  return false;
+}
+
+void
+command_set_thumbnails(ParsingByteStream &pbs)
+{
+  GUTF8String sizestr = pbs.get_token();
+  if (! sizestr)
+    sizestr = "128";
+  if (! sizestr.is_int() )
+    verror("expecting integer argument");
+  int size = atoi(sizestr);
+  if (size<32 || size >256) 
+    verror("size should be between 32 and 256 (e.g. 128)");
+  g().doc->generate_thumbnails(size, callback_thumbnails, NULL);
+  modified = true;
+}
+
+void
+command_remove_thumbnails(ParsingByteStream &)
+{
+  g().doc->remove_thumbnails();
+  modified = true;
+}
+
+void
+command_save_page(ParsingByteStream &pbs)
+{
+  GUTF8String fname = pbs.get_token();
+  if (! fname) 
+    verror("empty filename");
+  if (! g().file)
+    verror("must select a single page first");
+  if (nosave)
+    vprint("save_page: not saving anything (-n was specified)");
+  if (nosave)
+    return;
+  const GP<ByteStream> bs(g().file->get_djvu_bytestream(false, false));
+  const GP<ByteStream> out(ByteStream::create(GURL::Filename::UTF8(fname), "wb"));
+  out->writall("AT&T",4);
+  out->copy(*bs);
+  vprint("saved \"%s\" as \"%s\"  (without inserting included files)",
+         (const char*)ToNative(g().fileid), (const char*)fname);
+}
+
+void
+command_save_page_with(ParsingByteStream &pbs)
+{
+  GUTF8String fname = pbs.get_token();
+  if (! fname) 
+    verror("empty filename");
+  if (! g().file)
+    verror("must select a single page first");
+  if (nosave)
+    vprint("save-page-with: not saving anything (-n was specified)");
+  if (nosave)
+    return;
+  const GP<ByteStream> bs(g().file->get_djvu_bytestream(true, false));
+  const GP<ByteStream> out(ByteStream::create(GURL::Filename::UTF8(fname), "wb"));
+  out->writall("AT&T",4);
+  out->copy(*bs);
+  vprint("saved \"%s\" as \"%s\"  (inserting included files)",
+         (const char*)ToNative(g().fileid), (const char*)fname);
+}
+
+void
+command_save_bundled(ParsingByteStream &pbs)
+{
+  GUTF8String fname = pbs.get_token();
+  if (! fname) 
+    verror("empty filename");
+  if (nosave) 
+    vprint("save-bundled: not saving anything (-n was specified)");
+  else
+    g().doc->save_as(GURL::Filename::UTF8(fname), true);
+  modified = false;
+}
+
+void
+command_save_indirect(ParsingByteStream &pbs)
+{
+  GUTF8String fname = pbs.get_token();
+  if (! fname) 
+    verror("empty filename");
+  if (nosave) 
+    vprint("save-indirect: not saving anything (-n was specified)");
+  else
+    g().doc->save_as(GURL::Filename::UTF8(fname), false);
+  modified = false;
+}
+
+void
+command_save(void)
+{
+  if (!g().doc->can_be_saved())
+    verror("cannot save old format (use save-bundled or save-indirect)");
+  if (nosave)
+    vprint("save: not saving anything (-n was specified)");
+  else if (!modified)
+    vprint("save: document was not modified");
+  else 
+    g().doc->save();
+  modified = false;
+}
+
+void
+command_save(ParsingByteStream &)
+{
+  command_save();
+}
+
+void
+command_help(void)
+{
+  fprintf(stderr,
+          "\n"
+          "Commands\n"
+          "--------\n"
+          "The following commands can be separated by newlines or semicolons.\n"
+          "Comment lines start with '#'.  Commands usually operate on pages and files\n"
+          "specified by the \"select\" command.  All pages and files are initially selected.\n"
+          "A single page must be selected before executing commands marked with a period.\n"
+          "Commands marked with an underline do not use the selection\n"
+          "\n"
+          "   ls                     -- list all pages/files\n"
+          "   n                      -- list pages count\n"
+          "   dump                   -- shows IFF structure\n"
+          "   size                   -- prints page width and height in html friendly way\n"
+          "   select                 -- selects the entire document\n"
+          "   select <id>            -- selects a single page/file by name or page number\n"
+          "   select-shared-ant      -- selects the shared annotations file\n"
+          "   create-shared-ant      -- creates and select the shared annotations file\n"
+          "   showsel                -- displays currently selected pages/files\n"
+          " . print-ant              -- prints annotations\n"
+          " . print-merged-ant       -- prints annotations including the shared annotations\n"
+          " . print-meta             -- prints file metadatas (a subset of the annotations\n"
+          "   print-txt              -- prints hidden text using a lisp syntax\n"
+          "   print-pure-txt         -- print hidden text without coordinates\n"
+          " _ print-outline          -- print outline (bookmarks)\n"
+          " . print-xmp              -- print xmp annotations\n"
+          "   output-ant             -- dumps ant as a valid cmdfile\n"
+          "   output-txt             -- dumps text as a valid cmdfile\n"
+          "   output-all             -- dumps ant and text as a valid cmdfile\n"
+          " . set-ant [<antfile>]    -- copies <antfile> into the annotation chunk\n"
+          " . set-meta [<metafile>]  -- copies <metafile> into the metadata annotation tag\n"
+          " . set-txt [<txtfile>]    -- copies <txtfile> into the hidden text chunk\n"
+          " . set-xmp [<xmpfile>]    -- copies <xmpfile> into the xmp metadata annotation tag\n" 
+          " _ set-outline [<bmfile>] -- sets outline (bootmarks)\n"
+          " _ set-thumbnails [<sz>]  -- generates all thumbnails with given size\n"
+          "   set-rotation [+-]<rot> -- sets page rotation\n"
+          "   set-dpi <dpi>          -- sets page resolution\n"
+          "   remove-ant             -- removes annotations\n"
+          "   remove-meta            -- removes metadatas without changing other annotations\n"
+          "   remove-txt             -- removes hidden text\n"
+          " _ remove-outline         -- removes outline (bookmarks)\n"
+          " . remove-xmp             -- removes xmp metadata from annotation chunk\n"
+          " _ remove-thumbnails      -- removes all thumbnails\n"
+          " . set-page-title <title> -- sets an alternate page title\n"
+          " . save-page <name>       -- saves selected page/file as is\n"
+          " . save-page-with <name>  -- saves selected page/file, inserting all included files\n"
+          " _ save-bundled <name>    -- saves as bundled document under fname\n"
+          " _ save-indirect <name>   -- saves as indirect document under fname\n"
+          " _ save                   -- saves in-place\n"
+          " _ help                   -- prints this message\n"
+          "\n"
+          "Interactive example:\n"
+          "--------------------\n"
+          "  Type\n"
+          "    %% djvused -v file.djvu\n"
+          "  and play with the commands above\n"
+          "\n"
+          "Command line example:\n"
+          "---------------------\n"
+          "  Save all text and annotation chunks as a djvused script with\n"
+          "    %% djvused file.djvu -e output-all > file.dsed\n"
+          "  Then edit the script with any text editor.\n"
+          "  Finally restore the modified text and annotation chunks with\n"
+          "    %% djvused file.djvu -f file.dsed -s\n"
+          "  You may use option -v to see more messages\n"
+          "\n" );
+}
+
+void
+command_help(ParsingByteStream &)
+{
+  command_help();
+}
+
+typedef void (*CommandFunc)(ParsingByteStream &pbs);
+static GMap<GUTF8String,CommandFunc> &command_map() {
+  static GMap<GUTF8String,CommandFunc> xcommand_map;
+  static bool first=true;
+  if(first) {
+    first=false;
+    xcommand_map["ls"] = command_ls;
+    xcommand_map["n"] = command_n;
+    xcommand_map["dump"] = command_dump;
+    xcommand_map["size"] = command_size;
+    xcommand_map["showsel"] = command_showsel;
+    xcommand_map["select"] = command_select;
+    xcommand_map["select-shared-ant"] = command_select_shared_ant;
+    xcommand_map["create-shared-ant"] = command_create_shared_ant;
+    xcommand_map["print-ant"] = command_print_ant;  
+    xcommand_map["print-merged-ant"] = command_print_merged_ant;
+    xcommand_map["print-meta"] = command_print_meta;
+    xcommand_map["print-txt"] = command_print_txt;
+    xcommand_map["print-pure-txt"] = command_print_pure_txt;
+    xcommand_map["print-outline"] = command_print_outline;
+    xcommand_map["print-xmp"] = command_print_xmp;
+    xcommand_map["output-ant"] = command_output_ant;
+    xcommand_map["output-txt"] = command_output_txt;
+    xcommand_map["output-all"] = command_output_all;
+    xcommand_map["set-ant"] = command_set_ant;
+    xcommand_map["set-meta"] = command_set_meta;
+    xcommand_map["set-txt"] = command_set_txt;
+    xcommand_map["set-outline"] = command_set_outline;
+    xcommand_map["set-xmp"] = command_set_xmp;
+    xcommand_map["set-thumbnails"] = command_set_thumbnails;
+    xcommand_map["set-rotation"] = command_set_rotation;
+    xcommand_map["set-dpi"] = command_set_dpi;
+    xcommand_map["remove-ant"] = command_remove_ant;
+    xcommand_map["remove-meta"] = command_remove_meta;
+    xcommand_map["remove-txt"] = command_remove_txt;
+    xcommand_map["remove-outline"] = command_remove_outline;
+    xcommand_map["remove-thumbnails"] = command_remove_thumbnails;
+    xcommand_map["remove-xmp"] = command_remove_xmp;
+    xcommand_map["set-page-title"] = command_set_page_title;
+    xcommand_map["save-page"] = command_save_page;
+    xcommand_map["save-page-with"] = command_save_page_with;
+    xcommand_map["save-bundled"] = command_save_bundled;
+    xcommand_map["save-indirect"] = command_save_indirect;
+    xcommand_map["save"] = command_save;
+    xcommand_map["help"] = command_help;
+  }
+  return xcommand_map;
+}
+
+void
+usage()
+{
+  DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+          "DJVUSED --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+          "Simple DjVu file manipulation program\n"
+          "\n"
+          "Usage: djvused [options] djvufile\n"
+          "Executes scripting commands on djvufile.\n"
+          "Script command come either from a script file (option -f),\n"
+          "from the command line (option -e), or from stdin (default).\n"
+          "\n"
+          "Options are\n"
+          "  -v               -- verbose\n"
+          "  -f <scriptfile>  -- take commands from a file\n"
+          "  -e <script>      -- take commands from the command line\n"
+          "  -s               -- save after execution\n"
+          "  -u               -- produces utf8 instead of escaping non ascii chars\n"
+          "  -n               -- do not save anything\n"
+          "\n"
+          );
+  command_help();
+  exit(10);
+}
+
+
+
+// --------------------------------------------------
+// MAIN
+// --------------------------------------------------
+
+void 
+execute()
+{
+  if (!g().cmdbs)
+    g().cmdbs = ByteStream::create("r");
+  const GP<ParsingByteStream> gcmd(ParsingByteStream::create(g().cmdbs));
+  ParsingByteStream &cmd=*gcmd;
+  GUTF8String token;
+  vprint("type \"help\" to see available commands.");
+  vprint("ok.");
+  while (!! (token = cmd.get_token(true)))
+    {
+      CommandFunc func = command_map()[token];
+      G_TRY
+        {
+          if (!func) 
+            verror("unrecognized command");
+          // Cautious execution
+          (*func)(cmd);
+          // Skip extra arguments
+          int c = cmd.get_spaces();
+          if (c!=';' && c!='\n' && c!='\r' && c!=EOF)
+            {
+              while (c!=';' && c!='\n' && c!='\r' && c!=EOF)
+                c = cmd.get();
+              verror("too many arguments");
+            }
+          cmd.unget(c);
+        }
+      G_CATCH(ex)
+        {
+          vprint("Error (%s): %s",
+                 (const char*)ToNative(token), ex.get_cause());
+          if (! verbose)
+            G_RETHROW;
+        }
+      G_ENDCATCH;
+      vprint("ok.");
+    }
+}
+
+
+int 
+main(int argc, char **argv)
+{
+  DJVU_LOCALE;
+  G_TRY
+     {
+      { // extra nesting for windows
+        for (int i=1; i<argc; i++)
+          if (!strcmp(argv[i],"-v"))
+            verbose = true;
+          else if (!strcmp(argv[i],"-s"))
+            save = true; 
+          else if (!strcmp(argv[i],"-n"))
+            nosave = true;
+          else if (!strcmp(argv[i],"-u"))
+            utf8 = true;
+          else if (!strcmp(argv[i],"-f") && i+1<argc && !g().cmdbs) 
+            g().cmdbs = ByteStream::create(GURL::Filename::UTF8(GNativeString(argv[++i])), "r");
+          else if (!strcmp(argv[i],"-e") && !g().cmdbs && i+1<argc && ++i) 
+            g().cmdbs = ByteStream::create_static(argv[i],strlen(argv[i]));
+          else if (argv[i][0] != '-' && !g().djvufile)
+            g().djvufile = GNativeString(argv[i]);
+          else
+            usage();
+      }
+      if (!g().djvufile)
+        usage();
+      // BOM
+#ifdef _WIN32
+      if (utf8)
+        fwrite(utf8bom, sizeof(utf8bom), 1, stdout);
+#endif
+      // Open file
+      g().doc = DjVuDocEditor::create_wait(GURL::Filename::UTF8(g().djvufile));
+      select_all();
+      // Execute
+      execute();
+      if (modified)
+	{
+	  if (save)
+	    command_save();
+	  else
+	    fprintf(stderr,"djvused: (warning) file was modified but not saved\n");
+	}
+     }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      return 10;
+    }
+  G_ENDCATCH;
+  return 0;
+}
diff --git a/tools/djvuserve.1 b/tools/djvuserve.1
new file mode 100644
index 0000000..2a52698
--- /dev/null
+++ b/tools/djvuserve.1
@@ -0,0 +1,239 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUSERVE 1 "01/22/2002" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.SH NAME
+djvuserve \- Generate indirect DjVu documents on the fly.
+
+.SH DESCRIPTION
+Program 
+.B djvuserve 
+is a 
+.SM CGI
+program that can be executed by a 
+.SM HTTP 
+server for serving DjVu documents.
+This program is able to convert a bundled multi-page document
+into an indirect document on the fly.  
+
+.SH USING DJVUSERVE
+Program
+.B djvuserve
+must first be installed as a 
+.SM CGI
+program for your web server.
+There are several ways to achieve this.   The Apache web server, 
+for instance, often defines a specific directory for
+.SM CGI 
+programs using the 
+.B ScriptAlias
+directive.
+Assume that the file
+.B httpd.conf
+contains the following line:
+.IP "" 3
+.BI "ScriptAlias /cgi\(enbin/ " """/var/www/cgi\(enbin"""
+.PP
+It is then sufficient to create a small executable shell script 
+.IB /var/www/cgi\(enbin/ djvuserve
+containing the following lines:
+.IP "" 3
+.B #!/bin/sh
+.br
+.BI "exec " "/full/path/to/" "djvuserve"
+.PP
+Suppose that a large bundled multi-page DjVu document
+is available at the following
+.SM URL.
+.IP "" 3
+.IB http "" ://server/dir/doc.djvu
+.PP
+The
+.SM CGI 
+program
+.B djvuserve
+lets you access this same document 
+as an indirect multi-page DjVu document
+using the following 
+.SM URL.
+.IP "" 3
+.IB http "" ://server /cgi\(enbin/djvuserve/ dir/doc.djvu /index.djvu
+.PP
+Serving indirect multi-page DjVu documents provides
+for efficiently browsing large document without
+transferring unnecessary pages over the network.
+See 
+.BR djvu(1)
+for more information.
+.PP
+Furthermore 
+.B djvuserve 
+searches certain keywords among the
+.SM CGI 
+arguments of the 
+.SM URL.
+The keyword
+.B bundled
+forces serving a bundled document using
+.IP "" 3
+.IB http "" ://server /cgi\(enbin/djvuserve/ dir/doc.djvu ?bundled
+.PP
+The keyword
+.B download
+inserts a content disposition 
+.SM HTTP
+header that suggests to display a save dialog
+instead of displaying the document.
+.IP "" 3
+.IB http "" ://server /cgi\(enbin/djvuserve/ dir/doc.djvu ?download
+.PP
+
+.SH USING DJVUSERVE AS A HANDLER
+
+The Apache web server provides a way to automatically execute
+.B djvuserve
+for all DjVu documents.
+This can be achieved using the following
+directives in either the Apache configuration file
+or the 
+.BR .htaccess
+files.
+.IP "" 3
+.B Action djvu-server /cgi\(enbin/djvuserve/
+.br
+.B AddHandler djvu-server .djvu
+.PP
+Apache then executes program
+.B djvuserve
+for serving all DjVu files. 
+Providing the 
+.SM URL
+of DjVu file serves this DjVu file as usual,
+except that bundled multipage documents are converted
+to indirect documents on the fly.
+This convenience comes at the expense
+of the computational cost of executing
+.B djvuserve
+whenever a DjVu file is requested.
+
+.SH TECHNICAL DETAILS
+
+Program
+.B djvuserve
+provides a mean to directly access any component
+of a bundled multi-page DjVu document can be accessed using an extended 
+.SM URL.
+Suppose that the component file representing page 1
+is named
+.BR p0001.djvu .
+The following 
+.SM URL
+provides a direct access to this page:
+.IP "" 3
+.IB http "" ://server /cgi\(enbin/djvuserve/ dir/doc.djvu /p0001.djvu
+.PP
+It is preferred however to access individual pages using the 
+.B CGI
+style arguments described in 
+.BR nsdejavu (1),
+as in the following 
+.SM URL.
+.IP "" 3
+.IB http "" ://server /cgi\(enbin/djvuserve/ dir/doc.djvu ?djvuopts&page=12
+.PP
+The special component file name
+.B index.djvu
+is recognized as a request for the index of the corresponding
+indirect multi-page document.  In fact, when you access a bundled
+document using 
+.BR djvuserve ,
+the browser gets redirected to the following 
+.SM URL:
+.IP "" 3
+.IB http "" ://server /cgi\(enbin/djvuserve/ dir/doc.djvu /index.djvu
+.PP
+and then behaves as if the bundled file was a directory containing 
+the various component files of an equivalent indirect document.
+
+.SH ACCESS CONTROL
+
+Program
+.BR djvuserve ,
+like many
+.SM CGI
+programs, 
+bypasses a number of access protections established in a web server.
+Assume for instance that your web site contains DjVu files protected by a
+password.  
+Program
+.B djvuserve
+knows nothing about this protection and will happily serve
+any DjVu file associated with a valid
+.SM URL.
+
+Access control with 
+.B djvuserve 
+can be implemented by first remembering that the web server 
+always executes program 
+.B djvuserve
+via shell script
+.IB /var/www/cgi\(enbin/ djvuserve.
+
+This script can decide to execute the real program
+.B djvuserve
+on the basis of the target filename available in 
+the environment variable
+.SM PATH_TRANSLATED.  
+
+There can be several such scripts providing access to various 
+collections of DjVu files.  Each of these scripts can be 
+password protected using the usual methods supported by
+your web server.
+
+.SH KNOWN BUGS
+
+Hyperlinks specified using a relative 
+.SM URL 
+may not work with 
+.BR djvuserve.  
+These 
+.SM URLs 
+are relative to the 
+.SM URL 
+of the DjVu document. Yet 
+.BR djvuserve
+changes the apparent document 
+.SM URL
+.IB http://server/dir/doc.djvu
+into the more complicated 
+.SM URL
+.IB http://server /cgi\(enbin/djvuserve/ dir/doc.djvu /index.djvu.
+The extra components change the interpretation of relative 
+.SM URLs.
+
+.SH CREDITS
+This program was written by Leon Bottou <leonb@users.sourceforge.com>.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvmcvt (1),
+.BR nsdejavu (1)
+
diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp
new file mode 100644
index 0000000..1c78cb8
--- /dev/null
+++ b/tools/djvuserve.cpp
@@ -0,0 +1,433 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuDocument.h"
+#include "DjVmDir.h"
+#include "ByteStream.h"
+#include "IFFByteStream.h"
+#include "DjVuText.h"
+#include "DjVuImage.h"
+#include "GString.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuMessage.h"
+
+#include "common.h"
+
+#include <sys/stat.h>
+#include <time.h>
+
+
+static bool cgi = false;
+static bool head = false;
+
+
+struct DJVUSERVEGlobal 
+{
+  // Globals that need static initialization
+  // are grouped here to work around broken compilers.
+  GUTF8String pathinfo;
+  GUTF8String pathtranslated;
+  GUTF8String requestmethod;
+  GUTF8String querystring;
+};
+
+static DJVUSERVEGlobal& g(void)
+{
+  static DJVUSERVEGlobal g;
+  return g;
+}
+
+
+static void
+usage(void)
+{
+   DjVuPrintErrorUTF8(
+#ifdef DJVULIBRE_VERSION
+          "DJVUSERVE --- DjVuLibre-" DJVULIBRE_VERSION "\n"
+#endif
+          "Extracts hidden text from Djvu files\n"
+          "\n"
+          "Usage: djvuserve [<djvufile>[/<djvmid>]\n"
+          "Outputs the specified <djvufile> with valid Content-Type,\n"
+          "Content-Length, and Expire HTTP headers.  Bundled multipage DjVu\n"
+          "documents are accessed as indirect document using the <djvmid>\n"
+          "syntax. Specifying a <djvmid> of <index> generates an indirect page\n"
+          "directory pointing to the other component files.\n"
+          "This program is designed to be used as a CGI executable.\n"
+          "It uses environment variable PATH_TRANSLATED when executed\n"
+          "without arguments.\n\n" );
+   exit(10);
+}
+
+static const char * 
+day_name(int d)
+{
+   static const char *n[] = {
+     "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" 
+   };
+   if (d>=0 && d<7)
+     return n[d];
+   return "???";
+}
+
+static const char* 
+month_name(int d)
+{
+   static const char *n[] = {
+     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" 
+   };
+   if (d>=0 && d<12)
+     return n[d];
+   return "???";
+}
+
+void
+fprintdate(FILE *f, const char *fmt, const time_t *tim)
+{
+  char ctim[128];
+  struct tm *ttim = gmtime(tim);
+  /* strftime(ctim, sizeof(ctim)-1, "%a, %d %b %Y %H:%M:%S GMT", ttim); */
+  sprintf(ctim,"%3s, %02d %3s %04d %02d:%02d:%02d GMT",
+	  day_name(ttim->tm_wday), ttim->tm_mday,
+	  month_name(ttim->tm_mon), 1900+ttim->tm_year,
+	  ttim->tm_hour, ttim->tm_min, ttim->tm_sec);
+  fprintf(stdout, fmt, ctim);
+}
+
+void
+headers(const struct stat *statbuf, const char *fname = 0)
+{
+  fprintf(stdout,"Content-Type: image/x.djvu\n");
+  if (fname)
+    fprintf(stdout,"Content-Disposition: attachment; filename=\"%s\"\n", fname);
+  fprintf(stdout,"Content-Length: %ld\n", (long)statbuf->st_size);
+  time_t tim = time(0) + 360 * 24 * 3600;
+  fprintdate(stdout, "Last-Modified: %s\n", &statbuf->st_mtime);
+  fprintdate(stdout, "Expires: %s\n", &tim);
+}
+
+bool
+is_djvu_file_bundled(GURL &pathurl)
+{
+  GP<ByteStream> in = ByteStream::create(pathurl,"rb");
+  GP<IFFByteStream> iff = IFFByteStream::create(in);
+  GUTF8String chkid;
+  iff->get_chunk(chkid);
+  // Make sure that this is a DjVu file.
+  if (chkid != "FORM:DJVU" &&
+      chkid != "FORM:DJVM" &&
+      chkid != "FORM:PM44" &&
+      chkid != "FORM:BM44"   )
+    G_THROW("Corrupted DjVu file");
+  // Test if it is bundled
+  if (chkid == "FORM:DJVM")
+    {
+      while (iff->get_chunk(chkid) && chkid!="DIRM")
+        iff->close_chunk();
+      if (chkid == "DIRM")
+        {
+          GP<ByteStream> dirm = iff->get_bytestream();
+          if (dirm->read8() & 0x80)
+            return true;
+        }
+    }
+  return false;
+}
+
+void 
+djvuserver_file(GURL pathurl, bool bundled, bool download)
+{
+  GNativeString fname = pathurl.NativeFilename();
+  struct stat statbuf;
+  if (stat((const char *)fname, &statbuf) < 0)
+    G_THROW(strerror(errno));
+  
+  // Is this a bundled file?
+  if (is_djvu_file_bundled(pathurl) && !bundled)
+    {
+      // It is bundled
+      GUTF8String id = pathurl.name();
+      fprintf(stdout,"Location: %s/index.djvu", (const char*)id);
+      if (g().querystring.length())
+        fprintf(stdout,"?%s", (const char*)g().querystring);
+      fprintf(stdout,"\n\n");
+      return;
+    }
+  // Push the file
+  if (download)
+    headers(&statbuf, pathurl.fname());
+  else
+    headers(&statbuf);
+  if (head) 
+    return;
+  fprintf(stdout,"\n");
+  fflush(stdout);
+  GP<ByteStream> in = ByteStream::create(pathurl,"rb");
+  GP<ByteStream> out = ByteStream::get_stdout("ab");
+  out->copy(*in);
+}
+
+void 
+djvuserver_directory(GURL pathurl)
+{
+  GNativeString fname = pathurl.NativeFilename();
+  struct stat statbuf;
+  if (stat((const char *)fname, &statbuf) < 0)
+    G_THROW(strerror(errno));
+  // Find the DIRM chunk directly (save time)
+  GP<ByteStream> temp;
+  GP<ByteStream> bsin = ByteStream::create(pathurl,"rb");
+  GP<DjVmDir> dir = DjVmDir::create();
+  {
+    GP<IFFByteStream> iffin = IFFByteStream::create(bsin);
+    GUTF8String chkid;
+    iffin->get_chunk(chkid);
+    if (chkid != "FORM:DJVM")
+      G_THROW( "This is not a multipage DjVu document" );
+    while (iffin->get_chunk(chkid) && chkid!="DIRM")
+      iffin->close_chunk();
+    if (chkid != "DIRM")
+      G_THROW( "This is not a new style bundled DjVu document" );
+    temp = iffin->get_bytestream();
+    dir->decode(temp);
+    if (! dir->is_bundled())
+      G_THROW( "This is not a bundled DjVu document" );
+  }
+  // Assemble index of indirect multipage file
+  GP<ByteStream> bsdir = ByteStream::create();
+  {
+    GP<IFFByteStream> iff = IFFByteStream::create(bsdir);
+    iff->put_chunk("FORM:DJVM",1);
+    iff->put_chunk("DIRM");
+    temp = iff->get_bytestream();
+    dir->encode(temp, false, false);
+    iff->close_chunk();
+    iff->close_chunk();
+  }
+  // HTTP output
+  statbuf.st_size = bsdir->tell();
+  headers(&statbuf);
+  if (head) 
+    return;
+  bsdir->seek(0);
+  fprintf(stdout,"\n");
+  fflush(stdout);
+  GP<ByteStream> out = ByteStream::get_stdout("ab");
+  out->copy(*bsdir);
+}
+
+void 
+djvuserver_component(GURL pathurl, GUTF8String id)
+{
+  GNativeString fname = pathurl.NativeFilename();
+  struct stat statbuf;
+  if (stat((const char *)fname, &statbuf) < 0)
+    G_THROW(strerror(errno));
+  // Find the DIRM chunk directly (save time)
+  GP<ByteStream> temp;
+  GP<ByteStream> bsin = ByteStream::create(pathurl,"rb");
+  GP<DjVmDir> dir = DjVmDir::create();
+  {
+    GP<IFFByteStream> iffin = IFFByteStream::create(bsin);
+    GUTF8String chkid;
+    iffin->get_chunk(chkid);
+    if (chkid != "FORM:DJVM")
+      G_THROW( "This is not a multipage DjVu document" );
+    while (iffin->get_chunk(chkid) && chkid!="DIRM")
+      iffin->close_chunk();
+    if (chkid != "DIRM")
+      G_THROW( "This is not a new style bundled DjVu document" );
+    temp = iffin->get_bytestream();
+    dir->decode(temp);
+    if (! dir->is_bundled())
+      G_THROW( "This is not a bundled DjVu document" );
+  }
+  // Find the file record
+  GP<DjVmDir::File> frec = dir->id_to_file(id);
+  if (!frec)
+    G_THROW( "Cannot locate requested component file" );
+  if (!frec->size || !frec->offset)
+    G_THROW( "Corrupted DjVu directory" );
+
+  // HTTP output
+  statbuf.st_size = frec->size + 4;
+  headers(&statbuf);
+  if (head) 
+    return;
+  fprintf(stdout,"\n");
+  fflush(stdout);
+  GP<ByteStream> out = ByteStream::get_stdout("ab");
+  out->writall("AT&T", 4);
+  bsin->seek(frec->offset);
+  out->copy(*bsin, frec->size);
+}
+
+
+bool
+search_cgi_arg(const char *name)
+{
+  const char *s = g().querystring;
+  int l = strlen(name);
+  if (*s == '?')
+    s += 1;
+  while (*s)
+    {
+      if (! strncmp(s, name, l))
+        if (s[l]=='&' || s[l]=='=' || s[l]==0)
+          return true;
+      while (*s && *s != '&')
+        s += 1;
+      if (*s == '&')
+        s += 1;
+    }
+  return false;
+}
+
+
+int
+main(int argc, char ** argv)
+{
+  DJVU_LOCALE;
+  G_TRY 
+    {
+      // Obtain path
+      bool bundled = false;
+      bool download = false;
+      if (argc == 1)
+        {
+          cgi = true;
+          g().pathinfo = GNativeString(getenv("PATH_INFO"));
+          g().pathtranslated = GNativeString(getenv("PATH_TRANSLATED"));
+          if (! g().pathinfo)
+            usage();
+          if (! g().pathtranslated)
+            G_THROW("No path information");
+          g().requestmethod = GNativeString(getenv("REQUEST_METHOD"));
+          g().querystring = GUTF8String(getenv("QUERY_STRING"));
+          if (search_cgi_arg("bundled"))
+            bundled = true;
+          if (search_cgi_arg("download") || search_cgi_arg("bundle"))
+            bundled = download = true;
+        }
+      else if (argc == 2)
+        {
+          cgi = false;
+          g().pathtranslated = GNativeString(argv[1]);
+          g().requestmethod = "GET";
+        }
+      if (! g().pathtranslated)
+        usage();
+      head = false;
+      if (g().requestmethod == "HEAD")
+        head = true;
+      else if (g().requestmethod != "GET")
+        G_THROW("Only serve HEAD and GET requests");
+      // Do it.
+      GURL pathurl = GURL::Filename::UTF8(g().pathtranslated);
+      if (pathurl.is_file())
+        {
+          djvuserver_file(pathurl, bundled, download);
+        }
+      else
+        {
+          GUTF8String id = pathurl.name();
+          pathurl = pathurl.base();
+          if (! pathurl.is_file())
+            G_THROW("File not found");
+          if (id != "index" && id != "index.djvu")
+            djvuserver_component(pathurl, id);
+          else if (bundled)
+            djvuserver_file(pathurl, bundled, download);
+          else
+            djvuserver_directory(pathurl);
+        }
+    }
+  G_CATCH(ex)
+    {
+      if (cgi)
+        {
+          GUTF8String cause = DjVuMessageLite::LookUpUTF8(ex.get_cause());
+          fprintf(stdout,"Status: 400 %s\n", (const char*)cause);
+          fprintf(stdout,"Content-Type: text/html\n\n");
+          fprintf(stdout,
+                  "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n"
+                  "<HTML><HEAD><TITLE>400 Error</TITLE></HEAD><BODY>\n"
+                  "<H1>%s</H1>The requested URL '%s' cannot be processed.<P>\n"
+#ifdef DJVULIBRE_VERSION
+                  "<HR><ADDRESS>djvuserve/DjVuLibre-" DJVULIBRE_VERSION "</ADDRESS>\n"
+#endif
+                  "</BODY></HTML>\n",
+                  (const char *) cause,
+                  (const char *) g().pathinfo );
+        }
+      else
+        {
+          ex.perror();
+        }
+      exit(10);
+    }
+  G_ENDCATCH;
+  // return code zero
+  return 0;
+}
diff --git a/tools/djvutxt.1 b/tools/djvutxt.1
new file mode 100644
index 0000000..a71c03b
--- /dev/null
+++ b/tools/djvutxt.1
@@ -0,0 +1,120 @@
+.\" Copyright (c) 2001-2003 Leon Bottou, Yann Le Cun, Patrick Haffner,
+.\" Copyright (c) 2001 AT&T Corp., and Lizardtech, Inc.
+.\"
+.\" This is free documentation; 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.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.TH DJVUTXT 1 "10/11/2001" "DjVuLibre-3.5" "DjVuLibre-3.5"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvutxt \- Extract the hidden text from DjVu documents.
+
+.SH SYNOPSIS
+.BI "djvutxt [" options "] " "inputdjvufile" " [" outputtxtfile "]"
+
+.SH DESCRIPTION
+Program 
+.B djvutxt
+decodes the hidden text layer of a DjVu document 
+.I inputdjvufile
+and prints it into file
+.I outputtxtfile
+or on the standard output.
+The hidden text layer is usually generated with 
+the help of an optical character recognition software.
+
+Without options
+.BR -detail
+and
+.BR -escape ,
+this program simply outputs the UTF-8 text.
+Option
+.BR -detail
+cause the output of S-expressions
+describing the text and its location.
+Option
+.BR -escape
+uses C-style escape sequences to represent
+nonprintable non-ASCII characters.
+
+
+
+.SH OPTIONS
+.TP
+.BI "--page=" "pagespec"
+Specify which pages should be processed.
+When this option is not specified,
+the text of all pages of the documents is
+concatenated into the output file.
+The page specification
+.I pagespec 
+contains one or more comma-separated page ranges.
+A page range is either a page number, 
+or two page numbers separated by a dash.
+For instance, specification
+.BR "1-10" 
+outputs pages 1 to 10, and specification
+.BR "1,3,99999-4"
+outputs pages 1 and 3, followed by all the document
+pages in reverse order up to page 4.
+.TP
+.BI "--detail=" "keyword"
+This options causes
+.B djvutxt
+to output S-expressions 
+specifying the position of the text in the page.
+See the manual page
+.BR djvused (1)
+for a description of the output format.
+Argument 
+.I keyword
+specifies the maximum level of detail
+for which text location is reported.
+The recognized values are:
+.BR page ", " column ", " region ", " para ", "
+.BR line ", " word ", and " char "."
+All other values are interpreted as 
+.BR char .
+.TP
+.BI "--escape"
+Output escape sequences of the form
+.BI \ "ooo"
+for all non ASCII or non printable UTF-8 
+characters and for the backslash character.
+
+
+
+
+.SH REMARKS
+Use program
+.BR djvused (1)
+for more control over the text layer.
+
+.SH CREDITS
+This program was initially written by 
+Andrei Erofeev <andrew_erofeev@yahoo.com> and
+was then improved Bill Riemers <docbill@sourceforge.net> 
+and many others. It was then rewritten to use the 
+ddjvuapi by Leon Bottou <leonb@sourceforge.net>.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvused (1)
+
diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp
new file mode 100644
index 0000000..123062a
--- /dev/null
+++ b/tools/djvutxt.cpp
@@ -0,0 +1,371 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+
+/* Program djvutxt has been rewritten to use the ddjvuapi only.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <locale.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+# include <mbctype.h>
+#endif
+
+#include "libdjvu/miniexp.h"
+#include "libdjvu/ddjvuapi.h"
+
+
+/* Some day we'll redo i18n right. */
+#ifndef i18n
+# define i18n(x) (x)
+# define I18N(x) (x)
+#endif
+
+
+/* Options */
+const char *inputfilename = 0;
+const char *outputfilename = 0;
+const char *detail = 0;
+const char *pagespec = 0;
+int escape = 0;
+
+ddjvu_context_t *ctx;
+ddjvu_document_t *doc;
+
+
+void
+handle(int wait)
+{
+  const ddjvu_message_t *msg;
+  if (!ctx)
+    return;
+  if (wait)
+    msg = ddjvu_message_wait(ctx);
+  while ((msg = ddjvu_message_peek(ctx)))
+    {
+      switch(msg->m_any.tag)
+        {
+        case DDJVU_ERROR:
+          fprintf(stderr,"djvutxt: %s\n", msg->m_error.message);
+          if (msg->m_error.filename)
+            fprintf(stderr,"djvutxt: '%s:%d'\n", 
+                    msg->m_error.filename, msg->m_error.lineno);
+          exit(10);
+        default:
+          break;
+        }
+      ddjvu_message_pop(ctx);
+    }
+}
+
+
+void 
+die(const char *fmt, ...)
+{
+  /* Handling messages might give a better error message */
+  handle(FALSE);
+  /* Print */
+  va_list args;
+  fprintf(stderr,"djvutxt: ");
+  va_start(args, fmt);
+  vfprintf(stderr, fmt, args);
+  va_end(args);
+  fprintf(stderr,"\n");
+  /* Terminates */
+  exit(10);
+}
+
+
+void
+dopage(int pageno)
+{
+  miniexp_t r = miniexp_nil;
+  const char *lvl = (detail) ? detail : "page";
+  while ((r = ddjvu_document_get_pagetext(doc,pageno-1,lvl))==miniexp_dummy)
+    handle(TRUE);
+  if (detail)
+    {
+      miniexp_io_t io;
+      miniexp_io_init(&io);
+#ifdef miniexp_io_print7bits
+      int flags = (escape) ? miniexp_io_print7bits : 0;
+      io.p_flags = &flags;
+#else
+      io.p_print7bits = &escape;
+#endif
+      miniexp_pprint_r(&io, r, 72);
+    }
+  else if ((r = miniexp_nth(5, r)) && miniexp_stringp(r))
+    {
+      const char *s = miniexp_to_str(r); 
+      if (! escape)
+        fputs(s, stdout);
+      else
+        {
+          unsigned char c;
+          while ((c = *(unsigned char*)s++))
+            {
+              bool esc = false;
+              if (c == '\\' || c >= 0x7f)
+                esc = true; /* non-ascii */
+              if (c < 0x20 && !strchr("\013\035\037\012", c))
+                esc = true; /* non-printable other than separators */
+              if (esc)
+                printf("\\%03o", c);
+              else
+                putc(c, stdout);
+            }
+        }
+      fputs("\n\f", stdout);
+    }
+}
+
+
+void
+parse_pagespec(const char *s, int max_page, void (*dopage)(int))
+{
+  static const char *err = I18N("invalid page specification: %s");
+  int spec = 0;
+  int both = 1;
+  int start_page = 1;
+  int end_page = max_page;
+  int pageno;
+  char *p = (char*)s;
+  while (*p)
+    {
+      spec = 0;
+      while (*p==' ')
+        p += 1;
+      if (! *p)
+        break;
+      if (*p>='0' && *p<='9') {
+        end_page = strtol(p, &p, 10);
+        spec = 1;
+      } else if (*p=='$') {
+        spec = 1;
+        end_page = max_page;
+        p += 1;
+      } else if (both) {
+        end_page = 1;
+      } else {
+        end_page = max_page;
+      }
+      while (*p==' ')
+        p += 1;
+      if (both) {
+        start_page = end_page;
+        if (*p == '-') {
+          p += 1;
+          both = 0;
+          continue;
+        }
+      }
+      both = 1;
+      while (*p==' ')
+        p += 1;
+      if (*p && *p != ',')
+        die(i18n(err), s);
+      if (*p == ',')
+        p += 1;
+      if (! spec)
+        die(i18n(err), s);
+      if (end_page < 0)
+        end_page = 0;
+      if (start_page < 0)
+        start_page = 0;
+      if (end_page > max_page)
+        end_page = max_page;
+      if (start_page > max_page)
+        start_page = max_page;
+      if (start_page <= end_page)
+        for(pageno=start_page; pageno<=end_page; pageno++)
+          (*dopage)(pageno);
+      else
+        for(pageno=start_page; pageno>=end_page; pageno--)
+          (*dopage)(pageno);
+    }
+  if (! spec)
+    die(i18n(err), s);
+}
+
+
+void
+usage()
+{
+#ifdef DJVULIBRE_VERSION
+  fprintf(stderr, "DDJVU --- DjVuLibre-" DJVULIBRE_VERSION "\n");
+#endif
+  fprintf(stderr, "%s",
+    i18n("DjVu text extraction utility\n\n"
+         "Usage: djvutxt [options] <djvufile> [<outputfile>]\n\n"
+         "Options:\n"
+         " -page=PAGESPEC    Selects page(s) to be decoded.\n"
+         " -detail=KEYWORD   Outputs S-expression with the text location.\n"
+         "                   The optional keyword <page>, <region>, <para>,\n"
+         "                   <line>,<word>, or <char> specify the finest\n"
+         "                   level of detail. Default is <char>.\n"
+         " -escape           Output octal escape sequences for all\n"
+         "                   non ASCII UTF-8 characters.\n\n") );
+  /* Terminate */
+  exit(10);
+}
+
+
+int
+main(int argc, char **argv)
+{
+  int i;
+#if defined(_WIN32) && !defined(__CYGWIN32__)
+  _setmbcp(_MB_CP_OEM);
+#endif
+  /* Parse options */
+  for (i=1; i<argc; i++)
+    {
+      char *s = argv[i];
+      if (s[0] == '-' && s[1] != 0)
+        {
+          char buf[32];
+          const char *opt = s;
+          const char *arg = strchr(opt, '=');
+          if (*opt == '-')
+            opt += 1;
+          if (*opt == '-')
+            opt += 1;
+          if (arg)
+            {
+              int l = arg - opt;
+              if (l > (int)sizeof(buf) - 1)
+                l = sizeof(buf) - 1;
+              strncpy(buf, opt, l);
+              buf[l] = 0;
+              opt = buf;
+              arg += 1;
+            }
+          
+          if (!strcmp(opt,"page") || 
+              !strcmp(opt,"pages") )
+            {
+              if (!arg && i<argc)
+                arg = argv[i++];
+              if (!arg)
+                die(i18n("option %s needs an argument."), s);
+              if (pagespec)
+                fprintf(stderr,i18n("warning: duplicate option --page=...\n"));
+              pagespec = arg;
+            }
+          else if (!strcmp(opt, "detail"))
+            {
+              if (!arg)
+                arg = "char";
+              if (detail)
+                fprintf(stderr,i18n("warning: duplicate option --detail.\n"));
+              detail = arg;
+            }
+          else if (!strcmp(opt, "escape") && !arg)
+            escape = 1;
+          else
+            die(i18n("unrecognized option %s."), s);
+        }
+      else if (!inputfilename)
+        inputfilename = s;
+      else if (! outputfilename)
+        outputfilename = s;
+      else
+        usage();
+    }
+  
+  /* Defaults */
+  if (! inputfilename)
+    usage();
+  if (outputfilename)
+    if (! freopen(outputfilename, "w", stdout))
+      die(i18n("cannot open output file %s."), outputfilename);
+  if (! pagespec)
+    pagespec = "1-$";
+  
+  /* Create context and document */
+  if (! (ctx = ddjvu_context_create(argv[0])))
+    die(i18n("Cannot create djvu context."));
+  if (! (doc = ddjvu_document_create_by_filename(ctx, inputfilename, TRUE)))
+    die(i18n("Cannot open djvu document '%s'."), inputfilename);
+  while (! ddjvu_document_decoding_done(doc))
+    handle(TRUE);
+  
+  /* Process all pages */
+  i = ddjvu_document_get_pagenum(doc);
+  parse_pagespec(pagespec, i, dopage);
+  
+  /* Close */
+  if (doc)
+    ddjvu_document_release(doc);
+  if (ctx)
+    ddjvu_context_release(ctx);
+
+  /* Return */
+  minilisp_finish();  
+  return 0;
+}
+
diff --git a/tools/jb2cmp/README b/tools/jb2cmp/README
new file mode 100644
index 0000000..4ea2709
--- /dev/null
+++ b/tools/jb2cmp/README
@@ -0,0 +1,3 @@
+Files in this directory come from the minidjvu project
+<http://www.sourceforge.net/projects/minidjvu>.
+Thanks to Ilya Mezhirov. 
diff --git a/tools/jb2cmp/classify.cpp b/tools/jb2cmp/classify.cpp
new file mode 100644
index 0000000..fb0ae2a
--- /dev/null
+++ b/tools/jb2cmp/classify.cpp
@@ -0,0 +1,299 @@
+/* minidjvu - library for handling bilevel images with DjVuBitonal support
+ *
+ * classify.c - classifying patterns
+ *
+ * Copyright (C) 2005  Ilya Mezhirov
+ *
+ * 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
+ *
+ * 
+ * minidjvu is derived from DjVuLibre (http://djvu.sourceforge.net)
+ * All over DjVuLibre there is a patent alert from LizardTech
+ * which I guess I should reproduce (don't ask me what does this mean):
+ * 
+ *  ------------------------------------------------------------------
+ * | DjVu (r) Reference Library (v. 3.5)
+ * | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ * | The DjVu Reference Library is protected by U.S. Pat. No.
+ * | 6,058,214 and patents pending.
+ * |
+ * | This software is subject to, and may be distributed under, the
+ * | GNU General Public License, either Version 2 of the license,
+ * | or (at your option) any later version. The license should have
+ * | accompanied the software or you may obtain a copy of the license
+ * | from the Free Software Foundation at http://www.fsf.org .
+ * |
+ * | The computer code originally released by LizardTech under this
+ * | license and unmodified by other parties is deemed "the LIZARDTECH
+ * | ORIGINAL CODE."  Subject to any third party intellectual property
+ * | claims, LizardTech grants recipient a worldwide, royalty-free, 
+ * | non-exclusive license to make, use, sell, or otherwise dispose of 
+ * | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+ * | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+ * | General Public License.   This grant only confers the right to 
+ * | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+ * | the extent such infringement is reasonably necessary to enable 
+ * | recipient to make, have made, practice, sell, or otherwise dispose 
+ * | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+ * | any greater extent that may be necessary to utilize further 
+ * | modifications or combinations.
+ * |
+ * | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ * | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ * | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * +------------------------------------------------------------------
+ */
+
+
+#include "mdjvucfg.h"
+#include "minidjvu.h"
+#include <stdlib.h>
+
+
+/* Stuff for not using malloc in C++
+ * (made by Leon Bottou; has no use in minidjvu,
+ * but left here for potential DjVuLibre compatibility)
+ */
+#ifdef __cplusplus
+# define MALLOC(Type)    new Type
+# define FREE(p)         delete p
+# define MALLOCV(Type,n) new Type[n]
+# define FREEV(p)        delete [] p
+#else
+# define MALLOC(Type)    ((Type*)malloc(sizeof(Type)))
+# define FREE(p)         do{if(p)free(p);}while(0)
+# define MALLOCV(Type,n) ((Type*)malloc(sizeof(Type)*(n)))
+# define FREEV(p)        do{if(p)free(p);}while(0)
+#endif
+
+
+/* Classes are single-linked lists with an additional pointer to the last node.
+ * This is an class item.
+ */
+typedef struct ClassNode
+{
+    mdjvu_pattern_t ptr;
+    struct ClassNode *next;        /* NULL if this node is the last one */
+    struct ClassNode *global_next; /* next among all nodes to classify  */
+    int32 tag;                     /* filled before the final dumping   */
+} ClassNode;
+
+/* Classes themselves are composed in double-linked list. */
+typedef struct Class
+{
+    ClassNode *first, *last;
+    struct Class *prev_class;
+    struct Class *next_class;
+} Class;
+
+
+typedef struct Classification
+{
+    Class *first_class;
+    ClassNode *first_node, *last_node;
+} Classification;
+
+/* Creates an empty class and links it to the list of classes. */
+static Class *new_class(Classification *cl)
+{
+    Class *c = MALLOC(Class);
+    c->first = c->last = NULL;
+    c->prev_class = NULL;
+    c->next_class = cl->first_class;
+    if (cl->first_class) cl->first_class->prev_class = c;
+    cl->first_class = c;
+    return c;
+}
+
+/* Unlinks a class and deletes it. Its nodes are not deleted. */
+static void delete_class(Classification *cl, Class *c)
+{
+    Class *prev = c->prev_class, *next = c->next_class;
+
+    if (prev)
+        prev->next_class = next;
+    else
+        cl->first_class = next;
+
+    if (next)
+        next->prev_class = prev;
+
+    FREE(c);
+}
+
+/* Creates a new node and adds it to the given class. */
+static ClassNode *new_node(Classification *cl, Class *c, mdjvu_pattern_t ptr)
+{
+    ClassNode *n = MALLOC(ClassNode);
+    n->ptr = ptr;
+    n->next = c->first;
+    c->first = n;
+    if (!c->last) c->last = n;
+    n->global_next = NULL;
+
+    if (cl->last_node)
+        cl->last_node->global_next = n;
+    else
+        cl->first_node = n;
+
+    cl->last_node = n;
+    return n;
+}
+
+/* Merge two classes and delete one of them. */
+static Class *merge(Classification *cl, Class *c1, Class *c2)
+{
+    if (!c1->first)
+    {
+        delete_class(cl, c1);
+        return c2;
+    }
+    if (c2->first)
+    {
+        c1->last->next = c2->first;
+        c1->last = c2->last;
+    }
+    delete_class(cl, c2);
+    return c1;
+}
+
+/* Puts a tag on each node corresponding to its class. */
+static unsigned put_tags(Classification *cl)
+{
+    int32 tag = 1;
+    Class *c = cl->first_class;
+    while (c)
+    {
+        ClassNode *n = c->first;
+        while (n)
+        {
+            n->tag = tag;
+            n = n->next;
+        }
+        c = c->next_class;
+        tag++;
+    }
+    return tag - 1;
+}
+
+/* Deletes all classes; nodes are untouched. */
+static void delete_all_classes(Classification *cl)
+{
+    Class *c = cl->first_class;
+    while (c)
+    {
+        Class *t = c;
+        c = c->next_class;
+        FREE(t);
+    }
+}
+
+/* Compares p with nodes from c until a meaningful result. */
+static int compare_to_class(mdjvu_pattern_t p, Class *c, int32 dpi,
+                            mdjvu_matcher_options_t options)
+{
+    int r = 0;
+    ClassNode *n = c->first;
+    while(n)
+    {
+        r = mdjvu_match_patterns(p, n->ptr, dpi, options);
+        if (r) break;
+        n = n->next;
+    }
+    return r;
+}
+
+static void classify(Classification *cl, mdjvu_pattern_t p,
+                     int32 dpi, mdjvu_matcher_options_t options)
+{
+    Class *class_of_this = NULL;
+    Class *c, *next_c = NULL;
+    for (c = cl->first_class; c; c = next_c)
+    {
+        next_c = c->next_class; /* That's because c may be deleted in merging */
+
+        if (class_of_this == c) continue;
+        if (compare_to_class(p, c, dpi, options) != 1) continue;
+
+        if (class_of_this)
+            class_of_this = merge(cl, class_of_this, c);
+        else
+            class_of_this = c;
+    }
+    if (!class_of_this) class_of_this = new_class(cl);
+    new_node(cl, class_of_this, p);
+}
+
+MDJVU_IMPLEMENT int32 mdjvu_classify_patterns
+    (mdjvu_pattern_t *b, int32 *r, int32 n, int32 dpi,
+     mdjvu_matcher_options_t options)
+{
+    int32 i, max_tag;
+    ClassNode *node;
+    Classification cl;
+
+    cl.first_class = NULL;
+    cl.first_node = cl.last_node = NULL;
+
+    for (i = 0; i < n; i++) if (b[i]) classify(&cl, b[i], dpi, options);
+
+    max_tag = put_tags(&cl);
+    delete_all_classes(&cl);
+
+    i = 0;
+    node = cl.first_node;
+    while (node)
+    {
+        ClassNode *t;
+        while (!b[i]) r[i++] = 0;
+        r[i++] = node->tag;
+        t = node;
+        node = node->global_next;
+        FREE(t);
+    }
+    if (i < n) while (i < n) r[i++] = 0;
+    return max_tag;
+}
+
+#ifndef NO_MINIDJVU
+
+MDJVU_IMPLEMENT int32 mdjvu_classify_bitmaps_in_image
+    (mdjvu_image_t image, int32 *result, mdjvu_matcher_options_t options)
+{
+    int32 i, n = mdjvu_image_get_bitmap_count(image);
+    int32 dpi = mdjvu_image_get_resolution(image);
+    mdjvu_pattern_t *patterns = MALLOCV(mdjvu_pattern_t, n);
+    int32 max_tag;
+
+    for (i = 0; i < n; i++)
+    {
+        mdjvu_bitmap_t bitmap = mdjvu_image_get_bitmap(image, i);
+        if (mdjvu_image_get_no_substitution_flag(image, bitmap))
+            patterns[i] = NULL;
+        else
+            patterns[i] = mdjvu_pattern_create(bitmap);
+    }
+
+    max_tag = mdjvu_classify_patterns(patterns, result, n, dpi, options);
+
+    for (i = 0; i < n; i++)
+        if (patterns[i]) mdjvu_pattern_destroy(patterns[i]);
+    FREEV(patterns);
+
+    return max_tag;
+}
+
+#endif /* NO_MINIDJVU */
diff --git a/tools/jb2cmp/classify.h b/tools/jb2cmp/classify.h
new file mode 100644
index 0000000..abf6986
--- /dev/null
+++ b/tools/jb2cmp/classify.h
@@ -0,0 +1,83 @@
+/* minidjvu - library for handling bilevel images with DjVuBitonal support
+ *
+ * classify.h - classifying patterns
+ *
+ * Copyright (C) 2005  Ilya Mezhirov
+ *
+ * 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
+ *
+ * 
+ * minidjvu is derived from DjVuLibre (http://djvu.sourceforge.net)
+ * All over DjVuLibre there is a patent alert from LizardTech
+ * which I guess I should reproduce (don't ask me what does this mean):
+ * 
+ *  ------------------------------------------------------------------
+ * | DjVu (r) Reference Library (v. 3.5)
+ * | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ * | The DjVu Reference Library is protected by U.S. Pat. No.
+ * | 6,058,214 and patents pending.
+ * |
+ * | This software is subject to, and may be distributed under, the
+ * | GNU General Public License, either Version 2 of the license,
+ * | or (at your option) any later version. The license should have
+ * | accompanied the software or you may obtain a copy of the license
+ * | from the Free Software Foundation at http://www.fsf.org .
+ * |
+ * | The computer code originally released by LizardTech under this
+ * | license and unmodified by other parties is deemed "the LIZARDTECH
+ * | ORIGINAL CODE."  Subject to any third party intellectual property
+ * | claims, LizardTech grants recipient a worldwide, royalty-free, 
+ * | non-exclusive license to make, use, sell, or otherwise dispose of 
+ * | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+ * | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+ * | General Public License.   This grant only confers the right to 
+ * | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+ * | the extent such infringement is reasonably necessary to enable 
+ * | recipient to make, have made, practice, sell, or otherwise dispose 
+ * | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+ * | any greater extent that may be necessary to utilize further 
+ * | modifications or combinations.
+ * |
+ * | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ * | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ * | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * +------------------------------------------------------------------
+ */
+
+
+#ifndef MDJVU_CLASSIFY_H
+#define MDJVU_CLASSIFY_H
+
+/* Classifies a set of patterns.
+ * result - array of tags ranging from 1 to return value,
+ *    and 0 for those cells which were NULL (yes, NULLs are permitted).
+ * Every tag has at least one pattern to which it's attached.
+ * Equally tagged images are classified equivalent.
+ */
+
+MDJVU_FUNCTION int32 mdjvu_classify_patterns
+    (mdjvu_pattern_t *, int32 *result, int32 n, int32 dpi,
+     mdjvu_matcher_options_t);
+
+#ifndef NO_MINIDJVU
+
+/* Special tag 0 is reserved for bitmaps marked "no-substitution". */
+MDJVU_FUNCTION int32 mdjvu_classify_bitmaps_in_image
+    (mdjvu_image_t, int32 *result, mdjvu_matcher_options_t);
+
+#endif /* NO_MINIDJVU */
+
+#endif /* MDJVU_CLASSIFY_H */
diff --git a/tools/jb2cmp/cuts.cpp b/tools/jb2cmp/cuts.cpp
new file mode 100644
index 0000000..90aa020
--- /dev/null
+++ b/tools/jb2cmp/cuts.cpp
@@ -0,0 +1,240 @@
+/* minidjvu - library for handling bilevel images with DjVuBitonal support
+ *
+ * cuts.c - finding "cuts signature" consisting of consecutive cut positions
+ *
+ * Copyright (C) 2005  Ilya Mezhirov
+ *
+ * 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
+ *
+ * 
+ * minidjvu is derived from DjVuLibre (http://djvu.sourceforge.net)
+ * All over DjVuLibre there is a patent alert from LizardTech
+ * which I guess I should reproduce (don't ask me what does this mean):
+ * 
+ *  ------------------------------------------------------------------
+ * | DjVu (r) Reference Library (v. 3.5)
+ * | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ * | The DjVu Reference Library is protected by U.S. Pat. No.
+ * | 6,058,214 and patents pending.
+ * |
+ * | This software is subject to, and may be distributed under, the
+ * | GNU General Public License, either Version 2 of the license,
+ * | or (at your option) any later version. The license should have
+ * | accompanied the software or you may obtain a copy of the license
+ * | from the Free Software Foundation at http://www.fsf.org .
+ * |
+ * | The computer code originally released by LizardTech under this
+ * | license and unmodified by other parties is deemed "the LIZARDTECH
+ * | ORIGINAL CODE."  Subject to any third party intellectual property
+ * | claims, LizardTech grants recipient a worldwide, royalty-free, 
+ * | non-exclusive license to make, use, sell, or otherwise dispose of 
+ * | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+ * | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+ * | General Public License.   This grant only confers the right to 
+ * | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+ * | the extent such infringement is reasonably necessary to enable 
+ * | recipient to make, have made, practice, sell, or otherwise dispose 
+ * | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+ * | any greater extent that may be necessary to utilize further 
+ * | modifications or combinations.
+ * |
+ * | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ * | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ * | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * +------------------------------------------------------------------
+ */
+
+
+/* We cut an image horizontally in such a way
+ *     that below and above the cut the blackness is roughly the same.
+ * Than cutting each of the two pieces vertically in the same fashion.
+ * Then horizontally, and so on until SIGNATURE_SIZE - 1 cuts.
+ * The position of each cut is normalized into 0..255 and put into signature.
+ */
+
+#include "mdjvucfg.h"
+#include "minidjvu.h"
+#include <assert.h>
+
+
+/* Stuff for not using malloc in C++
+ * (made by Leon Bottou; has no use in minidjvu,
+ * but left here for potential DjVuLibre compatibility)
+ */
+#ifdef __cplusplus
+# define MALLOC(Type)    new Type
+# define FREE(p)         delete p
+# define MALLOCV(Type,n) new Type[n]
+# define FREEV(p)        delete [] p
+#else
+# define MALLOC(Type)    ((Type*)malloc(sizeof(Type)))
+# define FREE(p)         do{if(p)free(p);}while(0)
+# define MALLOCV(Type,n) ((Type*)malloc(sizeof(Type)*(n)))
+# define FREEV(p)        do{if(p)free(p);}while(0)
+#endif
+
+
+typedef unsigned char byte;
+
+static int32 sum_column_gray(byte **pixels, int32 x, int32 y1, int32 y2)
+{
+    int sum = 0, y;
+    for (y = y1; y <= y2; y++) sum += pixels[y][x];
+    return sum;
+}
+
+static int32 sum_row_gray(byte *row, int32 x1, int32 x2)
+{
+    int sum = 0, x, n = x2 - x1;
+    byte *p = row + x1;
+    for (x = 0; x <= n; x++) sum += p[x];
+    return sum;
+}
+
+static int32 sum_column_black_and_white(byte **pixels, int32 x, int32 y1, int32 y2)
+{
+    int sum = 0, y;
+    for (y = y1; y <= y2; y++) if (pixels[y][x]) sum++;
+    return sum;
+}
+
+static int32 sum_row_black_and_white(byte *row, int32 x1, int32 x2)
+{
+    int sum = 0, x, n = x2 - x1;
+    byte *p = row + x1;
+    for (x = 0; x <= n; x++) if (p[x]) sum++;
+    return sum;
+}
+
+static void make_vcut(int32 a, int32 l, int32 w, int32 h, byte **pixels,
+                      byte *sig, int32 k,
+                      int32 s_row(byte *, int32, int32),
+                      int32 s_col(byte **, int32, int32, int32),
+                      int32 size);
+
+static void make_hcut(int32 a, int32 l, int32 w, int32 h,
+                      byte **pixels, byte *sig, int32 k,
+                      int32 s_row(byte *, int32, int32),
+                      int32 s_col(byte **, int32, int32, int32),
+                      int32 size)
+{
+    int32 cut = 0; /* how many rows are in the top part */
+    int32 up_weight = 0;
+
+    if (k >= size) return;
+
+    if (a)
+    {
+        int32 last_row_weight = 0;
+
+        assert(w && h);
+
+        while ((up_weight << 1) < a)
+        {
+            last_row_weight = s_row(pixels[cut], l, l + w - 1);
+            up_weight += last_row_weight;
+            cut++;
+        }
+        cut--;
+        up_weight -= last_row_weight;
+        sig[k] = (byte) ((256 *
+                    (cut * w + w * ((a >> 1) - up_weight) / last_row_weight))
+                 / (w * h));
+        if (a - (up_weight << 1) > last_row_weight)
+        {
+            cut++;
+            up_weight += last_row_weight;
+        }
+    }
+    else
+    {
+        cut = h / 2;
+        sig[k] = 128;
+    }
+
+    make_vcut(up_weight, l, w, cut, pixels, sig, k << 1, s_row, s_col, size);
+    make_vcut(a - up_weight, l, w, h - cut, pixels + cut, sig, (k << 1) | 1, s_row, s_col, size);
+}
+
+static void make_vcut(int32 a, int32 l, int32 w, int32 h,
+                      byte **pixels, byte *sig, int32 k,
+                      int32 s_row(byte *, int32, int32),
+                      int32 s_col(byte **, int32, int32, int32),
+                      int32 size)
+{
+    int32 cut = 0;          /* how many columns are in the left part */
+    int32 left_weight = 0;
+
+    if (k >= size) return;
+
+    if (a)
+    {
+        int32 last_col_weight = 0;
+
+        assert(w && h);
+
+        while ((left_weight << 1) < a)
+        {
+            last_col_weight = s_col(pixels, l + cut, 0, h-1);
+            left_weight += last_col_weight;
+            cut++;
+        }
+        cut--;
+        left_weight -= last_col_weight;
+        sig[k] = (byte) ((256 *
+                    (cut * h + h * ((a >> 1) - left_weight) / last_col_weight))
+                 / (w * h));
+        if (a - (left_weight << 1) > last_col_weight)
+        {
+            cut++; left_weight += last_col_weight;
+        }
+    }
+    else
+    {
+        cut = w / 2;
+        sig[k] = 128;
+    }
+
+    make_hcut(left_weight, l, cut, h, pixels, sig, k << 1, s_row, s_col, size);
+    make_hcut(a - left_weight, l + cut, w - cut, h, pixels, sig, (k << 1) | 1, s_row, s_col, size);
+}
+
+static void get_signature(int32 width, int32 height, byte **pixels, byte *sig,
+            int32 s_row(byte *, int32, int32),
+            int32 s_col(byte **, int32, int32, int32),
+            int32 size)
+{
+    int32 area = 0, i;
+    for (i = 0; i < height; i++)
+    {
+        area += s_row(pixels[i], 0, width - 1);
+    }
+    /* FIXME: sig[0] is wasted */
+    make_hcut(area, 0, width, height, pixels, sig, 1, s_row, s_col, size);
+}
+
+MDJVU_IMPLEMENT void mdjvu_get_gray_signature(byte **data, int32 w, int32 h,
+                                              byte *result, int32 size)
+{
+    get_signature(w, h, data, result, sum_row_gray, sum_column_gray, size);
+}
+
+MDJVU_IMPLEMENT void mdjvu_get_black_and_white_signature
+                                        (byte **data, int32 w, int32 h,
+                                              byte *result, int32 size)
+{
+    get_signature(w, h, data, result, sum_row_black_and_white, sum_column_black_and_white, size);
+}
diff --git a/tools/jb2cmp/frames.cpp b/tools/jb2cmp/frames.cpp
new file mode 100644
index 0000000..0cf6d1d
--- /dev/null
+++ b/tools/jb2cmp/frames.cpp
@@ -0,0 +1,417 @@
+/* minidjvu - library for handling bilevel images with DjVuBitonal support
+ *
+ * frames.c - extracting frameworks and calculating "importance rating"
+ *
+ * Copyright (C) 2005  Ilya Mezhirov
+ *
+ * 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
+ *
+ * 
+ * minidjvu is derived from DjVuLibre (http://djvu.sourceforge.net)
+ * All over DjVuLibre there is a patent alert from LizardTech
+ * which I guess I should reproduce (don't ask me what does this mean):
+ * 
+ *  ------------------------------------------------------------------
+ * | DjVu (r) Reference Library (v. 3.5)
+ * | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ * | The DjVu Reference Library is protected by U.S. Pat. No.
+ * | 6,058,214 and patents pending.
+ * |
+ * | This software is subject to, and may be distributed under, the
+ * | GNU General Public License, either Version 2 of the license,
+ * | or (at your option) any later version. The license should have
+ * | accompanied the software or you may obtain a copy of the license
+ * | from the Free Software Foundation at http://www.fsf.org .
+ * |
+ * | The computer code originally released by LizardTech under this
+ * | license and unmodified by other parties is deemed "the LIZARDTECH
+ * | ORIGINAL CODE."  Subject to any third party intellectual property
+ * | claims, LizardTech grants recipient a worldwide, royalty-free, 
+ * | non-exclusive license to make, use, sell, or otherwise dispose of 
+ * | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+ * | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+ * | General Public License.   This grant only confers the right to 
+ * | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+ * | the extent such infringement is reasonably necessary to enable 
+ * | recipient to make, have made, practice, sell, or otherwise dispose 
+ * | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+ * | any greater extent that may be necessary to utilize further 
+ * | modifications or combinations.
+ * |
+ * | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ * | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ * | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * +------------------------------------------------------------------
+ */
+
+/* Frameworks are funny things...
+ * The algorithm is to be commented yet.
+ * Here's a picture illustrating what is a frame
+ * (view with monospace font):
+ *
+ *  Original letter:        Its framework:
+ *
+  .....@@@@@@@@........ .....................
+  ...@@@@@@@@@@@@...... ......@@@@@..........
+  ..@@@@@@@@@@@@@@..... .....@@...@@@........
+  ..@@@@@...@@@@@@@.... ....@@......@@.......
+  ..@@@@.....@@@@@@.... ....@........@.......
+  .@@@@@.....@@@@@@.... ....@........@.......
+  .@@@@@.....@@@@@@.... ....@........@.......
+  ..@@@@.....@@@@@@.... ....@........@.......
+  ..........@@@@@@@.... .............@.......
+  .......@@@@@@@@@@.... .............@.......
+  .....@@@@@@@@@@@@.... ........@@@@@@.......
+  ...@@@@@@@@@@@@@@.... ......@@@....@.......
+  ..@@@@@@@..@@@@@@.... .....@@......@.......
+  .@@@@@@....@@@@@@.... ...@@@.......@.......
+  .@@@@@.....@@@@@@.... ...@.........@.......
+  @@@@@......@@@@@@.... ..@@.........@.......
+  @@@@@......@@@@@@.... ..@..........@.......
+  @@@@@.....@@@@@@@.... ..@..........@.......
+  @@@@@@....@@@@@@@.@@@ ..@@.........@.......
+  .@@@@@@@@@@@@@@@@@@@@ ...@@.....@@@@@......
+  .@@@@@@@@@@@@@@@@@@@@ ....@@..@@@...@@@@@..
+  ..@@@@@@@@@.@@@@@@@@. .....@@@@............
+  ....@@@@@....@@@@@... .....................
+
+ * A letter is converted into grayshades,
+ *   and a frame is the set of its purely black pixels after the transformation.
+ * In the grayshade version of a letter,
+ *   all pixels that were white remain absolutely white,
+ *   the frame is black and the blackness falls down from it to the border.
+ */
+
+/* Offtopic: I wonder if this thing could help OCRing because frameworks
+ * perfectly retain readability while becoming essentially 1-dimensional.
+ */
+
+#include "mdjvucfg.h"
+#include "minidjvu.h"
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+#include <math.h>
+
+/* Stuff for not using malloc in C++
+ * (made by Leon Bottou; has no use in minidjvu,
+ * but left here for potential DjVuLibre compatibility)
+ */
+#ifdef __cplusplus
+# define MALLOC(Type)    new Type
+# define FREE(p)         delete p
+# define MALLOCV(Type,n) new Type[n]
+# define FREEV(p)        delete [] p
+#else
+# define MALLOC(Type)    ((Type*)malloc(sizeof(Type)))
+# define FREE(p)         do{if(p)free(p);}while(0)
+# define MALLOCV(Type,n) ((Type*)malloc(sizeof(Type)*(n)))
+# define FREEV(p)        do{if(p)free(p);}while(0)
+#endif
+
+
+/* This determines the gray level of the border (ratio of black).
+ * Setting it to 1 will effectively eliminate grayshading.
+ */
+#define BORDER_FALLOFF .7 /* this is the main constant in all the matcher... */
+
+typedef unsigned char byte;
+
+static int donut_connectivity_test(byte *upper, byte *row, byte *lower)/*{{{*/
+{
+    /*(on the pictures below 0 is white, 1 is black or gray)
+     *
+     * 01.
+     * 1 . -> 1
+     * ...
+     *
+     * .0.
+     * 1 1 ->  1
+     * .0.
+     *
+     * all others -> 0
+     */
+
+    int sum, l, u, d, r;
+
+    sum = (u = *upper ? 1 : 0) + (d = *lower ? 1 : 0) +
+          (l = row[-1] ? 1 : 0) + (r = row[1] ? 1 : 0);
+
+    switch(sum)
+    {
+        case 3:/*{{{*/
+        {
+            int x = 6 - (u + (l << 1) + d + (d << 1));
+            switch(x)
+            {
+                case 0: /* l */
+                    return upper[-1] && lower[-1] ? 0 : 1;
+                case 1: /* d */
+                    return lower[-1] && lower[1] ? 0 : 1;
+                case 2: /* r */
+                    return upper[1] && lower[1] ? 0 : 1;
+                case 3: /* u */
+                    return upper[-1] && upper[1] ? 0 : 1;
+                default: assert(0); return 0;
+            }
+        }
+        break;/*}}}*/
+        case 2:/*{{{*/
+        {
+            int s = l + r;
+            if (s & 1)
+            {
+                /*   A1.
+                 *   1 0 - should be !A (2x2 square extermination)
+                 *   .0.
+                 */
+                if (l)
+                {
+                    if (u)
+                        return upper[-1] ? 0 : 1;
+                    else
+                        return lower[-1] ? 0 : 1;
+                }
+                else /* r */
+                {
+                    if (u)
+                        return upper[1] ? 0 : 1;
+                    else
+                        return lower[1] ? 0 : 1;
+                }
+            }
+            else
+            {
+                /*   .0.
+                 *   1 1 - surely should be 1 to preserve connection
+                 *   .0.
+                 */
+                return 1;
+            }
+        }
+        break;/*}}}*/
+        case 0: case 4:
+            return 1;
+        case 1:
+            return 0;
+        default: assert(0); return 0;
+    }
+    assert(0); return 0;
+}/*}}}*/
+static byte donut_transform_pixel(byte *upper, byte *row, byte *lower)/*{{{*/
+{
+    /* (center pixel should be gray in order for this to work)
+     * (on the pictures below 0 is white, 1 is black or gray)
+     *
+     * 01.
+     * 1 . -> center will become 1
+     * ...
+     *
+     * .0.
+     * 1 1 -> center will become 1
+     * .0.
+     *
+     * 00.
+     * 1 0 -> center will become 1
+     * .0.
+     *
+     * 1..
+     * 1 0 -> center will become 0
+     * 1..
+     *
+     * 11.
+     * 1 0 -> center will become 0
+     * .0.
+     *
+     * .A.
+     * A A -> center will become 1
+     * .A.
+     */
+
+    int sum, l, u, d, r;
+    if (!*row) return 0;
+
+    sum = (u = *upper ? 1 : 0) + (d = *lower ? 1 : 0) +
+          (l = row[-1] ? 1 : 0) + (r = row[1] ? 1 : 0);
+
+    switch(sum)
+    {
+        case 1: case 3:/*{{{*/
+        {
+            int x = u + (l << 1) + d + (d << 1);
+            if (sum == 3) x = (6 - x) ^ 2;
+            switch(x)
+            {
+                case 0: /* r */
+                    return upper[1] && lower[1] ? 0 : 1;
+                case 1: /* u */
+                    return upper[-1] && upper[1] ? 0 : 1;
+                case 2: /* l */
+                    return upper[-1] && lower[-1] ? 0 : 1;
+                case 3: /* d */
+                    return lower[-1] && lower[1] ? 0 : 1;
+                default: assert(0); return 0;
+            }
+        }
+        break;/*}}}*/
+        case 2:/*{{{*/
+        {
+            int s = l + r;
+            if (s & 1)
+            {
+                /*   A1.
+                 *   1 0 - should be !A (2x2 square extermination)
+                 *   .0.
+                 */
+                if (l)
+                {
+                    if (u)
+                        return upper[-1] ? 0 : 1;
+                    else
+                        return lower[-1] ? 0 : 1;
+                }
+                else /* r */
+                {
+                    if (u)
+                        return upper[1] ? 0 : 1;
+                    else
+                        return lower[1] ? 0 : 1;
+                }
+            }
+            else
+            {
+                /*   .0.
+                 *   1 1 - surely should be 1 to preserve connection
+                 *   .0.
+                 */
+                return 1;
+            }
+        }
+        break;/*}}}*/
+        case 0: case 4:
+            return 1; /* lone pixels are NOT omitted */
+        default: assert(0); return 0;
+    }
+    assert(0); return 0;
+}/*}}}*/
+
+/* `pixels' should have a margin of 1 pixel at each side
+ * returns true if the image was changed
+ */
+static int flay(byte **pixels, int w, int h, int rank, int **ranks)
+{
+    int i, j, result = 0;
+
+    byte *buf = MALLOCV(byte, w * h);
+
+    assert(pixels);
+    assert(w);
+    assert(h);
+
+    for (i = 0; i < h; i++) for (j = 0; j < w; j++)
+    {
+        buf[w * i + j] =
+            donut_transform_pixel(pixels[i-1] + j, pixels[i] + j, pixels[i+1] + j);
+    }
+
+    for (i = 0; i < h; i++)
+    {
+        byte *up = pixels[i-1], *row = pixels[i], *dn = pixels[i+1];
+        byte *buf_row = buf + w * i;
+        int *rank_row = NULL;
+        if (ranks) rank_row = ranks[i];
+        for (j = 0; j < w; j++)
+        {
+            if (row[j] && !buf_row[j])
+            {
+                if (!donut_connectivity_test(up + j, row + j, dn + j))
+                {
+                    row[j] = buf_row[j];
+                    if (rank) rank_row[j] = rank;
+                    result = 1;
+                }
+            }
+            else
+                row[j] = buf_row[j];
+        }
+    }
+
+    FREEV(buf);
+    return result;
+}
+
+/* TODO: use less temporary buffers and silly copyings */
+MDJVU_IMPLEMENT void mdjvu_soften_pattern(byte **result, byte **pixels, int32 w, int32 h)/*{{{*/
+{
+    byte *r = MALLOCV(byte, (w + 2) * (h + 2));
+    byte **pointers = MALLOCV(byte *, h + 2);
+    int *ranks_buf = MALLOCV(int, w * h);
+    int **ranks = MALLOCV(int *, h);
+
+    int i, j, passes = 1;
+    double level = 1, falloff;
+    byte *colors;
+
+    memset(r, 0, (w + 2) * (h + 2));
+    memset(ranks_buf, 0, w * h * sizeof(int));
+
+    for (i = 0; i < h + 2; i++)
+        pointers[i] = r + (w + 2) * i + 1;
+
+    for (i = 0; i < h; i++)
+        memcpy(pointers[i+1], pixels[i], w);
+
+    for (i = 0; i < h; i++)
+        ranks[i] = ranks_buf + w * i;
+
+    while(flay(pointers + 1, w, h, passes, ranks)) passes++;
+
+    colors = MALLOCV(byte, passes + 1);
+
+    falloff = pow(BORDER_FALLOFF, 1./passes);
+
+    for (i = 0; i < passes; i++)
+    {
+        colors[i] = (byte) (level * 255);
+        level *= falloff;
+    }
+    /* TODO: test the next line */
+    /* colors[passes - 1] = 50; pay less attention to border pixels */
+    colors[passes] = 0;
+
+    pointers++;
+    for (i = 0; i < h; i++)
+    {
+        for (j = 0; j < w; j++)
+        {
+            if (pointers[i][j])
+            {
+                result[i][j] = 255;
+            }
+            else
+            {
+                result[i][j] = colors[passes - ranks[i][j]];
+            }
+        }
+    }
+    pointers--;
+
+    FREEV(colors);
+    FREEV(ranks);
+    FREEV(ranks_buf);
+    FREEV(r);
+    FREEV(pointers);
+}/*}}}*/
diff --git a/tools/jb2cmp/mdjvucfg.h b/tools/jb2cmp/mdjvucfg.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/jb2cmp/mdjvucfg.h
diff --git a/tools/jb2cmp/minidjvu.h b/tools/jb2cmp/minidjvu.h
new file mode 100644
index 0000000..6664daf
--- /dev/null
+++ b/tools/jb2cmp/minidjvu.h
@@ -0,0 +1,75 @@
+/* minidjvu - library for handling bilevel images with DjVuBitonal support
+ *
+ * no_mdjvu.h - stuff for compiling the pattern matcher outside of minidjvu
+ *
+ * Copyright (C) 2005  Ilya Mezhirov
+ *
+ * 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
+ *
+ * 
+ * minidjvu is derived from DjVuLibre (http://djvu.sourceforge.net)
+ * All over DjVuLibre there is a patent alert from LizardTech
+ * which I guess I should reproduce (don't ask me what does this mean):
+ * 
+ *  ------------------------------------------------------------------
+ * | DjVu (r) Reference Library (v. 3.5)
+ * | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ * | The DjVu Reference Library is protected by U.S. Pat. No.
+ * | 6,058,214 and patents pending.
+ * |
+ * | This software is subject to, and may be distributed under, the
+ * | GNU General Public License, either Version 2 of the license,
+ * | or (at your option) any later version. The license should have
+ * | accompanied the software or you may obtain a copy of the license
+ * | from the Free Software Foundation at http://www.fsf.org .
+ * |
+ * | The computer code originally released by LizardTech under this
+ * | license and unmodified by other parties is deemed "the LIZARDTECH
+ * | ORIGINAL CODE."  Subject to any third party intellectual property
+ * | claims, LizardTech grants recipient a worldwide, royalty-free, 
+ * | non-exclusive license to make, use, sell, or otherwise dispose of 
+ * | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+ * | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+ * | General Public License.   This grant only confers the right to 
+ * | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+ * | the extent such infringement is reasonably necessary to enable 
+ * | recipient to make, have made, practice, sell, or otherwise dispose 
+ * | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+ * | any greater extent that may be necessary to utilize further 
+ * | modifications or combinations.
+ * |
+ * | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ * | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ * | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * +------------------------------------------------------------------
+ */
+
+
+/*
+ * to compile the pattern matcher without the rest of minidjvu,
+ * do this:
+ *
+ *  mv no_mdjvu.h minidjvu.h
+ *  touch mdjvucfg.h
+ *  g++ -c *.cpp
+ */
+
+#define NO_MINIDJVU
+#define MDJVU_FUNCTION
+#define MDJVU_IMPLEMENT
+typedef int int32;
+#include "patterns.h"
+#include "classify.h" /* to compile it with the classificator */
diff --git a/tools/jb2cmp/patterns.cpp b/tools/jb2cmp/patterns.cpp
new file mode 100644
index 0000000..b31cf4e
--- /dev/null
+++ b/tools/jb2cmp/patterns.cpp
@@ -0,0 +1,626 @@
+/* minidjvu - library for handling bilevel images with DjVuBitonal support
+ *
+ * patterns.c - pattern matching algorithm
+ *
+ * Copyright (C) 2005  Ilya Mezhirov
+ *
+ * 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
+ *
+ * 
+ * minidjvu is derived from DjVuLibre (http://djvu.sourceforge.net)
+ * All over DjVuLibre there is a patent alert from LizardTech
+ * which I guess I should reproduce (don't ask me what does this mean):
+ * 
+ *  ------------------------------------------------------------------
+ * | DjVu (r) Reference Library (v. 3.5)
+ * | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ * | The DjVu Reference Library is protected by U.S. Pat. No.
+ * | 6,058,214 and patents pending.
+ * |
+ * | This software is subject to, and may be distributed under, the
+ * | GNU General Public License, either Version 2 of the license,
+ * | or (at your option) any later version. The license should have
+ * | accompanied the software or you may obtain a copy of the license
+ * | from the Free Software Foundation at http://www.fsf.org .
+ * |
+ * | The computer code originally released by LizardTech under this
+ * | license and unmodified by other parties is deemed "the LIZARDTECH
+ * | ORIGINAL CODE."  Subject to any third party intellectual property
+ * | claims, LizardTech grants recipient a worldwide, royalty-free, 
+ * | non-exclusive license to make, use, sell, or otherwise dispose of 
+ * | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+ * | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+ * | General Public License.   This grant only confers the right to 
+ * | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+ * | the extent such infringement is reasonably necessary to enable 
+ * | recipient to make, have made, practice, sell, or otherwise dispose 
+ * | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+ * | any greater extent that may be necessary to utilize further 
+ * | modifications or combinations.
+ * |
+ * | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ * | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ * | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * +------------------------------------------------------------------
+ */
+
+/* This is `patterns.c', the unit that handles pattern matching.
+ * Its task is only to compare pairs of images, not to classify a set of them.
+ * And this has absolutely nothing to do with choosing a cross-coding prototype.
+ */
+
+#include "mdjvucfg.h"
+#include "minidjvu.h"
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+
+/* Stuff for not using malloc in C++
+ * (made by Leon Bottou; has no use in minidjvu,
+ * but left here for potential DjVuLibre compatibility)
+ */
+#ifdef __cplusplus
+# define MALLOC(Type)    new Type
+# define FREE(p)         delete p
+# define MALLOCV(Type,n) new Type[n]
+# define FREEV(p)        delete [] p
+#else
+# define MALLOC(Type)    ((Type*)malloc(sizeof(Type)))
+# define FREE(p)         do{if(p)free(p);}while(0)
+# define MALLOCV(Type,n) ((Type*)malloc(sizeof(Type)*(n)))
+# define FREEV(p)        do{if(p)free(p);}while(0)
+#endif
+
+
+#define SIGNATURE_SIZE 32
+
+/* Mass center coordinates are stored in (1/MASS_CENTER_QUANT) pixels.
+ * This leads to more precise alignment then using whole pixels.
+ */
+#define MASS_CENTER_QUANT 8
+
+
+/* These are hand-tweaked parameters of this classifier. */
+
+typedef struct
+{
+    double pithdiff_threshold;
+    double softdiff_threshold;
+    double shiftdiff1_threshold;
+    double shiftdiff2_threshold;
+    double shiftdiff3_threshold;
+} Options;
+
+static const double pithdiff_veto_threshold        = 23;
+static const double softdiff_veto_threshold        = 100; /* that means off */
+static const double shiftdiff1_veto_threshold      = 1000;
+static const double shiftdiff2_veto_threshold      = 1500;
+static const double shiftdiff3_veto_threshold      = 2000;
+
+static const double size_difference_threshold = 10;
+static const double mass_difference_threshold = 15;
+
+static const double shiftdiff1_falloff        = .9;
+static const double shiftdiff2_falloff        = 1;
+static const double shiftdiff3_falloff        = 1.15;
+
+static void interpolate(Options *opt, const double *v1, const double *v2,
+                        int l, int r, int x)
+{
+    double w1 = ((double)(r - x)) / (r - l); /* weights */
+    double w2 = 1 - w1;
+    opt->pithdiff_threshold   = v1[0] * w1 + v2[0] * w2;
+    opt->softdiff_threshold   = v1[1] * w1 + v2[1] * w2;
+    opt->shiftdiff1_threshold = v1[2] * w1 + v2[2] * w2;
+    opt->shiftdiff2_threshold = v1[3] * w1 + v2[3] * w2;
+    opt->shiftdiff3_threshold = v1[4] * w1 + v2[4] * w2;
+}
+
+
+/* Sets `aggression' for pattern matching.
+ * Lower values are safer, bigger values produce smaller files.
+ */
+
+MDJVU_IMPLEMENT void mdjvu_set_aggression(mdjvu_matcher_options_t opt, int level)
+{
+    const double set200[5] = {7, 15, 60,  80, 170};
+    const double set150[5] = {5, 13, 50,  70, 160};
+    const double   set0[5] = {0,  0,  0,   0,   0};
+
+    if (level < 0) level = 0;
+
+    if (level > 150)
+        interpolate((Options *) opt, set150, set200, 150, 200, level);
+    else
+        interpolate((Options *) opt, set0, set150, 0, 150, level);
+}
+
+/* ========================================================================== */
+
+MDJVU_IMPLEMENT mdjvu_matcher_options_t mdjvu_matcher_options_create(void)
+{
+    mdjvu_matcher_options_t options = (mdjvu_matcher_options_t) MALLOC(Options);
+    mdjvu_set_aggression(options, 100);
+    return options;
+}
+
+MDJVU_IMPLEMENT void mdjvu_matcher_options_destroy(mdjvu_matcher_options_t opt)
+{
+    FREE((Options *) opt);
+}
+
+
+/* FIXME: maxint is maxint32 */
+static const int32 maxint = ~(1 << (sizeof(int32) * 8 - 1));
+typedef unsigned char byte;
+
+typedef struct ComparableImageData
+{
+    byte **pixels; /* 0 - purely white, 255 - purely black (inverse to PGM!) */
+    int32 width, height, mass;
+    int32 mass_center_x, mass_center_y;
+    byte signature[SIGNATURE_SIZE];  /* for shiftdiff 1 and 3 tests */
+    byte signature2[SIGNATURE_SIZE]; /* for shiftdiff 2 test */
+} Image;
+
+
+
+/* Each image pair undergoes simple tests (dimensions and mass)
+ * and at most five more advanced tests.
+ * Each test may end up with three outcomes: veto (-1), doubt (0) and match(1).
+ * Images are equivalent if and only if
+ *     there was no `veto'
+ *     and there was at least one `match'.
+ */
+
+
+/* We check whether images' dimensions are different
+ *     no more than by size_difference_threshold percent.
+ * Return value is usual: veto (-1) or doubt (0).
+ * Mass checking was introduced by Leon Bottou.
+ */
+
+static int simple_tests(Image *i1, Image *i2)
+{
+    int32 w1 = i1->width, h1 = i1->height, m1 = i1->mass;
+    int32 w2 = i2->width, h2 = i2->height, m2 = i2->mass;
+
+    if (100.* w1 > (100.+ size_difference_threshold) * w2) return -1;
+    if (100.* w2 > (100.+ size_difference_threshold) * w1) return -1;
+    if (100.* h1 > (100.+ size_difference_threshold) * h2) return -1;
+    if (100.* h2 > (100.+ size_difference_threshold) * h1) return -1;
+    if (100.* m1 > (100.+ mass_difference_threshold) * m2) return -1;
+    if (100.* m2 > (100.+ mass_difference_threshold) * m1) return -1;
+
+    return 0;
+}
+
+
+#define USE_PITHDIFF 1
+#define USE_SOFTDIFF 1
+#define USE_SHIFTDIFF_1 1
+#define USE_SHIFTDIFF_2 1
+#define USE_SHIFTDIFF_3 1
+
+
+/* Computing distance by comparing pixels {{{ */
+
+#if USE_PITHDIFF || USE_SOFTDIFF
+
+/* This function compares two images pixel by pixel.
+ * The exact way to compare pixels is defined by two functions,
+ *     compare_row and compare_with_white.
+ * Both functions take pointers to byte rows and their length.
+ *
+ * Now images are aligned by mass centers.
+ * Code needs some clarification, yes...
+ */
+static int32 distance_by_pixeldiff_functions_by_shift(Image *i1, Image *i2,
+    int32 (*compare_row)(byte *, byte *, int32),
+    int32 (*compare_with_white)(byte *, int32), int32 ceiling,
+    int32 shift_x, int32 shift_y) /* of i1's coordinate system with respect to i2 */
+{
+    int32 w1 = i1->width, w2 = i2->width, h1 = i1->height, h2 = i2->height;
+    int32 min_y = shift_y < 0 ? shift_y : 0;
+    int32 right1 = shift_x + w1;
+    int32 max_y_plus_1 = h2 > shift_y + h1 ? h2 : shift_y + h1;
+    int32 i;
+    int32 min_overlap_x = shift_x > 0 ? shift_x : 0;
+    int32 max_overlap_x_plus_1 = w2 < right1 ? w2 : right1;
+    int32 min_overlap_x_for_i1 = min_overlap_x - shift_x;
+    int32 max_overlap_x_plus_1_for_i1 = max_overlap_x_plus_1 - shift_x;
+    int32 overlap_length = max_overlap_x_plus_1 - min_overlap_x;
+    int32 score = 0;
+
+    if (overlap_length <= 0) return maxint;
+
+    for (i = min_y; i < max_y_plus_1; i++)
+    {
+        int32 y1 = i - shift_y;
+
+        /* calculate difference in the i-th line */
+
+        if (i < 0 || i >= h2)
+        {
+            /* calculate difference of i1 with white */
+            score += compare_with_white(i1->pixels[y1], w1);
+        }
+        else if (i < shift_y || i >= shift_y + h1)
+        {
+            /* calculate difference of i2 with white */
+            score += compare_with_white(i2->pixels[i], w2);
+        }
+        else
+        {
+            /* calculate difference in a line where the bitmaps overlap */
+            score += compare_row(i1->pixels[y1] + min_overlap_x_for_i1,
+                                 i2->pixels[i] + min_overlap_x,
+                                 overlap_length);
+
+
+            /* calculate penalty for the left margin */
+            if (min_overlap_x > 0)
+                score += compare_with_white(i2->pixels[i], min_overlap_x);
+            else
+                score += compare_with_white(i1->pixels[y1], min_overlap_x_for_i1);
+
+            /* calculate penalty for the right margin */
+            if (max_overlap_x_plus_1 < w2)
+            {
+                score += compare_with_white(
+                    i2->pixels[i] + max_overlap_x_plus_1,
+                    w2 - max_overlap_x_plus_1);
+            }
+            else
+            {
+                score += compare_with_white(
+                     i1->pixels[y1] + max_overlap_x_plus_1_for_i1,
+                     w1 - max_overlap_x_plus_1_for_i1);
+
+            }
+        }
+
+        if (score >= ceiling) return maxint;
+    }
+    return score;
+}
+
+static int32 distance_by_pixeldiff_functions(Image *i1, Image *i2,
+    int32 (*compare_row)(byte *, byte *, int32),
+    int32 (*compare_with_white)(byte *, int32), int32 ceiling)
+{
+    int32 w1, w2, h1, h2;
+    int32 shift_x, shift_y; /* of i1's coordinate system with respect to i2 */
+
+    /* make i1 to be narrower than i2 */
+    if (i1->width > i2->width)
+    {
+        Image *img = i1;
+        i1 = i2;
+        i2 = img;
+    }
+
+    w1 = i1->width; h1 = i1->height;
+    w2 = i2->width; h2 = i2->height; 
+
+    /* (shift_x, shift_y) */
+    /*     is what should be added to i1's coordinates to get i2's coordinates. */
+    shift_x = (w2 - w2/2) - (w1 - w1/2); /* center favors right */
+    shift_y = h2/2 - h1/2;               /* center favors top */
+
+    shift_x = i2->mass_center_x - i1->mass_center_x;
+    if (shift_x < 0)
+        shift_x = (shift_x - MASS_CENTER_QUANT / 2) / MASS_CENTER_QUANT;
+    else
+        shift_x = (shift_x + MASS_CENTER_QUANT / 2) / MASS_CENTER_QUANT;
+
+    shift_y = i2->mass_center_y - i1->mass_center_y;
+    if (shift_y < 0)
+        shift_y = (shift_y - MASS_CENTER_QUANT / 2) / MASS_CENTER_QUANT;
+    else
+        shift_y = (shift_y + MASS_CENTER_QUANT / 2) / MASS_CENTER_QUANT;
+
+    return distance_by_pixeldiff_functions_by_shift(
+        i1, i2, compare_row, compare_with_white, ceiling, shift_x, shift_y);
+}
+
+#endif
+
+/* Computing distance by comparing pixels }}} */
+/* inscribed framework penalty counting {{{ */
+
+/* (Look at `frames.c' to see what it's all about) */
+
+#if USE_PITHDIFF
+
+/* If the framework of one letter is inscribed into another and vice versa,
+ *     then those letters are probably equivalent.
+ * That's the idea...
+ * Counting penalty points here for any pixel
+ *     that's framework in one image and white in the other.
+ */
+
+static int32 pithdiff_compare_row(byte *row1, byte *row2, int32 n)
+{
+    int32 i, s = 0;
+    for (i = 0; i < n; i++)
+    {
+        int32 k = row1[i], l = row2[i];
+        if (k == 255)
+            s += 255 - l;
+        else if (l == 255)
+            s += 255 - k;
+    }
+    return s;
+}
+
+static int32 pithdiff_compare_with_white(byte *row, int32 n)
+{
+    int32 i, s = 0;
+    for (i = 0; i < n; i++) if (row[i] == 255) s += 255;
+    return s;
+}
+
+static int32 pithdiff_distance(Image *i1, Image *i2, int32 ceiling)
+{
+    return distance_by_pixeldiff_functions(i1, i2,
+            &pithdiff_compare_row, &pithdiff_compare_with_white, ceiling);
+}
+
+static int pithdiff_equivalence(Image *i1, Image *i2, double threshold, int32 dpi)
+{
+    int32 perimeter = i1->width + i1->height + i2->width + i2->height;
+    double ceiling = pithdiff_veto_threshold * dpi * perimeter / 100;
+    int32 d = pithdiff_distance(i1, i2, (int32) ceiling);
+    if (d == maxint) return -1;
+    if (d < threshold * dpi * perimeter / 100) return 1;
+    return 0;
+}
+
+#endif /* if USE_PITHDIFF */
+
+/* inscribed framework penalty counting }}} */
+/* soft penalty counting {{{ */
+
+#if USE_SOFTDIFF
+
+/* This test scores penalty points for pixels that are different in both images.
+ * Since every black pixel has a rating of importance,
+ *     the penalty for a pair of corresponding pixels, one black, one white,
+ *         is equal to the rating of the black pixel.
+ */
+
+static int32 softdiff_compare_row(byte *row1, byte *row2, int32 n)
+{
+    int32 i, s = 0;
+    for (i = 0; i < n; i++)
+    {
+        if (!row1[i])
+            s += row2[i];
+        else if (!row2[i])
+            s += row1[i];
+    }
+    return s;
+}
+
+static int32 softdiff_compare_with_white(byte *row, int32 n)
+{
+    int32 i, s = 0;
+    for (i = 0; i < n; i++) s += row[i];
+    return s;
+}
+
+static int32 softdiff_distance(Image *i1, Image *i2, int32 ceiling)
+{
+    return distance_by_pixeldiff_functions(i1, i2,
+            &softdiff_compare_row, &softdiff_compare_with_white, ceiling);
+}
+
+static int softdiff_equivalence(Image *i1, Image *i2, double threshold, int32 dpi)
+{
+    int32 perimeter = i1->width + i1->height + i2->width + i2->height;
+    double ceiling = softdiff_veto_threshold * dpi * perimeter / 100;
+    int32 d = softdiff_distance(i1, i2, (int32) ceiling);
+    if (d == maxint) return -1;
+    if (d < threshold * dpi * perimeter / 100) return 1;
+    return 0;
+}
+
+#endif /* if USE_SOFTDIFF */
+
+/* soft penalty counting }}} */
+/* shift signature comparison {{{ */
+
+/* Just finding the square of a normal Euclidean distance between vectors
+ * (but with falloff)
+ */
+
+#if USE_SHIFTDIFF_1 || USE_SHIFTDIFF_2 || USE_SHIFTDIFF_3
+static int shiftdiff_equivalence(byte *s1, byte *s2, double falloff, double veto, double threshold)
+{
+    int i, delay_before_falloff = 1, delay_counter = 1;
+    double penalty = 0;
+    double weight = 1;
+
+    for (i = 1; i < SIGNATURE_SIZE; i++) /* kluge: ignores the first byte */
+    {
+        int difference = s1[i] - s2[i];
+        penalty += difference * difference * weight;
+        if (!--delay_counter)
+        {
+            weight *= falloff;
+            delay_counter = delay_before_falloff <<= 1;
+        }
+    }
+
+    if (penalty >= veto * SIGNATURE_SIZE) return -1;
+    if (penalty <= threshold * SIGNATURE_SIZE) return 1;
+    return 0;
+}
+#endif
+/* shift signature comparison }}} */
+
+#ifndef NO_MINIDJVU
+mdjvu_pattern_t mdjvu_pattern_create(mdjvu_bitmap_t bitmap)
+{
+    int32 w = mdjvu_bitmap_get_width(bitmap);
+    int32 h = mdjvu_bitmap_get_height(bitmap);
+    mdjvu_pattern_t pattern;
+    byte **pixels = mdjvu_create_2d_array(w, h);
+    mdjvu_bitmap_unpack_all(bitmap, pixels);
+    pattern = mdjvu_pattern_create_from_array(pixels, w, h);
+    mdjvu_destroy_2d_array(pixels);
+    return pattern;
+}
+#endif
+
+/* Finding mass center {{{ */
+
+static void get_mass_center(unsigned char **pixels, int32 w, int32 h,
+                     int32 *pmass_center_x, int32 *pmass_center_y)
+{
+    double x_sum = 0, y_sum = 0, mass = 0;
+    int32 i, j;
+
+    for (i = 0; i < h; i++)
+    {
+        unsigned char *row = pixels[i];
+        for (j = 0; j < w; j++)
+        {
+            unsigned char pixel = row[j];
+            x_sum += pixel * j;
+            y_sum += pixel * i;
+            mass  += pixel;
+        }
+    }
+
+    *pmass_center_x = (int32) (x_sum * MASS_CENTER_QUANT / mass);
+    *pmass_center_y = (int32) (y_sum * MASS_CENTER_QUANT / mass);
+}
+
+/* Finding mass center }}} */
+
+
+MDJVU_IMPLEMENT mdjvu_pattern_t mdjvu_pattern_create_from_array(byte **pixels, int32 w, int32 h)/*{{{*/
+{
+    int32 i, mass;
+    Image *img = MALLOC(Image);
+    byte *pool = MALLOCV(byte, w * h);
+    memset(pool, 0, w * h);
+
+    img->width = w;
+    img->height = h;
+
+    img->pixels = MALLOCV(byte *, h);
+    for (i = 0; i < h; i++)
+        img->pixels[i] = pool + i * w;
+
+    mass = 0;
+    for (i = 0; i < h; i++)
+    {
+        int32 j;
+        for (j = 0; j < w; j++)
+            if (pixels[i][j])
+            {
+                img->pixels[i][j] = 255; /* i don't remember what for */
+                mass += 1;
+            }
+    }
+    img->mass = mass;
+
+    mdjvu_soften_pattern(img->pixels, img->pixels, w, h);
+    get_mass_center(img->pixels, w, h,
+                    &img->mass_center_x, &img->mass_center_y);
+    mdjvu_get_gray_signature(img->pixels, w, h,
+                             img->signature, SIGNATURE_SIZE);
+    mdjvu_get_black_and_white_signature(img->pixels, w, h,
+                                        img->signature2, SIGNATURE_SIZE);
+    return (mdjvu_pattern_t) img;
+}/*}}}*/
+
+/* Requires `opt' to be non-NULL */
+static int compare_patterns(mdjvu_pattern_t ptr1, mdjvu_pattern_t ptr2,/*{{{*/
+                            int32 dpi, Options *opt)
+
+{
+    Image *i1 = (Image *) ptr1, *i2 = (Image *) ptr2;
+    int i, state = 0; /* 0 - unsure, 1 - equal unless veto */
+
+    if (simple_tests(i1, i2)) return -1;
+
+    #if USE_SHIFTDIFF_1
+        i = shiftdiff_equivalence(i1->signature, i2->signature,
+            shiftdiff1_falloff, shiftdiff1_veto_threshold, opt->shiftdiff1_threshold);
+        if (i == -1) return -1;
+        state |= i;
+    #endif
+
+    #if USE_SHIFTDIFF_2
+        i = shiftdiff_equivalence(i1->signature2, i2->signature2,
+            shiftdiff2_falloff, shiftdiff2_veto_threshold, opt->shiftdiff2_threshold);
+        if (i == -1) return -1;
+        state |= i;
+    #endif
+
+    #if USE_SHIFTDIFF_3
+        i = shiftdiff_equivalence(i1->signature, i2->signature,
+            shiftdiff3_falloff, shiftdiff3_veto_threshold, opt->shiftdiff3_threshold);
+        if (i == -1) return -1;
+        state |= i;
+    #endif
+
+    #if USE_PITHDIFF
+        i = pithdiff_equivalence(i1, i2, opt->pithdiff_threshold, dpi);
+        if (i == -1) return 0; /* pithdiff has no right to veto at upper level */
+        state |= i;
+    #endif
+
+    #if USE_SOFTDIFF
+        i = softdiff_equivalence(i1, i2, opt->softdiff_threshold, dpi);
+        if (i == -1) return 0;  /* softdiff has no right to veto at upper level */
+        state |= i;
+    #endif
+
+    return state;
+}/*}}}*/
+
+MDJVU_IMPLEMENT int mdjvu_match_patterns(mdjvu_pattern_t ptr1, mdjvu_pattern_t ptr2,
+                    int32 dpi, mdjvu_matcher_options_t options)
+{
+    Options *opt;
+    int result;
+    if (options)
+        opt = (Options *) options;
+    else
+        opt = (Options *) mdjvu_matcher_options_create();
+
+    result = compare_patterns(ptr1, ptr2, dpi, opt);
+
+    if (!options)
+        mdjvu_matcher_options_destroy((mdjvu_matcher_options_t) opt);
+
+    return result;
+}
+
+
+MDJVU_IMPLEMENT void mdjvu_pattern_destroy(mdjvu_pattern_t p)/*{{{*/
+{
+    Image *img = (Image *) p;
+    FREEV(img->pixels[0]);
+    FREEV(img->pixels);
+    FREE(img);
+}/*}}}*/
diff --git a/tools/jb2cmp/patterns.h b/tools/jb2cmp/patterns.h
new file mode 100644
index 0000000..ca8e235
--- /dev/null
+++ b/tools/jb2cmp/patterns.h
@@ -0,0 +1,131 @@
+/* minidjvu - library for handling bilevel images with DjVuBitonal support
+ *
+ * patterns.h - matching patterns
+ *
+ * Copyright (C) 2005  Ilya Mezhirov
+ *
+ * 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
+ *
+ * 
+ * minidjvu is derived from DjVuLibre (http://djvu.sourceforge.net)
+ * All over DjVuLibre there is a patent alert from LizardTech
+ * which I guess I should reproduce (don't ask me what does this mean):
+ * 
+ *  ------------------------------------------------------------------
+ * | DjVu (r) Reference Library (v. 3.5)
+ * | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+ * | The DjVu Reference Library is protected by U.S. Pat. No.
+ * | 6,058,214 and patents pending.
+ * |
+ * | This software is subject to, and may be distributed under, the
+ * | GNU General Public License, either Version 2 of the license,
+ * | or (at your option) any later version. The license should have
+ * | accompanied the software or you may obtain a copy of the license
+ * | from the Free Software Foundation at http://www.fsf.org .
+ * |
+ * | The computer code originally released by LizardTech under this
+ * | license and unmodified by other parties is deemed "the LIZARDTECH
+ * | ORIGINAL CODE."  Subject to any third party intellectual property
+ * | claims, LizardTech grants recipient a worldwide, royalty-free, 
+ * | non-exclusive license to make, use, sell, or otherwise dispose of 
+ * | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+ * | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+ * | General Public License.   This grant only confers the right to 
+ * | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+ * | the extent such infringement is reasonably necessary to enable 
+ * | recipient to make, have made, practice, sell, or otherwise dispose 
+ * | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+ * | any greater extent that may be necessary to utilize further 
+ * | modifications or combinations.
+ * |
+ * | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+ * | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+ * | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * +------------------------------------------------------------------
+ */
+
+#ifndef MDJVU_PATTERNS_H
+#define MDJVU_PATTERNS_H
+
+
+/* To get an image ready for comparisons, one have to `prepare' it.
+ * A prepared image is called a `pattern' here.
+ */
+
+/* the struct itself is not defined in this header */
+typedef struct MinidjvuPattern *mdjvu_pattern_t;
+
+
+/* Allocate a pattern and calculate all necessary information.
+ * Memory consumption is byte per pixel + constant.
+ * The pattern would be completely independent on the bitmap given.
+ *     (that is, you can destroy the bitmap immediately)
+ */
+#ifndef NO_MINIDJVU
+MDJVU_FUNCTION mdjvu_pattern_t mdjvu_pattern_create(mdjvu_bitmap_t);
+#endif
+
+/* Same, but create from two-dimensional array.
+ */
+
+MDJVU_FUNCTION mdjvu_pattern_t mdjvu_pattern_create_from_array
+    (unsigned char **, int32 w, int32 h);
+
+
+/* Destroy the pattern. */
+
+MDJVU_FUNCTION void mdjvu_pattern_destroy(mdjvu_pattern_t);
+
+
+typedef struct MinidjvuMatcherOptions *mdjvu_matcher_options_t;
+
+MDJVU_FUNCTION mdjvu_matcher_options_t mdjvu_matcher_options_create(void);
+MDJVU_FUNCTION void mdjvu_set_aggression(mdjvu_matcher_options_t, int level);
+MDJVU_FUNCTION void mdjvu_matcher_options_destroy(mdjvu_matcher_options_t);
+
+
+/* Compare patterns.
+ * Returns
+ * +1 if images are considered equivalent,
+ * -1 if they are considered totally different (just to speed up things),
+ *  0 if unknown, but probably different.
+ * Exchanging the order of arguments should not change the outcome.
+ * If you have found that A ~ B and B ~ C,
+ *     then you may assume A ~ C regardless of this function's result.
+ *
+ * Options may be NULL.
+ */
+
+MDJVU_FUNCTION int mdjvu_match_patterns(mdjvu_pattern_t, mdjvu_pattern_t,
+                                        int32 dpi,
+                                        mdjvu_matcher_options_t);
+
+
+/* Auxiliary functions used in pattern matcher (TODO: comment them) */
+
+/* `result' and `pixels' may be the same array */
+MDJVU_FUNCTION void mdjvu_soften_pattern(unsigned char **result,
+    unsigned char **pixels, int32 w, int32 h);
+
+MDJVU_FUNCTION void mdjvu_get_gray_signature(
+    unsigned char **data, int32 w, int32 h,
+    unsigned char *result, int32 size);
+
+MDJVU_FUNCTION void mdjvu_get_black_and_white_signature(
+    unsigned char **data, int32 w, int32 h,
+    unsigned char *result, int32 size);
+
+#endif /* MDJVU_PATTERNS_H */
diff --git a/tools/jb2tune.cpp b/tools/jb2tune.cpp
new file mode 100644
index 0000000..fd4f91a
--- /dev/null
+++ b/tools/jb2tune.cpp
@@ -0,0 +1,397 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuGlobal.h"
+#include "GException.h"
+#include "GSmartPointer.h"
+#include "GContainer.h"
+#include "GRect.h"
+#include "GBitmap.h"
+#include "JB2Image.h"
+
+#include "jb2tune.h"
+
+#include "jb2cmp/minidjvu.h"
+#include "jb2cmp/patterns.h"
+#include "jb2cmp/classify.h"
+
+#include <math.h>
+
+#define REFINE_THRESHOLD 21
+
+
+
+// ----------------------------------------
+// UTILITIES
+
+
+// Keep informations for pattern matching
+struct MatchData 
+{
+  GP<GBitmap> bits;    // bitmap pointer
+  int area;            // number of black pixels
+  int match;           // jb2cmp pattern match
+};
+
+
+// Compute the number of black pixels.
+static int 
+compute_area(GBitmap *bits)
+{
+  GBitmap &bitmap = *bits;
+  int w = bitmap.columns();
+  int h = bitmap.rows();
+  int black_pixels = 0;
+  for (int i=0; i<h; i++)
+    {
+      unsigned char *row = bitmap[i];
+      for (int j=0; j<w; j++)
+        if (row[j])
+          black_pixels++;
+    }
+  return black_pixels;
+}
+
+
+// Estimate position of baseline.
+// The baseline position is measured in quarter pixels.
+// Using fractional pixels makes a big improvement.
+static int
+compute_baseline(GBitmap *bits)
+{
+   int h = bits->rows();
+   int w = bits->columns();
+   GTArray<int> mass(h);
+   int i, j, m;
+   int tm = 0;
+   for (i=0; i<h; i++)
+     {
+       unsigned char *row = (*bits)[i];
+       for (j=0; j<w; j++)
+         if (row[j])
+           break;
+       for (m = w-j; m>0; m--)
+         if (row[j+m-1])
+           break;
+       mass[i] = m;
+       tm += m;
+     }
+   m = 0;
+   i = 0;
+   while (m * 6 < tm * 4)
+     {
+       m += mass[i/4];
+       i += 1;
+     }
+   return i;
+}
+
+
+// Fill the MatchData array for lossless compression
+static void
+compute_matchdata_lossless(JB2Image *jimg, MatchData *lib)
+{
+  int i;
+  int nshapes = jimg->get_shape_count();
+  for (i=0; i<nshapes; i++)
+    {
+      JB2Shape &jshp = jimg->get_shape(i);
+      lib[i].bits = 0;
+      lib[i].area = 0;
+      lib[i].match = -1;
+      if (! jshp.bits) continue;
+      if (jshp.userdata & JB2SHAPE_SPECIAL) continue;
+      lib[i].bits = jshp.bits;
+      lib[i].area = compute_area(jshp.bits);
+    }
+}
+
+
+// Interface with Ilya's data structures.
+static mdjvu_pattern_t 
+compute_comparable_image(GBitmap *bits)
+{
+  int w = bits->columns();
+  int h = bits->rows();
+  GTArray<unsigned char*> p(h);
+  for (int i=0; i<h; i++) p[h-i-1] = (*bits)[i];
+  return mdjvu_pattern_create_from_array(p, w, h);  
+}
+
+
+// Compute MatchData array for lossy compression.
+static void
+compute_matchdata_lossy(JB2Image *jimg, MatchData *lib,
+                        int dpi, mdjvu_matcher_options_t options)
+{
+  int i;
+  int nshapes = jimg->get_shape_count();
+  // Prepare MatchData
+  GTArray<mdjvu_pattern_t> handles(nshapes);
+  for (i=0; i<nshapes; i++)
+    {
+      JB2Shape &jshp = jimg->get_shape(i);
+      lib[i].bits = 0;
+      lib[i].area = 0;
+      lib[i].match = -1;
+      handles[i] = 0;
+      if (! jshp.bits) continue;
+      if (jshp.userdata & JB2SHAPE_SPECIAL) continue;
+      lib[i].bits = jshp.bits;
+      lib[i].area = compute_area(jshp.bits);
+      handles[i] = compute_comparable_image(jshp.bits);
+    }
+  // Run Ilya's pattern matcher.
+  GTArray<int> tags(nshapes);  
+  int maxtag = mdjvu_classify_patterns(handles, tags, nshapes, dpi, options);
+  // Extract substitutions
+  GTArray<int> reps(maxtag);
+  for (i=0; i<=maxtag; i++)
+    reps[i] = -1;
+  for (i=0; i<nshapes; i++)
+    if (handles[i])
+      {
+        int r = reps[tags[i]];
+        lib[i].match = r;
+        if (r < 0) 
+          reps[tags[i]] = i;
+      }
+  // Free Ilya's data structures.
+  for (i=0; i<nshapes; i++)
+    if (handles[i])
+      mdjvu_pattern_destroy(handles[i]);
+}
+
+
+// Reorganize jb2image on the basis of matchdata.
+// Also locate cross-coding buddys.
+// Flag lossy is not strictly necessary
+// but speeds up things when it is false.
+static void 
+tune_jb2image(JB2Image *jimg, MatchData *lib, bool lossy)
+{
+  int nshapes = jimg->get_shape_count();
+  // Loop on all shapes
+  for (int current=0; current<nshapes; current++)
+    {
+      JB2Shape &jshp = jimg->get_shape(current);
+      // Process substitutions.
+      if (lossy && !(jshp.userdata & JB2SHAPE_LOSSLESS))
+        {
+          int substitute = lib[current].match;
+          if (substitute >= 0)
+            {
+              jshp.parent = substitute;
+              lib[current].bits = 0;
+              continue;
+            }
+        }
+      // Leave special shapes alone.
+      if (! jshp.bits) continue;
+      if (jshp.userdata & JB2SHAPE_SPECIAL) continue;
+      // Compute matchdata info
+      GBitmap &bitmap = *(jshp.bits);
+      int rows = bitmap.rows();
+      int cols = bitmap.columns();
+      int best_score = (REFINE_THRESHOLD * rows * cols + 50) / 100;
+      int black_pixels = lib[current].area;
+      int closest = -1;
+      // Search cross-coding buddy
+      bitmap.minborder(2);
+      if (best_score < 2) 
+        best_score = 2;
+      for (int candidate = 0; candidate < current; candidate++) 
+        {
+          int row, column;
+          // Access candidate bitmap
+          if (! lib[candidate].bits) 
+            continue;
+          GBitmap &cross_bitmap = *lib[candidate].bits;
+          int cross_cols = cross_bitmap.columns();
+          int cross_rows = cross_bitmap.rows();
+          // Prune
+          if (abs (lib[candidate].area - black_pixels) > best_score) 
+            continue;
+          if (abs (cross_rows - rows) > 2) 
+            continue;
+          if (abs (cross_cols - cols) > 2)
+            continue;
+          // Compute alignment (these are always +1, 0 or -1)
+          int cross_col_adjust = (cross_cols-cross_cols/2)-(cols-cols/2);
+          int cross_row_adjust = (cross_rows-cross_rows/2)-(rows-rows/2);
+          // Ensure adequate borders
+          cross_bitmap.minborder (2-cross_col_adjust);
+          cross_bitmap.minborder (2+cols-cross_cols+cross_col_adjust);
+          // Count pixel differences (including borders)
+          int score = 0;
+          unsigned char *p_row;
+          unsigned char *p_cross_row;
+          for (row = -1; row <= rows; row++) 
+            {
+              p_row = bitmap[row];
+              p_cross_row = cross_bitmap[row+cross_row_adjust];
+              p_cross_row += cross_col_adjust;
+              for (column = -1; column <= cols; column++) 
+                if (p_row[column] != p_cross_row[column])
+                  score ++;
+              if (score >= best_score)  // prune
+                break;
+            }
+          if (score < best_score) 
+            {
+              best_score = score;
+              closest = candidate;
+            }
+        }
+      // Decide what to do with the match.
+      if (closest >= 0)
+        {
+          // Mark the shape for cross-coding (``soft pattern matching'')
+          jshp.parent = closest;
+          // Exact match ==> Substitution
+          if (best_score == 0)
+            {
+              lib[current].match = closest;
+              lib[current].bits = 0;
+            }
+          // ISSUE: CROSS-IMPROVING.  When we decide not to do a substitution,
+          // we can slightly modify the current shape in order to make it
+          // closer to the matching shape, therefore improving the file size.
+          // In fact there is a continuity between pure cross-coding and pure
+          // substitution...
+        }
+    }
+  
+  // Process shape substitutions
+  for (int blitno=0; blitno<jimg->get_blit_count(); blitno++)
+    {
+      JB2Blit *jblt = jimg->get_blit(blitno);
+      JB2Shape &jshp = jimg->get_shape(jblt->shapeno);
+      if (lib[jblt->shapeno].bits==0 && jshp.parent>=0)
+        {
+          // Locate parent
+          int parent = jshp.parent;
+          while (! lib[parent].bits)
+            parent = lib[parent].match;
+          // Compute coordinate adjustment.
+          int cols = jshp.bits->columns();
+          int rows = jshp.bits->rows();
+          int cross_cols = lib[parent].bits->columns();
+          int cross_rows = lib[parent].bits->rows();
+          int cross_col_adjust = (cross_cols-cross_cols/2)-(cols-cols/2);
+          int cross_row_adjust = (cross_rows-cross_rows/2)-(rows-rows/2);
+           // Refine vertical adjustment
+          if (lossy)
+            {
+              int adjust = compute_baseline(lib[parent].bits) 
+                         - compute_baseline(jshp.bits);
+              if (adjust < 0)
+                adjust = - (2 - adjust) / 4;
+              else
+                adjust =   (2 + adjust) / 4;
+              if (abs(adjust - cross_row_adjust) <= 1 + cols/16 )
+                cross_row_adjust = adjust;
+            }
+          // Update blit record.
+          jblt->bottom -= cross_row_adjust;
+          jblt->left   -= cross_col_adjust;
+          jblt->shapeno = parent;
+          // Update shape record.
+          jshp.bits = 0;
+        }
+    }
+}
+
+
+
+
+// ----------------------------------------
+// LOSSLESS COMPRESSION
+
+
+void 
+tune_jb2image_lossless(JB2Image *jimg)
+{
+  int nshapes = jimg->get_shape_count();
+  GArray<MatchData> lib(nshapes);
+  compute_matchdata_lossless(jimg, lib);
+  tune_jb2image(jimg, lib, false);
+}
+
+
+// ----------------------------------------
+// LOSSY COMPRESSION
+// Thanks to Ilya Mezhirov.
+
+void 
+tune_jb2image_lossy(JB2Image *jimg, int dpi, int aggression)
+{
+  int nshapes = jimg->get_shape_count();
+  GArray<MatchData> lib(nshapes);
+
+  mdjvu_matcher_options_t options = mdjvu_matcher_options_create();
+  mdjvu_set_aggression(options, aggression);
+  compute_matchdata_lossy(jimg, lib, dpi, options);
+  mdjvu_matcher_options_destroy(options);
+
+  tune_jb2image(jimg, lib, true);
+}
diff --git a/tools/jb2tune.h b/tools/jb2tune.h
new file mode 100644
index 0000000..a443e2f
--- /dev/null
+++ b/tools/jb2tune.h
@@ -0,0 +1,76 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifndef _JB2TUNE_H
+#define _JB2TUNE_H
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma interface
+#endif
+
+#include "GBitmap.h"
+#include "JB2Image.h"
+
+extern void tune_jb2image_lossy(JB2Image *jimg, int dpi, int aggression);
+extern void tune_jb2image_lossless(JB2Image *jimg);
+
+// Values for userdata in JB2Shape
+#define JB2SHAPE_LOSSLESS 1
+#define JB2SHAPE_SPECIAL  2
+
+#endif
+
diff --git a/tools/tiff2pdf.c b/tools/tiff2pdf.c
new file mode 100644
index 0000000..a0a2b88
--- /dev/null
+++ b/tools/tiff2pdf.c
@@ -0,0 +1,5424 @@
+/*  -*- C -*-
+//C- -------------------------------------------------------------------
+//C- DjView4
+//C- Copyright (c) 2006  Leon Bottou
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C-  ------------------------------------------------------------------
+//
+// The following code is derived from program "tiff2pdf"
+// whose copyright notice is reproduced below.
+// Changes were made to make it independent from the private
+// include file tiffiop.h.
+*/
+
+/* $Id: tiff2pdf.c,v 1.37.2.7 2009-01-01 00:10:43 bfriesen Exp $
+ *
+ * tiff2pdf - converts a TIFF image to a PDF document
+ *
+ * Copyright (c) 2003 Ross Finlayson
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the name of
+ * Ross Finlayson may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Ross Finlayson.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL ROSS FINLAYSON BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#include "tiff2pdf.h"
+
+#ifdef HAVE_TIFF2PDF
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif
+
+#if defined(__GNUC__) || defined(HAVE_LONG_LONG_INT)
+# define uint64 unsigned long long
+#elif defined(_MSC_VER)
+# define uint64 unsigned __int64
+#else
+# define uint64 size_t
+#endif
+
+#ifndef HAVE_GETOPT_H
+/*
+ * Copyright (c) 1987, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+static int   opterr = 1,        /* if error message should be printed */
+             optind = 1,        /* index into parent argv vector */
+             optopt,            /* character checked for validity */
+             optreset;          /* reset getopt */
+static char *optarg;            /* argument associated with option */
+
+#define	BADCH	(int)'?'
+#define	BADARG	(int)':'
+#define	EMSG	""
+
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ */
+static int
+getopt(int argc, char * const argv[], const char *optstring)
+{
+	static char *place = EMSG;		/* option letter processing */
+	char *oli;				/* option letter list index */
+
+	if (optreset || *place == 0) {		/* update scanning pointer */
+		optreset = 0;
+		place = argv[optind];
+		if (optind >= argc || *place++ != '-') {
+			/* Argument is absent or is not an option */
+			place = EMSG;
+			return (-1);
+		}
+		optopt = *place++;
+		if (optopt == '-' && *place == 0) {
+			/* "--" => end of options */
+			++optind;
+			place = EMSG;
+			return (-1);
+		}
+		if (optopt == 0) {
+			/* Solitary '-', treat as a '-' option
+			   if the program (eg su) is looking for it. */
+			place = EMSG;
+			if (strchr(optstring, '-') == NULL)
+				return -1;
+			optopt = '-';
+		}
+	} else
+		optopt = *place++;
+
+	/* See if option letter is one the caller wanted... */
+	if (optopt == ':' || (oli = strchr(optstring, optopt)) == NULL) {
+		if (*place == 0)
+			++optind;
+		if (opterr && *optstring != ':')
+			(void)fprintf(stderr,
+                                      "unknown option -- %c\n", optopt);
+		return (BADCH);
+	}
+
+	/* Does this option need an argument? */
+	if (oli[1] != ':') {
+		/* don't need argument */
+		optarg = NULL;
+		if (*place == 0)
+			++optind;
+	} else {
+		/* Option-argument is either the rest of this argument or the
+		   entire next argument. */
+		if (*place)
+			optarg = place;
+		else if (argc > ++optind)
+			optarg = argv[optind];
+		else {
+			/* option-argument absent */
+			place = EMSG;
+			if (*optstring == ':')
+				return (BADARG);
+			if (opterr)
+				(void)fprintf(stderr,
+                                        "option requires an argument -- %c\n",
+                                        optopt);
+			return (BADCH);
+		}
+		place = EMSG;
+		++optind;
+	}
+	return (optopt);			/* return option letter */
+}
+#endif
+
+
+#define TIFF2PDF_MODULE "tiff2pdf"
+
+#define PS_UNIT_SIZE	72.0F
+
+/* This type is of PDF color spaces. */
+typedef enum {
+	T2P_CS_BILEVEL = 0x01,	/* Bilevel, black and white */
+	T2P_CS_GRAY = 0x02,	/* Single channel */
+	T2P_CS_RGB = 0x04,	/* Three channel tristimulus RGB */
+	T2P_CS_CMYK = 0x08,	/* Four channel CMYK print inkset */
+	T2P_CS_LAB = 0x10,	/* Three channel L*a*b* color space */
+	T2P_CS_PALETTE = 0x1000,/* One of the above with a color map */
+	T2P_CS_CALGRAY = 0x20,	/* Calibrated single channel */
+	T2P_CS_CALRGB = 0x40,	/* Calibrated three channel tristimulus RGB */
+	T2P_CS_ICCBASED = 0x80	/* ICC profile color specification */
+} t2p_cs_t;
+
+/* This type is of PDF compression types.  */
+typedef enum{
+	T2P_COMPRESS_NONE=0x00
+#ifdef CCITT_SUPPORT
+	, T2P_COMPRESS_G4=0x01
+#endif
+#if defined(JPEG_SUPPORT) || defined(OJPEG_SUPPORT)
+	, T2P_COMPRESS_JPEG=0x02
+#endif
+#ifdef ZIP_SUPPORT
+	, T2P_COMPRESS_ZIP=0x04
+#endif
+} t2p_compress_t;
+
+/* This type is whether TIFF image data can be used in PDF without transcoding. */
+typedef enum{
+	T2P_TRANSCODE_RAW=0x01, /* The raw data from the input can be used without recompressing */
+	T2P_TRANSCODE_ENCODE=0x02 /* The data from the input is perhaps unencoded and reencoded */
+} t2p_transcode_t;
+
+/* This type is of information about the data samples of the input image. */
+typedef enum{
+	T2P_SAMPLE_NOTHING=0x0000, /* The unencoded samples are normal for the output colorspace */
+	T2P_SAMPLE_ABGR_TO_RGB=0x0001, /* The unencoded samples are the result of ReadRGBAImage */
+	T2P_SAMPLE_RGBA_TO_RGB=0x0002, /* The unencoded samples are contiguous RGBA */
+	T2P_SAMPLE_RGBAA_TO_RGB=0x0004, /* The unencoded samples are RGBA with premultiplied alpha */
+	T2P_SAMPLE_YCBCR_TO_RGB=0x0008, 
+	T2P_SAMPLE_YCBCR_TO_LAB=0x0010, 
+	T2P_SAMPLE_REALIZE_PALETTE=0x0020, /* The unencoded samples are indexes into the color map */
+	T2P_SAMPLE_SIGNED_TO_UNSIGNED=0x0040, /* The unencoded samples are signed instead of unsignd */
+	T2P_SAMPLE_LAB_SIGNED_TO_UNSIGNED=0x0040, /* The L*a*b* samples have a* and b* signed */
+	T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG=0x0100 /* The unencoded samples are separate instead of contiguous */
+} t2p_sample_t;
+
+/* This type is of error status of the T2P struct. */
+typedef enum{
+	T2P_ERR_OK = 0, /* This is the value of t2p->t2p_error when there is no error */
+	T2P_ERR_ERROR = 1 /* This is the value of t2p->t2p_error when there was an error */
+} t2p_err_t;
+
+/* This struct defines a logical page of a TIFF. */
+typedef struct {
+	tdir_t page_directory;
+	uint32 page_number;
+	ttile_t page_tilecount;
+	uint32 page_extra;
+} T2P_PAGE;
+
+/* This struct defines a PDF rectangle's coordinates. */
+typedef struct {
+	float x1;
+	float y1;
+	float x2;
+	float y2;
+	float mat[9];
+} T2P_BOX;
+
+/* This struct defines a tile of a PDF.  */
+typedef struct {
+	T2P_BOX tile_box;
+} T2P_TILE;
+
+/* This struct defines information about the tiles on a PDF page. */
+typedef struct {
+	ttile_t tiles_tilecount;
+	uint32 tiles_tilewidth;
+	uint32 tiles_tilelength;
+	uint32 tiles_tilecountx;
+	uint32 tiles_tilecounty;
+	uint32 tiles_edgetilewidth;
+	uint32 tiles_edgetilelength;
+	T2P_TILE* tiles_tiles;
+} T2P_TILES;
+
+/* This struct is the context of a function to generate PDF from a TIFF. */
+typedef struct {
+	t2p_err_t t2p_error;
+	T2P_PAGE* tiff_pages;
+	T2P_TILES* tiff_tiles;
+	tdir_t tiff_pagecount;
+	uint16 tiff_compression;
+	uint16 tiff_photometric;
+	uint16 tiff_fillorder;
+	uint16 tiff_bitspersample;
+	uint16 tiff_samplesperpixel;
+	uint16 tiff_planar;
+	uint32 tiff_width;
+	uint32 tiff_length;
+	float tiff_xres;
+	float tiff_yres;
+	uint16 tiff_orientation;
+	toff_t tiff_dataoffset;
+	tsize_t tiff_datasize;
+	uint16 tiff_resunit;
+	uint16 pdf_centimeters;
+	uint16 pdf_overrideres;
+	uint16 pdf_overridepagesize;
+	float pdf_defaultxres;
+	float pdf_defaultyres;
+	float pdf_xres;
+	float pdf_yres;
+	float pdf_defaultpagewidth;
+	float pdf_defaultpagelength;
+	float pdf_pagewidth;
+	float pdf_pagelength;
+	float pdf_imagewidth;
+	float pdf_imagelength;
+	T2P_BOX pdf_mediabox;
+	T2P_BOX pdf_imagebox;
+	uint16 pdf_majorversion;
+	uint16 pdf_minorversion;
+	uint32 pdf_catalog;
+	uint32 pdf_pages;
+	uint32 pdf_info;
+	uint32 pdf_palettecs;
+	uint16 pdf_fitwindow;
+	uint32 pdf_startxref;
+	unsigned char* pdf_fileid;
+	unsigned char* pdf_datetime;
+	unsigned char* pdf_creator;
+	unsigned char* pdf_author;
+	unsigned char* pdf_title;
+	unsigned char* pdf_subject;
+	unsigned char* pdf_keywords;
+	t2p_cs_t pdf_colorspace;
+	uint16 pdf_colorspace_invert;
+	uint16 pdf_switchdecode;
+	uint16 pdf_palettesize;
+	unsigned char* pdf_palette;
+	int pdf_labrange[4];
+	t2p_compress_t pdf_defaultcompression;
+	uint16 pdf_defaultcompressionquality;
+	t2p_compress_t pdf_compression;
+	uint16 pdf_compressionquality;
+	uint16 pdf_nopassthrough;
+	t2p_transcode_t pdf_transcode;
+	t2p_sample_t pdf_sample;
+	uint32* pdf_xrefoffsets;
+	uint32 pdf_xrefcount;
+	tdir_t pdf_page;
+#ifdef OJPEG_SUPPORT
+	tdata_t pdf_ojpegdata;
+	uint32 pdf_ojpegdatalength;
+	uint32 pdf_ojpegiflength;
+#endif
+	float tiff_whitechromaticities[2];
+	float tiff_primarychromaticities[6];
+	float tiff_referenceblackwhite[2];
+	float* tiff_transferfunction[3];
+	int pdf_image_interpolate;	/* 0 (default) : do not interpolate,
+					   1 : interpolate */
+	uint16 tiff_transferfunctioncount;
+	uint32 pdf_icccs;
+	uint32 tiff_iccprofilelength;
+	tdata_t tiff_iccprofile;
+
+	/* fields for custom read/write procedures */
+	FILE *outputfile;
+	int outputdisable;
+	tsize_t outputwritten;
+} T2P;
+
+/* These functions are called by main. */
+
+static int tiff2pdf_match_paper_size(float*, float*, char*);
+
+/* These functions are used to generate a PDF from a TIFF. */ 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static T2P* t2p_init(void);
+static void t2p_validate(T2P*);
+static tsize_t t2p_write_pdf(T2P*, TIFF*, TIFF*);
+static void t2p_free(T2P*);
+
+#ifdef __cplusplus
+}
+#endif
+
+static void t2p_read_tiff_init(T2P*, TIFF*);
+static int t2p_cmp_t2p_page(const void*, const void*);
+static void t2p_read_tiff_data(T2P*, TIFF*);
+static void t2p_read_tiff_size(T2P*, TIFF*);
+static void t2p_read_tiff_size_tile(T2P*, TIFF*, ttile_t);
+static int t2p_tile_is_right_edge(T2P_TILES, ttile_t);
+static int t2p_tile_is_bottom_edge(T2P_TILES, ttile_t);
+/* static int t2p_tile_is_edge(T2P_TILES, ttile_t); */
+/* static int t2p_tile_is_corner_edge(T2P_TILES, ttile_t); */
+static tsize_t t2p_readwrite_pdf_image(T2P*, TIFF*, TIFF*);
+static tsize_t t2p_readwrite_pdf_image_tile(T2P*, TIFF*, TIFF*, ttile_t);
+#ifdef OJPEG_SUPPORT
+static int t2p_process_ojpeg_tables(T2P*, TIFF*);
+#endif
+#ifdef JPEG_SUPPORT
+static int t2p_process_jpeg_strip(unsigned char*, tsize_t*, unsigned char*, tsize_t*, tstrip_t, uint32);
+#endif
+static void t2p_tile_collapse_left(tdata_t, tsize_t, uint32, uint32, uint32);
+static void t2p_write_advance_directory(T2P*, TIFF*);
+static tsize_t t2p_sample_planar_separate_to_contig(T2P*, unsigned char*, unsigned char*, tsize_t);
+static tsize_t t2p_sample_realize_palette(T2P*, unsigned char*);
+static tsize_t t2p_sample_abgr_to_rgb(tdata_t, uint32);
+static tsize_t t2p_sample_rgba_to_rgb(tdata_t, uint32);
+static tsize_t t2p_sample_rgbaa_to_rgb(tdata_t, uint32);
+static tsize_t t2p_sample_lab_signed_to_unsigned(tdata_t, uint32);
+static tsize_t t2p_write_pdf_header(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_obj_start(uint32, TIFF*);
+static tsize_t t2p_write_pdf_obj_end(TIFF*);
+/* static tsize_t t2p_write_pdf_name(unsigned char*, TIFF*); */
+static tsize_t t2p_write_pdf_string(unsigned char*, TIFF*);
+static tsize_t t2p_write_pdf_stream(tdata_t, tsize_t, TIFF*);
+static tsize_t t2p_write_pdf_stream_start(TIFF*);
+static tsize_t t2p_write_pdf_stream_end(TIFF*);
+static tsize_t t2p_write_pdf_stream_dict(tsize_t, uint32, TIFF*);
+static tsize_t t2p_write_pdf_stream_dict_start(TIFF*);
+static tsize_t t2p_write_pdf_stream_dict_end(TIFF*);
+static tsize_t t2p_write_pdf_stream_length(tsize_t, TIFF*);
+static tsize_t t2p_write_pdf_catalog(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_info(T2P*, TIFF*, TIFF*);
+static void t2p_pdf_currenttime(T2P*);
+static void t2p_pdf_tifftime(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_pages(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_page(uint32, T2P*, TIFF*);
+static void t2p_compose_pdf_page(T2P*);
+static void t2p_compose_pdf_page_orient(T2P_BOX*, uint16);
+static void t2p_compose_pdf_page_orient_flip(T2P_BOX*, uint16);
+/* static tsize_t t2p_write_pdf_page_content(T2P*, TIFF*); */
+static tsize_t t2p_write_pdf_xobject_stream_dict(ttile_t, T2P*, TIFF*); 
+static tsize_t t2p_write_pdf_xobject_cs(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_transfer(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_transfer_dict(T2P*, TIFF*, uint16);
+static tsize_t t2p_write_pdf_transfer_stream(T2P*, TIFF*, uint16);
+static tsize_t t2p_write_pdf_xobject_calcs(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_xobject_icccs(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_xobject_icccs_dict(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_xobject_icccs_stream(T2P*, TIFF*);
+/* static tsize_t t2p_write_pdf_xobject_cs_stream(T2P*, TIFF*); */
+static tsize_t t2p_write_pdf_xobject_decode(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t, T2P*, TIFF*);
+static tsize_t t2p_write_pdf_xreftable(T2P*, TIFF*);
+static tsize_t t2p_write_pdf_trailer(T2P*, TIFF*);
+
+static void
+t2p_disable(TIFF *tif)
+{
+	T2P *t2p = (T2P*) TIFFClientdata(tif);
+	t2p->outputdisable = 1;
+}
+
+static void
+t2p_enable(TIFF *tif)
+{
+	T2P *t2p = (T2P*) TIFFClientdata(tif);
+	t2p->outputdisable = 0;
+}
+
+/*
+ * Procs for TIFFClientOpen
+ */
+
+static tsize_t 
+t2pReadFile(TIFF *tif, tdata_t data, tsize_t size)
+{
+	thandle_t client = TIFFClientdata(tif);
+	TIFFReadWriteProc proc =  TIFFGetReadProc(tif);
+	if (proc)
+		return proc(client, data, size);
+	return -1;
+}
+
+static tsize_t 
+t2pWriteFile(TIFF *tif, tdata_t data, tsize_t size)
+{
+	thandle_t client = TIFFClientdata(tif);
+	TIFFReadWriteProc proc =  TIFFGetWriteProc(tif);
+	if (proc)
+		return proc(client, data, size);
+	return -1;
+}
+
+static toff_t
+t2pSeekFile(TIFF *tif, toff_t offset, int whence)
+{
+	thandle_t client = TIFFClientdata(tif);
+	TIFFSeekProc proc =  TIFFGetSeekProc(tif);
+	if (proc)
+		return proc(client, offset, whence);
+	return -1;
+}
+
+static tsize_t 
+t2p_readproc(thandle_t handle, tdata_t data, tsize_t size) 
+{
+	(void) handle, (void) data, (void) size;
+	return -1;
+}
+
+static tsize_t 
+t2p_writeproc(thandle_t handle, tdata_t data, tsize_t size) 
+{
+	T2P *t2p = (T2P*) handle;
+	if (t2p->outputdisable <= 0 && t2p->outputfile) {
+		tsize_t written = fwrite(data, 1, size, t2p->outputfile);
+		t2p->outputwritten += written;
+		return written;
+	}
+	return size; 
+}
+
+static toff_t 
+t2p_seekproc(thandle_t handle, toff_t offset, int whence) 
+{ 
+	T2P *t2p = (T2P*) handle;
+	if (t2p->outputdisable <= 0 && t2p->outputfile)
+		return fseek(t2p->outputfile, offset, whence);
+	return offset;
+}
+
+static int 
+t2p_closeproc(thandle_t handle)
+{ 
+	(void) handle;
+	return 0; 
+}
+
+static toff_t 
+t2p_sizeproc(thandle_t handle) 
+{
+	(void) handle;
+	return -1;
+}
+
+static int 
+t2p_mapproc(thandle_t handle, tdata_t *data, toff_t *offset) 
+{ 
+	(void) handle, (void) data, (void) offset;
+	return -1; 
+}
+
+static void 
+t2p_unmapproc(thandle_t handle, tdata_t data, toff_t offset)
+{ 
+	(void) handle, (void) data, (void) offset;
+}
+
+static uint64
+checkAdd64(uint64 summand1, uint64 summand2, T2P* t2p)
+{
+	uint64 bytes = summand1 + summand2;
+
+	if (bytes - summand1 != summand2) {
+		TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+		t2p->t2p_error = T2P_ERR_ERROR;
+		bytes = 0;
+	}
+
+	return bytes;
+}
+
+static uint64
+checkMultiply64(uint64 first, uint64 second, T2P* t2p)
+{
+	uint64 bytes = first * second;
+
+	if (second && bytes / second != first) {
+		TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+		t2p->t2p_error = T2P_ERR_ERROR;
+		bytes = 0;
+	}
+
+	return bytes;
+}
+
+/*
+
+  This is the main function.
+
+  The program converts one TIFF file to one PDF file, including multiple page 
+  TIFF files, tiled TIFF files, black and white. grayscale, and color TIFF 
+  files that contain data of TIFF photometric interpretations of bilevel, 
+  grayscale, RGB, YCbCr, CMYK separation, and ICC L*a*b* as supported by 
+  libtiff and PDF.
+
+  If you have multiple TIFF files to convert into one PDF file then use tiffcp 
+  or other program to concatenate the files into a multiple page TIFF file.  
+  If the input TIFF file is of huge dimensions (greater than 10000 pixels height
+  or width) convert the input image to a tiled TIFF if it is not already.
+
+  The standard output is standard output.  Set the output file name with the 
+  "-o output.pdf" option.
+
+  All black and white files are compressed into a single strip CCITT G4 Fax 
+  compressed PDF, unless tiled, where tiled black and white images are 
+  compressed into tiled CCITT G4 Fax compressed PDF, libtiff CCITT support 
+  is assumed.
+
+  Color and grayscale data can be compressed using either JPEG compression, 
+  ITU-T T.81, or Zip/Deflate LZ77 compression, per PNG 1.2 and RFC 1951.  Set 
+  the compression type using the -j or -z options.  JPEG compression support 
+  requires that libtiff be configured with JPEG support, and Zip/Deflate 
+  compression support requires that libtiff is configured with Zip support, 
+  in tiffconf.h.  Use only one or the other of -j and -z.  The -q option 
+  sets the image compression quality, that is 1-100 with libjpeg JPEG 
+  compression and one of 1, 10, 11, 12, 13, 14, or 15 for PNG group compression 
+  predictor methods, add 100, 200, ..., 900 to set zlib compression quality 1-9.
+  PNG Group differencing predictor methods are not currently implemented.
+
+  If the input TIFF contains single strip CCITT G4 Fax compressed information, 
+  then that is written to the PDF file without transcoding, unless the options 
+  of no compression and no passthrough are set, -d and -n.
+
+  If the input TIFF contains JPEG or single strip Zip/Deflate compressed 
+  information, and they are configured, then that is written to the PDF file 
+  without transcoding, unless the options of no compression and no passthrough 
+  are set.
+
+  The default page size upon which the TIFF image is placed is determined by 
+  the resolution and extent of the image data.  Default values for the TIFF 
+  image resolution can be set using the -x and -y options.  The page size can 
+  be set using the -p option for paper size, or -w and -l for paper width and 
+  length, then each page of the TIFF image is centered on its page.  The 
+  distance unit for default resolution and page width and length can be set 
+  by the -u option, the default unit is inch.
+
+  Various items of the output document information can be set with the -e, -c, 
+  -a, -t, -s, and -k tags.  Setting the argument of the option to "" for these 
+  tags causes the relevant document information field to be not written.  Some 
+  of the document information values otherwise get their information from the 
+  input TIFF image, the software, author, document name, and image description.
+
+  The output PDF file conforms to the PDF 1.1 specification or PDF 1.2 if using 
+  Zip/Deflate compression.  
+  
+  The Portable Document Format (PDF) specification is copyrighted by Adobe 
+  Systems, Incorporated.  Todos derechos reservados.
+
+  Here is a listing of the usage example and the options to the tiff2pdf 
+  program that is part of the libtiff distribution.  Options followed by 
+  a colon have a required argument.
+  
+    usage:  tiff2pdf [options] input.tif
+
+    options:
+    -o: output to file name
+
+    -j: compress with JPEG (requires libjpeg configured with libtiff)
+    -z: compress with Zip/Deflate (requires zlib configured with libtiff)
+    -q: compression quality
+    -n: no compressed data passthrough
+    -d: do not compress (decompress)
+    -i: invert colors
+    -u: set distance unit, 'i' for inch, 'm' for centimeter
+    -x: set x resolution default
+    -y: set y resolution default
+    -w: width in units
+    -l: length in units
+    -r: 'd' for resolution default, 'o' for resolution override
+    -p: paper size, eg "letter", "legal", "a4"
+    -f: set pdf "fit window" user preference
+    -b:	set PDF "Interpolate" user preference
+    -e: date, overrides image or current date/time default, YYYYMMDDHHMMSS
+    -c: creator, overrides image software default
+    -a: author, overrides image artist default
+    -t: title, overrides image document name default
+    -s: subject, overrides image image description default
+    -k: keywords
+
+    -h: usage
+
+    examples:
+
+        tiff2pdf -o output.pdf input.tiff
+
+    The above example would generate the file output.pdf from input.tiff.
+
+        tiff2pdf input.tiff
+
+    The above example would generate PDF output from input.tiff and write it 
+    to standard output.
+
+        tiff2pdf -j -p letter -o output.pdf input.tiff
+
+    The above example would generate the file output.pdf from input.tiff, 
+    putting the image pages on a letter sized page, compressing the output 
+    with JPEG.
+
+	Please report bugs through:
+	 
+	http://bugzilla.remotesensing.org/buglist.cgi?product=libtiff
+
+    See also libtiff.3t, tiffcp.
+  */
+
+int
+tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
+{
+        char *outfilename = "<null>";
+        T2P *t2p = NULL;
+        TIFF *output = NULL;
+	tsize_t written = 0;
+	int c;
+
+        (void)written;
+
+	t2p = t2p_init();
+
+	if (t2p == NULL){
+		TIFFError(TIFF2PDF_MODULE, "Can't initialize context");
+		goto fail;
+	}
+
+	while (argv &&
+	       (c = getopt(argc, (void*)argv,
+			   "o:q:u:x:y:w:l:r:p:e:c:a:t:s:k:jzndifbh")) != -1){
+		switch (c) {
+			case 'o':
+				outfilename = optarg;
+				break;
+#ifdef JPEG_SUPPORT
+			case 'j':  
+				t2p->pdf_defaultcompression=T2P_COMPRESS_JPEG;
+				break;
+#endif
+#ifndef JPEG_SUPPORT
+			case 'j':  
+				TIFFWarning(
+					TIFF2PDF_MODULE, 
+					"JPEG support in libtiff required for JPEG compression, ignoring option");
+				break;
+#endif
+#ifdef ZIP_SUPPORT
+			case 'z':  
+				t2p->pdf_defaultcompression=T2P_COMPRESS_ZIP;
+				break;
+#endif
+#ifndef ZIP_SUPPORT
+			case 'z':  
+				TIFFWarning(
+					TIFF2PDF_MODULE, 
+					"Zip support in libtiff required for Zip compression, ignoring option");
+				break;
+#endif
+			case 'q': 
+				t2p->pdf_defaultcompressionquality=atoi(optarg);
+				break;
+			case 'n': 
+				t2p->pdf_nopassthrough=1;
+				break;
+			case 'd': 
+				t2p->pdf_defaultcompression=T2P_COMPRESS_NONE;
+				break;
+			case 'u': 
+				if(optarg[0]=='m'){
+					t2p->pdf_centimeters=1;
+				}
+				break;
+			case 'x': 
+				t2p->pdf_defaultxres = 
+					(float)atof(optarg) / (t2p->pdf_centimeters?2.54F:1.0F);
+				break;
+			case 'y': 
+				t2p->pdf_defaultyres = 
+					(float)atof(optarg) / (t2p->pdf_centimeters?2.54F:1.0F);
+				break;
+			case 'w': 
+				t2p->pdf_overridepagesize=1;
+				t2p->pdf_defaultpagewidth = 
+					((float)atof(optarg) * PS_UNIT_SIZE) / (t2p->pdf_centimeters?2.54F:1.0F);
+				break;
+			case 'l': 
+				t2p->pdf_overridepagesize=1;
+				t2p->pdf_defaultpagelength = 
+					((float)atof(optarg) * PS_UNIT_SIZE) / (t2p->pdf_centimeters?2.54F:1.0F);
+				break;
+			case 'r': 
+				if(optarg[0]=='o'){
+					t2p->pdf_overrideres=1;
+				}
+				break;
+			case 'p': 
+				if(tiff2pdf_match_paper_size(
+					&(t2p->pdf_defaultpagewidth), 
+					&(t2p->pdf_defaultpagelength), 
+					optarg)){
+					t2p->pdf_overridepagesize=1;
+				} else {
+					TIFFWarning(TIFF2PDF_MODULE, 
+					"Unknown paper size %s, ignoring option",
+						optarg);
+				}
+				break;
+			case 'i':
+				t2p->pdf_colorspace_invert=1;
+				break;
+			case 'f': 
+				t2p->pdf_fitwindow=1;
+				break;
+			case 'e':
+				t2p->pdf_datetime =
+					(unsigned char*)_TIFFmalloc(17);
+				if(t2p->pdf_datetime==NULL){
+					TIFFError(TIFF2PDF_MODULE, 
+				"Can't allocate %u bytes of memory for main", 
+						17); 
+					goto fail;
+				}
+				if(strlen(optarg)==0){
+					t2p->pdf_datetime[0] = 0;
+				} else {
+					if(strlen(optarg)>14){optarg[14]=0;}
+					t2p->pdf_datetime[0] = 'D';
+					t2p->pdf_datetime[1] = ':';
+					strcpy((char *)t2p->pdf_datetime + 2,
+					       optarg);
+				}
+				break;
+			case 'c': 
+				t2p->pdf_creator = (unsigned char *)
+					_TIFFmalloc(strlen(optarg) + 1);
+				if(t2p->pdf_creator==NULL){
+					TIFFError(TIFF2PDF_MODULE, 
+				"Can't allocate %lu bytes of memory for main", 
+						  (long)strlen(optarg) + 1); 
+					goto fail;
+				}
+				strcpy((char *)t2p->pdf_creator, optarg);
+				t2p->pdf_creator[strlen(optarg)] = 0;
+				break;
+			case 'a': 
+				t2p->pdf_author = (unsigned char *)
+					_TIFFmalloc(strlen(optarg) + 1);
+				if(t2p->pdf_author==NULL){
+					TIFFError(
+						TIFF2PDF_MODULE, 
+				"Can't allocate %lu bytes of memory for main", 
+						(long)strlen(optarg) + 1); 
+					goto fail;
+				}
+				strcpy((char *)t2p->pdf_author, optarg);
+				t2p->pdf_author[strlen(optarg)]=0;
+				break;
+			case 't': 
+				t2p->pdf_title = (unsigned char*)
+					_TIFFmalloc(strlen(optarg)+1);
+				if(t2p->pdf_title==NULL){
+					TIFFError(
+						TIFF2PDF_MODULE, 
+				"Can't allocate %lu bytes of memory for main", 
+						(long)strlen(optarg) + 1); 
+					goto fail;
+				}
+				strcpy((char *)t2p->pdf_title, optarg);
+				t2p->pdf_title[strlen(optarg)] = 0;
+				break;
+			case 's': 
+				t2p->pdf_subject = (unsigned char*)
+					_TIFFmalloc(strlen(optarg) + 1);
+				if(t2p->pdf_subject==NULL){
+					TIFFError(
+						TIFF2PDF_MODULE, 
+				"Can't allocate %lu bytes of memory for main", 
+						(long)strlen(optarg)+1); 
+					goto fail;
+				}
+				strcpy((char *)t2p->pdf_subject, optarg);
+				t2p->pdf_subject[strlen(optarg)]=0;
+				break;
+			case 'k': 
+				t2p->pdf_keywords = (unsigned char*)
+					_TIFFmalloc(strlen(optarg) + 1);
+				if(t2p->pdf_keywords==NULL){
+					TIFFError(
+						TIFF2PDF_MODULE, 
+				"Can't allocate %lu bytes of memory for main", 
+						(long)strlen(optarg) + 1); 
+					goto fail;
+				}
+				strcpy((char *)t2p->pdf_keywords, optarg);
+				t2p->pdf_keywords[strlen(optarg)] = 0;
+				break;		
+			case 'b':
+				t2p->pdf_image_interpolate = 1;
+				break;
+		}
+	}
+
+	/*
+	 * Output
+	 */
+	t2p->outputdisable = 0;
+        t2p->outputfile = outputfile;
+
+	output = TIFFClientOpen(outfilename, "w", (thandle_t) t2p,
+				t2p_readproc, t2p_writeproc, t2p_seekproc, 
+				t2p_closeproc, t2p_sizeproc, 
+				t2p_mapproc, t2p_unmapproc );
+	if (output == NULL) {
+		TIFFError(TIFF2PDF_MODULE,
+			  "Can't initialize output descriptor");
+		goto fail;
+	}
+	
+	/*
+	 * Validate
+	 */
+	t2p_validate(t2p);
+	t2pSeekFile(output, (toff_t) 0, SEEK_SET);
+
+	/*
+	 * Write
+	 */
+	written = t2p_write_pdf(t2p, input, output);
+	if (t2p->t2p_error != 0) {
+		TIFFError(TIFF2PDF_MODULE,
+			  "An error occurred creating output PDF file");
+		goto fail;
+	}
+
+/* success: */
+	if (output != NULL)
+		TIFFClose(output);
+	if (t2p != NULL)
+		t2p_free(t2p);
+	return(EXIT_SUCCESS);
+
+fail:
+	if(input != NULL)
+		TIFFClose(input);
+	if (output != NULL)
+		TIFFClose(output);
+	if (t2p != NULL)
+		t2p_free(t2p);
+	return(EXIT_FAILURE);
+  
+}
+
+
+static int tiff2pdf_match_paper_size(float* width, float* length, char* papersize){
+
+	size_t i, len;
+	const char* sizes[]={
+		"LETTER", "A4", "LEGAL",
+		"EXECUTIVE", "LETTER", "LEGAL", "LEDGER", "TABLOID", 
+		"A", "B", "C", "D", "E", "F", "G", "H", "J", "K", 
+		"A10", "A9", "A8", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", 
+		"2A0", "4A0", "2A", "4A", 
+		"B10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", 
+		"JISB10", "JISB9", "JISB8", "JISB7", "JISB6", "JISB5", "JISB4", 
+		"JISB3", "JISB2", "JISB1", "JISB0", 
+		"C10", "C9", "C8", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", 
+		"RA2", "RA1", "RA0", "SRA4", "SRA3", "SRA2", "SRA1", "SRA0", 
+		"A3EXTRA", "A4EXTRA", 
+		"STATEMENT", "FOLIO", "QUARTO", 
+		NULL
+	} ;
+	const int widths[]={
+		612, 595, 612,
+		522, 612,612,792,792,
+		612,792,1224,1584,2448,2016,792,2016,2448,2880,
+		74,105,147,210,298,420,595,842,1191,1684,2384,3370,4768,3370,4768,
+		88,125,176,249,354,499,709,1001,1417,2004,2835,
+		91,128,181,258,363,516,729,1032,1460,2064,2920,
+		79,113,162,230,323,459,649,918,1298,1298,2599,
+		1219,1729,2438,638,907,1276,1814,2551,
+		914,667,
+		396, 612, 609, 
+		0
+	};
+	const int lengths[]={
+		792,842,1008,
+		756,792,1008,1224,1224,
+		792,1224,1584,2448,3168,2880,6480,10296,12672,10296,
+		105,147,210,298,420,595,842,1191,1684,2384,3370,4768,6741,4768,6741,
+		125,176,249,354,499,709,1001,1417,2004,2835,4008,
+		128,181,258,363,516,729,1032,1460,2064,2920,4127,
+		113,162,230,323,459,649,918,1298,1837,1837,3677,
+		1729,2438,3458,907,1276,1814,2551,3628,
+		1262,914,
+		612, 936, 780, 
+		0
+	};
+
+	len=strlen(papersize);
+	for(i=0;i<len;i++){
+		papersize[i]=toupper(papersize[i]);
+	}
+	for(i=0;sizes[i]!=NULL; i++){
+		if (strcmp( (const char*)papersize, sizes[i])==0){
+			*width=(float)widths[i];
+			*length=(float)lengths[i];
+			return(1);
+		}
+	}
+
+	return(0);
+}
+
+/*
+	This function allocates and initializes a T2P context struct pointer.
+*/
+
+static T2P* t2p_init(){
+
+	T2P* t2p = (T2P*) _TIFFmalloc(sizeof(T2P));
+	if(t2p==NULL){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"Can't allocate %lu bytes of memory for t2p_init", 
+			(long)sizeof(T2P));
+		return( (T2P*) NULL );
+	}
+	_TIFFmemset(t2p, 0x00, sizeof(T2P));
+	t2p->pdf_majorversion=1;
+	t2p->pdf_minorversion=1;
+	t2p->pdf_defaultxres=300.0;
+	t2p->pdf_defaultyres=300.0;
+	t2p->pdf_defaultpagewidth=612.0;
+	t2p->pdf_defaultpagelength=792.0;
+	t2p->pdf_xrefcount=3; /* Catalog, Info, Pages */
+	
+	return(t2p);
+}
+
+/*
+	This function frees a T2P context struct pointer and any allocated data fields of it.
+*/
+
+static void t2p_free(T2P* t2p){
+
+	int i=0;
+
+	if(t2p != NULL){
+		if(t2p->pdf_xrefoffsets != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_xrefoffsets);
+		}
+		if(t2p->tiff_pages != NULL){
+			_TIFFfree( (tdata_t) t2p->tiff_pages);
+		}
+		for(i=0;i<t2p->tiff_pagecount;i++){
+			if(t2p->tiff_tiles[i].tiles_tiles != NULL){
+				_TIFFfree( (tdata_t) t2p->tiff_tiles[i].tiles_tiles);
+			}
+		}
+		if(t2p->tiff_tiles != NULL){
+			_TIFFfree( (tdata_t) t2p->tiff_tiles);
+		}
+		if(t2p->pdf_palette != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_palette);
+		}
+		if(t2p->pdf_fileid != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_fileid);
+		}
+		if(t2p->pdf_datetime != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_datetime);
+		}
+		if(t2p->pdf_creator != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_creator);
+		}
+		if(t2p->pdf_author != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_author);
+		}
+		if(t2p->pdf_title != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_title);
+		}
+		if(t2p->pdf_subject != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_subject);
+		}
+		if(t2p->pdf_keywords != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_keywords);
+		}
+#ifdef OJPEG_SUPPORT
+		if(t2p->pdf_ojpegdata != NULL){
+			_TIFFfree( (tdata_t) t2p->pdf_ojpegdata);
+		}
+#endif
+		_TIFFfree( (tdata_t) t2p );
+	}
+
+	return;
+}
+
+/*
+	This function validates the values of a T2P context struct pointer
+        before calling t2p_write_pdf with it.
+*/
+
+static void t2p_validate(T2P* t2p){
+
+#ifdef JPEG_SUPPORT
+	if(t2p->pdf_defaultcompression==T2P_COMPRESS_JPEG){
+		if(t2p->pdf_defaultcompressionquality>100 ||
+			t2p->pdf_defaultcompressionquality<1){
+			t2p->pdf_defaultcompressionquality=0;
+		}
+	}
+#endif
+#ifdef ZIP_SUPPORT
+	if(t2p->pdf_defaultcompression==T2P_COMPRESS_ZIP){
+ 		uint16 m=t2p->pdf_defaultcompressionquality%100;
+ 		if(t2p->pdf_defaultcompressionquality/100 > 9 ||
+ 			(m>1 && m<10) || m>15){
+ 			t2p->pdf_defaultcompressionquality=0;
+		}
+		if(t2p->pdf_defaultcompressionquality%100 !=0){
+ 			t2p->pdf_defaultcompressionquality/=100;
+ 			t2p->pdf_defaultcompressionquality*=100;
+			TIFFError(
+				TIFF2PDF_MODULE, 
+				"PNG Group predictor differencing not implemented, assuming compression quality %u", 
+				t2p->pdf_defaultcompressionquality);
+		}
+		t2p->pdf_defaultcompressionquality%=100;
+		if(t2p->pdf_minorversion<2){t2p->pdf_minorversion=2;}
+	}
+#endif
+	(void)0;
+
+	return;
+}
+
+
+/*
+	This function scans the input TIFF file for pages.  It attempts
+        to determine which IFD's of the TIFF file contain image document
+        pages.  For each, it gathers some information that has to do
+        with the output of the PDF document as a whole.  
+*/
+
+static void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+
+	tdir_t directorycount=0;
+	tdir_t i=0;
+	uint16 pagen=0;
+	uint16 paged=0;
+	uint16 xuint16=0;
+
+	directorycount=TIFFNumberOfDirectories(input);
+	t2p->tiff_pages = (T2P_PAGE*) _TIFFmalloc(directorycount * sizeof(T2P_PAGE));
+	if(t2p->tiff_pages==NULL){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"Can't allocate %lu bytes of memory for tiff_pages array, %s", 
+			directorycount * (long)sizeof(T2P_PAGE), 
+			TIFFFileName(input));
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	}
+	_TIFFmemset( t2p->tiff_pages, 0x00, directorycount * sizeof(T2P_PAGE));
+	t2p->tiff_tiles = (T2P_TILES*) _TIFFmalloc(directorycount * sizeof(T2P_TILES));
+	if(t2p->tiff_tiles==NULL){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"Can't allocate %lu bytes of memory for tiff_tiles array, %s", 
+			directorycount * (long)sizeof(T2P_TILES), 
+			TIFFFileName(input));
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	}
+	_TIFFmemset( t2p->tiff_tiles, 0x00, directorycount * sizeof(T2P_TILES));
+	for(i=0;i<directorycount;i++){
+		uint32 subfiletype = 0;
+		
+		if(!TIFFSetDirectory(input, i)){
+			TIFFError(
+				TIFF2PDF_MODULE, 
+				"Can't set directory %u of input file %s", 
+				i,
+				TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return;
+		}
+		if(TIFFGetField(input, TIFFTAG_PAGENUMBER, &pagen, &paged)){
+			if((pagen>paged) && (paged != 0)){
+				t2p->tiff_pages[t2p->tiff_pagecount].page_number = 
+					paged;
+			} else {
+				t2p->tiff_pages[t2p->tiff_pagecount].page_number = 
+					pagen;
+			}
+			goto ispage2;
+		}
+		if(TIFFGetField(input, TIFFTAG_SUBFILETYPE, &subfiletype)){
+			if ( ((subfiletype & FILETYPE_PAGE) != 0)
+                             || (subfiletype == 0)){
+				goto ispage;
+			} else {
+				goto isnotpage;
+			}
+		}
+		if(TIFFGetField(input, TIFFTAG_OSUBFILETYPE, &subfiletype)){
+			if ((subfiletype == OFILETYPE_IMAGE) 
+				|| (subfiletype == OFILETYPE_PAGE)
+				|| (subfiletype == 0) ){
+				goto ispage;
+			} else {
+				goto isnotpage;
+			}
+		}
+		ispage:
+		t2p->tiff_pages[t2p->tiff_pagecount].page_number=t2p->tiff_pagecount;
+		ispage2:
+		t2p->tiff_pages[t2p->tiff_pagecount].page_directory=i;
+		if(TIFFIsTiled(input)){
+			t2p->tiff_pages[t2p->tiff_pagecount].page_tilecount = 
+				TIFFNumberOfTiles(input);
+		}
+		t2p->tiff_pagecount++;
+		isnotpage:
+		(void)0;
+	}
+	
+	qsort((void*) t2p->tiff_pages, t2p->tiff_pagecount,
+              sizeof(T2P_PAGE), t2p_cmp_t2p_page);
+
+	for(i=0;i<t2p->tiff_pagecount;i++){
+		t2p->pdf_xrefcount += 5;
+		TIFFSetDirectory(input, t2p->tiff_pages[i].page_directory );
+		if((TIFFGetField(input, TIFFTAG_PHOTOMETRIC, &xuint16)
+                    && (xuint16==PHOTOMETRIC_PALETTE))
+		   || TIFFGetField(input, TIFFTAG_INDEXED, &xuint16)) {
+			t2p->tiff_pages[i].page_extra++;
+			t2p->pdf_xrefcount++;
+		}
+#ifdef ZIP_SUPPORT
+		if (TIFFGetField(input, TIFFTAG_COMPRESSION, &xuint16)) {
+                        if( (xuint16== COMPRESSION_DEFLATE ||
+                             xuint16== COMPRESSION_ADOBE_DEFLATE) && 
+                            ((t2p->tiff_pages[i].page_tilecount != 0) 
+                             || TIFFNumberOfStrips(input)==1) &&
+                            (t2p->pdf_nopassthrough==0)	){
+                                if(t2p->pdf_minorversion<2){t2p->pdf_minorversion=2;}
+                        }
+                }
+#endif
+		if (TIFFGetField(input, TIFFTAG_TRANSFERFUNCTION,
+                                 &(t2p->tiff_transferfunction[0]),
+                                 &(t2p->tiff_transferfunction[1]),
+                                 &(t2p->tiff_transferfunction[2]))) {
+			if(t2p->tiff_transferfunction[1] !=
+			   t2p->tiff_transferfunction[0]) {
+				t2p->tiff_transferfunctioncount = 3;
+				t2p->tiff_pages[i].page_extra += 4;
+				t2p->pdf_xrefcount += 4;
+			} else {
+				t2p->tiff_transferfunctioncount = 1;
+				t2p->tiff_pages[i].page_extra += 2;
+				t2p->pdf_xrefcount += 2;
+			}
+			if(t2p->pdf_minorversion < 2)
+				t2p->pdf_minorversion = 2;
+                } else {
+			t2p->tiff_transferfunctioncount=0;
+		}
+		if( TIFFGetField(
+			input, 
+			TIFFTAG_ICCPROFILE, 
+			&(t2p->tiff_iccprofilelength), 
+			&(t2p->tiff_iccprofile)) != 0){
+			t2p->tiff_pages[i].page_extra++;
+			t2p->pdf_xrefcount++;
+			if(t2p->pdf_minorversion<3){t2p->pdf_minorversion=3;}
+		}
+		t2p->tiff_tiles[i].tiles_tilecount=
+			t2p->tiff_pages[i].page_tilecount;
+		if( (TIFFGetField(input, TIFFTAG_PLANARCONFIG, &xuint16) != 0)
+			&& (xuint16 == PLANARCONFIG_SEPARATE ) ){
+				TIFFGetField(input, TIFFTAG_SAMPLESPERPIXEL, &xuint16);
+				t2p->tiff_tiles[i].tiles_tilecount/= xuint16;
+		}
+		if( t2p->tiff_tiles[i].tiles_tilecount > 0){
+			t2p->pdf_xrefcount += 
+				(t2p->tiff_tiles[i].tiles_tilecount -1)*2;
+			TIFFGetField(input, 
+				TIFFTAG_TILEWIDTH, 
+				&( t2p->tiff_tiles[i].tiles_tilewidth) );
+			TIFFGetField(input, 
+				TIFFTAG_TILELENGTH, 
+				&( t2p->tiff_tiles[i].tiles_tilelength) );
+			t2p->tiff_tiles[i].tiles_tiles = 
+			(T2P_TILE*) _TIFFmalloc(
+				t2p->tiff_tiles[i].tiles_tilecount 
+				* sizeof(T2P_TILE) );
+			if( t2p->tiff_tiles[i].tiles_tiles == NULL){
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory for t2p_read_tiff_init, %s", 
+					t2p->tiff_tiles[i].tiles_tilecount * (long)sizeof(T2P_TILE), 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+		}
+	}
+
+	return;
+}
+
+/*
+ * This function is used by qsort to sort a T2P_PAGE* array of page structures
+ * by page number.
+ */
+
+static int t2p_cmp_t2p_page(const void* e1, const void* e2){
+
+	return( ((T2P_PAGE*)e1)->page_number - ((T2P_PAGE*)e2)->page_number );
+}
+
+/*
+	This function sets the input directory to the directory of a given
+	page and determines information about the image.  It checks
+	the image characteristics to determine if it is possible to convert
+	the image data into a page of PDF output, setting values of the T2P
+	struct for this page.  It determines what color space is used in
+	the output PDF to represent the image.
+	
+	It determines if the image can be converted as raw data without
+	requiring transcoding of the image data.
+*/
+
+static void t2p_read_tiff_data(T2P* t2p, TIFF* input){
+
+	int i=0;
+	uint16* r;
+	uint16* g;
+	uint16* b;
+	uint16* a;
+	uint16 xuint16;
+	uint16* xuint16p;
+	float* xfloatp;
+
+	t2p->pdf_transcode = T2P_TRANSCODE_ENCODE;
+	t2p->pdf_sample = T2P_SAMPLE_NOTHING;
+        t2p->pdf_switchdecode = t2p->pdf_colorspace_invert;
+        
+	
+	TIFFSetDirectory(input, t2p->tiff_pages[t2p->pdf_page].page_directory);
+
+	TIFFGetField(input, TIFFTAG_IMAGEWIDTH, &(t2p->tiff_width));
+	if(t2p->tiff_width == 0){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"No support for %s with zero width", 
+			TIFFFileName(input)	);
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	}
+
+	TIFFGetField(input, TIFFTAG_IMAGELENGTH, &(t2p->tiff_length));
+	if(t2p->tiff_length == 0){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"No support for %s with zero length", 
+			TIFFFileName(input)	);
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	}
+
+        if(TIFFGetField(input, TIFFTAG_COMPRESSION, &(t2p->tiff_compression)) == 0){
+                TIFFError(
+                        TIFF2PDF_MODULE, 
+                        "No support for %s with no compression tag", 
+                        TIFFFileName(input)     );
+                t2p->t2p_error = T2P_ERR_ERROR;
+                return;
+
+        }
+        if( TIFFIsCODECConfigured(t2p->tiff_compression) == 0){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"No support for %s with compression type %u:  not configured", 
+			TIFFFileName(input), 
+			t2p->tiff_compression	
+			);
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	
+	}
+
+	TIFFGetFieldDefaulted(input, TIFFTAG_BITSPERSAMPLE, &(t2p->tiff_bitspersample));
+	switch(t2p->tiff_bitspersample){
+		case 1:
+		case 2:
+		case 4:
+		case 8:
+			break;
+		case 0:
+			TIFFWarning(
+				TIFF2PDF_MODULE, 
+				"Image %s has 0 bits per sample, assuming 1",
+				TIFFFileName(input));
+			t2p->tiff_bitspersample=1;
+			break;
+		default:
+			TIFFError(
+				TIFF2PDF_MODULE, 
+				"No support for %s with %u bits per sample",
+				TIFFFileName(input),
+				t2p->tiff_bitspersample);
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return;
+	}
+
+	TIFFGetFieldDefaulted(input, TIFFTAG_SAMPLESPERPIXEL, &(t2p->tiff_samplesperpixel));
+	if(t2p->tiff_samplesperpixel>4){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"No support for %s with %u samples per pixel",
+			TIFFFileName(input),
+			t2p->tiff_samplesperpixel);
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	}
+	if(t2p->tiff_samplesperpixel==0){
+		TIFFWarning(
+			TIFF2PDF_MODULE, 
+			"Image %s has 0 samples per pixel, assuming 1",
+			TIFFFileName(input));
+		t2p->tiff_samplesperpixel=1;
+	}
+	
+	if(TIFFGetField(input, TIFFTAG_SAMPLEFORMAT, &xuint16) != 0 ){
+		switch(xuint16){
+			case 0:
+			case 1:
+			case 4:
+				break;
+			default:
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"No support for %s with sample format %u",
+					TIFFFileName(input),
+					xuint16);
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+				break;
+		}
+	}
+	
+	TIFFGetFieldDefaulted(input, TIFFTAG_FILLORDER, &(t2p->tiff_fillorder));
+	
+        if(TIFFGetField(input, TIFFTAG_PHOTOMETRIC, &(t2p->tiff_photometric)) == 0){
+                TIFFError(
+                        TIFF2PDF_MODULE, 
+                        "No support for %s with no photometric interpretation tag", 
+                        TIFFFileName(input)     );
+                t2p->t2p_error = T2P_ERR_ERROR;
+                return;
+
+        }
+        
+	switch(t2p->tiff_photometric){
+		case PHOTOMETRIC_MINISWHITE:
+		case PHOTOMETRIC_MINISBLACK: 
+			if (t2p->tiff_bitspersample==1){
+				t2p->pdf_colorspace=T2P_CS_BILEVEL;
+				if(t2p->tiff_photometric==PHOTOMETRIC_MINISWHITE){
+					t2p->pdf_switchdecode ^= 1;
+				}
+			} else {
+				t2p->pdf_colorspace=T2P_CS_GRAY;
+				if(t2p->tiff_photometric==PHOTOMETRIC_MINISWHITE){
+					t2p->pdf_switchdecode ^= 1;
+				} 
+			}
+			break;
+		case PHOTOMETRIC_RGB: 
+			t2p->pdf_colorspace=T2P_CS_RGB;
+			if(t2p->tiff_samplesperpixel == 3){
+				break;
+			}
+			if(TIFFGetField(input, TIFFTAG_INDEXED, &xuint16)){
+				if(xuint16==1)
+					goto photometric_palette;
+			}
+			if(t2p->tiff_samplesperpixel > 3) {
+				if(t2p->tiff_samplesperpixel == 4) {
+					t2p->pdf_colorspace = T2P_CS_RGB;
+					if(TIFFGetField(input,
+							TIFFTAG_EXTRASAMPLES,
+							&xuint16, &xuint16p)
+					   && xuint16 == 1) {
+						if(xuint16p[0] == EXTRASAMPLE_ASSOCALPHA){
+							t2p->pdf_sample=T2P_SAMPLE_RGBAA_TO_RGB;
+							break;
+						}
+						if(xuint16p[0] == EXTRASAMPLE_UNASSALPHA){
+							t2p->pdf_sample=T2P_SAMPLE_RGBA_TO_RGB;
+							break;
+						}
+						TIFFWarning(
+							TIFF2PDF_MODULE, 
+							"RGB image %s has 4 samples per pixel, assuming RGBA",
+							TIFFFileName(input));
+							break;
+					}
+					t2p->pdf_colorspace=T2P_CS_CMYK;
+					t2p->pdf_switchdecode ^= 1;
+					TIFFWarning(
+						TIFF2PDF_MODULE, 
+						"RGB image %s has 4 samples per pixel, assuming inverse CMYK",
+					TIFFFileName(input));
+					break;
+				} else {
+					TIFFError(
+						TIFF2PDF_MODULE, 
+						"No support for RGB image %s with %u samples per pixel", 
+						TIFFFileName(input), 
+						t2p->tiff_samplesperpixel);
+					t2p->t2p_error = T2P_ERR_ERROR;
+					break;
+				}
+			} else {
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"No support for RGB image %s with %u samples per pixel", 
+					TIFFFileName(input), 
+					t2p->tiff_samplesperpixel);
+				t2p->t2p_error = T2P_ERR_ERROR;
+				break;
+			}
+		case PHOTOMETRIC_PALETTE: 
+			photometric_palette:
+			if(t2p->tiff_samplesperpixel!=1){
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"No support for palettized image %s with not one sample per pixel", 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+			t2p->pdf_colorspace=T2P_CS_RGB | T2P_CS_PALETTE;
+			t2p->pdf_palettesize=0x0001<<t2p->tiff_bitspersample;
+			if(!TIFFGetField(input, TIFFTAG_COLORMAP, &r, &g, &b)){
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"Palettized image %s has no color map", 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			} 
+			if(t2p->pdf_palette != NULL){
+				_TIFFfree(t2p->pdf_palette);
+				t2p->pdf_palette=NULL;
+			}
+			t2p->pdf_palette = (unsigned char*)
+				_TIFFmalloc(t2p->pdf_palettesize*3);
+			if(t2p->pdf_palette==NULL){
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"Can't allocate %u bytes of memory for t2p_read_tiff_image, %s", 
+					t2p->pdf_palettesize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+			for(i=0;i<t2p->pdf_palettesize;i++){
+				t2p->pdf_palette[(i*3)]  = (unsigned char) (r[i]>>8);
+				t2p->pdf_palette[(i*3)+1]= (unsigned char) (g[i]>>8);
+				t2p->pdf_palette[(i*3)+2]= (unsigned char) (b[i]>>8);
+			}
+			t2p->pdf_palettesize *= 3;
+			break;
+		case PHOTOMETRIC_SEPARATED:
+			if(TIFFGetField(input, TIFFTAG_INDEXED, &xuint16)){
+				if(xuint16==1){
+						goto photometric_palette_cmyk;
+				}
+			}
+			if( TIFFGetField(input, TIFFTAG_INKSET, &xuint16) ){
+				if(xuint16 != INKSET_CMYK){
+					TIFFError(
+						TIFF2PDF_MODULE, 
+						"No support for %s because its inkset is not CMYK",
+						TIFFFileName(input) );
+					t2p->t2p_error = T2P_ERR_ERROR;
+					return;
+				}
+			}
+			if(t2p->tiff_samplesperpixel==4){
+				t2p->pdf_colorspace=T2P_CS_CMYK;
+			} else {
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"No support for %s because it has %u samples per pixel",
+					TIFFFileName(input), 
+					t2p->tiff_samplesperpixel);
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+			break;
+			photometric_palette_cmyk:
+			if(t2p->tiff_samplesperpixel!=1){
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"No support for palettized CMYK image %s with not one sample per pixel", 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+			t2p->pdf_colorspace=T2P_CS_CMYK | T2P_CS_PALETTE;
+			t2p->pdf_palettesize=0x0001<<t2p->tiff_bitspersample;
+			if(!TIFFGetField(input, TIFFTAG_COLORMAP, &r, &g, &b, &a)){
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"Palettized image %s has no color map", 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			} 
+			if(t2p->pdf_palette != NULL){
+				_TIFFfree(t2p->pdf_palette);
+				t2p->pdf_palette=NULL;
+			}
+			t2p->pdf_palette = (unsigned char*) 
+				_TIFFmalloc(t2p->pdf_palettesize*4);
+			if(t2p->pdf_palette==NULL){
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"Can't allocate %u bytes of memory for t2p_read_tiff_image, %s", 
+					t2p->pdf_palettesize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+			for(i=0;i<t2p->pdf_palettesize;i++){
+				t2p->pdf_palette[(i*4)]  = (unsigned char) (r[i]>>8);
+				t2p->pdf_palette[(i*4)+1]= (unsigned char) (g[i]>>8);
+				t2p->pdf_palette[(i*4)+2]= (unsigned char) (b[i]>>8);
+				t2p->pdf_palette[(i*4)+3]= (unsigned char) (a[i]>>8);
+			}
+			t2p->pdf_palettesize *= 4;
+			break;
+		case PHOTOMETRIC_YCBCR:
+			t2p->pdf_colorspace=T2P_CS_RGB;
+			if(t2p->tiff_samplesperpixel==1){
+				t2p->pdf_colorspace=T2P_CS_GRAY;
+				t2p->tiff_photometric=PHOTOMETRIC_MINISBLACK;
+				break;
+			}
+			t2p->pdf_sample=T2P_SAMPLE_YCBCR_TO_RGB;
+#ifdef JPEG_SUPPORT
+			if(t2p->pdf_defaultcompression==T2P_COMPRESS_JPEG){
+				t2p->pdf_sample=T2P_SAMPLE_NOTHING;
+			}
+#endif
+			break;
+		case PHOTOMETRIC_CIELAB:
+			t2p->pdf_labrange[0]= -127;
+			t2p->pdf_labrange[1]= 127;
+			t2p->pdf_labrange[2]= -127;
+			t2p->pdf_labrange[3]= 127;
+			t2p->pdf_sample=T2P_SAMPLE_LAB_SIGNED_TO_UNSIGNED;
+			t2p->pdf_colorspace=T2P_CS_LAB;
+			break;
+		case PHOTOMETRIC_ICCLAB:
+			t2p->pdf_labrange[0]= 0;
+			t2p->pdf_labrange[1]= 255;
+			t2p->pdf_labrange[2]= 0;
+			t2p->pdf_labrange[3]= 255;
+			t2p->pdf_colorspace=T2P_CS_LAB;
+			break;
+		case PHOTOMETRIC_ITULAB:
+			t2p->pdf_labrange[0]=-85;
+			t2p->pdf_labrange[1]=85;
+			t2p->pdf_labrange[2]=-75;
+			t2p->pdf_labrange[3]=124;
+			t2p->pdf_sample=T2P_SAMPLE_LAB_SIGNED_TO_UNSIGNED;
+			t2p->pdf_colorspace=T2P_CS_LAB;
+			break;
+		case PHOTOMETRIC_LOGL:
+		case PHOTOMETRIC_LOGLUV:
+			TIFFError(
+				TIFF2PDF_MODULE, 
+				"No support for %s with photometric interpretation LogL/LogLuv", 
+				TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return;
+		default:
+			TIFFError(
+				TIFF2PDF_MODULE, 
+				"No support for %s with photometric interpretation %u", 
+				TIFFFileName(input),
+				t2p->tiff_photometric);
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return;
+	}
+
+	if(TIFFGetField(input, TIFFTAG_PLANARCONFIG, &(t2p->tiff_planar))){
+		switch(t2p->tiff_planar){
+			case 0:
+				TIFFWarning(
+					TIFF2PDF_MODULE, 
+					"Image %s has planar configuration 0, assuming 1", 
+					TIFFFileName(input));
+				t2p->tiff_planar=PLANARCONFIG_CONTIG;
+			case PLANARCONFIG_CONTIG:
+				break;
+			case PLANARCONFIG_SEPARATE:
+				t2p->pdf_sample=T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG;
+				if(t2p->tiff_bitspersample!=8){
+					TIFFError(
+						TIFF2PDF_MODULE, 
+						"No support for %s with separated planar configuration and %u bits per sample", 
+						TIFFFileName(input),
+						t2p->tiff_bitspersample);
+					t2p->t2p_error = T2P_ERR_ERROR;
+					return;
+				}
+				break;
+			default:
+				TIFFError(
+					TIFF2PDF_MODULE, 
+					"No support for %s with planar configuration %u", 
+					TIFFFileName(input),
+					t2p->tiff_planar);
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+		}
+	}
+
+        TIFFGetFieldDefaulted(input, TIFFTAG_ORIENTATION,
+                              &(t2p->tiff_orientation));
+        if(t2p->tiff_orientation>8){
+                TIFFWarning(TIFF2PDF_MODULE,
+                            "Image %s has orientation %u, assuming 0",
+                            TIFFFileName(input), t2p->tiff_orientation);
+                t2p->tiff_orientation=0;
+        }
+
+        if(TIFFGetField(input, TIFFTAG_XRESOLUTION, &(t2p->tiff_xres) ) == 0){
+                t2p->tiff_xres=0.0;
+        }
+        if(TIFFGetField(input, TIFFTAG_YRESOLUTION, &(t2p->tiff_yres) ) == 0){
+                t2p->tiff_yres=0.0;
+        }
+	TIFFGetFieldDefaulted(input, TIFFTAG_RESOLUTIONUNIT,
+			      &(t2p->tiff_resunit));
+	if(t2p->tiff_resunit == RESUNIT_CENTIMETER) {
+		t2p->tiff_xres *= 2.54F;
+		t2p->tiff_yres *= 2.54F;
+	} else if (t2p->tiff_resunit != RESUNIT_INCH
+		   && t2p->pdf_centimeters != 0) {
+		t2p->tiff_xres *= 2.54F;
+		t2p->tiff_yres *= 2.54F;
+	}
+
+	t2p_compose_pdf_page(t2p);
+
+	t2p->pdf_transcode = T2P_TRANSCODE_ENCODE;
+	if(t2p->pdf_nopassthrough==0){
+#ifdef CCITT_SUPPORT
+		if(t2p->tiff_compression==COMPRESSION_CCITTFAX4  
+			){
+			if(TIFFIsTiled(input) || (TIFFNumberOfStrips(input)==1) ){
+				t2p->pdf_transcode = T2P_TRANSCODE_RAW;
+				t2p->pdf_compression=T2P_COMPRESS_G4;
+			}
+		}
+#endif
+#ifdef ZIP_SUPPORT
+		if(t2p->tiff_compression== COMPRESSION_ADOBE_DEFLATE 
+			|| t2p->tiff_compression==COMPRESSION_DEFLATE){
+			if(TIFFIsTiled(input) || (TIFFNumberOfStrips(input)==1) ){
+				t2p->pdf_transcode = T2P_TRANSCODE_RAW;
+				t2p->pdf_compression=T2P_COMPRESS_ZIP;
+			}
+		}
+#endif
+#ifdef OJPEG_SUPPORT
+		if(t2p->tiff_compression==COMPRESSION_OJPEG){
+			t2p->pdf_transcode = T2P_TRANSCODE_RAW;
+			t2p->pdf_compression=T2P_COMPRESS_JPEG;
+			t2p_process_ojpeg_tables(t2p, input);
+		}
+#endif
+#ifdef JPEG_SUPPORT
+		if(t2p->tiff_compression==COMPRESSION_JPEG){
+			t2p->pdf_transcode = T2P_TRANSCODE_RAW;
+			t2p->pdf_compression=T2P_COMPRESS_JPEG;
+		}
+#endif
+		(void)0;
+	}
+
+	if(t2p->pdf_transcode!=T2P_TRANSCODE_RAW){
+		t2p->pdf_compression = t2p->pdf_defaultcompression;
+	}
+
+#ifdef JPEG_SUPPORT
+	if(t2p->pdf_defaultcompression==T2P_COMPRESS_JPEG){
+		if(t2p->pdf_colorspace & T2P_CS_PALETTE){
+			t2p->pdf_sample|=T2P_SAMPLE_REALIZE_PALETTE;
+			t2p->pdf_colorspace ^= T2P_CS_PALETTE;
+			t2p->tiff_pages[t2p->pdf_page].page_extra--;
+		}
+	}
+	if(t2p->tiff_compression==COMPRESSION_JPEG){
+		if(t2p->tiff_planar==PLANARCONFIG_SEPARATE){
+			TIFFError(
+				TIFF2PDF_MODULE, 
+				"No support for %s with JPEG compression and separated planar configuration", 
+				TIFFFileName(input));
+				t2p->t2p_error=T2P_ERR_ERROR;
+			return;
+		}
+	}
+#endif
+#ifdef OJPEG_SUPPORT
+	if(t2p->tiff_compression==COMPRESSION_OJPEG){
+		if(t2p->tiff_planar==PLANARCONFIG_SEPARATE){
+			TIFFError(
+				TIFF2PDF_MODULE, 
+				"No support for %s with OJPEG compression and separated planar configuration", 
+				TIFFFileName(input));
+				t2p->t2p_error=T2P_ERR_ERROR;
+			return;
+		}
+	}
+#endif
+
+	if(t2p->pdf_sample & T2P_SAMPLE_REALIZE_PALETTE){
+		if(t2p->pdf_colorspace & T2P_CS_CMYK){
+			t2p->tiff_samplesperpixel=4;
+			t2p->tiff_photometric=PHOTOMETRIC_SEPARATED;
+		} else {
+			t2p->tiff_samplesperpixel=3;
+			t2p->tiff_photometric=PHOTOMETRIC_RGB;
+		}
+	}
+
+	if (TIFFGetField(input, TIFFTAG_TRANSFERFUNCTION,
+			 &(t2p->tiff_transferfunction[0]),
+			 &(t2p->tiff_transferfunction[1]),
+			 &(t2p->tiff_transferfunction[2]))) {
+		if(t2p->tiff_transferfunction[1] !=
+		   t2p->tiff_transferfunction[0]) {
+			t2p->tiff_transferfunctioncount=3;
+		} else {
+			t2p->tiff_transferfunctioncount=1;
+		}
+	} else {
+		t2p->tiff_transferfunctioncount=0;
+	}
+	if(TIFFGetField(input, TIFFTAG_WHITEPOINT, &xfloatp)!=0){
+		t2p->tiff_whitechromaticities[0]=xfloatp[0];
+		t2p->tiff_whitechromaticities[1]=xfloatp[1];
+		if(t2p->pdf_colorspace & T2P_CS_GRAY){
+			t2p->pdf_colorspace |= T2P_CS_CALGRAY;
+		}
+		if(t2p->pdf_colorspace & T2P_CS_RGB){
+			t2p->pdf_colorspace |= T2P_CS_CALRGB;
+		}
+	}
+	if(TIFFGetField(input, TIFFTAG_PRIMARYCHROMATICITIES, &xfloatp)!=0){
+		t2p->tiff_primarychromaticities[0]=xfloatp[0];
+		t2p->tiff_primarychromaticities[1]=xfloatp[1];
+		t2p->tiff_primarychromaticities[2]=xfloatp[2];
+		t2p->tiff_primarychromaticities[3]=xfloatp[3];
+		t2p->tiff_primarychromaticities[4]=xfloatp[4];
+		t2p->tiff_primarychromaticities[5]=xfloatp[5];
+		if(t2p->pdf_colorspace & T2P_CS_RGB){
+			t2p->pdf_colorspace |= T2P_CS_CALRGB;
+		}
+	}
+	if(t2p->pdf_colorspace & T2P_CS_LAB){
+		if(TIFFGetField(input, TIFFTAG_WHITEPOINT, &xfloatp) != 0){
+			t2p->tiff_whitechromaticities[0]=xfloatp[0];
+			t2p->tiff_whitechromaticities[1]=xfloatp[1];
+		} else {
+			t2p->tiff_whitechromaticities[0]=0.3457F; /* 0.3127F; */
+			t2p->tiff_whitechromaticities[1]=0.3585F; /* 0.3290F; */
+		}
+	}
+	if(TIFFGetField(input, 
+		TIFFTAG_ICCPROFILE, 
+		&(t2p->tiff_iccprofilelength), 
+		&(t2p->tiff_iccprofile))!=0){
+		t2p->pdf_colorspace |= T2P_CS_ICCBASED;
+	} else {
+		t2p->tiff_iccprofilelength=0;
+		t2p->tiff_iccprofile=NULL;
+	}
+	
+#ifdef CCITT_SUPPORT
+	if( t2p->tiff_bitspersample==1 &&
+		t2p->tiff_samplesperpixel==1){
+		t2p->pdf_compression = T2P_COMPRESS_G4;
+	}
+#endif
+
+
+	return;
+}
+
+/*
+	This function returns the necessary size of a data buffer to contain the raw or 
+	uncompressed image data from the input TIFF for a page.
+*/
+
+static void t2p_read_tiff_size(T2P* t2p, TIFF* input){
+
+	uint32* sbc=NULL;
+#if defined(JPEG_SUPPORT) || defined (OJPEG_SUPPORT)
+	unsigned char* jpt=NULL;
+	tstrip_t i=0;
+	tstrip_t stripcount=0;
+#endif
+        uint64 k = 0;
+
+	if(t2p->pdf_transcode == T2P_TRANSCODE_RAW){
+#ifdef CCITT_SUPPORT
+		if(t2p->pdf_compression == T2P_COMPRESS_G4 ){
+			TIFFGetField(input, TIFFTAG_STRIPBYTECOUNTS, &sbc);
+			t2p->tiff_datasize=sbc[0];
+			return;
+		}
+#endif
+#ifdef ZIP_SUPPORT
+		if(t2p->pdf_compression == T2P_COMPRESS_ZIP){
+			TIFFGetField(input, TIFFTAG_STRIPBYTECOUNTS, &sbc);
+			t2p->tiff_datasize=sbc[0];
+			return;
+		}
+#endif
+#ifdef OJPEG_SUPPORT
+		if(t2p->tiff_compression == COMPRESSION_OJPEG){
+			if(!TIFFGetField(input, TIFFTAG_STRIPBYTECOUNTS, &sbc)){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Input file %s missing field: TIFFTAG_STRIPBYTECOUNTS",
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+			stripcount=TIFFNumberOfStrips(input);
+			for(i=0;i<stripcount;i++){
+				k = checkAdd64(k, sbc[i], t2p);
+			}
+			if(TIFFGetField(input, TIFFTAG_JPEGIFOFFSET, &(t2p->tiff_dataoffset))){
+				if(t2p->tiff_dataoffset != 0){
+					if(TIFFGetField(input, TIFFTAG_JPEGIFBYTECOUNT, &(t2p->tiff_datasize))!=0){
+                                          if((uint64)t2p->tiff_datasize < k) {
+							TIFFWarning(TIFF2PDF_MODULE, 
+								"Input file %s has short JPEG interchange file byte count", 
+								TIFFFileName(input));
+							t2p->pdf_ojpegiflength=t2p->tiff_datasize;
+							k = checkAdd64(k, t2p->tiff_datasize, t2p);
+							k = checkAdd64(k, 6, t2p);
+							k = checkAdd64(k, stripcount, t2p);
+							k = checkAdd64(k, stripcount, t2p);
+							t2p->tiff_datasize = (tsize_t) k;
+							if ((uint64) t2p->tiff_datasize != k) {
+								TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+								t2p->t2p_error = T2P_ERR_ERROR;
+							}
+							return;
+						}
+						return;
+					}else {
+						TIFFError(TIFF2PDF_MODULE, 
+							"Input file %s missing field: TIFFTAG_JPEGIFBYTECOUNT",
+							TIFFFileName(input));
+							t2p->t2p_error = T2P_ERR_ERROR;
+							return;
+					}
+				}
+			}
+			k = checkAdd64(k, stripcount, t2p);
+			k = checkAdd64(k, stripcount, t2p);
+			k = checkAdd64(k, 2048, t2p);
+			t2p->tiff_datasize = (tsize_t) k;
+			if ((uint64) t2p->tiff_datasize != k) {
+				TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+				t2p->t2p_error = T2P_ERR_ERROR;
+			}
+			return;
+		}
+#endif
+#ifdef JPEG_SUPPORT
+		if(t2p->tiff_compression == COMPRESSION_JPEG) {
+			uint32 count = 0;
+			if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0 ){
+				if(count > 4){
+					k += count;
+					k -= 2; /* don't use EOI of header */
+				}
+			} else {
+				k = 2; /* SOI for first strip */
+			}
+			stripcount=TIFFNumberOfStrips(input);
+			if(!TIFFGetField(input, TIFFTAG_STRIPBYTECOUNTS, &sbc)){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Input file %s missing field: TIFFTAG_STRIPBYTECOUNTS",
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return;
+			}
+			for(i=0;i<stripcount;i++){
+				k = checkAdd64(k, sbc[i], t2p);
+				k -=4; /* don't use SOI or EOI of strip */
+			}
+			k = checkAdd64(k, 2, t2p); /* use EOI of last strip */
+			t2p->tiff_datasize = (tsize_t) k;
+			if ((uint64) t2p->tiff_datasize != k) {
+				TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+				t2p->t2p_error = T2P_ERR_ERROR;
+			}
+		}
+#endif
+		(void) 0;
+	}
+	k = checkMultiply64(TIFFScanlineSize(input), t2p->tiff_length, t2p);
+	if(t2p->tiff_planar==PLANARCONFIG_SEPARATE){
+		k = checkMultiply64(k, t2p->tiff_samplesperpixel, t2p);
+	}
+	if (k == 0) {
+		/* Assume we had overflow inside TIFFScanlineSize */
+		t2p->t2p_error = T2P_ERR_ERROR;
+	}
+
+	t2p->tiff_datasize = (tsize_t) k;
+	if ((uint64) t2p->tiff_datasize != k) {
+		TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+		t2p->t2p_error = T2P_ERR_ERROR;
+	}
+
+	return;
+}
+
+/*
+	This function returns the necessary size of a data buffer to contain the raw or 
+	uncompressed image data from the input TIFF for a tile of a page.
+*/
+
+static void t2p_read_tiff_size_tile(T2P* t2p, TIFF* input, ttile_t tile){
+
+	uint32* tbc = NULL;
+	uint16 edge=0;
+#ifdef JPEG_SUPPORT
+	unsigned char* jpt;
+#endif
+        uint64 k;
+
+	edge |= t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile);
+	edge |= t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile);
+	
+	if(t2p->pdf_transcode==T2P_TRANSCODE_RAW){
+		if(edge
+#if defined(JPEG_SUPPORT) || defined(OJPEG_SUPPORT)
+		&& !(t2p->pdf_compression==T2P_COMPRESS_JPEG)
+#endif
+		){
+			t2p->tiff_datasize=TIFFTileSize(input);
+			if (t2p->tiff_datasize == 0) {
+				/* Assume we had overflow inside TIFFTileSize */
+				t2p->t2p_error = T2P_ERR_ERROR;
+			}
+			return;
+		} else {
+			TIFFGetField(input, TIFFTAG_TILEBYTECOUNTS, &tbc);
+			k=tbc[tile];
+#ifdef OJPEG_SUPPORT
+			if(t2p->tiff_compression==COMPRESSION_OJPEG){
+			  	k = checkAdd64(k, 2048, t2p);
+			}
+#endif
+#ifdef JPEG_SUPPORT
+			if(t2p->tiff_compression==COMPRESSION_JPEG) {
+				uint32 count = 0;
+				if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt)!=0){
+					if(count > 4){
+						k = checkAdd64(k, count, t2p);
+						k -= 4; /* don't use EOI of header or SOI of tile */
+
+
+					}
+				}
+			}
+#endif
+			t2p->tiff_datasize = (tsize_t) k;
+			if ((uint64) t2p->tiff_datasize != k) {
+				TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+				t2p->t2p_error = T2P_ERR_ERROR;
+			}
+			return;
+		}
+	}
+	k = TIFFTileSize(input);
+	if(t2p->tiff_planar==PLANARCONFIG_SEPARATE){
+		k = checkMultiply64(k, t2p->tiff_samplesperpixel, t2p);
+	}
+	if (k == 0) {
+		/* Assume we had overflow inside TIFFTileSize */
+		t2p->t2p_error = T2P_ERR_ERROR;
+	}
+
+	t2p->tiff_datasize = (tsize_t) k;
+	if ((uint64) t2p->tiff_datasize != k) {
+		TIFFError(TIFF2PDF_MODULE, "Integer overflow");
+		t2p->t2p_error = T2P_ERR_ERROR;
+	}
+
+	return;
+}
+
+/*
+ * This functions returns a non-zero value when the tile is on the right edge
+ * and does not have full imaged tile width.
+ */
+
+static int t2p_tile_is_right_edge(T2P_TILES tiles, ttile_t tile){
+
+	if( ((tile+1) % tiles.tiles_tilecountx == 0) 
+		&& (tiles.tiles_edgetilewidth != 0) ){
+		return(1);
+	} else {
+		return(0);
+	}
+}
+
+/*
+ * This functions returns a non-zero value when the tile is on the bottom edge
+ * and does not have full imaged tile length.
+ */
+
+static int t2p_tile_is_bottom_edge(T2P_TILES tiles, ttile_t tile){
+
+	if( ((tile+1) > (tiles.tiles_tilecount-tiles.tiles_tilecountx) )
+		&& (tiles.tiles_edgetilelength != 0) ){
+		return(1);
+	} else {
+		return(0);
+	}
+}
+
+/*
+	This function reads the raster image data from the input TIFF for an image and writes 
+	the data to the output PDF XObject image dictionary stream.  It returns the amount written 
+	or zero on error.
+*/
+
+static tsize_t t2p_readwrite_pdf_image(T2P* t2p, TIFF* input, TIFF* output){
+
+	tsize_t written=0;
+	unsigned char* buffer=NULL;
+	unsigned char* samplebuffer=NULL;
+	tsize_t bufferoffset=0;
+	tsize_t samplebufferoffset=0;
+	tsize_t read=0;
+	tstrip_t i=0;
+	tstrip_t j=0;
+	tstrip_t stripcount=0;
+	tsize_t stripsize=0;
+	tsize_t sepstripcount=0;
+	tsize_t sepstripsize=0;
+#ifdef OJPEG_SUPPORT
+	toff_t inputoffset=0;
+	uint16 h_samp=1;
+	uint16 v_samp=1;
+	uint16 ri=1;
+	uint32 rows=0;
+#endif
+#ifdef JPEG_SUPPORT
+	unsigned char* jpt;
+	float* xfloatp;
+	uint32* sbc;
+	unsigned char* stripbuffer;
+	tsize_t striplength=0;
+	uint32 max_striplength=0;
+#endif
+
+	/* Fail if prior error (in particular, can't trust tiff_datasize) */
+	if (t2p->t2p_error != T2P_ERR_OK)
+		return(0);
+
+	if(t2p->pdf_transcode == T2P_TRANSCODE_RAW){
+#ifdef CCITT_SUPPORT
+		if(t2p->pdf_compression == T2P_COMPRESS_G4){
+			buffer = (unsigned char*)
+				_TIFFmalloc(t2p->tiff_datasize);
+			if (buffer == NULL) {
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			TIFFReadRawStrip(input, 0, (tdata_t) buffer,
+					 t2p->tiff_datasize);
+			if (t2p->tiff_fillorder==FILLORDER_LSB2MSB){
+					/*
+					 * make sure is lsb-to-msb
+					 * bit-endianness fill order
+					 */
+					TIFFReverseBits(buffer,
+							t2p->tiff_datasize);
+			}
+			t2pWriteFile(output, (tdata_t) buffer,
+				      t2p->tiff_datasize);
+			_TIFFfree(buffer);
+			return(t2p->tiff_datasize);
+		}
+#endif
+#ifdef ZIP_SUPPORT
+		if (t2p->pdf_compression == T2P_COMPRESS_ZIP) {
+			buffer = (unsigned char*)
+				_TIFFmalloc(t2p->tiff_datasize);
+                        memset(buffer, 0, t2p->tiff_datasize);
+			if(buffer == NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			TIFFReadRawStrip(input, 0, (tdata_t) buffer,
+					 t2p->tiff_datasize);
+			if (t2p->tiff_fillorder==FILLORDER_LSB2MSB) {
+					TIFFReverseBits(buffer,
+							t2p->tiff_datasize);
+			}
+			t2pWriteFile(output, (tdata_t) buffer,
+				      t2p->tiff_datasize);
+			_TIFFfree(buffer);
+			return(t2p->tiff_datasize);
+		}
+#endif
+#ifdef OJPEG_SUPPORT
+		if(t2p->tiff_compression == COMPRESSION_OJPEG) {
+
+			if(t2p->tiff_dataoffset != 0) {
+				buffer = (unsigned char*)
+					_TIFFmalloc(t2p->tiff_datasize);
+                                memset(buffer, 0, t2p->tiff_datasize);
+				if(buffer == NULL) {
+					TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+						(unsigned long)t2p->tiff_datasize, 
+						TIFFFileName(input));
+					t2p->t2p_error = T2P_ERR_ERROR;
+					return(0);
+				}
+				if(t2p->pdf_ojpegiflength==0){
+					inputoffset=t2pSeekFile(input, 0,
+								 SEEK_CUR);
+					t2pSeekFile(input,
+						     t2p->tiff_dataoffset,
+						     SEEK_SET);
+					t2pReadFile(input, (tdata_t) buffer,
+						     t2p->tiff_datasize);
+					t2pSeekFile(input, inputoffset,
+						     SEEK_SET);
+					t2pWriteFile(output, (tdata_t) buffer,
+						      t2p->tiff_datasize);
+					_TIFFfree(buffer);
+					return(t2p->tiff_datasize);
+				} else {
+					inputoffset=t2pSeekFile(input, 0,
+								 SEEK_CUR);
+					t2pSeekFile(input,
+						     t2p->tiff_dataoffset,
+						     SEEK_SET);
+					bufferoffset = t2pReadFile(input,
+						(tdata_t) buffer,
+						t2p->pdf_ojpegiflength);
+					t2p->pdf_ojpegiflength = 0;
+					t2pSeekFile(input, inputoffset,
+						     SEEK_SET);
+					TIFFGetField(input,
+						     TIFFTAG_YCBCRSUBSAMPLING,
+						     &h_samp, &v_samp);
+					buffer[bufferoffset++]= 0xff;
+					buffer[bufferoffset++]= 0xdd;
+					buffer[bufferoffset++]= 0x00;
+					buffer[bufferoffset++]= 0x04;
+					h_samp*=8;
+					v_samp*=8;
+					ri=(t2p->tiff_width+h_samp-1) / h_samp;
+					TIFFGetField(input,
+						     TIFFTAG_ROWSPERSTRIP,
+						     &rows);
+					ri*=(rows+v_samp-1)/v_samp;
+					buffer[bufferoffset++]= (ri>>8) & 0xff;
+					buffer[bufferoffset++]= ri & 0xff;
+					stripcount=TIFFNumberOfStrips(input);
+					for(i=0;i<stripcount;i++){
+						if(i != 0 ){ 
+							buffer[bufferoffset++]=0xff;
+							buffer[bufferoffset++]=(0xd0 | ((i-1)%8));
+						}
+						bufferoffset+=TIFFReadRawStrip(input, 
+							i, 
+							(tdata_t) &(((unsigned char*)buffer)[bufferoffset]), 
+							-1);
+					}
+					t2pWriteFile(output, (tdata_t) buffer, bufferoffset);
+					_TIFFfree(buffer);
+					return(bufferoffset);
+				}
+			} else {
+				if(! t2p->pdf_ojpegdata){
+					TIFFError(TIFF2PDF_MODULE, 
+				"No support for OJPEG image %s with bad tables", 
+						TIFFFileName(input));
+					t2p->t2p_error = T2P_ERR_ERROR;
+					return(0);
+				}
+				buffer = (unsigned char*)
+					_TIFFmalloc(t2p->tiff_datasize);
+                                memset(buffer, 0, t2p->tiff_datasize);
+				if(buffer==NULL){
+					TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+						(unsigned long)t2p->tiff_datasize, 
+						TIFFFileName(input));
+					t2p->t2p_error = T2P_ERR_ERROR;
+					return(0);
+				}
+				_TIFFmemcpy(buffer, t2p->pdf_ojpegdata, t2p->pdf_ojpegdatalength);
+				bufferoffset=t2p->pdf_ojpegdatalength;
+				stripcount=TIFFNumberOfStrips(input);
+				for(i=0;i<stripcount;i++){
+					if(i != 0){
+						buffer[bufferoffset++]=0xff;
+						buffer[bufferoffset++]=(0xd0 | ((i-1)%8));
+					}
+					bufferoffset+=TIFFReadRawStrip(input, 
+						i, 
+						(tdata_t) &(((unsigned char*)buffer)[bufferoffset]), 
+						-1);
+				}
+				if( ! ( (buffer[bufferoffset-1]==0xd9) && (buffer[bufferoffset-2]==0xff) ) ){
+						buffer[bufferoffset++]=0xff;
+						buffer[bufferoffset++]=0xd9;
+				}
+				t2pWriteFile(output, (tdata_t) buffer, bufferoffset);
+				_TIFFfree(buffer);
+				return(bufferoffset);
+				TIFFError(TIFF2PDF_MODULE, 
+	"No support for OJPEG image %s with no JPEG File Interchange offset", 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			return(t2p->tiff_datasize);
+		}
+#endif
+#ifdef JPEG_SUPPORT
+		if(t2p->tiff_compression == COMPRESSION_JPEG) {
+			uint32 count = 0;
+			buffer = (unsigned char*)
+				_TIFFmalloc(t2p->tiff_datasize);
+                        memset(buffer, 0, t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			if (TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) {
+				if(count > 4) {
+					_TIFFmemcpy(buffer, jpt, count);
+					bufferoffset += count - 2;
+				}
+			}
+			stripcount=TIFFNumberOfStrips(input);
+			TIFFGetField(input, TIFFTAG_STRIPBYTECOUNTS, &sbc);
+			for(i=0;i<stripcount;i++){
+				if(sbc[i]>max_striplength) max_striplength=sbc[i];
+			}
+			stripbuffer = (unsigned char*)
+				_TIFFmalloc(max_striplength);
+			if(stripbuffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+					max_striplength, 
+					TIFFFileName(input));
+				_TIFFfree(buffer);
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			for(i=0;i<stripcount;i++){
+				striplength=TIFFReadRawStrip(input, i, (tdata_t) stripbuffer, -1);
+				if(!t2p_process_jpeg_strip(
+					stripbuffer, 
+					&striplength, 
+					buffer, 
+					&bufferoffset, 
+					i, 
+					t2p->tiff_length)){
+						TIFFError(TIFF2PDF_MODULE, 
+				"Can't process JPEG data in input file %s", 
+							TIFFFileName(input));
+						_TIFFfree(samplebuffer);
+						_TIFFfree(buffer);
+						t2p->t2p_error = T2P_ERR_ERROR;
+						return(0);
+				}
+			}
+			buffer[bufferoffset++]=0xff; 
+			buffer[bufferoffset++]=0xd9;
+			t2pWriteFile(output, (tdata_t) buffer, bufferoffset);
+			_TIFFfree(stripbuffer);
+			_TIFFfree(buffer);
+			return(bufferoffset);
+		}
+#endif
+		(void)0;
+	}
+
+	if(t2p->pdf_sample==T2P_SAMPLE_NOTHING){
+		buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+                memset(buffer, 0, t2p->tiff_datasize);
+		if(buffer==NULL){
+			TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+				(unsigned long)t2p->tiff_datasize, 
+				TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return(0);
+		}
+		stripsize=TIFFStripSize(input);
+		stripcount=TIFFNumberOfStrips(input);
+		for(i=0;i<stripcount;i++){
+			read = 
+				TIFFReadEncodedStrip(input, 
+				i, 
+				(tdata_t) &buffer[bufferoffset], 
+				stripsize);
+			if(read==-1){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Error on decoding strip %u of %s", 
+					i, 
+					TIFFFileName(input));
+				_TIFFfree(buffer);
+				t2p->t2p_error=T2P_ERR_ERROR;
+				return(0);
+			}
+			bufferoffset+=read;
+		}
+	} else {
+		if(t2p->pdf_sample & T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG){
+		
+			sepstripsize=TIFFStripSize(input);
+			sepstripcount=TIFFNumberOfStrips(input);
+		
+			stripsize=sepstripsize*t2p->tiff_samplesperpixel;
+			stripcount=sepstripcount/t2p->tiff_samplesperpixel;
+			
+			buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+                        memset(buffer, 0, t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			samplebuffer = (unsigned char*) _TIFFmalloc(stripsize);
+			if(samplebuffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			for(i=0;i<stripcount;i++){
+				samplebufferoffset=0;
+				for(j=0;j<t2p->tiff_samplesperpixel;j++){
+					read = 
+						TIFFReadEncodedStrip(input, 
+							i + j*stripcount, 
+							(tdata_t) &(samplebuffer[samplebufferoffset]), 
+							sepstripsize);
+					if(read==-1){
+						TIFFError(TIFF2PDF_MODULE, 
+					"Error on decoding strip %u of %s", 
+							i + j*stripcount, 
+							TIFFFileName(input));
+							_TIFFfree(buffer);
+						t2p->t2p_error=T2P_ERR_ERROR;
+						return(0);
+					}
+					samplebufferoffset+=read;
+				}
+				t2p_sample_planar_separate_to_contig(
+					t2p,
+					&(buffer[bufferoffset]),
+					samplebuffer, 
+					samplebufferoffset); 
+				bufferoffset+=samplebufferoffset;
+			}
+			_TIFFfree(samplebuffer);
+			goto dataready;
+		}
+
+		buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+                memset(buffer, 0, t2p->tiff_datasize);
+		if(buffer==NULL){
+			TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+				(unsigned long)t2p->tiff_datasize, 
+				TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return(0);
+		}
+		stripsize=TIFFStripSize(input);
+		stripcount=TIFFNumberOfStrips(input);
+		for(i=0;i<stripcount;i++){
+			read = 
+				TIFFReadEncodedStrip(input, 
+				i, 
+				(tdata_t) &buffer[bufferoffset], 
+				stripsize);
+			if(read==-1){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Error on decoding strip %u of %s", 
+					i, 
+					TIFFFileName(input));
+				_TIFFfree(samplebuffer);
+				_TIFFfree(buffer);
+				t2p->t2p_error=T2P_ERR_ERROR;
+				return(0);
+			}
+			bufferoffset+=read;
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_REALIZE_PALETTE){
+			samplebuffer=(unsigned char*)_TIFFrealloc( 
+				(tdata_t) buffer, 
+				t2p->tiff_datasize * t2p->tiff_samplesperpixel);
+			if(samplebuffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+			  _TIFFfree(buffer);
+			} else {
+				buffer=samplebuffer;
+				t2p->tiff_datasize *= t2p->tiff_samplesperpixel;
+			}
+			t2p_sample_realize_palette(t2p, buffer);
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_RGBA_TO_RGB){
+			t2p->tiff_datasize=t2p_sample_rgba_to_rgb(
+				(tdata_t)buffer, 
+				t2p->tiff_width*t2p->tiff_length);
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_RGBAA_TO_RGB){
+			t2p->tiff_datasize=t2p_sample_rgbaa_to_rgb(
+				(tdata_t)buffer, 
+				t2p->tiff_width*t2p->tiff_length);
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_YCBCR_TO_RGB){
+			samplebuffer=(unsigned char*)_TIFFrealloc(
+				(tdata_t)buffer, 
+				t2p->tiff_width*t2p->tiff_length*4);
+			if(samplebuffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				_TIFFfree(buffer);
+				return(0);
+			} else {
+				buffer=samplebuffer;
+			}
+			if(!TIFFReadRGBAImageOriented(
+				input, 
+				t2p->tiff_width, 
+				t2p->tiff_length, 
+				(uint32*)buffer, 
+				ORIENTATION_TOPLEFT,
+				0)){
+				TIFFError(TIFF2PDF_MODULE, 
+	"Can't use TIFFReadRGBAImageOriented to extract RGB image from %s", 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			t2p->tiff_datasize=t2p_sample_abgr_to_rgb(
+				(tdata_t) buffer, 
+				t2p->tiff_width*t2p->tiff_length);
+
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_LAB_SIGNED_TO_UNSIGNED){
+			t2p->tiff_datasize=t2p_sample_lab_signed_to_unsigned(
+				(tdata_t)buffer, 
+				t2p->tiff_width*t2p->tiff_length);
+		}
+	}
+
+dataready:
+
+	t2p_disable(output);
+	TIFFSetField(output, TIFFTAG_PHOTOMETRIC, t2p->tiff_photometric);
+	TIFFSetField(output, TIFFTAG_BITSPERSAMPLE, t2p->tiff_bitspersample);
+	TIFFSetField(output, TIFFTAG_SAMPLESPERPIXEL, t2p->tiff_samplesperpixel);
+	TIFFSetField(output, TIFFTAG_IMAGEWIDTH, t2p->tiff_width);
+	TIFFSetField(output, TIFFTAG_IMAGELENGTH, t2p->tiff_length);
+	TIFFSetField(output, TIFFTAG_ROWSPERSTRIP, t2p->tiff_length);
+	TIFFSetField(output, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+	TIFFSetField(output, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
+
+	switch(t2p->pdf_compression){
+	case T2P_COMPRESS_NONE:
+		TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
+		break;
+#ifdef CCITT_SUPPORT
+	case T2P_COMPRESS_G4:
+		TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_CCITTFAX4);
+		break;
+#endif
+#ifdef JPEG_SUPPORT
+	case T2P_COMPRESS_JPEG:
+		if(t2p->tiff_photometric==PHOTOMETRIC_YCBCR) {
+			uint16 hor = 0, ver = 0;
+			if (TIFFGetField(input, TIFFTAG_YCBCRSUBSAMPLING, &hor, &ver) !=0 ) {
+				if(hor != 0 && ver != 0){
+					TIFFSetField(output, TIFFTAG_YCBCRSUBSAMPLING, hor, ver);
+				}
+			}
+			if(TIFFGetField(input, TIFFTAG_REFERENCEBLACKWHITE, &xfloatp)!=0){
+				TIFFSetField(output, TIFFTAG_REFERENCEBLACKWHITE, xfloatp);
+			}
+		}
+		if(TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_JPEG)==0){
+			TIFFError(TIFF2PDF_MODULE, 
+		"Unable to use JPEG compression for input %s and output %s", 
+				TIFFFileName(input),
+				TIFFFileName(output));
+			_TIFFfree(buffer);
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return(0);
+		}
+		TIFFSetField(output, TIFFTAG_JPEGTABLESMODE, 0);
+
+		if(t2p->pdf_colorspace & (T2P_CS_RGB | T2P_CS_LAB)){
+			TIFFSetField(output, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_YCBCR);
+			if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR){
+				TIFFSetField(output, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+			} else {
+				TIFFSetField(output, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RAW);
+			}
+		}
+		if(t2p->pdf_colorspace & T2P_CS_GRAY){
+			(void)0;
+		}
+		if(t2p->pdf_colorspace & T2P_CS_CMYK){
+			(void)0;
+		}
+		if(t2p->pdf_defaultcompressionquality != 0){
+			TIFFSetField(output, 
+				TIFFTAG_JPEGQUALITY, 
+				t2p->pdf_defaultcompressionquality);
+		}
+	
+		break;
+#endif
+#ifdef ZIP_SUPPORT
+	case T2P_COMPRESS_ZIP:
+		TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_DEFLATE);
+		if(t2p->pdf_defaultcompressionquality%100 != 0){
+			TIFFSetField(output, 
+				TIFFTAG_PREDICTOR, 
+				t2p->pdf_defaultcompressionquality % 100);
+		}
+		if(t2p->pdf_defaultcompressionquality/100 != 0){
+			TIFFSetField(output, 
+				TIFFTAG_ZIPQUALITY, 
+				(t2p->pdf_defaultcompressionquality / 100));
+		}
+		break;
+#endif
+	default:
+		break;
+	}
+
+	t2p_enable(output);
+	t2p->outputwritten = 0;
+#ifdef JPEG_SUPPORT
+	if(t2p->pdf_compression == T2P_COMPRESS_JPEG
+	   && t2p->tiff_photometric == PHOTOMETRIC_YCBCR){
+		bufferoffset = TIFFWriteEncodedStrip(output, (tstrip_t)0,
+						     buffer,
+						     stripsize * stripcount); 
+	} else
+#endif
+	{
+		bufferoffset = TIFFWriteEncodedStrip(output, (tstrip_t)0,
+						     buffer,
+						     t2p->tiff_datasize); 
+	}
+	if (buffer != NULL) {
+		_TIFFfree(buffer);
+		buffer=NULL;
+	}
+
+	if (bufferoffset == (tsize_t)-1) {
+		TIFFError(TIFF2PDF_MODULE, 
+			  "Error writing encoded strip to output PDF %s", 
+			  TIFFFileName(output));
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	}
+	
+	written = t2p->outputwritten;
+	return(written);
+}
+
+/*
+ * This function reads the raster image data from the input TIFF for an image
+ * tile and writes the data to the output PDF XObject image dictionary stream
+ * for the tile.  It returns the amount written or zero on error.
+ */
+
+static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_t tile){
+
+	uint16 edge=0;
+	tsize_t written=0;
+	unsigned char* buffer=NULL;
+	tsize_t bufferoffset=0;
+	unsigned char* samplebuffer=NULL;
+	tsize_t samplebufferoffset=0;
+	tsize_t read=0;
+	uint16 i=0;
+	ttile_t tilecount=0;
+	tsize_t tilesize=0;
+	ttile_t septilecount=0;
+	tsize_t septilesize=0;
+#ifdef JPEG_SUPPORT
+	unsigned char* jpt;
+	float* xfloatp;
+	uint32 xuint32=0;
+#endif
+        (void)tilesize;
+
+	/* Fail if prior error (in particular, can't trust tiff_datasize) */
+	if (t2p->t2p_error != T2P_ERR_OK)
+		return(0);
+
+	edge |= t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile);
+	edge |= t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile);
+
+	if( (t2p->pdf_transcode == T2P_TRANSCODE_RAW) && ((edge == 0)
+#if defined(JPEG_SUPPORT) || defined(OJPEG_SUPPORT)
+		|| (t2p->pdf_compression == T2P_COMPRESS_JPEG)
+#endif
+	)
+	){
+#ifdef CCITT_SUPPORT
+		if(t2p->pdf_compression == T2P_COMPRESS_G4){
+			buffer= (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory "
+                                        "for t2p_readwrite_pdf_image_tile, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			TIFFReadRawTile(input, tile, (tdata_t) buffer, t2p->tiff_datasize);
+			if (t2p->tiff_fillorder==FILLORDER_LSB2MSB){
+					TIFFReverseBits(buffer, t2p->tiff_datasize);
+			}
+			t2pWriteFile(output, (tdata_t) buffer, t2p->tiff_datasize);
+			_TIFFfree(buffer);
+			return(t2p->tiff_datasize);
+		}
+#endif
+#ifdef ZIP_SUPPORT
+		if(t2p->pdf_compression == T2P_COMPRESS_ZIP){
+			buffer= (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory "
+                                        "for t2p_readwrite_pdf_image_tile, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			TIFFReadRawTile(input, tile, (tdata_t) buffer, t2p->tiff_datasize);
+			if (t2p->tiff_fillorder==FILLORDER_LSB2MSB){
+					TIFFReverseBits(buffer, t2p->tiff_datasize);
+			}
+			t2pWriteFile(output, (tdata_t) buffer, t2p->tiff_datasize);
+			_TIFFfree(buffer);
+			return(t2p->tiff_datasize);
+		}
+#endif
+#ifdef OJPEG_SUPPORT
+		if(t2p->tiff_compression == COMPRESSION_OJPEG){
+			if(! t2p->pdf_ojpegdata){
+				TIFFError(TIFF2PDF_MODULE, 
+					"No support for OJPEG image %s with "
+                                        "bad tables", 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			buffer=(unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory "
+                                        "for t2p_readwrite_pdf_image, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			_TIFFmemcpy(buffer, t2p->pdf_ojpegdata, t2p->pdf_ojpegdatalength);
+			if(edge!=0){
+				if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile)){
+					buffer[7]=
+						(t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength >> 8) & 0xff;
+					buffer[8]=
+						(t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength ) & 0xff;
+				}
+				if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile)){
+					buffer[9]=
+						(t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth >> 8) & 0xff;
+					buffer[10]=
+						(t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth ) & 0xff;
+				}
+			}
+			bufferoffset=t2p->pdf_ojpegdatalength;
+			bufferoffset+=TIFFReadRawTile(input, 
+					tile, 
+					(tdata_t) &(((unsigned char*)buffer)[bufferoffset]), 
+					-1);
+			((unsigned char*)buffer)[bufferoffset++]=0xff;
+			((unsigned char*)buffer)[bufferoffset++]=0xd9;
+			t2pWriteFile(output, (tdata_t) buffer, bufferoffset);
+			_TIFFfree(buffer);
+			return(bufferoffset);
+		}
+#endif
+#ifdef JPEG_SUPPORT
+		if(t2p->tiff_compression == COMPRESSION_JPEG){
+			unsigned char table_end[2];
+			uint32 count = 0;
+			buffer= (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory "
+                                        "for t2p_readwrite_pdf_image_tile, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			if(TIFFGetField(input, TIFFTAG_JPEGTABLES, &count, &jpt) != 0) {
+				if (count > 0) {
+					_TIFFmemcpy(buffer, jpt, count);
+					bufferoffset += count - 2;
+					table_end[0] = buffer[bufferoffset-2];
+					table_end[1] = buffer[bufferoffset-1];
+				}
+				if (count > 0) {
+					xuint32 = bufferoffset;
+					bufferoffset += TIFFReadRawTile(
+						input, 
+						tile, 
+						(tdata_t) &(((unsigned char*)buffer)[bufferoffset-2]), 
+						-1);
+						buffer[xuint32-2]=table_end[0];
+						buffer[xuint32-1]=table_end[1];
+				} else {
+					bufferoffset += TIFFReadRawTile(
+						input, 
+						tile, 
+						(tdata_t) &(((unsigned char*)buffer)[bufferoffset]), 
+						-1);
+				}
+			}
+			t2pWriteFile(output, (tdata_t) buffer, bufferoffset);
+			_TIFFfree(buffer);
+			return(bufferoffset);
+		}
+#endif
+		(void)0;
+	}
+
+	if(t2p->pdf_sample==T2P_SAMPLE_NOTHING){
+		buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+		if(buffer==NULL){
+			TIFFError(TIFF2PDF_MODULE, 
+				"Can't allocate %lu bytes of memory for "
+                                "t2p_readwrite_pdf_image_tile, %s", 
+				(unsigned long)t2p->tiff_datasize, 
+				TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return(0);
+		}
+
+		read = TIFFReadEncodedTile(
+			input, 
+			tile, 
+			(tdata_t) &buffer[bufferoffset], 
+			t2p->tiff_datasize);
+		if(read==-1){
+			TIFFError(TIFF2PDF_MODULE, 
+				"Error on decoding tile %u of %s", 
+				tile, 
+				TIFFFileName(input));
+			_TIFFfree(buffer);
+			t2p->t2p_error=T2P_ERR_ERROR;
+			return(0);
+		}
+
+	} else {
+
+		if(t2p->pdf_sample == T2P_SAMPLE_PLANAR_SEPARATE_TO_CONTIG){
+			septilesize=TIFFTileSize(input);
+			septilecount=TIFFNumberOfTiles(input);
+			tilesize=septilesize*t2p->tiff_samplesperpixel;
+			tilecount=septilecount/t2p->tiff_samplesperpixel;
+			buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory "
+                                        "for t2p_readwrite_pdf_image_tile, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			samplebuffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+			if(samplebuffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory "
+                                        "for t2p_readwrite_pdf_image_tile, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			samplebufferoffset=0;
+			for(i=0;i<t2p->tiff_samplesperpixel;i++){
+				read = 
+					TIFFReadEncodedTile(input, 
+						tile + i*tilecount, 
+						(tdata_t) &(samplebuffer[samplebufferoffset]), 
+						septilesize);
+				if(read==-1){
+					TIFFError(TIFF2PDF_MODULE, 
+						"Error on decoding tile %u of %s", 
+						tile + i*tilecount, 
+						TIFFFileName(input));
+						_TIFFfree(samplebuffer);
+						_TIFFfree(buffer);
+					t2p->t2p_error=T2P_ERR_ERROR;
+					return(0);
+				}
+				samplebufferoffset+=read;
+			}
+			t2p_sample_planar_separate_to_contig(
+				t2p,
+				&(buffer[bufferoffset]),
+				samplebuffer, 
+				samplebufferoffset); 
+			bufferoffset+=samplebufferoffset;
+			_TIFFfree(samplebuffer);
+		}
+
+		if(buffer==NULL){
+			buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+			if(buffer==NULL){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Can't allocate %lu bytes of memory "
+                                        "for t2p_readwrite_pdf_image_tile, %s", 
+					(unsigned long)t2p->tiff_datasize, 
+					TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+			}
+			read = TIFFReadEncodedTile(
+				input, 
+				tile, 
+				(tdata_t) &buffer[bufferoffset], 
+				t2p->tiff_datasize);
+			if(read==-1){
+				TIFFError(TIFF2PDF_MODULE, 
+					"Error on decoding tile %u of %s", 
+					tile, 
+					TIFFFileName(input));
+				_TIFFfree(buffer);
+				t2p->t2p_error=T2P_ERR_ERROR;
+				return(0);
+			}
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_RGBA_TO_RGB){
+			t2p->tiff_datasize=t2p_sample_rgba_to_rgb(
+				(tdata_t)buffer, 
+				t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth
+				*t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_RGBAA_TO_RGB){
+			t2p->tiff_datasize=t2p_sample_rgbaa_to_rgb(
+				(tdata_t)buffer, 
+				t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth
+				*t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_YCBCR_TO_RGB){
+			TIFFError(TIFF2PDF_MODULE, 
+				"No support for YCbCr to RGB in tile for %s", 
+				TIFFFileName(input));
+			_TIFFfree(buffer);
+			t2p->t2p_error = T2P_ERR_ERROR;
+			return(0);
+		}
+
+		if(t2p->pdf_sample & T2P_SAMPLE_LAB_SIGNED_TO_UNSIGNED){
+			t2p->tiff_datasize=t2p_sample_lab_signed_to_unsigned(
+				(tdata_t)buffer, 
+				t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth
+				*t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+		}
+	}
+
+	if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile) != 0){
+		t2p_tile_collapse_left(
+			buffer, 
+			TIFFTileRowSize(input),
+			t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth,
+			t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth, 
+			t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+	}
+
+
+	t2p_disable(output);
+	TIFFSetField(output, TIFFTAG_PHOTOMETRIC, t2p->tiff_photometric);
+	TIFFSetField(output, TIFFTAG_BITSPERSAMPLE, t2p->tiff_bitspersample);
+	TIFFSetField(output, TIFFTAG_SAMPLESPERPIXEL, t2p->tiff_samplesperpixel);
+	if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile) == 0){
+		TIFFSetField(
+			output, 
+			TIFFTAG_IMAGEWIDTH, 
+			t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);
+	} else {
+		TIFFSetField(
+			output, 
+			TIFFTAG_IMAGEWIDTH, 
+			t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);
+	}
+	if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile) == 0){
+		TIFFSetField(
+			output, 
+			TIFFTAG_IMAGELENGTH, 
+			t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+		TIFFSetField(
+			output, 
+			TIFFTAG_ROWSPERSTRIP, 
+			t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+	} else {
+		TIFFSetField(
+			output, 
+			TIFFTAG_IMAGELENGTH, 
+			t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
+		TIFFSetField(
+			output, 
+			TIFFTAG_ROWSPERSTRIP, 
+			t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
+	}
+	TIFFSetField(output, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+	TIFFSetField(output, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
+
+	switch(t2p->pdf_compression){
+	case T2P_COMPRESS_NONE:
+		TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
+		break;
+#ifdef CCITT_SUPPORT
+	case T2P_COMPRESS_G4:
+		TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_CCITTFAX4);
+		break;
+#endif
+#ifdef JPEG_SUPPORT
+	case T2P_COMPRESS_JPEG:
+		if (t2p->tiff_photometric==PHOTOMETRIC_YCBCR) {
+			uint16 hor = 0, ver = 0;
+			if (TIFFGetField(input, TIFFTAG_YCBCRSUBSAMPLING, &hor, &ver)!=0) {
+				if (hor != 0 && ver != 0) {
+					TIFFSetField(output, TIFFTAG_YCBCRSUBSAMPLING, hor, ver);
+				}
+			}
+			if(TIFFGetField(input, TIFFTAG_REFERENCEBLACKWHITE, &xfloatp)!=0){
+				TIFFSetField(output, TIFFTAG_REFERENCEBLACKWHITE, xfloatp);
+			}
+		}
+		TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_JPEG);
+		TIFFSetField(output, TIFFTAG_JPEGTABLESMODE, 0); /* JPEGTABLESMODE_NONE */
+		if(t2p->pdf_colorspace & (T2P_CS_RGB | T2P_CS_LAB)){
+			TIFFSetField(output, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_YCBCR);
+			if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR){
+				TIFFSetField(output, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
+			} else {
+				TIFFSetField(output, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RAW);
+			}
+		}
+		if(t2p->pdf_colorspace & T2P_CS_GRAY){
+			(void)0;
+		}
+		if(t2p->pdf_colorspace & T2P_CS_CMYK){
+			(void)0;
+		}
+		if(t2p->pdf_defaultcompressionquality != 0){
+			TIFFSetField(output, 
+				TIFFTAG_JPEGQUALITY, 
+				t2p->pdf_defaultcompressionquality);
+		}
+		break;
+#endif
+#ifdef ZIP_SUPPORT
+	case T2P_COMPRESS_ZIP:
+		TIFFSetField(output, TIFFTAG_COMPRESSION, COMPRESSION_DEFLATE);
+		if(t2p->pdf_defaultcompressionquality%100 != 0){
+			TIFFSetField(output, 
+				TIFFTAG_PREDICTOR, 
+				t2p->pdf_defaultcompressionquality % 100);
+		}
+		if(t2p->pdf_defaultcompressionquality/100 != 0){
+			TIFFSetField(output, 
+				TIFFTAG_ZIPQUALITY, 
+				(t2p->pdf_defaultcompressionquality / 100));
+		}
+		break;
+#endif
+	default:
+		break;
+	}
+
+	t2p_enable(output);
+	t2p->outputwritten = 0;
+	bufferoffset = TIFFWriteEncodedStrip(output, (tstrip_t) 0, buffer,
+					     TIFFStripSize(output)); 
+	if (buffer != NULL) {
+		_TIFFfree(buffer);
+		buffer = NULL;
+	}
+	if (bufferoffset == -1) {
+		TIFFError(TIFF2PDF_MODULE, 
+			  "Error writing encoded tile to output PDF %s", 
+			  TIFFFileName(output));
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	}
+	
+	written = t2p->outputwritten;
+	
+	return(written);
+}
+
+#ifdef OJPEG_SUPPORT
+static int t2p_process_ojpeg_tables(T2P* t2p, TIFF* input){
+	uint16 proc=0;
+	void* q;
+	uint32 q_length=0;
+	void* dc;
+	uint32 dc_length=0;
+	void* ac;
+	uint32 ac_length=0;
+	uint16* lp;
+	uint16* pt;
+	uint16 h_samp=1;
+	uint16 v_samp=1;
+	unsigned char* ojpegdata;
+	uint16 table_count;
+	uint32 offset_table;
+	uint32 offset_ms_l;
+	uint32 code_count;
+	uint32 i=0;
+	uint32 dest=0;
+	uint16 ri=0;
+	uint32 rows=0;
+	
+	if(!TIFFGetField(input, TIFFTAG_JPEGPROC, &proc)){
+		TIFFError(TIFF2PDF_MODULE, 
+			"Missing JPEGProc field in OJPEG image %s", 
+			TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	}
+	if(proc!=JPEGPROC_BASELINE && proc!=JPEGPROC_LOSSLESS){
+		TIFFError(TIFF2PDF_MODULE, 
+			"Bad JPEGProc field in OJPEG image %s", 
+			TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	}
+	if(!TIFFGetField(input, TIFFTAG_JPEGQTABLES, &q_length, &q)){
+		TIFFError(TIFF2PDF_MODULE, 
+			"Missing JPEGQTables field in OJPEG image %s", 
+			TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	}
+	if(q_length < (64U * t2p->tiff_samplesperpixel)){
+		TIFFError(TIFF2PDF_MODULE, 
+			"Bad JPEGQTables field in OJPEG image %s", 
+			TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	} 
+	if(!TIFFGetField(input, TIFFTAG_JPEGDCTABLES, &dc_length, &dc)){
+		TIFFError(TIFF2PDF_MODULE, 
+			"Missing JPEGDCTables field in OJPEG image %s", 
+			TIFFFileName(input));
+			t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	}
+	if(proc==JPEGPROC_BASELINE){
+		if(!TIFFGetField(input, TIFFTAG_JPEGACTABLES, &ac_length, &ac)){
+			TIFFError(TIFF2PDF_MODULE, 
+				"Missing JPEGACTables field in OJPEG image %s", 
+				TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+			return(0);
+		}
+	} else {
+		if(!TIFFGetField(input, TIFFTAG_JPEGLOSSLESSPREDICTORS, &lp)){
+			TIFFError(TIFF2PDF_MODULE, 
+				"Missing JPEGLosslessPredictors field in OJPEG image %s", 
+				TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+				return(0);
+		}
+		if(!TIFFGetField(input, TIFFTAG_JPEGPOINTTRANSFORM, &pt)){
+			TIFFError(TIFF2PDF_MODULE, 
+				"Missing JPEGPointTransform field in OJPEG image %s", 
+				TIFFFileName(input));
+				t2p->t2p_error = T2P_ERR_ERROR;
+			return(0);
+		}
+	}
+	if(!TIFFGetField(input, TIFFTAG_YCBCRSUBSAMPLING, &h_samp, &v_samp)){
+		h_samp=1;
+		v_samp=1;
+	}
+	if(t2p->pdf_ojpegdata != NULL){
+		_TIFFfree(t2p->pdf_ojpegdata);
+		t2p->pdf_ojpegdata=NULL;
+	} 
+	t2p->pdf_ojpegdata = _TIFFmalloc(2048);
+	if(t2p->pdf_ojpegdata == NULL){
+		TIFFError(TIFF2PDF_MODULE, 
+			"Can't allocate %u bytes of memory for t2p_process_ojpeg_tables, %s", 
+			2048, 
+			TIFFFileName(input));
+		return(0);
+	}
+	_TIFFmemset(t2p->pdf_ojpegdata, 0x00, 2048);
+	t2p->pdf_ojpegdatalength = 0;
+	table_count=t2p->tiff_samplesperpixel;
+	if(proc==JPEGPROC_BASELINE){
+		if(table_count>2) table_count=2;
+	}
+	ojpegdata=(unsigned char*)t2p->pdf_ojpegdata;
+	ojpegdata[t2p->pdf_ojpegdatalength++]=0xff;
+	ojpegdata[t2p->pdf_ojpegdatalength++]=0xd8;
+	ojpegdata[t2p->pdf_ojpegdatalength++]=0xff;
+	if(proc==JPEGPROC_BASELINE){
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xc0;
+	} else {
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xc3;
+	}
+	ojpegdata[t2p->pdf_ojpegdatalength++]=0x00;
+	ojpegdata[t2p->pdf_ojpegdatalength++]=(8 + 3*t2p->tiff_samplesperpixel);
+	ojpegdata[t2p->pdf_ojpegdatalength++]=(t2p->tiff_bitspersample & 0xff);
+	if(TIFFIsTiled(input)){
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength >> 8) & 0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength ) & 0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth >> 8) & 0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth ) & 0xff;
+	} else {
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_length >> 8) & 0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_length ) & 0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_width >> 8) & 0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=
+			(t2p->tiff_width ) & 0xff;
+	}
+	ojpegdata[t2p->pdf_ojpegdatalength++]=(t2p->tiff_samplesperpixel & 0xff);
+	for(i=0;i<t2p->tiff_samplesperpixel;i++){
+		ojpegdata[t2p->pdf_ojpegdatalength++]=i;
+		if(i==0){
+			ojpegdata[t2p->pdf_ojpegdatalength] |= h_samp<<4 & 0xf0;;
+			ojpegdata[t2p->pdf_ojpegdatalength++] |= v_samp & 0x0f;
+		} else {
+				ojpegdata[t2p->pdf_ojpegdatalength++]= 0x11;
+		}
+		ojpegdata[t2p->pdf_ojpegdatalength++]=i;
+	}
+	for(dest=0;dest<t2p->tiff_samplesperpixel;dest++){
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xdb;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0x00;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0x43;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=dest;
+		_TIFFmemcpy( &(ojpegdata[t2p->pdf_ojpegdatalength++]), 
+			&(((unsigned char*)q)[64*dest]), 64);
+		t2p->pdf_ojpegdatalength+=64;
+	}
+	offset_table=0;
+	for(dest=0;dest<table_count;dest++){
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xc4;
+		offset_ms_l=t2p->pdf_ojpegdatalength;
+		t2p->pdf_ojpegdatalength+=2;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=dest & 0x0f;
+		_TIFFmemcpy( &(ojpegdata[t2p->pdf_ojpegdatalength]), 
+			&(((unsigned char*)dc)[offset_table]), 16);
+		code_count=0;
+		offset_table+=16;
+		for(i=0;i<16;i++){
+			code_count+=ojpegdata[t2p->pdf_ojpegdatalength++];
+		}
+		ojpegdata[offset_ms_l]=((19+code_count)>>8) & 0xff;
+		ojpegdata[offset_ms_l+1]=(19+code_count) & 0xff;
+		_TIFFmemcpy( &(ojpegdata[t2p->pdf_ojpegdatalength]), 
+			&(((unsigned char*)dc)[offset_table]), code_count);
+		offset_table+=code_count;
+		t2p->pdf_ojpegdatalength+=code_count;
+	}
+	if(proc==JPEGPROC_BASELINE){
+	offset_table=0;
+		for(dest=0;dest<table_count;dest++){
+			ojpegdata[t2p->pdf_ojpegdatalength++]=0xff;
+			ojpegdata[t2p->pdf_ojpegdatalength++]=0xc4;
+			offset_ms_l=t2p->pdf_ojpegdatalength;
+			t2p->pdf_ojpegdatalength+=2;
+			ojpegdata[t2p->pdf_ojpegdatalength] |= 0x10;
+			ojpegdata[t2p->pdf_ojpegdatalength++] |=dest & 0x0f;
+			_TIFFmemcpy( &(ojpegdata[t2p->pdf_ojpegdatalength]), 
+				&(((unsigned char*)ac)[offset_table]), 16);
+			code_count=0;
+			offset_table+=16;
+			for(i=0;i<16;i++){
+				code_count+=ojpegdata[t2p->pdf_ojpegdatalength++];
+			}	
+			ojpegdata[offset_ms_l]=((19+code_count)>>8) & 0xff;
+			ojpegdata[offset_ms_l+1]=(19+code_count) & 0xff;
+			_TIFFmemcpy( &(ojpegdata[t2p->pdf_ojpegdatalength]), 
+				&(((unsigned char*)ac)[offset_table]), code_count);
+			offset_table+=code_count;
+			t2p->pdf_ojpegdatalength+=code_count;
+		}
+	}
+	if(TIFFNumberOfStrips(input)>1){
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0xdd;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0x00;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0x04;
+		h_samp*=8;
+		v_samp*=8;
+		ri=(t2p->tiff_width+h_samp-1) / h_samp;
+		TIFFGetField(input, TIFFTAG_ROWSPERSTRIP, &rows);
+		ri*=(rows+v_samp-1)/v_samp;
+		ojpegdata[t2p->pdf_ojpegdatalength++]= (ri>>8) & 0xff;
+		ojpegdata[t2p->pdf_ojpegdatalength++]= ri & 0xff;
+	}
+	ojpegdata[t2p->pdf_ojpegdatalength++]=0xff;
+	ojpegdata[t2p->pdf_ojpegdatalength++]=0xda;
+	ojpegdata[t2p->pdf_ojpegdatalength++]=0x00;
+	ojpegdata[t2p->pdf_ojpegdatalength++]=(6 + 2*t2p->tiff_samplesperpixel);
+	ojpegdata[t2p->pdf_ojpegdatalength++]=t2p->tiff_samplesperpixel & 0xff;
+	for(i=0;i<t2p->tiff_samplesperpixel;i++){
+		ojpegdata[t2p->pdf_ojpegdatalength++]= i & 0xff;
+		if(proc==JPEGPROC_BASELINE){
+			ojpegdata[t2p->pdf_ojpegdatalength] |= 
+				( ( (i>(table_count-1U)) ? (table_count-1U) : i) << 4U) & 0xf0;
+			ojpegdata[t2p->pdf_ojpegdatalength++] |= 
+				( (i>(table_count-1U)) ? (table_count-1U) : i) & 0x0f;
+		} else {
+			ojpegdata[t2p->pdf_ojpegdatalength++] =  (i << 4) & 0xf0;
+		}
+	}
+	if(proc==JPEGPROC_BASELINE){
+		t2p->pdf_ojpegdatalength++;
+		ojpegdata[t2p->pdf_ojpegdatalength++]=0x3f;
+		t2p->pdf_ojpegdatalength++;
+	} else {
+		ojpegdata[t2p->pdf_ojpegdatalength++]= (lp[0] & 0xff);
+		t2p->pdf_ojpegdatalength++;
+		ojpegdata[t2p->pdf_ojpegdatalength++]= (pt[0] & 0x0f);
+	}
+
+	return(1);
+}
+#endif
+
+#ifdef JPEG_SUPPORT
+static int t2p_process_jpeg_strip(
+	unsigned char* strip, 
+	tsize_t* striplength, 
+	unsigned char* buffer, 
+	tsize_t* bufferoffset, 
+	tstrip_t no, 
+	uint32 height){
+
+	tsize_t i=0;
+	uint16 ri =0;
+	uint16 v_samp=1;
+	uint16 h_samp=1;
+	int j=0;
+	
+	i++;
+	
+	while(i<(*striplength)){
+		switch( strip[i] ){
+			case 0xd8:
+				i+=2;
+				break;
+			case 0xc0:
+			case 0xc1:
+			case 0xc3:
+			case 0xc9:
+			case 0xca:
+				if(no==0){
+					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
+					for(j=0;j<buffer[*bufferoffset+9];j++){
+						if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) 
+							h_samp = (buffer[*bufferoffset+11+(2*j)]>>4);
+						if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) 
+							v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f);
+					}
+					v_samp*=8;
+					h_samp*=8;
+					ri=((( ((uint16)(buffer[*bufferoffset+5])<<8) | 
+					(uint16)(buffer[*bufferoffset+6]) )+v_samp-1)/ 
+					v_samp);
+					ri*=((( ((uint16)(buffer[*bufferoffset+7])<<8) | 
+					(uint16)(buffer[*bufferoffset+8]) )+h_samp-1)/ 
+					h_samp);
+					buffer[*bufferoffset+5]=
+                                          (unsigned char) ((height>>8) & 0xff);
+					buffer[*bufferoffset+6]=
+                                            (unsigned char) (height & 0xff);
+					*bufferoffset+=strip[i+2]+2;
+					i+=strip[i+2]+2;
+
+					buffer[(*bufferoffset)++]=0xff;
+					buffer[(*bufferoffset)++]=0xdd;
+					buffer[(*bufferoffset)++]=0x00;
+					buffer[(*bufferoffset)++]=0x04;
+					buffer[(*bufferoffset)++]=(ri >> 8) & 0xff;
+					buffer[(*bufferoffset)++]= ri & 0xff;
+				} else {
+					i+=strip[i+2]+2;
+				}
+				break;
+			case 0xc4:
+			case 0xdb:
+				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
+				*bufferoffset+=strip[i+2]+2;
+				i+=strip[i+2]+2;
+				break;
+			case 0xda:
+				if(no==0){
+					_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
+					*bufferoffset+=strip[i+2]+2;
+					i+=strip[i+2]+2;
+				} else {
+					buffer[(*bufferoffset)++]=0xff;
+					buffer[(*bufferoffset)++]=
+                                            (unsigned char)(0xd0 | ((no-1)%8));
+					i+=strip[i+2]+2;
+				}
+				_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1);
+				*bufferoffset+=(*striplength)-i-1;
+				return(1);
+			default:
+				i+=strip[i+2]+2;
+		}
+	}
+	
+
+	return(0);
+}
+#endif
+
+/*
+	This functions converts a tilewidth x tilelength buffer of samples into an edgetilewidth x 
+	tilelength buffer of samples.
+*/
+static void t2p_tile_collapse_left(
+	tdata_t buffer, 
+	tsize_t scanwidth, 
+	uint32 tilewidth, 
+	uint32 edgetilewidth, 
+	uint32 tilelength){
+	
+	uint32 i=0;
+	tsize_t edgescanwidth=0;
+	
+	edgescanwidth = (scanwidth * edgetilewidth + (tilewidth - 1))/ tilewidth;
+	for(i=0;i<tilelength;i++){
+		_TIFFmemcpy( 
+			&(((char*)buffer)[edgescanwidth*i]), 
+			&(((char*)buffer)[scanwidth*i]), 
+			edgescanwidth);
+	}
+	
+	return;
+}
+
+
+/*
+ * This function calls TIFFWriteDirectory on the output after blanking its
+ * output by replacing the read, write, and seek procedures with empty
+ * implementations, then it replaces the original implementations.
+ */
+
+static void
+t2p_write_advance_directory(T2P* t2p, TIFF* output)
+{
+	t2p_disable(output);
+	if(!TIFFWriteDirectory(output)){
+		TIFFError(TIFF2PDF_MODULE, 
+			"Error writing virtual directory to output PDF %s", 
+			TIFFFileName(output));
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	}
+	t2p_enable(output);
+	return;
+}
+
+static tsize_t t2p_sample_planar_separate_to_contig(T2P* t2p, 
+                                                    unsigned char* buffer, 
+                                                    unsigned char* samplebuffer, 
+                                                    tsize_t samplebuffersize){
+
+	tsize_t stride=0;
+	tsize_t i=0;
+	tsize_t j=0;
+	
+	stride=samplebuffersize/t2p->tiff_samplesperpixel;
+	for(i=0;i<stride;i++){
+		for(j=0;j<t2p->tiff_samplesperpixel;j++){
+			buffer[i*t2p->tiff_samplesperpixel + j] = samplebuffer[i + j*stride];
+		}
+	}
+
+	return(samplebuffersize);
+}
+
+static tsize_t t2p_sample_realize_palette(T2P* t2p, unsigned char* buffer){
+
+	uint32 sample_count=0;
+	uint16 component_count=0;
+	uint32 palette_offset=0;
+	uint32 sample_offset=0;
+	uint32 i=0;
+	uint32 j=0;
+	sample_count=t2p->tiff_width*t2p->tiff_length;
+	component_count=t2p->tiff_samplesperpixel;
+	
+	for(i=sample_count;i>0;i--){
+		palette_offset=buffer[i-1] * component_count;
+		sample_offset= (i-1) * component_count;
+		for(j=0;j<component_count;j++){
+			buffer[sample_offset+j]=t2p->pdf_palette[palette_offset+j];
+		}
+	}
+
+	return(0);
+}
+
+/*
+	This functions converts in place a buffer of ABGR interleaved data
+	into RGB interleaved data, discarding A.
+*/
+
+static tsize_t t2p_sample_abgr_to_rgb(tdata_t data, uint32 samplecount)
+{
+	uint32 i=0;
+	uint32 sample=0;
+	
+	for(i=0;i<samplecount;i++){
+		sample=((uint32*)data)[i];
+		((char*)data)[i*3]= (char) (sample & 0xff);
+		((char*)data)[i*3+1]= (char) ((sample>>8) & 0xff);
+		((char*)data)[i*3+2]= (char) ((sample>>16) & 0xff);
+	}
+
+	return(i*3);
+}
+
+/*
+ * This functions converts in place a buffer of RGBA interleaved data
+ * into RGB interleaved data, discarding A.
+ */
+
+static tsize_t
+t2p_sample_rgbaa_to_rgb(tdata_t data, uint32 samplecount)
+{
+	uint32 i;
+	
+	for(i = 0; i < samplecount; i++)
+		memcpy((uint8*)data + i * 3, (uint8*)data + i * 4, 3);
+
+	return(i * 3);
+}
+
+/*
+ * This functions converts in place a buffer of RGBA interleaved data
+ * into RGB interleaved data, adding 255-A to each component sample.
+ */
+
+static tsize_t
+t2p_sample_rgba_to_rgb(tdata_t data, uint32 samplecount)
+{
+	uint32 i = 0;
+	uint32 sample = 0;
+	uint8 alpha = 0;
+	
+	for (i = 0; i < samplecount; i++) {
+		sample=((uint32*)data)[i];
+		alpha=(uint8)((255 - (sample & 0xff)));
+		((uint8 *)data)[i * 3] = (uint8) ((sample >> 24) & 0xff) + alpha;
+		((uint8 *)data)[i * 3 + 1] = (uint8) ((sample >> 16) & 0xff) + alpha;
+		((uint8 *)data)[i * 3 + 2] = (uint8) ((sample >> 8) & 0xff) + alpha;
+		
+	}
+
+	return (i * 3);
+}
+
+/*
+	This function converts the a and b samples of Lab data from signed
+	to unsigned.
+*/
+
+static tsize_t t2p_sample_lab_signed_to_unsigned(tdata_t buffer, uint32 samplecount){
+
+	uint32 i=0;
+
+	for(i=0;i<samplecount;i++){
+		if( (((unsigned char*)buffer)[(i*3)+1] & 0x80) !=0){
+			((unsigned char*)buffer)[(i*3)+1] =
+				(unsigned char)(0x80 + ((char*)buffer)[(i*3)+1]);
+		} else {
+			((unsigned char*)buffer)[(i*3)+1] |= 0x80;
+		}
+		if( (((unsigned char*)buffer)[(i*3)+2] & 0x80) !=0){
+			((unsigned char*)buffer)[(i*3)+2] =
+				(unsigned char)(0x80 + ((char*)buffer)[(i*3)+2]);
+		} else {
+			((unsigned char*)buffer)[(i*3)+2] |= 0x80;
+		}
+	}
+
+	return(samplecount*3);
+}
+
+/* 
+	This function writes the PDF header to output.
+*/
+
+static tsize_t t2p_write_pdf_header(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+	
+	buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7);
+
+	return(written);
+}
+
+/*
+	This function writes the beginning of a PDF object to output.
+*/
+
+static tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+
+	buflen=sprintf(buffer, "%lu", (unsigned long)number);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen );
+	written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7);
+
+	return(written);
+}
+
+/*
+	This function writes the end of a PDF object to output.
+*/
+
+static tsize_t t2p_write_pdf_obj_end(TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2pWriteFile(output, (tdata_t) "endobj\n", 7);
+
+	return(written);
+}
+
+/*
+	This function writes a PDF string object to output.
+*/
+	
+static tsize_t t2p_write_pdf_string(unsigned char* pdfstr, TIFF* output){
+
+	tsize_t written = 0;
+	uint32 i = 0;
+	char buffer[64];
+	uint32 len = 0;
+	
+	len = strlen((char *)pdfstr);
+	written += t2pWriteFile(output, (tdata_t) "(", 1);
+	for (i=0; i<len; i++) {
+		if((pdfstr[i]&0x80) || (pdfstr[i]==127) || (pdfstr[i]<32)){
+			sprintf(buffer, "\\%.3hho", pdfstr[i]);
+			buffer[sizeof(buffer) - 1] = '\0';
+			written += t2pWriteFile(output, (tdata_t) buffer, 4);
+		} else {
+			switch (pdfstr[i]){
+				case 0x08:
+					written += t2pWriteFile(output, (tdata_t) "\\b", 2);
+					break;
+				case 0x09:
+					written += t2pWriteFile(output, (tdata_t) "\\t", 2);
+					break;
+				case 0x0A:
+					written += t2pWriteFile(output, (tdata_t) "\\n", 2);
+					break;
+				case 0x0C:
+					written += t2pWriteFile(output, (tdata_t) "\\f", 2);
+					break;
+				case 0x0D:
+					written += t2pWriteFile(output, (tdata_t) "\\r", 2);
+					break;
+				case 0x28:
+					written += t2pWriteFile(output, (tdata_t) "\\(", 2);
+					break;
+				case 0x29:
+					written += t2pWriteFile(output, (tdata_t) "\\)", 2);
+					break;
+				case 0x5C:
+					written += t2pWriteFile(output, (tdata_t) "\\\\", 2);
+					break;
+				default:
+					written += t2pWriteFile(output, (tdata_t) &pdfstr[i], 1);
+			}
+		}
+	}
+	written += t2pWriteFile(output, (tdata_t) ") ", 1);
+
+	return(written);
+}
+
+
+/*
+	This function writes a buffer of data to output.
+*/
+
+static tsize_t t2p_write_pdf_stream(tdata_t buffer, tsize_t len, TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2pWriteFile(output, (tdata_t) buffer, len);
+
+	return(written);
+}
+
+/*
+	This functions writes the beginning of a PDF stream to output.
+*/
+
+static tsize_t t2p_write_pdf_stream_start(TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2pWriteFile(output, (tdata_t) "stream\n", 7);
+
+	return(written);
+}
+
+/*
+	This function writes the end of a PDF stream to output. 
+*/
+
+static tsize_t t2p_write_pdf_stream_end(TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2pWriteFile(output, (tdata_t) "\nendstream\n", 11);
+
+	return(written);
+}
+
+/*
+	This function writes a stream dictionary for a PDF stream to output.
+*/
+
+static tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){
+	
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+	
+	written += t2pWriteFile(output, (tdata_t) "/Length ", 8);
+	if(len!=0){
+		written += t2p_write_pdf_stream_length(len, output);
+	} else {
+		buflen=sprintf(buffer, "%lu", (unsigned long)number);
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
+	}
+	
+	return(written);
+}
+
+/*
+	This functions writes the beginning of a PDF stream dictionary to output.
+*/
+
+static tsize_t t2p_write_pdf_stream_dict_start(TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2pWriteFile(output, (tdata_t) "<< \n", 4);
+
+	return(written);
+}
+
+/*
+	This function writes the end of a PDF stream dictionary to output. 
+*/
+
+static tsize_t t2p_write_pdf_stream_dict_end(TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2pWriteFile(output, (tdata_t) " >>\n", 4);
+
+	return(written);
+}
+
+/*
+	This function writes a number to output.
+*/
+
+static tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+
+	buflen=sprintf(buffer, "%lu", (unsigned long)len);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) "\n", 1);
+
+	return(written);
+}
+
+/*
+	This function writes the PDF Catalog structure to output.
+*/
+
+static tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+
+	written += t2pWriteFile(output, 
+		(tdata_t)"<< \n/Type /Catalog \n/Pages ", 
+		27);
+	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen );
+	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
+	if(t2p->pdf_fitwindow){
+		written += t2pWriteFile(output, 
+			(tdata_t) "/ViewerPreferences <</FitWindow true>>\n", 
+			39);
+	}
+	written += t2pWriteFile(output, (tdata_t)">>\n", 3);
+
+	return(written);
+}
+
+/*
+	This function writes the PDF Info structure to output.
+*/
+
+static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
+
+	tsize_t written = 0;
+	unsigned char* info;
+	char buffer[512];
+	int buflen = 0;
+
+        (void) buflen;
+
+	if(t2p->pdf_datetime==NULL){
+		t2p_pdf_tifftime(t2p, input);
+	}
+	if(strlen((char *)t2p->pdf_datetime) > 0){
+		written += t2pWriteFile(output, (tdata_t) "<< \n/CreationDate ", 18);
+		written += t2p_write_pdf_string(t2p->pdf_datetime, output);
+		written += t2pWriteFile(output, (tdata_t) "\n/ModDate ", 10);
+		written += t2p_write_pdf_string(t2p->pdf_datetime, output);
+	}
+	written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11);
+	_TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer));
+	buflen = sprintf(buffer, "libtiff / tiff2pdf - %d", TIFFLIB_VERSION);
+	written += t2p_write_pdf_string((unsigned char*)buffer, output);
+	written += t2pWriteFile(output, (tdata_t) "\n", 1);
+	if(t2p->pdf_creator != NULL){ 
+		if(strlen((char *)t2p->pdf_creator)>0){
+			if(strlen((char *)t2p->pdf_creator) > 511) {
+				t2p->pdf_creator[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Creator ", 9);
+			written += t2p_write_pdf_string(t2p->pdf_creator, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	} else{
+		if( TIFFGetField(input, TIFFTAG_SOFTWARE, &info) != 0){
+			if(strlen((char *)info) > 511) {
+				info[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Creator ", 9);
+			written += t2p_write_pdf_string(info, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	}
+	if(t2p->pdf_author != NULL) { 
+		if(strlen((char *)t2p->pdf_author) > 0) {
+			if(strlen((char *)t2p->pdf_author) > 511) {
+				t2p->pdf_author[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Author ", 8);
+			written += t2p_write_pdf_string(t2p->pdf_author, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	} else{
+		if( TIFFGetField(input, TIFFTAG_ARTIST, &info) != 0){
+			if(strlen((char *)info) > 511) {
+				info[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Author ", 8);
+			written += t2p_write_pdf_string(info, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		} else if ( TIFFGetField(input, TIFFTAG_COPYRIGHT, &info) != 0){
+			if(strlen((char *)info) > 511) {
+				info[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Author ", 8);
+			written += t2p_write_pdf_string(info, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		} 
+	}
+	if(t2p->pdf_title != NULL) {
+		if(strlen((char *)t2p->pdf_title) > 0) {
+			if(strlen((char *)t2p->pdf_title) > 511) {
+				t2p->pdf_title[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Title ", 7);
+			written += t2p_write_pdf_string(t2p->pdf_title, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	} else{
+		if( TIFFGetField(input, TIFFTAG_DOCUMENTNAME, &info) != 0){
+			if(strlen((char *)info) > 511) {
+				info[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Title ", 7);
+			written += t2p_write_pdf_string(info, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	}
+	if(t2p->pdf_subject != NULL) {
+		if(strlen((char *)t2p->pdf_subject) > 0) {
+			if(strlen((char *)t2p->pdf_subject) > 511) {
+				t2p->pdf_subject[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Subject ", 9);
+			written += t2p_write_pdf_string(t2p->pdf_subject, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	} else {
+		if(TIFFGetField(input, TIFFTAG_IMAGEDESCRIPTION, &info) != 0) {
+			if(strlen((char *)info) > 511) {
+				info[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Subject ", 9);
+			written += t2p_write_pdf_string(info, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	}
+	if(t2p->pdf_keywords != NULL) { 
+		if(strlen((char *)t2p->pdf_keywords) > 0) {
+			if(strlen((char *)t2p->pdf_keywords) > 511) {
+				t2p->pdf_keywords[512] = '\0';
+			}
+			written += t2pWriteFile(output, (tdata_t) "/Keywords ", 10);
+			written += t2p_write_pdf_string(t2p->pdf_keywords, output);
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+	}
+	written += t2pWriteFile(output, (tdata_t) ">> \n", 4);	
+
+	return(written);
+}
+
+/*
+ * This function fills a string of a T2P struct with the current time as a PDF
+ * date string, it is called by t2p_pdf_tifftime.
+ */
+
+static void t2p_pdf_currenttime(T2P* t2p)
+{
+
+	struct tm* currenttime;
+	time_t timenow;
+
+	timenow=time(0);
+	currenttime=localtime(&timenow);
+	sprintf((char *)t2p->pdf_datetime, "D:%.4d%.2d%.2d%.2d%.2d%.2d",
+		(currenttime->tm_year+1900) % 65536, 
+		(currenttime->tm_mon+1) % 256, 
+		(currenttime->tm_mday) % 256, 
+		(currenttime->tm_hour) % 256, 
+		(currenttime->tm_min) % 256, 
+		(currenttime->tm_sec) % 256);
+
+	return;
+}
+
+/*
+ * This function fills a string of a T2P struct with the date and time of a
+ * TIFF file if it exists or the current time as a PDF date string.
+ */
+
+static void t2p_pdf_tifftime(T2P* t2p, TIFF* input){
+
+	char* datetime;
+
+	t2p->pdf_datetime = (unsigned char*) _TIFFmalloc(19);
+	if(t2p->pdf_datetime == NULL){
+		TIFFError(TIFF2PDF_MODULE, 
+		"Can't allocate %u bytes of memory for t2p_pdf_tiff_time", 17); 
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return;
+	}
+	t2p->pdf_datetime[16] = '\0';
+	if( TIFFGetField(input, TIFFTAG_DATETIME, &datetime) != 0 
+	    && (strlen(datetime) >= 19) ){
+		t2p->pdf_datetime[0]='D';
+		t2p->pdf_datetime[1]=':';
+		t2p->pdf_datetime[2]=datetime[0];
+		t2p->pdf_datetime[3]=datetime[1];
+		t2p->pdf_datetime[4]=datetime[2];
+		t2p->pdf_datetime[5]=datetime[3];
+		t2p->pdf_datetime[6]=datetime[5];
+		t2p->pdf_datetime[7]=datetime[6];
+		t2p->pdf_datetime[8]=datetime[8];
+		t2p->pdf_datetime[9]=datetime[9];
+		t2p->pdf_datetime[10]=datetime[11];
+		t2p->pdf_datetime[11]=datetime[12];
+		t2p->pdf_datetime[12]=datetime[14];
+		t2p->pdf_datetime[13]=datetime[15];
+		t2p->pdf_datetime[14]=datetime[17];
+		t2p->pdf_datetime[15]=datetime[18];
+	} else {
+		t2p_pdf_currenttime(t2p);
+	}
+
+	return;
+}
+
+/*
+ * This function writes a PDF Pages Tree structure to output.
+ */
+
+static tsize_t t2p_write_pdf_pages(T2P* t2p, TIFF* output)
+{
+	tsize_t written=0;
+	tdir_t i=0;
+	char buffer[16];
+	int buflen=0;
+
+	int page=0;
+	written += t2pWriteFile(output, 
+		(tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26);
+	page = t2p->pdf_pages+1;
+	for (i=0;i<t2p->tiff_pagecount;i++){
+		buflen=sprintf(buffer, "%d", page);
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+		if ( ((i+1)%8)==0 ) {
+			written += t2pWriteFile(output, (tdata_t) "\n", 1);
+		}
+		page +=3;
+		page += t2p->tiff_pages[i].page_extra;
+		if(t2p->tiff_pages[i].page_tilecount>0){
+			page += (2 * t2p->tiff_pages[i].page_tilecount);
+		} else {
+			page +=2;
+		}
+	}
+	written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10);
+	_TIFFmemset(buffer, 0x00, 16);
+	buflen=sprintf(buffer, "%d", t2p->tiff_pagecount);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6);
+
+	return(written);
+}
+
+/*
+	This function writes a PDF Page structure to output.
+*/
+
+static tsize_t t2p_write_pdf_page(uint32 object, T2P* t2p, TIFF* output){
+
+	unsigned int i=0;
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+	
+	written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24);
+	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
+	written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); 
+	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " ", 1); 
+	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " ", 1); 
+	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " ", 1); 
+	buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) "] \n", 3); 
+	written += t2pWriteFile(output, (tdata_t) "/Contents ", 10);
+	buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1));
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6);
+	written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15);
+	if( t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount != 0 ){
+		written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);
+		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){
+			written += t2pWriteFile(output, (tdata_t) "/Im", 3);
+			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			written += t2pWriteFile(output, (tdata_t) "_", 1);
+			buflen = sprintf(buffer, "%u", i+1);
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			written += t2pWriteFile(output, (tdata_t) " ", 1);
+			buflen = sprintf(
+				buffer, 
+				"%lu", 
+				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+			if(i%4==3){
+				written += t2pWriteFile(output, (tdata_t) "\n", 1);
+			}
+		}
+		written += t2pWriteFile(output, (tdata_t) ">>\n", 3);
+	} else {
+			written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12);
+			written += t2pWriteFile(output, (tdata_t) "/Im", 3);
+			buflen = sprintf(buffer, "%u", t2p->pdf_page+1);
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			written += t2pWriteFile(output, (tdata_t) " ", 1);
+			buflen = sprintf(
+				buffer, 
+				"%lu", 
+				(unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); 
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+		written += t2pWriteFile(output, (tdata_t) ">>\n", 3);
+	}
+	if(t2p->tiff_transferfunctioncount != 0) {
+		written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13);
+		t2pWriteFile(output, (tdata_t) "/GS1 ", 5);
+		buflen = sprintf(
+			buffer, 
+			"%lu", 
+			(unsigned long)(object + 3)); 
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+		written += t2pWriteFile(output, (tdata_t) ">> \n", 4);
+	}
+	written += t2pWriteFile(output, (tdata_t) "/ProcSet [ ", 11);
+	if(t2p->pdf_colorspace == T2P_CS_BILEVEL 
+		|| t2p->pdf_colorspace == T2P_CS_GRAY
+		){
+		written += t2pWriteFile(output, (tdata_t) "/ImageB ", 8);
+	} else {
+		written += t2pWriteFile(output, (tdata_t) "/ImageC ", 8);
+		if(t2p->pdf_colorspace & T2P_CS_PALETTE){
+			written += t2pWriteFile(output, (tdata_t) "/ImageI ", 8);
+		}
+	}
+	written += t2pWriteFile(output, (tdata_t) "]\n>>\n>>\n", 8);
+
+	return(written);
+}
+
+/*
+	This function composes the page size and image and tile locations on a page.
+*/
+
+static void t2p_compose_pdf_page(T2P* t2p){
+
+	uint32 i=0;
+	uint32 i2=0;
+	T2P_TILE* tiles=NULL;
+	T2P_BOX* boxp=NULL;
+	uint32 tilecountx=0;
+	uint32 tilecounty=0;
+	uint32 tilewidth=0;
+	uint32 tilelength=0;
+	int istiled=0;
+	float f=0;
+	
+	t2p->pdf_xres = t2p->tiff_xres;
+	t2p->pdf_yres = t2p->tiff_yres;
+	if(t2p->pdf_overrideres) {
+		t2p->pdf_xres = t2p->pdf_defaultxres;
+		t2p->pdf_yres = t2p->pdf_defaultyres;
+	}
+	if(t2p->pdf_xres == 0.0)
+		t2p->pdf_xres = t2p->pdf_defaultxres;
+	if(t2p->pdf_yres == 0.0)
+		t2p->pdf_yres = t2p->pdf_defaultyres;
+	if (t2p->tiff_resunit != RESUNIT_CENTIMETER	/* RESUNIT_NONE and */
+	    && t2p->tiff_resunit != RESUNIT_INCH) {	/* other cases */
+		t2p->pdf_imagewidth = ((float)(t2p->tiff_width))/t2p->pdf_xres;
+		t2p->pdf_imagelength = ((float)(t2p->tiff_length))/t2p->pdf_yres;
+	} else {
+		t2p->pdf_imagewidth = 
+			((float)(t2p->tiff_width))*PS_UNIT_SIZE/t2p->pdf_xres;
+		t2p->pdf_imagelength = 
+			((float)(t2p->tiff_length))*PS_UNIT_SIZE/t2p->pdf_yres;
+	}
+	if(t2p->pdf_overridepagesize != 0) {
+		t2p->pdf_pagewidth = t2p->pdf_defaultpagewidth;
+		t2p->pdf_pagelength = t2p->pdf_defaultpagelength;
+	} else {
+		t2p->pdf_pagewidth = t2p->pdf_imagewidth;
+		t2p->pdf_pagelength = t2p->pdf_imagelength;
+	}
+	t2p->pdf_mediabox.x1=0.0;
+	t2p->pdf_mediabox.y1=0.0;
+	t2p->pdf_mediabox.x2=t2p->pdf_pagewidth;
+	t2p->pdf_mediabox.y2=t2p->pdf_pagelength;
+	t2p->pdf_imagebox.x1=0.0;
+	t2p->pdf_imagebox.y1=0.0;
+	t2p->pdf_imagebox.x2=t2p->pdf_imagewidth;
+	t2p->pdf_imagebox.y2=t2p->pdf_imagelength;
+	if(t2p->pdf_overridepagesize!=0){
+		t2p->pdf_imagebox.x1+=((t2p->pdf_pagewidth-t2p->pdf_imagewidth)/2.0F);
+		t2p->pdf_imagebox.y1+=((t2p->pdf_pagelength-t2p->pdf_imagelength)/2.0F);
+		t2p->pdf_imagebox.x2+=((t2p->pdf_pagewidth-t2p->pdf_imagewidth)/2.0F);
+		t2p->pdf_imagebox.y2+=((t2p->pdf_pagelength-t2p->pdf_imagelength)/2.0F);
+	}
+	if(t2p->tiff_orientation > 4){
+		f=t2p->pdf_mediabox.x2;
+		t2p->pdf_mediabox.x2=t2p->pdf_mediabox.y2;
+		t2p->pdf_mediabox.y2=f;
+	}
+	istiled=((t2p->tiff_tiles[t2p->pdf_page]).tiles_tilecount==0) ? 0 : 1;
+	if(istiled==0){
+		t2p_compose_pdf_page_orient(&(t2p->pdf_imagebox), t2p->tiff_orientation);
+		return;
+	} else {
+		tilewidth=(t2p->tiff_tiles[t2p->pdf_page]).tiles_tilewidth;
+		tilelength=(t2p->tiff_tiles[t2p->pdf_page]).tiles_tilelength;
+		tilecountx=(t2p->tiff_width + 
+			tilewidth -1)/ 
+			tilewidth;
+		(t2p->tiff_tiles[t2p->pdf_page]).tiles_tilecountx=tilecountx;
+		tilecounty=(t2p->tiff_length + 
+			tilelength -1)/ 
+			tilelength;
+		(t2p->tiff_tiles[t2p->pdf_page]).tiles_tilecounty=tilecounty;
+		(t2p->tiff_tiles[t2p->pdf_page]).tiles_edgetilewidth=
+			t2p->tiff_width % tilewidth;
+		(t2p->tiff_tiles[t2p->pdf_page]).tiles_edgetilelength=
+			t2p->tiff_length % tilelength;
+		tiles=(t2p->tiff_tiles[t2p->pdf_page]).tiles_tiles;
+		for(i2=0;i2<tilecounty-1;i2++){
+			for(i=0;i<tilecountx-1;i++){
+				boxp=&(tiles[i2*tilecountx+i].tile_box);
+				boxp->x1 = 
+					t2p->pdf_imagebox.x1 
+					+ ((float)(t2p->pdf_imagewidth * i * tilewidth)
+					/ (float)t2p->tiff_width);
+				boxp->x2 = 
+					t2p->pdf_imagebox.x1 
+					+ ((float)(t2p->pdf_imagewidth * (i+1) * tilewidth)
+					/ (float)t2p->tiff_width);
+				boxp->y1 = 
+					t2p->pdf_imagebox.y2 
+					- ((float)(t2p->pdf_imagelength * (i2+1) * tilelength)
+					/ (float)t2p->tiff_length);
+				boxp->y2 = 
+					t2p->pdf_imagebox.y2 
+					- ((float)(t2p->pdf_imagelength * i2 * tilelength)
+					/ (float)t2p->tiff_length);
+			}
+			boxp=&(tiles[i2*tilecountx+i].tile_box);
+			boxp->x1 = 
+				t2p->pdf_imagebox.x1 
+				+ ((float)(t2p->pdf_imagewidth * i * tilewidth)
+				/ (float)t2p->tiff_width);
+			boxp->x2 = t2p->pdf_imagebox.x2;
+			boxp->y1 = 
+				t2p->pdf_imagebox.y2 
+				- ((float)(t2p->pdf_imagelength * (i2+1) * tilelength)
+				/ (float)t2p->tiff_length);
+			boxp->y2 = 
+				t2p->pdf_imagebox.y2 
+				- ((float)(t2p->pdf_imagelength * i2 * tilelength)
+				/ (float)t2p->tiff_length);
+		}
+		for(i=0;i<tilecountx-1;i++){
+			boxp=&(tiles[i2*tilecountx+i].tile_box);
+			boxp->x1 = 
+				t2p->pdf_imagebox.x1 
+				+ ((float)(t2p->pdf_imagewidth * i * tilewidth)
+				/ (float)t2p->tiff_width);
+			boxp->x2 = 
+				t2p->pdf_imagebox.x1 
+				+ ((float)(t2p->pdf_imagewidth * (i+1) * tilewidth)
+				/ (float)t2p->tiff_width);
+			boxp->y1 = t2p->pdf_imagebox.y1;
+			boxp->y2 = 
+				t2p->pdf_imagebox.y2 
+				- ((float)(t2p->pdf_imagelength * i2 * tilelength)
+				/ (float)t2p->tiff_length);
+		}
+		boxp=&(tiles[i2*tilecountx+i].tile_box);
+		boxp->x1 = 
+			t2p->pdf_imagebox.x1 
+			+ ((float)(t2p->pdf_imagewidth * i * tilewidth)
+			/ (float)t2p->tiff_width);
+		boxp->x2 = t2p->pdf_imagebox.x2;
+		boxp->y1 = t2p->pdf_imagebox.y1;
+		boxp->y2 = 
+			t2p->pdf_imagebox.y2 
+			- ((float)(t2p->pdf_imagelength * i2 * tilelength)
+			/ (float)t2p->tiff_length);
+	}
+	if(t2p->tiff_orientation==0 || t2p->tiff_orientation==1){
+		for(i=0;i<(t2p->tiff_tiles[t2p->pdf_page]).tiles_tilecount;i++){
+			t2p_compose_pdf_page_orient( &(tiles[i].tile_box) , 0);
+		}
+		return;
+	}
+	for(i=0;i<(t2p->tiff_tiles[t2p->pdf_page]).tiles_tilecount;i++){
+		boxp=&(tiles[i].tile_box);
+		boxp->x1 -= t2p->pdf_imagebox.x1;
+		boxp->x2 -= t2p->pdf_imagebox.x1;
+		boxp->y1 -= t2p->pdf_imagebox.y1;
+		boxp->y2 -= t2p->pdf_imagebox.y1;
+		if(t2p->tiff_orientation==2 || t2p->tiff_orientation==3){
+			boxp->x1 = t2p->pdf_imagebox.x2 - t2p->pdf_imagebox.x1 - boxp->x1;
+			boxp->x2 = t2p->pdf_imagebox.x2 - t2p->pdf_imagebox.x1 - boxp->x2;
+		}
+		if(t2p->tiff_orientation==3 || t2p->tiff_orientation==4){
+			boxp->y1 = t2p->pdf_imagebox.y2 - t2p->pdf_imagebox.y1 - boxp->y1;
+			boxp->y2 = t2p->pdf_imagebox.y2 - t2p->pdf_imagebox.y1 - boxp->y2;
+		}
+		if(t2p->tiff_orientation==8 || t2p->tiff_orientation==5){
+			boxp->y1 = t2p->pdf_imagebox.y2 - t2p->pdf_imagebox.y1 - boxp->y1;
+			boxp->y2 = t2p->pdf_imagebox.y2 - t2p->pdf_imagebox.y1 - boxp->y2;
+		}
+		if(t2p->tiff_orientation==5 || t2p->tiff_orientation==6){
+			boxp->x1 = t2p->pdf_imagebox.x2 - t2p->pdf_imagebox.x1 - boxp->x1;
+			boxp->x2 = t2p->pdf_imagebox.x2 - t2p->pdf_imagebox.x1 - boxp->x2;
+		}
+		if(t2p->tiff_orientation > 4){
+			f=boxp->x1;
+			boxp->x1 = boxp->y1;
+			boxp->y1 = f;
+			f=boxp->x2;
+			boxp->x2 = boxp->y2;
+			boxp->y2 = f; 
+			t2p_compose_pdf_page_orient_flip(boxp, t2p->tiff_orientation);
+		} else {
+			t2p_compose_pdf_page_orient(boxp, t2p->tiff_orientation);
+		}
+		
+	}
+
+	return;
+}
+
+static void t2p_compose_pdf_page_orient(T2P_BOX* boxp, uint16 orientation){
+
+	float m1[9];
+	float f=0.0;
+	
+	if( boxp->x1 > boxp->x2){
+		f=boxp->x1;
+		boxp->x1=boxp->x2;
+		boxp->x2 = f;
+	}
+	if( boxp->y1 > boxp->y2){
+		f=boxp->y1;
+		boxp->y1=boxp->y2;
+		boxp->y2 = f;
+	}
+	boxp->mat[0]=m1[0]=boxp->x2-boxp->x1;
+	boxp->mat[1]=m1[1]=0.0;
+	boxp->mat[2]=m1[2]=0.0;
+	boxp->mat[3]=m1[3]=0.0;
+	boxp->mat[4]=m1[4]=boxp->y2-boxp->y1;
+	boxp->mat[5]=m1[5]=0.0;
+	boxp->mat[6]=m1[6]=boxp->x1;
+	boxp->mat[7]=m1[7]=boxp->y1;
+	boxp->mat[8]=m1[8]=1.0;
+	switch(orientation){
+		case 0:
+		case 1:
+			break;
+		case 2:
+			boxp->mat[0]=0.0F-m1[0];
+			boxp->mat[6]+=m1[0];
+			break;
+		case 3:
+			boxp->mat[0]=0.0F-m1[0];
+			boxp->mat[4]=0.0F-m1[4];
+			boxp->mat[6]+=m1[0];
+			boxp->mat[7]+=m1[4];
+			break;
+		case 4:
+			boxp->mat[4]=0.0F-m1[4];
+			boxp->mat[7]+=m1[4];
+			break;
+		case 5:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=0.0F-m1[0];
+			boxp->mat[3]=0.0F-m1[4];
+			boxp->mat[4]=0.0F;
+			boxp->mat[6]+=m1[4];
+			boxp->mat[7]+=m1[0];
+			break;
+		case 6:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=0.0F-m1[0];
+			boxp->mat[3]=m1[4];
+			boxp->mat[4]=0.0F;
+			boxp->mat[7]+=m1[0];
+			break;
+		case 7:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=m1[0];
+			boxp->mat[3]=m1[4];
+			boxp->mat[4]=0.0F;
+			break;
+		case 8:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=m1[0];
+			boxp->mat[3]=0.0F-m1[4];
+			boxp->mat[4]=0.0F;
+			boxp->mat[6]+=m1[4];
+			break;
+	}
+
+	return;
+}
+
+static void t2p_compose_pdf_page_orient_flip(T2P_BOX* boxp, uint16 orientation){
+
+	float m1[9];
+	float f=0.0;
+	
+	if( boxp->x1 > boxp->x2){
+		f=boxp->x1;
+		boxp->x1=boxp->x2;
+		boxp->x2 = f;
+	}
+	if( boxp->y1 > boxp->y2){
+		f=boxp->y1;
+		boxp->y1=boxp->y2;
+		boxp->y2 = f;
+	}
+	boxp->mat[0]=m1[0]=boxp->x2-boxp->x1;
+	boxp->mat[1]=m1[1]=0.0F;
+	boxp->mat[2]=m1[2]=0.0F;
+	boxp->mat[3]=m1[3]=0.0F;
+	boxp->mat[4]=m1[4]=boxp->y2-boxp->y1;
+	boxp->mat[5]=m1[5]=0.0F;
+	boxp->mat[6]=m1[6]=boxp->x1;
+	boxp->mat[7]=m1[7]=boxp->y1;
+	boxp->mat[8]=m1[8]=1.0F;
+	switch(orientation){
+		case 5:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=0.0F-m1[4];
+			boxp->mat[3]=0.0F-m1[0];
+			boxp->mat[4]=0.0F;
+			boxp->mat[6]+=m1[0];
+			boxp->mat[7]+=m1[4];
+			break;
+		case 6:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=0.0F-m1[4];
+			boxp->mat[3]=m1[0];
+			boxp->mat[4]=0.0F;
+			boxp->mat[7]+=m1[4];
+			break;
+		case 7:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=m1[4];
+			boxp->mat[3]=m1[0];
+			boxp->mat[4]=0.0F;
+			break;
+		case 8:
+			boxp->mat[0]=0.0F;
+			boxp->mat[1]=m1[4];
+			boxp->mat[3]=0.0F-m1[0];
+			boxp->mat[4]=0.0F;
+			boxp->mat[6]+=m1[0];
+			break;
+	}
+
+	return;
+}
+
+/*
+	This function writes a PDF Contents stream to output.
+*/
+
+static tsize_t t2p_write_pdf_page_content_stream(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	ttile_t i=0;
+	char buffer[512];
+	int buflen=0;
+	T2P_BOX box;
+	
+	if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ 
+		for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){
+			box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box;
+			buflen=sprintf(buffer, 
+				"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", 
+				t2p->tiff_transferfunctioncount?"/GS1 gs ":"",
+				box.mat[0],
+				box.mat[1],
+				box.mat[3],
+				box.mat[4],
+				box.mat[6],
+				box.mat[7],
+				t2p->pdf_page + 1, 
+				(long)(i + 1));
+			written += t2p_write_pdf_stream(buffer, buflen, output);
+		}
+	} else {
+		box=t2p->pdf_imagebox;
+		buflen=sprintf(buffer, 
+			"q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", 
+			t2p->tiff_transferfunctioncount?"/GS1 gs ":"",
+			box.mat[0],
+			box.mat[1],
+			box.mat[3],
+			box.mat[4],
+			box.mat[6],
+			box.mat[7],
+			t2p->pdf_page+1);
+		written += t2p_write_pdf_stream(buffer, buflen, output);
+	}
+
+	return(written);
+}
+
+/*
+	This function writes a PDF Image XObject stream dictionary to output. 
+*/
+
+static tsize_t t2p_write_pdf_xobject_stream_dict(ttile_t tile, 
+                                                 T2P* t2p, 
+                                                 TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+
+	written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); 
+	written += t2pWriteFile(output, 
+		(tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", 
+		42);
+	buflen=sprintf(buffer, "%u", t2p->pdf_page+1);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	if(tile != 0){
+		written += t2pWriteFile(output, (tdata_t) "_", 1);
+		buflen=sprintf(buffer, "%lu", (unsigned long)tile);
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	}
+	written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8);
+	_TIFFmemset((tdata_t)buffer, 0x00, 16);
+	if(tile==0){
+		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width);
+	} else {
+		if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){
+			buflen=sprintf(
+				buffer, 
+				"%lu", 
+				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);
+		} else {
+			buflen=sprintf(
+				buffer, 
+				"%lu", 
+				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);
+		}
+	}
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9);
+	_TIFFmemset((tdata_t)buffer, 0x00, 16);
+	if(tile==0){
+		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length);
+	} else {
+		if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){
+			buflen=sprintf(
+				buffer, 
+				"%lu", 
+				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
+		} else {
+			buflen=sprintf(
+				buffer, 
+				"%lu", 
+				(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+		}
+	}
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19);
+	_TIFFmemset((tdata_t)buffer, 0x00, 16);
+	buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13);
+	written += t2p_write_pdf_xobject_cs(t2p, output);
+	if (t2p->pdf_image_interpolate)
+		written += t2pWriteFile(output,
+					 (tdata_t) "\n/Interpolate true", 18);
+	if( (t2p->pdf_switchdecode != 0)
+#ifdef CCITT_SUPPORT
+		&& ! (t2p->pdf_colorspace == T2P_CS_BILEVEL 
+		&& t2p->pdf_compression == T2P_COMPRESS_G4)
+#endif
+		){
+		written += t2p_write_pdf_xobject_decode(t2p, output);
+	}
+	written += t2p_write_pdf_xobject_stream_filter(tile, t2p, output);
+	
+	return(written);
+}
+
+/*
+ * 	This function writes a PDF Image XObject Colorspace name to output.
+ */
+
+
+static tsize_t t2p_write_pdf_xobject_cs(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[128];
+	int buflen=0;
+
+	float X_W=1.0;
+	float Y_W=1.0;
+	float Z_W=1.0;
+	
+	if( (t2p->pdf_colorspace & T2P_CS_ICCBASED) != 0){
+		written += t2p_write_pdf_xobject_icccs(t2p, output);
+		return(written);
+	}
+	if( (t2p->pdf_colorspace & T2P_CS_PALETTE) != 0){
+		written += t2pWriteFile(output, (tdata_t) "[ /Indexed ", 11);
+		t2p->pdf_colorspace ^= T2P_CS_PALETTE;
+		written += t2p_write_pdf_xobject_cs(t2p, output);
+		t2p->pdf_colorspace |= T2P_CS_PALETTE;
+		buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 );
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " ", 1);
+		_TIFFmemset(buffer, 0x00, 16);
+		buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); 
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7);
+		return(written);
+	}
+	if(t2p->pdf_colorspace & T2P_CS_BILEVEL){
+			written += t2pWriteFile(output, (tdata_t) "/DeviceGray \n", 13);
+	}
+	if(t2p->pdf_colorspace & T2P_CS_GRAY){
+			if(t2p->pdf_colorspace & T2P_CS_CALGRAY){
+				written += t2p_write_pdf_xobject_calcs(t2p, output);
+			} else {
+				written += t2pWriteFile(output, (tdata_t) "/DeviceGray \n", 13);
+			}
+	}
+	if(t2p->pdf_colorspace & T2P_CS_RGB){
+			if(t2p->pdf_colorspace & T2P_CS_CALRGB){
+				written += t2p_write_pdf_xobject_calcs(t2p, output);
+			} else {
+				written += t2pWriteFile(output, (tdata_t) "/DeviceRGB \n", 12);
+			}
+	}
+	if(t2p->pdf_colorspace & T2P_CS_CMYK){
+			written += t2pWriteFile(output, (tdata_t) "/DeviceCMYK \n", 13);
+	}
+	if(t2p->pdf_colorspace & T2P_CS_LAB){
+			written += t2pWriteFile(output, (tdata_t) "[/Lab << \n", 10);
+			written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);
+			X_W = t2p->tiff_whitechromaticities[0];
+			Y_W = t2p->tiff_whitechromaticities[1];
+			Z_W = 1.0F - (X_W + Y_W);
+			X_W /= Y_W;
+			Z_W /= Y_W;
+			Y_W = 1.0F;
+			buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			X_W = 0.3457F; /* 0.3127F; */ /* D50, commented D65 */
+			Y_W = 0.3585F; /* 0.3290F; */
+			Z_W = 1.0F - (X_W + Y_W);
+			X_W /= Y_W;
+			Z_W /= Y_W;
+			Y_W = 1.0F;
+			buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			written += t2pWriteFile(output, (tdata_t) "/Range ", 7);
+			buflen=sprintf(buffer, "[%d %d %d %d] \n", 
+				t2p->pdf_labrange[0], 
+				t2p->pdf_labrange[1], 
+				t2p->pdf_labrange[2], 
+				t2p->pdf_labrange[3]);
+			written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			written += t2pWriteFile(output, (tdata_t) ">>] \n", 5);
+			
+	}
+	
+	return(written);
+}
+
+static tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+
+	written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25);
+	if(t2p->tiff_transferfunctioncount == 1){
+		buflen=sprintf(buffer, "%lu",
+			       (unsigned long)(t2p->pdf_xrefcount + 1));
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+	} else {
+		written += t2pWriteFile(output, (tdata_t) "[ ", 2);
+		buflen=sprintf(buffer, "%lu",
+			       (unsigned long)(t2p->pdf_xrefcount + 1));
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+		buflen=sprintf(buffer, "%lu",
+			       (unsigned long)(t2p->pdf_xrefcount + 2));
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+		buflen=sprintf(buffer, "%lu",
+			       (unsigned long)(t2p->pdf_xrefcount + 3));
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) " 0 R ", 5);
+		written += t2pWriteFile(output, (tdata_t) "/Identity ] ", 12);
+	}
+
+	written += t2pWriteFile(output, (tdata_t) " >> \n", 5);
+
+	return(written);
+}
+
+static tsize_t t2p_write_pdf_transfer_dict(T2P* t2p, TIFF* output, uint16 i){
+
+	tsize_t written=0;
+	char buffer[32];
+	int buflen=0;
+	(void)i; // XXX
+
+	written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17);
+	written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19);
+	written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18);
+	buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample));
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19);
+	written += t2p_write_pdf_stream_dict(1<<(t2p->tiff_bitspersample+1), 0, output);
+
+	return(written);
+}
+
+static tsize_t t2p_write_pdf_transfer_stream(T2P* t2p, TIFF* output, uint16 i){
+
+	tsize_t written=0;
+
+	written += t2p_write_pdf_stream(
+		t2p->tiff_transferfunction[i], 
+		(1<<(t2p->tiff_bitspersample+1)), 
+		output);
+
+	return(written);
+}
+
+/*
+	This function writes a PDF Image XObject Colorspace array to output.
+*/
+
+static tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[128];
+	int buflen=0;
+	
+	float X_W=0.0;
+	float Y_W=0.0;
+	float Z_W=0.0;
+	float X_R=0.0;
+	float Y_R=0.0;
+	float Z_R=0.0;
+	float X_G=0.0;
+	float Y_G=0.0;
+	float Z_G=0.0;
+	float X_B=0.0;
+	float Y_B=0.0;
+	float Z_B=0.0;
+	float x_w=0.0;
+	float y_w=0.0;
+	float z_w=0.0;
+	float x_r=0.0;
+	float y_r=0.0;
+	float x_g=0.0;
+	float y_g=0.0;
+	float x_b=0.0;
+	float y_b=0.0;
+	float R=1.0;
+	float G=1.0;
+	float B=1.0;
+	
+	written += t2pWriteFile(output, (tdata_t) "[", 1);
+	if(t2p->pdf_colorspace & T2P_CS_CALGRAY){
+		written += t2pWriteFile(output, (tdata_t) "/CalGray ", 9);
+		X_W = t2p->tiff_whitechromaticities[0];
+		Y_W = t2p->tiff_whitechromaticities[1];
+		Z_W = 1.0F - (X_W + Y_W);
+		X_W /= Y_W;
+		Z_W /= Y_W;
+		Y_W = 1.0F;
+	}
+	if(t2p->pdf_colorspace & T2P_CS_CALRGB){
+		written += t2pWriteFile(output, (tdata_t) "/CalRGB ", 8);
+		x_w = t2p->tiff_whitechromaticities[0];
+		y_w = t2p->tiff_whitechromaticities[1];
+		x_r = t2p->tiff_primarychromaticities[0];
+		y_r = t2p->tiff_primarychromaticities[1];
+		x_g = t2p->tiff_primarychromaticities[2];
+		y_g = t2p->tiff_primarychromaticities[3];
+		x_b = t2p->tiff_primarychromaticities[4];
+		y_b = t2p->tiff_primarychromaticities[5];
+		z_w = y_w * ((x_g - x_b)*y_r - (x_r-x_b)*y_g + (x_r-x_g)*y_b);
+		Y_R = (y_r/R) * ((x_g-x_b)*y_w - (x_w-x_b)*y_g + (x_w-x_g)*y_b) / z_w;
+		X_R = Y_R * x_r / y_r;
+		Z_R = Y_R * (((1-x_r)/y_r)-1);
+		Y_G = ((0.0F-(y_g))/G) * ((x_r-x_b)*y_w - (x_w-x_b)*y_r + (x_w-x_r)*y_b) / z_w;
+		X_G = Y_G * x_g / y_g;
+		Z_G = Y_G * (((1-x_g)/y_g)-1);
+		Y_B = (y_b/B) * ((x_r-x_g)*y_w - (x_w-x_g)*y_r + (x_w-x_r)*y_g) / z_w;
+		X_B = Y_B * x_b / y_b;
+		Z_B = Y_B * (((1-x_b)/y_b)-1);
+		X_W = (X_R * R) + (X_G * G) + (X_B * B);
+		Y_W = (Y_R * R) + (Y_G * G) + (Y_B * B);
+		Z_W = (Z_R * R) + (Z_G * G) + (Z_B * B);
+		X_W /= Y_W;
+		Z_W /= Y_W;
+		Y_W = 1.0;
+	}
+	written += t2pWriteFile(output, (tdata_t) "<< \n", 4);
+	if(t2p->pdf_colorspace & T2P_CS_CALGRAY){
+		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);
+		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12);
+	}
+	if(t2p->pdf_colorspace & T2P_CS_CALRGB){
+		written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12);
+		buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W);
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8);
+		buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", 
+			X_R, Y_R, Z_R, 
+			X_G, Y_G, Z_G, 
+			X_B, Y_B, Z_B); 
+		written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+		written += t2pWriteFile(output, (tdata_t) "/Gamma [2.2 2.2 2.2] \n", 22);
+	}
+	written += t2pWriteFile(output, (tdata_t) ">>] \n", 5);
+
+	return(written);
+}
+
+/*
+	This function writes a PDF Image XObject Colorspace array to output.
+*/
+
+static tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+	
+	written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11);
+	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7);
+
+	return(written);
+}
+
+static tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+	
+	written += t2pWriteFile(output, (tdata_t) "/N ", 3);
+	buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11);
+	t2p->pdf_colorspace ^= T2P_CS_ICCBASED;
+	written += t2p_write_pdf_xobject_cs(t2p, output);
+	t2p->pdf_colorspace |= T2P_CS_ICCBASED;
+	written += t2p_write_pdf_stream_dict(t2p->tiff_iccprofilelength, 0, output);
+	
+	return(written);
+}
+
+static tsize_t t2p_write_pdf_xobject_icccs_stream(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2p_write_pdf_stream(
+				(tdata_t) t2p->tiff_iccprofile, 
+				(tsize_t) t2p->tiff_iccprofilelength, 
+				output);
+	
+	return(written);
+}
+
+/*
+	This function writes a palette stream for an indexed color space to output.
+*/
+
+static tsize_t t2p_write_pdf_xobject_palettecs_stream(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+
+	written += t2p_write_pdf_stream(
+				(tdata_t) t2p->pdf_palette, 
+				(tsize_t) t2p->pdf_palettesize, 
+				output);
+	
+	return(written);
+}
+
+/*
+	This function writes a PDF Image XObject Decode array to output.
+*/
+
+static tsize_t t2p_write_pdf_xobject_decode(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	int i=0;
+
+	written += t2pWriteFile(output, (tdata_t) "/Decode [ ", 10);
+	for (i=0;i<t2p->tiff_samplesperpixel;i++){
+		written += t2pWriteFile(output, (tdata_t) "1 0 ", 4);
+	}
+	written += t2pWriteFile(output, (tdata_t) "]\n", 2);
+
+	return(written);
+}
+
+/*
+	This function writes a PDF Image XObject stream filter name and parameters to 
+	output.
+*/
+
+static tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[16];
+	int buflen=0;
+
+	if(t2p->pdf_compression==T2P_COMPRESS_NONE){
+		return(written);
+	}
+	written += t2pWriteFile(output, (tdata_t) "/Filter ", 8);
+	switch(t2p->pdf_compression){
+#ifdef CCITT_SUPPORT
+		case T2P_COMPRESS_G4:
+			written += t2pWriteFile(output, (tdata_t) "/CCITTFaxDecode ", 16);
+			written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13);
+			written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9);
+			if(tile==0){
+				written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
+				buflen=sprintf(buffer, "%lu",
+					       (unsigned long)t2p->tiff_width);
+				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
+				buflen=sprintf(buffer, "%lu",
+					       (unsigned long)t2p->tiff_length);
+				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+			} else {
+				if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){
+					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
+					buflen=sprintf(
+						buffer, 
+						"%lu", 
+						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth);
+					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				} else {
+					written += t2pWriteFile(output, (tdata_t) "/Columns ", 9);
+					buflen=sprintf(
+						buffer, 
+						"%lu", 
+						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth);
+					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				}
+				if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){
+					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
+					buflen=sprintf(
+						buffer, 
+						"%lu", 
+						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength);
+					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				} else {
+					written += t2pWriteFile(output, (tdata_t) " /Rows ", 7);
+					buflen=sprintf(
+						buffer, 
+						"%lu", 
+						(unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength);
+					written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				}
+			}
+			if(t2p->pdf_switchdecode == 0){
+				written += t2pWriteFile(output, (tdata_t) " /BlackIs1 true ", 16);
+			}
+			written += t2pWriteFile(output, (tdata_t) ">>\n", 3);
+			break;
+#endif
+#ifdef JPEG_SUPPORT
+		case T2P_COMPRESS_JPEG:
+			written += t2pWriteFile(output, (tdata_t) "/DCTDecode ", 11);
+
+			if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR) {
+				written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13);
+				written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 0 >>\n", 24);
+			}
+			break;
+#endif
+#ifdef ZIP_SUPPORT
+		case T2P_COMPRESS_ZIP:
+			written += t2pWriteFile(output, (tdata_t) "/FlateDecode ", 13);
+			if(t2p->pdf_compressionquality%100){
+				written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13);
+				written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14);
+				_TIFFmemset(buffer, 0x00, 16);
+				buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100);
+				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				written += t2pWriteFile(output, (tdata_t) " /Columns ", 10);
+				_TIFFmemset(buffer, 0x00, 16);
+				buflen = sprintf(buffer, "%lu",
+						 (unsigned long)t2p->tiff_width);
+				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				written += t2pWriteFile(output, (tdata_t) " /Colors ", 9);
+				_TIFFmemset(buffer, 0x00, 16);
+				buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel);
+				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19);
+				_TIFFmemset(buffer, 0x00, 16);
+				buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample);
+				written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+				written += t2pWriteFile(output, (tdata_t) ">>\n", 3);
+			}
+			break;
+#endif
+		default:
+			break;
+	}
+
+	return(written);
+}
+
+/*
+	This function writes a PDF xref table to output.
+*/
+
+static tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){
+
+	tsize_t written=0;
+	char buffer[21];
+	int buflen=0;
+	uint32 i=0;
+
+	written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7);
+	buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1));
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22);
+	for (i=0;i<t2p->pdf_xrefcount;i++){
+		sprintf(buffer, "%.10lu 00000 n \n",
+			(unsigned long)t2p->pdf_xrefoffsets[i]);
+		written += t2pWriteFile(output, (tdata_t) buffer, 20);
+	}
+
+	return(written);
+}
+
+/*
+ * This function writes a PDF trailer to output.
+ */
+
+static tsize_t t2p_write_pdf_trailer(T2P* t2p, TIFF* output)
+{
+
+	tsize_t written = 0;
+	char buffer[32];
+	int buflen = 0;
+	char fileidbuf[16];
+	int i = 0;
+
+        for (i=0; i<(int)sizeof(fileidbuf); i++)
+          fileidbuf[i] = (char) rand();
+
+	t2p->pdf_fileid = (unsigned char*)_TIFFmalloc(33);
+	if(t2p->pdf_fileid == NULL) {
+		TIFFError(
+			TIFF2PDF_MODULE, 
+		"Can't allocate %u bytes of memory for t2p_write_pdf_trailer", 
+			33 );
+		t2p->t2p_error = T2P_ERR_ERROR;
+		return(0);
+	}
+	_TIFFmemset(t2p->pdf_fileid, 0x00, 33);
+	for (i = 0; i < 16; i++) {
+		sprintf((char *)t2p->pdf_fileid + 2 * i,
+			"%.2hhX", fileidbuf[i]);
+	}
+	written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17);
+	buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1));
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	_TIFFmemset(buffer, 0x00, 32);	
+	written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7);
+	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	_TIFFmemset(buffer, 0x00, 32);	
+	written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12);
+	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	_TIFFmemset(buffer, 0x00, 32);	
+	written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11);
+	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, 32);
+	written += t2pWriteFile(output, (tdata_t) "><", 2);
+	written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, 32);
+	written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16);
+	buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref);
+	written += t2pWriteFile(output, (tdata_t) buffer, buflen);
+	_TIFFmemset(buffer, 0x00, 32);	
+	written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7);
+
+	return(written);
+}
+ 
+/*
+
+  This function writes a PDF to a file given a pointer to a TIFF.
+
+  The idea with using a TIFF* as output for a PDF file is that the file 
+  can be created with TIFFClientOpen for memory-mapped use within the TIFF 
+  library, and TIFFWriteEncodedStrip can be used to write compressed data to 
+  the output.  The output is not actually a TIFF file, it is a PDF file.  
+
+  This function uses only t2pWriteFile and TIFFWriteEncodedStrip to write to 
+  the output TIFF file.  When libtiff would otherwise be writing data to the 
+  output file, the write procedure of the TIFF structure is replaced with an 
+  empty implementation.
+
+  The first argument to the function is an initialized and validated T2P 
+  context struct pointer.
+
+  The second argument to the function is the TIFF* that is the input that has 
+  been opened for reading and no other functions have been called upon it.
+
+  The third argument to the function is the TIFF* that is the output that has 
+  been opened for writing.  It has to be opened so that it hasn't written any 
+  data to the output.  If the output is seekable then it's OK to seek to the 
+  beginning of the file.  The function only writes to the output PDF and does 
+  not seek.  See the example usage in the main() function.
+
+	TIFF* output = TIFFOpen("output.pdf", "w");
+	assert(output != NULL);
+
+	if(output->tif_seekproc != NULL){
+		t2pSeekFile(output, (toff_t) 0, SEEK_SET);
+	}
+
+  This function returns the file size of the output PDF file.  On error it 
+  returns zero and the t2p->t2p_error variable is set to T2P_ERR_ERROR.
+
+  After this function completes, call t2p_free on t2p, TIFFClose on input, 
+  and TIFFClose on output.
+*/
+
+static tsize_t t2p_write_pdf(T2P* t2p, TIFF* input, TIFF* output){
+
+	tsize_t written=0;
+	ttile_t i2=0;
+	tsize_t streamlen=0;
+	uint16 i=0;
+
+	t2p_read_tiff_init(t2p, input);
+	if(t2p->t2p_error!=T2P_ERR_OK){return(0);}
+	t2p->pdf_xrefoffsets= (uint32*) _TIFFmalloc(t2p->pdf_xrefcount * sizeof(uint32) );
+	if(t2p->pdf_xrefoffsets==NULL){
+		TIFFError(
+			TIFF2PDF_MODULE, 
+			"Can't allocate %lu bytes of memory for t2p_write_pdf", 
+			t2p->pdf_xrefcount * (long)sizeof(uint32) );
+		return(written);
+	}
+	t2p->pdf_xrefcount=0;
+	t2p->pdf_catalog=1;
+	t2p->pdf_info=2;
+	t2p->pdf_pages=3;
+	written += t2p_write_pdf_header(t2p, output);
+	t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+	t2p->pdf_catalog=t2p->pdf_xrefcount;
+	written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+	written += t2p_write_pdf_catalog(t2p, output);
+	written += t2p_write_pdf_obj_end(output);
+	t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+	t2p->pdf_info=t2p->pdf_xrefcount;
+	written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+	written += t2p_write_pdf_info(t2p, input, output);
+	written += t2p_write_pdf_obj_end(output);
+	t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+	t2p->pdf_pages=t2p->pdf_xrefcount;
+	written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+	written += t2p_write_pdf_pages(t2p, output);
+	written += t2p_write_pdf_obj_end(output);
+	for(t2p->pdf_page=0;t2p->pdf_page<t2p->tiff_pagecount;t2p->pdf_page++){
+		t2p_read_tiff_data(t2p, input);
+		if(t2p->t2p_error!=T2P_ERR_OK){return(0);}
+		t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+		written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+		written += t2p_write_pdf_page(t2p->pdf_xrefcount, t2p, output);
+		written += t2p_write_pdf_obj_end(output);
+		t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+		written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+		written += t2p_write_pdf_stream_dict_start(output);
+		written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output);
+		written += t2p_write_pdf_stream_dict_end(output);
+		written += t2p_write_pdf_stream_start(output);
+		streamlen=written;
+		written += t2p_write_pdf_page_content_stream(t2p, output);
+		streamlen=written-streamlen;
+		written += t2p_write_pdf_stream_end(output);
+		written += t2p_write_pdf_obj_end(output);
+		t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+		written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+		written += t2p_write_pdf_stream_length(streamlen, output);
+		written += t2p_write_pdf_obj_end(output);
+		if(t2p->tiff_transferfunctioncount != 0){
+			t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+			written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+			written += t2p_write_pdf_transfer(t2p, output);
+			written += t2p_write_pdf_obj_end(output);
+			for(i=0; i < t2p->tiff_transferfunctioncount; i++){
+				t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+				written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+				written += t2p_write_pdf_stream_dict_start(output);
+				written += t2p_write_pdf_transfer_dict(t2p, output, i);
+				written += t2p_write_pdf_stream_dict_end(output);
+				written += t2p_write_pdf_stream_start(output);
+				streamlen=written;
+				written += t2p_write_pdf_transfer_stream(t2p, output, i);
+				streamlen=written-streamlen;
+				written += t2p_write_pdf_stream_end(output);
+				written += t2p_write_pdf_obj_end(output);
+			}
+		}
+		if( (t2p->pdf_colorspace & T2P_CS_PALETTE) != 0){
+			t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+			t2p->pdf_palettecs=t2p->pdf_xrefcount;
+			written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+			written += t2p_write_pdf_stream_dict_start(output);
+			written += t2p_write_pdf_stream_dict(t2p->pdf_palettesize, 0, output);
+			written += t2p_write_pdf_stream_dict_end(output);
+			written += t2p_write_pdf_stream_start(output);
+			streamlen=written;
+			written += t2p_write_pdf_xobject_palettecs_stream(t2p, output);
+			streamlen=written-streamlen;
+			written += t2p_write_pdf_stream_end(output);
+			written += t2p_write_pdf_obj_end(output);
+		}
+		if( (t2p->pdf_colorspace & T2P_CS_ICCBASED) != 0){
+			t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+			t2p->pdf_icccs=t2p->pdf_xrefcount;
+			written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+			written += t2p_write_pdf_stream_dict_start(output);
+			written += t2p_write_pdf_xobject_icccs_dict(t2p, output);
+			written += t2p_write_pdf_stream_dict_end(output);
+			written += t2p_write_pdf_stream_start(output);
+			streamlen=written;
+			written += t2p_write_pdf_xobject_icccs_stream(t2p, output);
+			streamlen=written-streamlen;
+			written += t2p_write_pdf_stream_end(output);
+			written += t2p_write_pdf_obj_end(output);
+		}
+		if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount !=0){
+			for(i2=0;i2<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i2++){
+				t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+				written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+				written += t2p_write_pdf_stream_dict_start(output);
+				written += t2p_write_pdf_xobject_stream_dict(
+					i2+1, 
+					t2p, 
+					output);
+				written += t2p_write_pdf_stream_dict_end(output);
+				written += t2p_write_pdf_stream_start(output);
+				streamlen=written;
+				t2p_read_tiff_size_tile(t2p, input, i2);
+				written += t2p_readwrite_pdf_image_tile(t2p, input, output, i2);
+				t2p_write_advance_directory(t2p, output);
+				if(t2p->t2p_error!=T2P_ERR_OK){return(0);}
+				streamlen=written-streamlen;
+				written += t2p_write_pdf_stream_end(output);
+				written += t2p_write_pdf_obj_end(output);
+				t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+				written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+				written += t2p_write_pdf_stream_length(streamlen, output);
+				written += t2p_write_pdf_obj_end(output);
+			}
+		} else {
+			t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+			written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+			written += t2p_write_pdf_stream_dict_start(output);
+			written += t2p_write_pdf_xobject_stream_dict(
+				0, 
+				t2p, 
+				output);
+			written += t2p_write_pdf_stream_dict_end(output);
+			written += t2p_write_pdf_stream_start(output);
+			streamlen=written;
+			t2p_read_tiff_size(t2p, input);
+			written += t2p_readwrite_pdf_image(t2p, input, output);
+			t2p_write_advance_directory(t2p, output);
+			if(t2p->t2p_error!=T2P_ERR_OK){return(0);}
+			streamlen=written-streamlen;
+			written += t2p_write_pdf_stream_end(output);
+			written += t2p_write_pdf_obj_end(output);
+			t2p->pdf_xrefoffsets[t2p->pdf_xrefcount++]=written;
+			written += t2p_write_pdf_obj_start(t2p->pdf_xrefcount, output);
+			written += t2p_write_pdf_stream_length(streamlen, output);
+			written += t2p_write_pdf_obj_end(output);
+		}
+	}
+	t2p->pdf_startxref = written;
+	written += t2p_write_pdf_xreftable(t2p, output);
+	written += t2p_write_pdf_trailer(t2p, output);
+	t2p_disable(output);
+
+	return(written);
+}
+
+/* vim: set ts=8 sts=8 sw=8 noet: */
+
+#endif
diff --git a/tools/tiff2pdf.c.diff b/tools/tiff2pdf.c.diff
new file mode 100644
index 0000000..8315bc6
--- /dev/null
+++ b/tools/tiff2pdf.c.diff
@@ -0,0 +1,1511 @@
+--- tiff2pdf.c.orig	2014-07-08 17:16:30.856560449 -0400
++++ tiff2pdf.c	2014-07-08 17:16:52.260561336 -0400
+@@ -1,3 +1,26 @@
++/*  -*- C -*-
++//C- -------------------------------------------------------------------
++//C- DjView4
++//C- Copyright (c) 2006  Leon Bottou
++//C-
++//C- This software is subject to, and may be distributed under, the
++//C- GNU General Public License, either version 2 of the license,
++//C- or (at your option) any later version. The license should have
++//C- accompanied the software or you may obtain a copy of the license
++//C- from the Free Software Foundation at http://www.fsf.org .
++//C-
++//C- This program is distributed in the hope that it will be useful,
++//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
++//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++//C- GNU General Public License for more details.
++//C-  ------------------------------------------------------------------
++//
++// The following code is derived from program "tiff2pdf"
++// whose copyright notice is reproduced below.
++// Changes were made to make it independent from the private
++// include file tiffiop.h.
++*/
++
+ /* $Id: tiff2pdf.c,v 1.37.2.7 2009-01-01 00:10:43 bfriesen Exp $
+  *
+  * tiff2pdf - converts a TIFF image to a PDF document
+@@ -24,7 +47,9 @@
+  * OF THIS SOFTWARE.
+  */
+ 
+-#include "tif_config.h"
++#include "tiff2pdf.h"
++
++#ifdef HAVE_TIFF2PDF
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -40,17 +65,137 @@
+ # include <fcntl.h>
+ #endif
+ 
+-#ifdef HAVE_IO_H
+-# include <io.h>
++#ifdef HAVE_GETOPT_H
++# include <getopt.h>
++#endif
++
++#if defined(__GNUC__) || defined(HAVE_LONG_LONG_INT)
++# define uint64 unsigned long long
++#elif defined(_MSC_VER)
++# define uint64 unsigned __int64
++#else
++# define uint64 size_t
+ #endif
+ 
+-#include "tiffiop.h"
+-#include "tiffio.h"
++#ifndef HAVE_GETOPT_H
++/*
++ * Copyright (c) 1987, 1993, 1994
++ *	The Regents of the University of California.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++
++static int   opterr = 1,        /* if error message should be printed */
++             optind = 1,        /* index into parent argv vector */
++             optopt,            /* character checked for validity */
++             optreset;          /* reset getopt */
++static char *optarg;            /* argument associated with option */
++
++#define	BADCH	(int)'?'
++#define	BADARG	(int)':'
++#define	EMSG	""
++
++/*
++ * getopt --
++ *	Parse argc/argv argument vector.
++ */
++static int
++getopt(int argc, char * const argv[], const char *optstring)
++{
++	static char *place = EMSG;		/* option letter processing */
++	char *oli;				/* option letter list index */
++
++	if (optreset || *place == 0) {		/* update scanning pointer */
++		optreset = 0;
++		place = argv[optind];
++		if (optind >= argc || *place++ != '-') {
++			/* Argument is absent or is not an option */
++			place = EMSG;
++			return (-1);
++		}
++		optopt = *place++;
++		if (optopt == '-' && *place == 0) {
++			/* "--" => end of options */
++			++optind;
++			place = EMSG;
++			return (-1);
++		}
++		if (optopt == 0) {
++			/* Solitary '-', treat as a '-' option
++			   if the program (eg su) is looking for it. */
++			place = EMSG;
++			if (strchr(optstring, '-') == NULL)
++				return -1;
++			optopt = '-';
++		}
++	} else
++		optopt = *place++;
+ 
+-#ifndef HAVE_GETOPT
+-extern int getopt(int, char**, char*);
++	/* See if option letter is one the caller wanted... */
++	if (optopt == ':' || (oli = strchr(optstring, optopt)) == NULL) {
++		if (*place == 0)
++			++optind;
++		if (opterr && *optstring != ':')
++			(void)fprintf(stderr,
++                                      "unknown option -- %c\n", optopt);
++		return (BADCH);
++	}
++
++	/* Does this option need an argument? */
++	if (oli[1] != ':') {
++		/* don't need argument */
++		optarg = NULL;
++		if (*place == 0)
++			++optind;
++	} else {
++		/* Option-argument is either the rest of this argument or the
++		   entire next argument. */
++		if (*place)
++			optarg = place;
++		else if (argc > ++optind)
++			optarg = argv[optind];
++		else {
++			/* option-argument absent */
++			place = EMSG;
++			if (*optstring == ':')
++				return (BADARG);
++			if (opterr)
++				(void)fprintf(stderr,
++                                        "option requires an argument -- %c\n",
++                                        optopt);
++			return (BADCH);
++		}
++		place = EMSG;
++		++optind;
++	}
++	return (optopt);			/* return option letter */
++}
+ #endif
+ 
++
+ #define TIFF2PDF_MODULE "tiff2pdf"
+ 
+ #define PS_UNIT_SIZE	72.0F
+@@ -232,8 +377,7 @@
+ 
+ /* These functions are called by main. */
+ 
+-void tiff2pdf_usage(void);
+-int tiff2pdf_match_paper_size(float*, float*, char*);
++static int tiff2pdf_match_paper_size(float*, float*, char*);
+ 
+ /* These functions are used to generate a PDF from a TIFF. */ 
+ 
+@@ -241,76 +385,76 @@
+ extern "C" {
+ #endif
+ 
+-T2P* t2p_init(void);
+-void t2p_validate(T2P*);
+-tsize_t t2p_write_pdf(T2P*, TIFF*, TIFF*);
+-void t2p_free(T2P*);
++static T2P* t2p_init(void);
++static void t2p_validate(T2P*);
++static tsize_t t2p_write_pdf(T2P*, TIFF*, TIFF*);
++static void t2p_free(T2P*);
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ 
+-void t2p_read_tiff_init(T2P*, TIFF*);
+-int t2p_cmp_t2p_page(const void*, const void*);
+-void t2p_read_tiff_data(T2P*, TIFF*);
+-void t2p_read_tiff_size(T2P*, TIFF*);
+-void t2p_read_tiff_size_tile(T2P*, TIFF*, ttile_t);
+-int t2p_tile_is_right_edge(T2P_TILES, ttile_t);
+-int t2p_tile_is_bottom_edge(T2P_TILES, ttile_t);
+-int t2p_tile_is_edge(T2P_TILES, ttile_t);
+-int t2p_tile_is_corner_edge(T2P_TILES, ttile_t);
+-tsize_t t2p_readwrite_pdf_image(T2P*, TIFF*, TIFF*);
+-tsize_t t2p_readwrite_pdf_image_tile(T2P*, TIFF*, TIFF*, ttile_t);
++static void t2p_read_tiff_init(T2P*, TIFF*);
++static int t2p_cmp_t2p_page(const void*, const void*);
++static void t2p_read_tiff_data(T2P*, TIFF*);
++static void t2p_read_tiff_size(T2P*, TIFF*);
++static void t2p_read_tiff_size_tile(T2P*, TIFF*, ttile_t);
++static int t2p_tile_is_right_edge(T2P_TILES, ttile_t);
++static int t2p_tile_is_bottom_edge(T2P_TILES, ttile_t);
++/* static int t2p_tile_is_edge(T2P_TILES, ttile_t); */
++/* static int t2p_tile_is_corner_edge(T2P_TILES, ttile_t); */
++static tsize_t t2p_readwrite_pdf_image(T2P*, TIFF*, TIFF*);
++static tsize_t t2p_readwrite_pdf_image_tile(T2P*, TIFF*, TIFF*, ttile_t);
+ #ifdef OJPEG_SUPPORT
+-int t2p_process_ojpeg_tables(T2P*, TIFF*);
++static int t2p_process_ojpeg_tables(T2P*, TIFF*);
+ #endif
+ #ifdef JPEG_SUPPORT
+-int t2p_process_jpeg_strip(unsigned char*, tsize_t*, unsigned char*, tsize_t*, tstrip_t, uint32);
++static int t2p_process_jpeg_strip(unsigned char*, tsize_t*, unsigned char*, tsize_t*, tstrip_t, uint32);
+ #endif
+-void t2p_tile_collapse_left(tdata_t, tsize_t, uint32, uint32, uint32);
+-void t2p_write_advance_directory(T2P*, TIFF*);
+-tsize_t t2p_sample_planar_separate_to_contig(T2P*, unsigned char*, unsigned char*, tsize_t);
+-tsize_t t2p_sample_realize_palette(T2P*, unsigned char*);
+-tsize_t t2p_sample_abgr_to_rgb(tdata_t, uint32);
+-tsize_t t2p_sample_rgba_to_rgb(tdata_t, uint32);
+-tsize_t t2p_sample_rgbaa_to_rgb(tdata_t, uint32);
+-tsize_t t2p_sample_lab_signed_to_unsigned(tdata_t, uint32);
+-tsize_t t2p_write_pdf_header(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_obj_start(uint32, TIFF*);
+-tsize_t t2p_write_pdf_obj_end(TIFF*);
+-tsize_t t2p_write_pdf_name(unsigned char*, TIFF*);
+-tsize_t t2p_write_pdf_string(unsigned char*, TIFF*);
+-tsize_t t2p_write_pdf_stream(tdata_t, tsize_t, TIFF*);
+-tsize_t t2p_write_pdf_stream_start(TIFF*);
+-tsize_t t2p_write_pdf_stream_end(TIFF*);
+-tsize_t t2p_write_pdf_stream_dict(tsize_t, uint32, TIFF*);
+-tsize_t t2p_write_pdf_stream_dict_start(TIFF*);
+-tsize_t t2p_write_pdf_stream_dict_end(TIFF*);
+-tsize_t t2p_write_pdf_stream_length(tsize_t, TIFF*);
+-tsize_t t2p_write_pdf_catalog(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_info(T2P*, TIFF*, TIFF*);
+-void t2p_pdf_currenttime(T2P*);
+-void t2p_pdf_tifftime(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_pages(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_page(uint32, T2P*, TIFF*);
+-void t2p_compose_pdf_page(T2P*);
+-void t2p_compose_pdf_page_orient(T2P_BOX*, uint16);
+-void t2p_compose_pdf_page_orient_flip(T2P_BOX*, uint16);
+-tsize_t t2p_write_pdf_page_content(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_stream_dict(ttile_t, T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_cs(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_transfer(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_transfer_dict(T2P*, TIFF*, uint16);
+-tsize_t t2p_write_pdf_transfer_stream(T2P*, TIFF*, uint16);
+-tsize_t t2p_write_pdf_xobject_calcs(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_icccs(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_icccs_dict(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_icccs_stream(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_cs_stream(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_decode(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t, T2P*, TIFF*);
+-tsize_t t2p_write_pdf_xreftable(T2P*, TIFF*);
+-tsize_t t2p_write_pdf_trailer(T2P*, TIFF*);
++static void t2p_tile_collapse_left(tdata_t, tsize_t, uint32, uint32, uint32);
++static void t2p_write_advance_directory(T2P*, TIFF*);
++static tsize_t t2p_sample_planar_separate_to_contig(T2P*, unsigned char*, unsigned char*, tsize_t);
++static tsize_t t2p_sample_realize_palette(T2P*, unsigned char*);
++static tsize_t t2p_sample_abgr_to_rgb(tdata_t, uint32);
++static tsize_t t2p_sample_rgba_to_rgb(tdata_t, uint32);
++static tsize_t t2p_sample_rgbaa_to_rgb(tdata_t, uint32);
++static tsize_t t2p_sample_lab_signed_to_unsigned(tdata_t, uint32);
++static tsize_t t2p_write_pdf_header(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_obj_start(uint32, TIFF*);
++static tsize_t t2p_write_pdf_obj_end(TIFF*);
++/* static tsize_t t2p_write_pdf_name(unsigned char*, TIFF*); */
++static tsize_t t2p_write_pdf_string(unsigned char*, TIFF*);
++static tsize_t t2p_write_pdf_stream(tdata_t, tsize_t, TIFF*);
++static tsize_t t2p_write_pdf_stream_start(TIFF*);
++static tsize_t t2p_write_pdf_stream_end(TIFF*);
++static tsize_t t2p_write_pdf_stream_dict(tsize_t, uint32, TIFF*);
++static tsize_t t2p_write_pdf_stream_dict_start(TIFF*);
++static tsize_t t2p_write_pdf_stream_dict_end(TIFF*);
++static tsize_t t2p_write_pdf_stream_length(tsize_t, TIFF*);
++static tsize_t t2p_write_pdf_catalog(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_info(T2P*, TIFF*, TIFF*);
++static void t2p_pdf_currenttime(T2P*);
++static void t2p_pdf_tifftime(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_pages(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_page(uint32, T2P*, TIFF*);
++static void t2p_compose_pdf_page(T2P*);
++static void t2p_compose_pdf_page_orient(T2P_BOX*, uint16);
++static void t2p_compose_pdf_page_orient_flip(T2P_BOX*, uint16);
++/* static tsize_t t2p_write_pdf_page_content(T2P*, TIFF*); */
++static tsize_t t2p_write_pdf_xobject_stream_dict(ttile_t, T2P*, TIFF*); 
++static tsize_t t2p_write_pdf_xobject_cs(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_transfer(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_transfer_dict(T2P*, TIFF*, uint16);
++static tsize_t t2p_write_pdf_transfer_stream(T2P*, TIFF*, uint16);
++static tsize_t t2p_write_pdf_xobject_calcs(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_xobject_icccs(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_xobject_icccs_dict(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_xobject_icccs_stream(T2P*, TIFF*);
++/* static tsize_t t2p_write_pdf_xobject_cs_stream(T2P*, TIFF*); */
++static tsize_t t2p_write_pdf_xobject_decode(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t, T2P*, TIFF*);
++static tsize_t t2p_write_pdf_xreftable(T2P*, TIFF*);
++static tsize_t t2p_write_pdf_trailer(T2P*, TIFF*);
+ 
+ static void
+ t2p_disable(TIFF *tif)
+@@ -563,16 +707,17 @@
+     See also libtiff.3t, tiffcp.
+   */
+ 
+-int main(int argc, char** argv){
+-
+-	extern char *optarg;
+-	extern int optind;
+-	const char *outfilename = NULL;
++int
++tiff2pdf(TIFF *input, FILE *outputfile, int argc, const char **argv)
++{
++        char *outfilename = "<null>";
+         T2P *t2p = NULL;
+-	TIFF *input = NULL, *output = NULL;
++        TIFF *output = NULL;
+ 	tsize_t written = 0;
+ 	int c;
+ 
++        (void)written;
++
+ 	t2p = t2p_init();
+ 
+ 	if (t2p == NULL){
+@@ -581,7 +726,7 @@
+ 	}
+ 
+ 	while (argv &&
+-	       (c = getopt(argc, argv,
++	       (c = getopt(argc, (void*)argv,
+ 			   "o:q:u:x:y:w:l:r:p:e:c:a:t:s:k:jzndifbh")) != -1){
+ 		switch (c) {
+ 			case 'o':
+@@ -690,8 +835,8 @@
+ 					_TIFFmalloc(strlen(optarg) + 1);
+ 				if(t2p->pdf_creator==NULL){
+ 					TIFFError(TIFF2PDF_MODULE, 
+-				"Can't allocate %u bytes of memory for main", 
+-						  strlen(optarg) + 1); 
++				"Can't allocate %lu bytes of memory for main", 
++						  (long)strlen(optarg) + 1); 
+ 					goto fail;
+ 				}
+ 				strcpy((char *)t2p->pdf_creator, optarg);
+@@ -703,8 +848,8 @@
+ 				if(t2p->pdf_author==NULL){
+ 					TIFFError(
+ 						TIFF2PDF_MODULE, 
+-				"Can't allocate %u bytes of memory for main", 
+-						strlen(optarg) + 1); 
++				"Can't allocate %lu bytes of memory for main", 
++						(long)strlen(optarg) + 1); 
+ 					goto fail;
+ 				}
+ 				strcpy((char *)t2p->pdf_author, optarg);
+@@ -716,8 +861,8 @@
+ 				if(t2p->pdf_title==NULL){
+ 					TIFFError(
+ 						TIFF2PDF_MODULE, 
+-				"Can't allocate %u bytes of memory for main", 
+-						strlen(optarg) + 1); 
++				"Can't allocate %lu bytes of memory for main", 
++						(long)strlen(optarg) + 1); 
+ 					goto fail;
+ 				}
+ 				strcpy((char *)t2p->pdf_title, optarg);
+@@ -729,8 +874,8 @@
+ 				if(t2p->pdf_subject==NULL){
+ 					TIFFError(
+ 						TIFF2PDF_MODULE, 
+-				"Can't allocate %u bytes of memory for main", 
+-						strlen(optarg)+1); 
++				"Can't allocate %lu bytes of memory for main", 
++						(long)strlen(optarg)+1); 
+ 					goto fail;
+ 				}
+ 				strcpy((char *)t2p->pdf_subject, optarg);
+@@ -742,8 +887,8 @@
+ 				if(t2p->pdf_keywords==NULL){
+ 					TIFFError(
+ 						TIFF2PDF_MODULE, 
+-				"Can't allocate %u bytes of memory for main", 
+-						strlen(optarg) + 1); 
++				"Can't allocate %lu bytes of memory for main", 
++						(long)strlen(optarg) + 1); 
+ 					goto fail;
+ 				}
+ 				strcpy((char *)t2p->pdf_keywords, optarg);
+@@ -752,54 +897,14 @@
+ 			case 'b':
+ 				t2p->pdf_image_interpolate = 1;
+ 				break;
+-			case 'h': 
+-			case '?': 
+-				tiff2pdf_usage();
+-				goto success;
+-				break;
+-		}
+-		}
+-
+-	/*
+-	 * Input
+-	 */
+-	if(argc > optind) {
+-		input = TIFFOpen(argv[optind++], "r");
+-		if (input==NULL) {
+-			TIFFError(TIFF2PDF_MODULE, 
+-				  "Can't open input file %s for reading", 
+-				  argv[optind-1]);
+-			goto fail;
+ 		}
+-	} else {
+-		TIFFError(TIFF2PDF_MODULE, "No input file specified"); 
+-		tiff2pdf_usage();
+-		goto fail;
+-	}
+-
+-	if(argc > optind) {
+-		TIFFError(TIFF2PDF_MODULE, 
+-			  "No support for multiple input files"); 
+-		tiff2pdf_usage();
+-		goto fail;
+ 	}
+ 
+ 	/*
+ 	 * Output
+ 	 */
+ 	t2p->outputdisable = 0;
+-	if (outfilename) {
+-		t2p->outputfile = fopen(outfilename, "wb");
+-		if (t2p->outputfile == NULL) {
+-			TIFFError(TIFF2PDF_MODULE,
+-				  "Can't open output file %s for writing",
+-				  outfilename);
+-			goto fail;
+-		}
+-	} else {
+-		outfilename = "-";
+-		t2p->outputfile = stdout;
+-	}
++        t2p->outputfile = outputfile;
+ 
+ 	output = TIFFClientOpen(outfilename, "w", (thandle_t) t2p,
+ 				t2p_readproc, t2p_writeproc, t2p_seekproc, 
+@@ -827,7 +932,7 @@
+ 		goto fail;
+ 	}
+ 
+-success:
++/* success: */
+ 	if (output != NULL)
+ 		TIFFClose(output);
+ 	if (t2p != NULL)
+@@ -845,50 +950,8 @@
+   
+ }
+ 
+-void tiff2pdf_usage(){
+-	char* lines[]={
+-	"usage:  tiff2pdf [options] input.tiff",
+-	"options:",
+-	" -o: output to file name",
+-#ifdef JPEG_SUPPORT
+-	" -j: compress with JPEG", 
+-#endif
+-#ifdef ZIP_SUPPORT
+-	" -z: compress with Zip/Deflate",
+-#endif
+-	" -q: compression quality",
+-	" -n: no compressed data passthrough",
+-	" -d: do not compress (decompress)",
+-	" -i: invert colors",
+-	" -u: set distance unit, 'i' for inch, 'm' for centimeter",
+-	" -x: set x resolution default in dots per unit",
+-	" -y: set y resolution default in dots per unit",
+-	" -w: width in units",
+-	" -l: length in units",
+-	" -r: 'd' for resolution default, 'o' for resolution override",
+-	" -p: paper size, eg \"letter\", \"legal\", \"A4\"",
+-	" -f: set PDF \"Fit Window\" user preference",
+-	" -e: date, overrides image or current date/time default, YYYYMMDDHHMMSS",
+-	" -c: sets document creator, overrides image software default",
+-	" -a: sets document author, overrides image artist default",
+-	" -t: sets document title, overrides image document name default",
+-	" -s: sets document subject, overrides image image description default",
+-	" -k: sets document keywords",
+-	" -b: set PDF \"Interpolate\" user preference",
+-	" -h: usage",
+-	NULL
+-	};
+-	int i=0;
+ 
+-	fprintf(stderr, "%s\n\n", TIFFGetVersion());
+-	for (i=0;lines[i]!=NULL;i++){
+-		fprintf(stderr, "%s\n", lines[i]);
+-	}
+-
+-	return;
+-}
+-
+-int tiff2pdf_match_paper_size(float* width, float* length, char* papersize){
++static int tiff2pdf_match_paper_size(float* width, float* length, char* papersize){
+ 
+ 	size_t i, len;
+ 	const char* sizes[]={
+@@ -952,14 +1015,14 @@
+ 	This function allocates and initializes a T2P context struct pointer.
+ */
+ 
+-T2P* t2p_init(){
++static T2P* t2p_init(){
+ 
+ 	T2P* t2p = (T2P*) _TIFFmalloc(sizeof(T2P));
+ 	if(t2p==NULL){
+ 		TIFFError(
+ 			TIFF2PDF_MODULE, 
+-			"Can't allocate %u bytes of memory for t2p_init", 
+-			sizeof(T2P));
++			"Can't allocate %lu bytes of memory for t2p_init", 
++			(long)sizeof(T2P));
+ 		return( (T2P*) NULL );
+ 	}
+ 	_TIFFmemset(t2p, 0x00, sizeof(T2P));
+@@ -978,7 +1041,7 @@
+ 	This function frees a T2P context struct pointer and any allocated data fields of it.
+ */
+ 
+-void t2p_free(T2P* t2p){
++static void t2p_free(T2P* t2p){
+ 
+ 	int i=0;
+ 
+@@ -1037,7 +1100,7 @@
+         before calling t2p_write_pdf with it.
+ */
+ 
+-void t2p_validate(T2P* t2p){
++static void t2p_validate(T2P* t2p){
+ 
+ #ifdef JPEG_SUPPORT
+ 	if(t2p->pdf_defaultcompression==T2P_COMPRESS_JPEG){
+@@ -1079,7 +1142,7 @@
+         with the output of the PDF document as a whole.  
+ */
+ 
+-void t2p_read_tiff_init(T2P* t2p, TIFF* input){
++static void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+ 
+ 	tdir_t directorycount=0;
+ 	tdir_t i=0;
+@@ -1092,8 +1155,8 @@
+ 	if(t2p->tiff_pages==NULL){
+ 		TIFFError(
+ 			TIFF2PDF_MODULE, 
+-			"Can't allocate %u bytes of memory for tiff_pages array, %s", 
+-			directorycount * sizeof(T2P_PAGE), 
++			"Can't allocate %lu bytes of memory for tiff_pages array, %s", 
++			directorycount * (long)sizeof(T2P_PAGE), 
+ 			TIFFFileName(input));
+ 		t2p->t2p_error = T2P_ERR_ERROR;
+ 		return;
+@@ -1103,8 +1166,8 @@
+ 	if(t2p->tiff_tiles==NULL){
+ 		TIFFError(
+ 			TIFF2PDF_MODULE, 
+-			"Can't allocate %u bytes of memory for tiff_tiles array, %s", 
+-			directorycount * sizeof(T2P_TILES), 
++			"Can't allocate %lu bytes of memory for tiff_tiles array, %s", 
++			directorycount * (long)sizeof(T2P_TILES), 
+ 			TIFFFileName(input));
+ 		t2p->t2p_error = T2P_ERR_ERROR;
+ 		return;
+@@ -1236,8 +1299,8 @@
+ 			if( t2p->tiff_tiles[i].tiles_tiles == NULL){
+ 				TIFFError(
+ 					TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory for t2p_read_tiff_init, %s", 
+-					t2p->tiff_tiles[i].tiles_tilecount * sizeof(T2P_TILE), 
++					"Can't allocate %lu bytes of memory for t2p_read_tiff_init, %s", 
++					t2p->tiff_tiles[i].tiles_tilecount * (long)sizeof(T2P_TILE), 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return;
+@@ -1253,7 +1316,7 @@
+  * by page number.
+  */
+ 
+-int t2p_cmp_t2p_page(const void* e1, const void* e2){
++static int t2p_cmp_t2p_page(const void* e1, const void* e2){
+ 
+ 	return( ((T2P_PAGE*)e1)->page_number - ((T2P_PAGE*)e2)->page_number );
+ }
+@@ -1270,7 +1333,7 @@
+ 	requiring transcoding of the image data.
+ */
+ 
+-void t2p_read_tiff_data(T2P* t2p, TIFF* input){
++static void t2p_read_tiff_data(T2P* t2p, TIFF* input){
+ 
+ 	int i=0;
+ 	uint16* r;
+@@ -1850,7 +1913,7 @@
+ 	uncompressed image data from the input TIFF for a page.
+ */
+ 
+-void t2p_read_tiff_size(T2P* t2p, TIFF* input){
++static void t2p_read_tiff_size(T2P* t2p, TIFF* input){
+ 
+ 	uint32* sbc=NULL;
+ #if defined(JPEG_SUPPORT) || defined (OJPEG_SUPPORT)
+@@ -1891,7 +1954,7 @@
+ 			if(TIFFGetField(input, TIFFTAG_JPEGIFOFFSET, &(t2p->tiff_dataoffset))){
+ 				if(t2p->tiff_dataoffset != 0){
+ 					if(TIFFGetField(input, TIFFTAG_JPEGIFBYTECOUNT, &(t2p->tiff_datasize))!=0){
+-						if(t2p->tiff_datasize < k) {
++                                          if((uint64)t2p->tiff_datasize < k) {
+ 							TIFFWarning(TIFF2PDF_MODULE, 
+ 								"Input file %s has short JPEG interchange file byte count", 
+ 								TIFFFileName(input));
+@@ -1984,7 +2047,7 @@
+ 	uncompressed image data from the input TIFF for a tile of a page.
+ */
+ 
+-void t2p_read_tiff_size_tile(T2P* t2p, TIFF* input, ttile_t tile){
++static void t2p_read_tiff_size_tile(T2P* t2p, TIFF* input, ttile_t tile){
+ 
+ 	uint32* tbc = NULL;
+ 	uint16 edge=0;
+@@ -2060,7 +2123,7 @@
+  * and does not have full imaged tile width.
+  */
+ 
+-int t2p_tile_is_right_edge(T2P_TILES tiles, ttile_t tile){
++static int t2p_tile_is_right_edge(T2P_TILES tiles, ttile_t tile){
+ 
+ 	if( ((tile+1) % tiles.tiles_tilecountx == 0) 
+ 		&& (tiles.tiles_edgetilewidth != 0) ){
+@@ -2075,7 +2138,7 @@
+  * and does not have full imaged tile length.
+  */
+ 
+-int t2p_tile_is_bottom_edge(T2P_TILES tiles, ttile_t tile){
++static int t2p_tile_is_bottom_edge(T2P_TILES tiles, ttile_t tile){
+ 
+ 	if( ((tile+1) > (tiles.tiles_tilecount-tiles.tiles_tilecountx) )
+ 		&& (tiles.tiles_edgetilelength != 0) ){
+@@ -2086,33 +2149,12 @@
+ }
+ 
+ /*
+- * This function returns a non-zero value when the tile is a right edge tile
+- * or a bottom edge tile.
+- */
+-
+-int t2p_tile_is_edge(T2P_TILES tiles, ttile_t tile){
+-
+-	return(t2p_tile_is_right_edge(tiles, tile) | t2p_tile_is_bottom_edge(tiles, tile) );
+-}
+-
+-/*
+-	This function returns a non-zero value when the tile is a right edge tile and a bottom 
+-	edge tile.
+-*/
+-
+-int t2p_tile_is_corner_edge(T2P_TILES tiles, ttile_t tile){
+-
+-	return(t2p_tile_is_right_edge(tiles, tile) & t2p_tile_is_bottom_edge(tiles, tile) );
+-}
+-
+-
+-/*
+ 	This function reads the raster image data from the input TIFF for an image and writes 
+ 	the data to the output PDF XObject image dictionary stream.  It returns the amount written 
+ 	or zero on error.
+ */
+ 
+-tsize_t t2p_readwrite_pdf_image(T2P* t2p, TIFF* input, TIFF* output){
++static tsize_t t2p_readwrite_pdf_image(T2P* t2p, TIFF* input, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	unsigned char* buffer=NULL;
+@@ -2153,8 +2195,8 @@
+ 				_TIFFmalloc(t2p->tiff_datasize);
+ 			if (buffer == NULL) {
+ 				TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2182,8 +2224,8 @@
+                         memset(buffer, 0, t2p->tiff_datasize);
+ 			if(buffer == NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2209,8 +2251,8 @@
+                                 memset(buffer, 0, t2p->tiff_datasize);
+ 				if(buffer == NULL) {
+ 					TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-						t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++						(unsigned long)t2p->tiff_datasize, 
+ 						TIFFFileName(input));
+ 					t2p->t2p_error = T2P_ERR_ERROR;
+ 					return(0);
+@@ -2285,8 +2327,8 @@
+                                 memset(buffer, 0, t2p->tiff_datasize);
+ 				if(buffer==NULL){
+ 					TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-						t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++						(unsigned long)t2p->tiff_datasize, 
+ 						TIFFFileName(input));
+ 					t2p->t2p_error = T2P_ERR_ERROR;
+ 					return(0);
+@@ -2328,8 +2370,8 @@
+                         memset(buffer, 0, t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2390,8 +2432,8 @@
+                 memset(buffer, 0, t2p->tiff_datasize);
+ 		if(buffer==NULL){
+ 			TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-				t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++				(unsigned long)t2p->tiff_datasize, 
+ 				TIFFFileName(input));
+ 			t2p->t2p_error = T2P_ERR_ERROR;
+ 			return(0);
+@@ -2428,8 +2470,8 @@
+                         memset(buffer, 0, t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2437,8 +2479,8 @@
+ 			samplebuffer = (unsigned char*) _TIFFmalloc(stripsize);
+ 			if(samplebuffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2477,8 +2519,8 @@
+                 memset(buffer, 0, t2p->tiff_datasize);
+ 		if(buffer==NULL){
+ 			TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-				t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++				(unsigned long)t2p->tiff_datasize, 
+ 				TIFFFileName(input));
+ 			t2p->t2p_error = T2P_ERR_ERROR;
+ 			return(0);
+@@ -2510,8 +2552,8 @@
+ 				t2p->tiff_datasize * t2p->tiff_samplesperpixel);
+ 			if(samplebuffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 			  _TIFFfree(buffer);
+@@ -2540,8 +2582,8 @@
+ 				t2p->tiff_width*t2p->tiff_length*4);
+ 			if(samplebuffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-	"Can't allocate %u bytes of memory for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++	"Can't allocate %lu bytes of memory for t2p_readwrite_pdf_image, %s", 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				_TIFFfree(buffer);
+@@ -2699,7 +2741,7 @@
+  * for the tile.  It returns the amount written or zero on error.
+  */
+ 
+-tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_t tile){
++static tsize_t t2p_readwrite_pdf_image_tile(T2P* t2p, TIFF* input, TIFF* output, ttile_t tile){
+ 
+ 	uint16 edge=0;
+ 	tsize_t written=0;
+@@ -2718,6 +2760,7 @@
+ 	float* xfloatp;
+ 	uint32 xuint32=0;
+ #endif
++        (void)tilesize;
+ 
+ 	/* Fail if prior error (in particular, can't trust tiff_datasize) */
+ 	if (t2p->t2p_error != T2P_ERR_OK)
+@@ -2737,9 +2780,9 @@
+ 			buffer= (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory "
++					"Can't allocate %lu bytes of memory "
+                                         "for t2p_readwrite_pdf_image_tile, %s", 
+-					t2p->tiff_datasize, 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2758,9 +2801,9 @@
+ 			buffer= (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory "
++					"Can't allocate %lu bytes of memory "
+                                         "for t2p_readwrite_pdf_image_tile, %s", 
+-					t2p->tiff_datasize, 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2787,9 +2830,9 @@
+ 			buffer=(unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory "
++					"Can't allocate %lu bytes of memory "
+                                         "for t2p_readwrite_pdf_image, %s", 
+-					t2p->tiff_datasize, 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2828,9 +2871,9 @@
+ 			buffer= (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory "
++					"Can't allocate %lu bytes of memory "
+                                         "for t2p_readwrite_pdf_image_tile, %s", 
+-					t2p->tiff_datasize, 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2871,9 +2914,9 @@
+ 		buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 		if(buffer==NULL){
+ 			TIFFError(TIFF2PDF_MODULE, 
+-				"Can't allocate %u bytes of memory for "
++				"Can't allocate %lu bytes of memory for "
+                                 "t2p_readwrite_pdf_image_tile, %s", 
+-				t2p->tiff_datasize, 
++				(unsigned long)t2p->tiff_datasize, 
+ 				TIFFFileName(input));
+ 			t2p->t2p_error = T2P_ERR_ERROR;
+ 			return(0);
+@@ -2904,9 +2947,9 @@
+ 			buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory "
++					"Can't allocate %lu bytes of memory "
+                                         "for t2p_readwrite_pdf_image_tile, %s", 
+-					t2p->tiff_datasize, 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2914,9 +2957,9 @@
+ 			samplebuffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 			if(samplebuffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory "
++					"Can't allocate %lu bytes of memory "
+                                         "for t2p_readwrite_pdf_image_tile, %s", 
+-					t2p->tiff_datasize, 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -2953,9 +2996,9 @@
+ 			buffer = (unsigned char*) _TIFFmalloc(t2p->tiff_datasize);
+ 			if(buffer==NULL){
+ 				TIFFError(TIFF2PDF_MODULE, 
+-					"Can't allocate %u bytes of memory "
++					"Can't allocate %lu bytes of memory "
+                                         "for t2p_readwrite_pdf_image_tile, %s", 
+-					t2p->tiff_datasize, 
++					(unsigned long)t2p->tiff_datasize, 
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 				return(0);
+@@ -3140,7 +3183,7 @@
+ }
+ 
+ #ifdef OJPEG_SUPPORT
+-int t2p_process_ojpeg_tables(T2P* t2p, TIFF* input){
++static int t2p_process_ojpeg_tables(T2P* t2p, TIFF* input){
+ 	uint16 proc=0;
+ 	void* q;
+ 	uint32 q_length=0;
+@@ -3384,7 +3427,7 @@
+ #endif
+ 
+ #ifdef JPEG_SUPPORT
+-int t2p_process_jpeg_strip(
++static int t2p_process_jpeg_strip(
+ 	unsigned char* strip, 
+ 	tsize_t* striplength, 
+ 	unsigned char* buffer, 
+@@ -3477,7 +3520,7 @@
+ 	This functions converts a tilewidth x tilelength buffer of samples into an edgetilewidth x 
+ 	tilelength buffer of samples.
+ */
+-void t2p_tile_collapse_left(
++static void t2p_tile_collapse_left(
+ 	tdata_t buffer, 
+ 	tsize_t scanwidth, 
+ 	uint32 tilewidth, 
+@@ -3488,7 +3531,7 @@
+ 	tsize_t edgescanwidth=0;
+ 	
+ 	edgescanwidth = (scanwidth * edgetilewidth + (tilewidth - 1))/ tilewidth;
+-	for(i=i;i<tilelength;i++){
++	for(i=0;i<tilelength;i++){
+ 		_TIFFmemcpy( 
+ 			&(((char*)buffer)[edgescanwidth*i]), 
+ 			&(((char*)buffer)[scanwidth*i]), 
+@@ -3505,7 +3548,7 @@
+  * implementations, then it replaces the original implementations.
+  */
+ 
+-void
++static void
+ t2p_write_advance_directory(T2P* t2p, TIFF* output)
+ {
+ 	t2p_disable(output);
+@@ -3520,8 +3563,7 @@
+ 	return;
+ }
+ 
+-tsize_t t2p_sample_planar_separate_to_contig(
+-											T2P* t2p, 
++static tsize_t t2p_sample_planar_separate_to_contig(T2P* t2p, 
+                                                     unsigned char* buffer, 
+                                                     unsigned char* samplebuffer, 
+                                                     tsize_t samplebuffersize){
+@@ -3540,7 +3582,7 @@
+ 	return(samplebuffersize);
+ }
+ 
+-tsize_t t2p_sample_realize_palette(T2P* t2p, unsigned char* buffer){
++static tsize_t t2p_sample_realize_palette(T2P* t2p, unsigned char* buffer){
+ 
+ 	uint32 sample_count=0;
+ 	uint16 component_count=0;
+@@ -3567,7 +3609,7 @@
+ 	into RGB interleaved data, discarding A.
+ */
+ 
+-tsize_t t2p_sample_abgr_to_rgb(tdata_t data, uint32 samplecount)
++static tsize_t t2p_sample_abgr_to_rgb(tdata_t data, uint32 samplecount)
+ {
+ 	uint32 i=0;
+ 	uint32 sample=0;
+@@ -3587,7 +3629,7 @@
+  * into RGB interleaved data, discarding A.
+  */
+ 
+-tsize_t
++static tsize_t
+ t2p_sample_rgbaa_to_rgb(tdata_t data, uint32 samplecount)
+ {
+ 	uint32 i;
+@@ -3603,7 +3645,7 @@
+  * into RGB interleaved data, adding 255-A to each component sample.
+  */
+ 
+-tsize_t
++static tsize_t
+ t2p_sample_rgba_to_rgb(tdata_t data, uint32 samplecount)
+ {
+ 	uint32 i = 0;
+@@ -3627,7 +3669,7 @@
+ 	to unsigned.
+ */
+ 
+-tsize_t t2p_sample_lab_signed_to_unsigned(tdata_t buffer, uint32 samplecount){
++static tsize_t t2p_sample_lab_signed_to_unsigned(tdata_t buffer, uint32 samplecount){
+ 
+ 	uint32 i=0;
+ 
+@@ -3653,7 +3695,7 @@
+ 	This function writes the PDF header to output.
+ */
+ 
+-tsize_t t2p_write_pdf_header(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_header(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -3670,7 +3712,7 @@
+ 	This function writes the beginning of a PDF object to output.
+ */
+ 
+-tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){
++static tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -3687,7 +3729,7 @@
+ 	This function writes the end of a PDF object to output.
+ */
+ 
+-tsize_t t2p_write_pdf_obj_end(TIFF* output){
++static tsize_t t2p_write_pdf_obj_end(TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -3697,108 +3739,10 @@
+ }
+ 
+ /*
+-	This function writes a PDF name object to output.
+-*/
+-
+-tsize_t t2p_write_pdf_name(unsigned char* name, TIFF* output){
+-
+-	tsize_t written=0;
+-	uint32 i=0;
+-	char buffer[64];
+-	uint16 nextchar=0;
+-	uint32 namelen=0;
+-	
+-	namelen = strlen((char *)name);
+-	if (namelen>126) {
+-		namelen=126;
+-	}
+-	written += t2pWriteFile(output, (tdata_t) "/", 1);
+-	for (i=0;i<namelen;i++){
+-		if ( ((unsigned char)name[i]) < 0x21){
+-			sprintf(buffer, "#%.2X", name[i]);
+-			buffer[sizeof(buffer) - 1] = '\0';
+-			written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-			nextchar=1;
+-		}
+-		if ( ((unsigned char)name[i]) > 0x7E){
+-			sprintf(buffer, "#%.2X", name[i]);
+-			buffer[sizeof(buffer) - 1] = '\0';
+-			written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-			nextchar=1;
+-		}
+-		if (nextchar==0){
+-			switch (name[i]){
+-				case 0x23:
+-					sprintf(buffer, "#%.2X", name[i]);
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x25:
+-					sprintf(buffer, "#%.2X", name[i]);
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x28:
+-					sprintf(buffer, "#%.2X", name[i]);
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x29:
+-					sprintf(buffer, "#%.2X", name[i]); 
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x2F:
+-					sprintf(buffer, "#%.2X", name[i]); 
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x3C:
+-					sprintf(buffer, "#%.2X", name[i]); 
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x3E:
+-					sprintf(buffer, "#%.2X", name[i]);
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x5B:
+-					sprintf(buffer, "#%.2X", name[i]); 
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x5D:
+-					sprintf(buffer, "#%.2X", name[i]);
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x7B:
+-					sprintf(buffer, "#%.2X", name[i]); 
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				case 0x7D:
+-					sprintf(buffer, "#%.2X", name[i]); 
+-					buffer[sizeof(buffer) - 1] = '\0';
+-					written += t2pWriteFile(output, (tdata_t) buffer, 3);
+-					break;
+-				default:
+-					written += t2pWriteFile(output, (tdata_t) &name[i], 1);
+-			}
+-		}
+-		nextchar=0;
+-	}
+-	written += t2pWriteFile(output, (tdata_t) " ", 1);
+-
+-	return(written);
+-}
+-
+-/*
+ 	This function writes a PDF string object to output.
+ */
+ 	
+-tsize_t t2p_write_pdf_string(unsigned char* pdfstr, TIFF* output){
++static tsize_t t2p_write_pdf_string(unsigned char* pdfstr, TIFF* output){
+ 
+ 	tsize_t written = 0;
+ 	uint32 i = 0;
+@@ -3853,7 +3797,7 @@
+ 	This function writes a buffer of data to output.
+ */
+ 
+-tsize_t t2p_write_pdf_stream(tdata_t buffer, tsize_t len, TIFF* output){
++static tsize_t t2p_write_pdf_stream(tdata_t buffer, tsize_t len, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -3866,7 +3810,7 @@
+ 	This functions writes the beginning of a PDF stream to output.
+ */
+ 
+-tsize_t t2p_write_pdf_stream_start(TIFF* output){
++static tsize_t t2p_write_pdf_stream_start(TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -3879,7 +3823,7 @@
+ 	This function writes the end of a PDF stream to output. 
+ */
+ 
+-tsize_t t2p_write_pdf_stream_end(TIFF* output){
++static tsize_t t2p_write_pdf_stream_end(TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -3892,7 +3836,7 @@
+ 	This function writes a stream dictionary for a PDF stream to output.
+ */
+ 
+-tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){
++static tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){
+ 	
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -3914,7 +3858,7 @@
+ 	This functions writes the beginning of a PDF stream dictionary to output.
+ */
+ 
+-tsize_t t2p_write_pdf_stream_dict_start(TIFF* output){
++static tsize_t t2p_write_pdf_stream_dict_start(TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -3927,7 +3871,7 @@
+ 	This function writes the end of a PDF stream dictionary to output. 
+ */
+ 
+-tsize_t t2p_write_pdf_stream_dict_end(TIFF* output){
++static tsize_t t2p_write_pdf_stream_dict_end(TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -3940,7 +3884,7 @@
+ 	This function writes a number to output.
+ */
+ 
+-tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){
++static tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -3957,7 +3901,7 @@
+ 	This function writes the PDF Catalog structure to output.
+ */
+ 
+-tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -3983,13 +3927,15 @@
+ 	This function writes the PDF Info structure to output.
+ */
+ 
+-tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
++static tsize_t t2p_write_pdf_info(T2P* t2p, TIFF* input, TIFF* output){
+ 
+ 	tsize_t written = 0;
+ 	unsigned char* info;
+ 	char buffer[512];
+ 	int buflen = 0;
+ 
++        (void) buflen;
++
+ 	if(t2p->pdf_datetime==NULL){
+ 		t2p_pdf_tifftime(t2p, input);
+ 	}
+@@ -4107,7 +4053,7 @@
+  * date string, it is called by t2p_pdf_tifftime.
+  */
+ 
+-void t2p_pdf_currenttime(T2P* t2p)
++static void t2p_pdf_currenttime(T2P* t2p)
+ {
+ 
+ 	struct tm* currenttime;
+@@ -4131,7 +4077,7 @@
+  * TIFF file if it exists or the current time as a PDF date string.
+  */
+ 
+-void t2p_pdf_tifftime(T2P* t2p, TIFF* input){
++static void t2p_pdf_tifftime(T2P* t2p, TIFF* input){
+ 
+ 	char* datetime;
+ 
+@@ -4172,7 +4118,7 @@
+  * This function writes a PDF Pages Tree structure to output.
+  */
+ 
+-tsize_t t2p_write_pdf_pages(T2P* t2p, TIFF* output)
++static tsize_t t2p_write_pdf_pages(T2P* t2p, TIFF* output)
+ {
+ 	tsize_t written=0;
+ 	tdir_t i=0;
+@@ -4211,7 +4157,7 @@
+ 	This function writes a PDF Page structure to output.
+ */
+ 
+-tsize_t t2p_write_pdf_page(uint32 object, T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_page(uint32 object, T2P* t2p, TIFF* output){
+ 
+ 	unsigned int i=0;
+ 	tsize_t written=0;
+@@ -4306,7 +4252,7 @@
+ 	This function composes the page size and image and tile locations on a page.
+ */
+ 
+-void t2p_compose_pdf_page(T2P* t2p){
++static void t2p_compose_pdf_page(T2P* t2p){
+ 
+ 	uint32 i=0;
+ 	uint32 i2=0;
+@@ -4493,7 +4439,7 @@
+ 	return;
+ }
+ 
+-void t2p_compose_pdf_page_orient(T2P_BOX* boxp, uint16 orientation){
++static void t2p_compose_pdf_page_orient(T2P_BOX* boxp, uint16 orientation){
+ 
+ 	float m1[9];
+ 	float f=0.0;
+@@ -4568,7 +4514,7 @@
+ 	return;
+ }
+ 
+-void t2p_compose_pdf_page_orient_flip(T2P_BOX* boxp, uint16 orientation){
++static void t2p_compose_pdf_page_orient_flip(T2P_BOX* boxp, uint16 orientation){
+ 
+ 	float m1[9];
+ 	float f=0.0;
+@@ -4630,7 +4576,7 @@
+ 	This function writes a PDF Contents stream to output.
+ */
+ 
+-tsize_t t2p_write_pdf_page_content_stream(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_page_content_stream(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	ttile_t i=0;
+@@ -4676,7 +4622,7 @@
+ 	This function writes a PDF Image XObject stream dictionary to output. 
+ */
+ 
+-tsize_t t2p_write_pdf_xobject_stream_dict(ttile_t tile, 
++static tsize_t t2p_write_pdf_xobject_stream_dict(ttile_t tile, 
+                                                  T2P* t2p, 
+                                                  TIFF* output){
+ 
+@@ -4758,7 +4704,7 @@
+  */
+ 
+ 
+-tsize_t t2p_write_pdf_xobject_cs(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_cs(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[128];
+@@ -4839,7 +4785,7 @@
+ 	return(written);
+ }
+ 
+-tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -4873,7 +4819,7 @@
+ 	return(written);
+ }
+ 
+-tsize_t t2p_write_pdf_transfer_dict(T2P* t2p, TIFF* output, uint16 i){
++static tsize_t t2p_write_pdf_transfer_dict(T2P* t2p, TIFF* output, uint16 i){
+ 
+ 	tsize_t written=0;
+ 	char buffer[32];
+@@ -4891,7 +4837,7 @@
+ 	return(written);
+ }
+ 
+-tsize_t t2p_write_pdf_transfer_stream(T2P* t2p, TIFF* output, uint16 i){
++static tsize_t t2p_write_pdf_transfer_stream(T2P* t2p, TIFF* output, uint16 i){
+ 
+ 	tsize_t written=0;
+ 
+@@ -4907,7 +4853,7 @@
+ 	This function writes a PDF Image XObject Colorspace array to output.
+ */
+ 
+-tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[128];
+@@ -5003,7 +4949,7 @@
+ 	This function writes a PDF Image XObject Colorspace array to output.
+ */
+ 
+-tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -5017,7 +4963,7 @@
+ 	return(written);
+ }
+ 
+-tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -5035,7 +4981,7 @@
+ 	return(written);
+ }
+ 
+-tsize_t t2p_write_pdf_xobject_icccs_stream(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_icccs_stream(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -5051,7 +4997,7 @@
+ 	This function writes a palette stream for an indexed color space to output.
+ */
+ 
+-tsize_t t2p_write_pdf_xobject_palettecs_stream(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_palettecs_stream(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 
+@@ -5067,7 +5013,7 @@
+ 	This function writes a PDF Image XObject Decode array to output.
+ */
+ 
+-tsize_t t2p_write_pdf_xobject_decode(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_decode(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	int i=0;
+@@ -5086,7 +5032,7 @@
+ 	output.
+ */
+ 
+-tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[16];
+@@ -5196,7 +5142,7 @@
+ 	This function writes a PDF xref table to output.
+ */
+ 
+-tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){
++static tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	char buffer[21];
+@@ -5220,7 +5166,7 @@
+  * This function writes a PDF trailer to output.
+  */
+ 
+-tsize_t t2p_write_pdf_trailer(T2P* t2p, TIFF* output)
++static tsize_t t2p_write_pdf_trailer(T2P* t2p, TIFF* output)
+ {
+ 
+ 	tsize_t written = 0;
+@@ -5229,10 +5175,9 @@
+ 	char fileidbuf[16];
+ 	int i = 0;
+ 
+-	((int*)fileidbuf)[0] = rand();
+-	((int*)fileidbuf)[1] = rand();
+-	((int*)fileidbuf)[2] = rand();
+-	((int*)fileidbuf)[3] = rand();
++        for (i=0; i<(int)sizeof(fileidbuf); i++)
++          fileidbuf[i] = (char) rand();
++
+ 	t2p->pdf_fileid = (unsigned char*)_TIFFmalloc(33);
+ 	if(t2p->pdf_fileid == NULL) {
+ 		TIFFError(
+@@ -5312,7 +5257,7 @@
+   and TIFFClose on output.
+ */
+ 
+-tsize_t t2p_write_pdf(T2P* t2p, TIFF* input, TIFF* output){
++static tsize_t t2p_write_pdf(T2P* t2p, TIFF* input, TIFF* output){
+ 
+ 	tsize_t written=0;
+ 	ttile_t i2=0;
+@@ -5325,8 +5270,8 @@
+ 	if(t2p->pdf_xrefoffsets==NULL){
+ 		TIFFError(
+ 			TIFF2PDF_MODULE, 
+-			"Can't allocate %u bytes of memory for t2p_write_pdf", 
+-			t2p->pdf_xrefcount * sizeof(uint32) );
++			"Can't allocate %lu bytes of memory for t2p_write_pdf", 
++			t2p->pdf_xrefcount * (long)sizeof(uint32) );
+ 		return(written);
+ 	}
+ 	t2p->pdf_xrefcount=0;
+@@ -5475,3 +5420,5 @@
+ }
+ 
+ /* vim: set ts=8 sts=8 sw=8 noet: */
++
++#endif
diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h
new file mode 100644
index 0000000..656dc43
--- /dev/null
+++ b/tools/tiff2pdf.h
@@ -0,0 +1,45 @@
+//C-  -*- C -*-
+//C- -------------------------------------------------------------------
+//C- DjView4
+//C- Copyright (c) 2006  Leon Bottou
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C-  ------------------------------------------------------------------
+
+#ifndef TIFF2PDF_H
+# define TIFF2PDF_H
+# if HAVE_CONFIG_H
+#  include "config.h"
+# endif
+# if HAVE_TIFF
+#  include <stdio.h>
+#  include <stddef.h>
+#  include <stdlib.h>
+#  include <tiff.h>
+#  include <tiffio.h>
+#  include <tiffconf.h>
+#  ifdef TIFFLIB_VERSION
+#   if TIFFLIB_VERSION > 20041104
+#    define HAVE_TIFF2PDF 1
+#   endif
+#  endif
+# endif
+# if HAVE_TIFF2PDF
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+int tiff2pdf(TIFF *input, FILE *output, int argc, const char **argv);
+#  ifdef __cplusplus
+}
+#  endif
+# endif  /* HAVE_TIFF2PDF */
+#endif /* TIFF2PDF_H */
diff --git a/win32/djvulibre/.gitignore b/win32/djvulibre/.gitignore
new file mode 100644
index 0000000..c71ab6a
--- /dev/null
+++ b/win32/djvulibre/.gitignore
@@ -0,0 +1,6 @@
+Release/
+Debug/
+/*.sdf
+/*.opensdf
+/*.suo
+/djvulibre+djview.sln
diff --git a/win32/djvulibre/bzz/bzz.vcxproj b/win32/djvulibre/bzz/bzz.vcxproj
new file mode 100644
index 0000000..80b8d49
--- /dev/null
+++ b/win32/djvulibre/bzz/bzz.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{32F68FEC-40AC-4FE7-A221-ED4ACB95D0DE}</ProjectGuid>
+    <RootNamespace>bzz</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\bzz.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/bzz/bzz.vcxproj.filters b/win32/djvulibre/bzz/bzz.vcxproj.filters
new file mode 100644
index 0000000..88c805b
--- /dev/null
+++ b/win32/djvulibre/bzz/bzz.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\bzz.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/bzz/bzz.vcxproj.user b/win32/djvulibre/bzz/bzz.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/bzz/bzz.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/c44/c44.vcxproj b/win32/djvulibre/c44/c44.vcxproj
new file mode 100644
index 0000000..7425c75
--- /dev/null
+++ b/win32/djvulibre/c44/c44.vcxproj
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C709A49C-3BCC-44B9-BD97-7C3E1DC10771}</ProjectGuid>
+    <RootNamespace>c44</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>false</CLRSupport>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\c44.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/c44/c44.vcxproj.filters b/win32/djvulibre/c44/c44.vcxproj.filters
new file mode 100644
index 0000000..419b7e3
--- /dev/null
+++ b/win32/djvulibre/c44/c44.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\c44.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/c44/c44.vcxproj.user b/win32/djvulibre/c44/c44.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/c44/c44.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/cjb2/cjb2.vcxproj b/win32/djvulibre/cjb2/cjb2.vcxproj
new file mode 100644
index 0000000..5cd6906
--- /dev/null
+++ b/win32/djvulibre/cjb2/cjb2.vcxproj
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1A387849-BB31-499C-82DF-327D45199766}</ProjectGuid>
+    <RootNamespace>cjb2</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\cjb2.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\classify.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\cuts.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\frames.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2tune.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\patterns.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\jb2cmp\classify.h" />
+    <ClInclude Include="..\..\..\tools\jb2tune.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\mdjvucfg.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\minidjvu.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\patterns.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libtiff\libtiff.vcxproj">
+      <Project>{629ef023-7766-40c3-82ba-39bdd2235096}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/cjb2/cjb2.vcxproj.filters b/win32/djvulibre/cjb2/cjb2.vcxproj.filters
new file mode 100644
index 0000000..e9f7b57
--- /dev/null
+++ b/win32/djvulibre/cjb2/cjb2.vcxproj.filters
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\cjb2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\classify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\cuts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\frames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2tune.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\patterns.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\jb2cmp\classify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2tune.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\mdjvucfg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\minidjvu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\patterns.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/cjb2/cjb2.vcxproj.user b/win32/djvulibre/cjb2/cjb2.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/cjb2/cjb2.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj b/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj
new file mode 100644
index 0000000..63fac72
--- /dev/null
+++ b/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{812ABE62-FD6D-4904-9A03-20C1A76E662E}</ProjectGuid>
+    <RootNamespace>cpaldjvu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\jb2cmp\classify.cpp" />
+    <ClCompile Include="..\..\..\tools\cpaldjvu.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\cuts.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\frames.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2tune.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\patterns.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\jb2cmp\classify.h" />
+    <ClInclude Include="..\..\..\tools\jb2tune.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\mdjvucfg.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\minidjvu.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\patterns.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj.filters b/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj.filters
new file mode 100644
index 0000000..60bbb5f
--- /dev/null
+++ b/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj.filters
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\jb2cmp\classify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\cpaldjvu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\cuts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\frames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2tune.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\patterns.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\jb2cmp\classify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2tune.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\mdjvucfg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\minidjvu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\patterns.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj.user b/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/cpaldjvu/cpaldjvu.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/csepdjvu/csepdjvu.vcxproj b/win32/djvulibre/csepdjvu/csepdjvu.vcxproj
new file mode 100644
index 0000000..e884c3f
--- /dev/null
+++ b/win32/djvulibre/csepdjvu/csepdjvu.vcxproj
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BD6F2207-514D-47A1-98DF-F5BC6D6698C5}</ProjectGuid>
+    <RootNamespace>csepdjvu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\jb2cmp\classify.cpp" />
+    <ClCompile Include="..\..\..\tools\csepdjvu.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\cuts.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\frames.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2tune.cpp" />
+    <ClCompile Include="..\..\..\tools\jb2cmp\patterns.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\jb2cmp\classify.h" />
+    <ClInclude Include="..\..\..\tools\jb2tune.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\mdjvucfg.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\minidjvu.h" />
+    <ClInclude Include="..\..\..\tools\jb2cmp\patterns.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/csepdjvu/csepdjvu.vcxproj.filters b/win32/djvulibre/csepdjvu/csepdjvu.vcxproj.filters
new file mode 100644
index 0000000..ffcdb05
--- /dev/null
+++ b/win32/djvulibre/csepdjvu/csepdjvu.vcxproj.filters
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\jb2cmp\classify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\csepdjvu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\cuts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\frames.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2tune.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\jb2cmp\patterns.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\jb2cmp\classify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2tune.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\mdjvucfg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\minidjvu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\jb2cmp\patterns.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/csepdjvu/csepdjvu.vcxproj.user b/win32/djvulibre/csepdjvu/csepdjvu.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/csepdjvu/csepdjvu.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/ddjvu/ddjvu.vcxproj b/win32/djvulibre/ddjvu/ddjvu.vcxproj
new file mode 100644
index 0000000..8120600
--- /dev/null
+++ b/win32/djvulibre/ddjvu/ddjvu.vcxproj
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BF9D97C9-2C91-4DBB-9DE5-0128E1408990}</ProjectGuid>
+    <RootNamespace>ddjvu</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\ddjvu.cpp" />
+    <ClCompile Include="..\..\..\tools\tiff2pdf.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\tiff2pdf.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libtiff\libtiff.vcxproj">
+      <Project>{629ef023-7766-40c3-82ba-39bdd2235096}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/ddjvu/ddjvu.vcxproj.filters b/win32/djvulibre/ddjvu/ddjvu.vcxproj.filters
new file mode 100644
index 0000000..15c30b0
--- /dev/null
+++ b/win32/djvulibre/ddjvu/ddjvu.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\ddjvu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\tiff2pdf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\tiff2pdf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/ddjvu/ddjvu.vcxproj.user b/win32/djvulibre/ddjvu/ddjvu.vcxproj.user
new file mode 100644
index 0000000..f5e1823
--- /dev/null
+++ b/win32/djvulibre/ddjvu/ddjvu.vcxproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>false</ShowAllFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/dirs.props b/win32/djvulibre/dirs.props
new file mode 100644
index 0000000..20dd004
--- /dev/null
+++ b/win32/djvulibre/dirs.props
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <DjvulibreRoot>$(SolutionDir)\..\..</DjvulibreRoot>
+    <ZlibRoot>$(SolutionDir)\..\zlib</ZlibRoot>
+    <TiffRoot>$(SolutionDir)\..\tiff</TiffRoot>
+    <JpegRoot>$(SolutionDir)\..\jpeg</JpegRoot>
+    <ZlibDir>$(ZlibRoot)\zlib</ZlibDir>
+    <TiffDir>$(TiffRoot)\tiff\libtiff</TiffDir>
+    <JpegDir>$(JpegRoot)\jpeg-6b</JpegDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="DjvulibreRoot">
+      <Value>$(DjvulibreRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ZlibRoot">
+      <Value>$(ZlibRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="TiffRoot">
+      <Value>$(TiffRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="JpegRoot">
+      <Value>$(JpegRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ZlibDir">
+      <Value>$(ZlibDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="TiffDir">
+      <Value>$(TiffDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="JpegDir">
+      <Value>$(JpegDir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvm/djvm.vcxproj b/win32/djvulibre/djvm/djvm.vcxproj
new file mode 100644
index 0000000..e1a50e4
--- /dev/null
+++ b/win32/djvulibre/djvm/djvm.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{738B89BD-E570-4A9E-8687-F42B71735809}</ProjectGuid>
+    <RootNamespace>djvm</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvm.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvm/djvm.vcxproj.filters b/win32/djvulibre/djvm/djvm.vcxproj.filters
new file mode 100644
index 0000000..29a3bcb
--- /dev/null
+++ b/win32/djvulibre/djvm/djvm.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvm.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvm/djvm.vcxproj.user b/win32/djvulibre/djvm/djvm.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvm/djvm.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvmcvt/djvmcvt.vcxproj b/win32/djvulibre/djvmcvt/djvmcvt.vcxproj
new file mode 100644
index 0000000..551baae
--- /dev/null
+++ b/win32/djvulibre/djvmcvt/djvmcvt.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2B567A39-619A-4BCB-808D-514AE7855481}</ProjectGuid>
+    <RootNamespace>djvmcvt</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvmcvt.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvmcvt/djvmcvt.vcxproj.filters b/win32/djvulibre/djvmcvt/djvmcvt.vcxproj.filters
new file mode 100644
index 0000000..7f564fc
--- /dev/null
+++ b/win32/djvulibre/djvmcvt/djvmcvt.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvmcvt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvmcvt/djvmcvt.vcxproj.user b/win32/djvulibre/djvmcvt/djvmcvt.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvmcvt/djvmcvt.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvudump/djvudump.vcxproj b/win32/djvulibre/djvudump/djvudump.vcxproj
new file mode 100644
index 0000000..aa1a404
--- /dev/null
+++ b/win32/djvulibre/djvudump/djvudump.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0AE40A22-9737-4202-88ED-4C242217BA7F}</ProjectGuid>
+    <RootNamespace>djvudump</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvudump.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvudump/djvudump.vcxproj.filters b/win32/djvulibre/djvudump/djvudump.vcxproj.filters
new file mode 100644
index 0000000..6e03baf
--- /dev/null
+++ b/win32/djvulibre/djvudump/djvudump.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvudump.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvudump/djvudump.vcxproj.user b/win32/djvulibre/djvudump/djvudump.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvudump/djvudump.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuextract/djvuextract.vcxproj b/win32/djvulibre/djvuextract/djvuextract.vcxproj
new file mode 100644
index 0000000..25ebed2
--- /dev/null
+++ b/win32/djvulibre/djvuextract/djvuextract.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4ECCCCBF-82A9-4DC6-B167-D8DA3D645168}</ProjectGuid>
+    <RootNamespace>djvuextract</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvuextract.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuextract/djvuextract.vcxproj.filters b/win32/djvulibre/djvuextract/djvuextract.vcxproj.filters
new file mode 100644
index 0000000..46d0a76
--- /dev/null
+++ b/win32/djvulibre/djvuextract/djvuextract.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvuextract.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuextract/djvuextract.vcxproj.user b/win32/djvulibre/djvuextract/djvuextract.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvuextract/djvuextract.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvulibre-install.sh b/win32/djvulibre/djvulibre-install.sh
new file mode 100755
index 0000000..773c932
--- /dev/null
+++ b/win32/djvulibre/djvulibre-install.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+c=/cygdrive/c
+qtdir=$c/QtSDK/Desktop/Qt/4.8.1/msvc2010
+djdir=$HOME/djvulibre-3.5
+dwdir=$djdir/win32/djvulibre/Release
+djsrc=$HOME/djvulibre-djview/src
+msvc="$c/Program Files/Microsoft Visual Studio 10.0/VC"
+msredist="$msvc/redist/x86/Microsoft.VC100.CRT"
+
+target=$HOME/DjVuLibre
+
+function run() {
+    echo "$@"
+    "$@"
+    if test $? -ne 0 ; then
+      echo "FAILED: " "$@"
+    fi
+}
+
+## Djvulibre tools
+echo ---- DjVuLibre tools
+
+djexe="bzz.exe c44.exe cjb2.exe cpaldjvu.exe csepdjvu.exe
+       ddjvu.exe djvm.exe djvmcvt.exe djvudump.exe djvuextract.exe 
+       djvumake.exe djvups.exe djvused.exe djvuserve.exe djvutoxml.exe
+       djvutxt.exe djvuxmlparser.exe"
+djdll="libdjvulibre.dll libjpeg.dll libtiff.dll libz.dll"
+for n in $djdll $djexe ; do 
+    run cp $dwdir/$n $target ; done
+
+## Qt libs
+echo ---- Qt libs
+
+qtdll="QtCore4.dll QtGui4.dll QtNetwork4.dll QtOpenGL4.dll"
+qtssl="ssleay32.dll libeay32.dll libssl32.dll"
+qtplug="accessible codecs imageformats"
+for n in $qtdll ; do 
+    run cp $qtdir/lib/$n $target ; done
+for n in $qtssl ; do 
+    test -r $qtdir/bin/$n && run cp $qtdir/bin/$n $target ; done
+test -d $target/plugins || run mkdir $target/plugins
+for n in $qtplug ; do 
+    test -d $target/plugins/$n || run mkdir $target/plugins/$n 
+    for m in $qtdir/plugins/$n/*.dll ; do
+        run cp $m $target/plugins/$n ; done
+    run chmod 0755 $target/plugins/$n/* ; done
+    run rm $target/plugins/*/*d4.dll
+    run rm $target/plugins/imageformats/qsvg*
+run find $target -name '*.dll' -exec chmod 0755 {} \;
+
+echo '[Paths]' > $target/qt.conf
+
+## MS libs
+echo ---- MS libs
+
+for n in "$msredist"/* ; do
+    run cp "$n" $target; done
+
+## DjVuLibre shared files
+echo ---- DjVuLibre shared files
+
+test -d $target/share || mkdir $target/share
+run cp -r $djdir/share/djvu $target/share
+run find $target/share -name CVS -exec rm -rf {} \; -prune
+
+## DjVuLibre dev files
+echo ---- DjVuLibre dev files
+
+run cp $dwdir/libdjvulibre.lib $target
+test -d $target/include || run mkdir $target/include
+test -d $target/include/libdjvu || run mkdir $target/include/libdjvu
+run cp $djdir/libdjvu/miniexp.h $target/include/libdjvu
+run cp $djdir/libdjvu/ddjvuapi.h $target/include/libdjvu
+
+## DjView exe
+echo ---- DjView exe
+
+if test -r $dwdir/djview.exe ; then
+  run cp $dwdir/djview.exe $target
+else
+  run cp $djsrc/release/djview.exe $target
+fi
+( cd $djsrc; run $qtdir/bin/lrelease djview.pro )
+test -d $target/share/djvu/djview4 || run mkdir $target/share/djvu/djview4
+run cp $djsrc/*.qm $target/share/djvu/djview4
+run cp $qtdir/translations/qt_*.qm  $target/share/djvu/djview4
+run chmod 0644 $target/share/djvu/djview4/qt*.qm
+run rm -f $target/share/djvu/djview4/qt_help_*.qm
+
+
+## Doc
+echo ---- Doc
+
+run cp $djdir/win32/djvulibre/djvulibre.nsi $target
+run cp $djdir/win32/djvulibre/djvulibre*.nsh $target
+
+test -d $target/man || run mkdir $target/man
+test -d $target/doc || run mkdir $target/doc
+run cp $djdir/doc/*.djvu $target/doc
+run cp $djdir/doc/*.txt $target/doc
+run unix2dos $target/doc/*.txt
+run cp $djdir/COPYING $target/COPYING.txt
+run unix2dos $target/COPYING.txt
diff --git a/win32/djvulibre/djvulibre.nsi b/win32/djvulibre/djvulibre.nsi
new file mode 100755
index 0000000..8a34871
--- /dev/null
+++ b/win32/djvulibre/djvulibre.nsi
@@ -0,0 +1,576 @@
+;---------------------------------------------------------;
+;Created 08-24 april 2013 by                                 ;
+;(C) Kravtsov Konstantin Ivanovich, Novokuznetsk, Russia  ;
+;State of Art edition version - see below NSI_VER                                   ;
+;LogicLib and Winver applied by Leon Bottou               ;             ;
+;----------------------------------------------------------
+
+;Used software:
+;--------------
+;NSIS 2.46 (http://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-setup.exe/download)
+;add-on NSIS 2.46+log (http://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-log.zip/download)
+;HM NIS Edit 2.0.3 -- it's good IDE for NSI building (http://prdownloads.sourceforge.net/hmne/nisedit2.0.3.exe?download)
+;with 2.46 NSIS update (http://nsis.sourceforge.net/mediawiki/images/6/64/HMnsiSyntaxConfig.zip)
+;Notepad ++ 6.3 (http://download.tuxfamily.org/notepadplus/6.3/npp.6.3.Installer.exe)
+;Used docs
+;---------
+;NSIS docs and manuals at http://forum.oszone.net/thread-248731.html
+;NSIS help at http://forum.oszone.net/thread-168287.html
+;NSIS 2.46 User Manual shipped with NSIS
+
+
+
+
+;INSTALLER START
+;---------------
+;prepare names
+
+RequestExecutionLevel admin
+
+!define NSI_VER "9.2"
+!define DJVULIBRE_NAME "DjVuLibre"
+!define DJVULIBRE_VERSION "3.5.27"
+!define CLASSES "Software\Classes\"
+!define DJVIEW_NAME "DjView"
+!define DJVIEW_VERSION "4.10"
+!define VI_PRODUCT_VERSION "4.10.0.0"
+
+!define PRODUCT_NAME "${DJVULIBRE_NAME} ${DJVIEW_NAME}"
+!define UNINST_NAME "${DJVULIBRE_NAME}+${DJVIEW_NAME}" ; for uninstaller
+!define MENU_NAME "${DJVULIBRE_NAME}"
+!define PRODUCT_VERSION "${DJVULIBRE_VERSION}+${DJVIEW_VERSION}"
+
+;provide other info
+!define PRODUCT_PUBLISHER "DjVuZone"
+!define DJVULIBRE_WEB_SITE "http://djvu.sourceforge.net"
+!define DJVUORG_WEB_SITE "http://djvu.org"
+!define DJVIEW_OPTS "--outline --continuous"
+!define PRODUCT_DOWNLOAD_PAGE "http://sourceforge.net/projects/djvu/files/DjVuLibre_Windows/"
+!define PRODUCT_ONLINEHELP_PAGE "http://djvu.sourceforge.net/doc/index.html"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\djview.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINST_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+
+;label for HCR
+!define FILEID "Djview.DjVuFile"
+!define NO_EXT "no key"
+!define BACKUP_EXT "DjView.Backup"
+
+;const for url.lnk
+!define RUN_URL "$WINDIR\system32\rundll32.exe"
+!define ICO_URL "$WINDIR\system32\url.dll"
+!define URL_PAR " url.dll,FileProtocolHandler"
+
+;vars
+Var Djvu_EXT ; ext var
+Var COUNT    ; counter var
+Var KEY_VAL  ; readed key valuse
+Var TMP_EXT  ; for temp reading ext val from reg
+Var INST_LOG_REN ; flag of exist install.log
+
+;fill installer description
+VIProductVersion "${VI_PRODUCT_VERSION}"
+
+;end-user doesnot see
+;djvulibre version anywhere except installer
+;dll's and utils doesn't report any
+VIAddVersionKey "DjvuLibreVersion" ${DJVULIBRE_VERSION}
+VIAddVersionKey "DjViewVersion" ${DJVIEW_VERSION}
+VIAddVersionKey "Installer by" "Konstantin Kravtsov (C) 2013"
+VIAddVersionKey "FileVersion" ${PRODUCT_VERSION}
+VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
+VIAddVersionKey "LegalCopyright" "GPL v2+"
+VIAddVersionKey "CompanyName" ${PRODUCT_PUBLISHER}
+VIAddVersionKey "FileDescription" "DjVu view, edit and create tools for Windows"
+
+;----------------
+;Includes section
+;----------------
+
+!include "LogicLib.nsh"
+!include "WinVer.nsh"
+
+
+;---------------
+;Install section
+;---------------
+
+SetCompressor /SOLID lzma
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "..\DjVuLibre-${DJVULIBRE_VERSION}_DjView-${DJVIEW_VERSION}_Setup.exe"
+InstallDir "$PROGRAMFILES\DjVuLibre"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+;settings
+!define MUI_ABORTWARNING
+!define MUI_HEADERIMAGE
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
+
+;language selection dialog settings
+!define MUI_LANGDLL_ALWAYSSHOW
+!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
+
+;workaround lang change effect
+!define MUI_PAGE_CUSTOMFUNCTION_PRE preWelcomePage
+
+;set components decription layout bottom
+!define MUI_COMPONENTSPAGE_SMALLDESC
+
+
+;welcome page
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+!insertmacro MUI_PAGE_WELCOME
+
+;license page
+!insertmacro MUI_PAGE_LICENSE "COPYING.txt"
+
+;directory page
+!insertmacro MUI_PAGE_DIRECTORY
+
+;install options page
+!insertmacro MUI_PAGE_COMPONENTS
+
+;instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+
+;finish page
+!define MUI_FINISHPAGE_RUN " "
+!define MUI_FINISHPAGE_RUN_TEXT $(Launch_LAB)
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchReadme"
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_FINISHPAGE_TITLE_3LINES
+!insertmacro MUI_PAGE_FINISH
+
+;uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;reserve files
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+;language files
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "Russian"
+
+; end MUI 1.67 compatible ------
+
+
+Function .onInit
+  ;check language
+  !insertmacro MUI_LANGDLL_DISPLAY
+FunctionEnd
+
+Function preWelcomePage
+  ReadRegStr $KEY_VAL  ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString"
+  ${If} "$KEY_VAL" != ""
+    ReadRegStr $COUNT ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion"
+    ${If} "$COUNT" == "${PRODUCT_VERSION}"
+      MessageBox MB_YESNO|MB_ICONEXCLAMATION $(Message_AlreadyInstalled) IDNO done
+    ${ElseIf} "$COUNT" S< "${PRODUCT_VERSION}"
+      MessageBox MB_YESNO|MB_ICONEXCLAMATION $(Message_OldFound) IDNO done
+    ${ElseIf} "$COUNT" S> "${PRODUCT_VERSION}"
+      MessageBox MB_YESNO|MB_ICONEXCLAMATION $(Message_NewFound) IDNO done
+    ${EndIf}
+    ;Run the uninstaller
+    ClearErrors
+    ExecWait '"$KEY_VAL" /S' ;; silent
+  ${EndIf}
+done:
+FunctionEnd
+
+Function RegisterExt
+  ; Kravtsov Konstantin Ivanovich (C) 2013
+  ; for register ext. Push EXT with ext and call
+  Pop $Djvu_EXT
+  ClearErrors
+  ReadRegStr $TMP_EXT HKLM "${CLASSES}$Djvu_EXT" ""
+  ${If} ${Errors}
+    WriteRegStr HKLM "${CLASSES}$Djvu_EXT" ${BACKUP_EXT} "${NO_EXT}"
+  ${ElseIf} "$TMP_EXT" != "${FILEID}"
+    WriteRegStr HKLM "${CLASSES}$Djvu_EXT" "${BACKUP_EXT}" "$TMP_EXT"
+  ${EndIf}
+  WriteRegStr HKLM "${CLASSES}$Djvu_EXT" "" "${FILEID}"
+FunctionEnd
+
+Function LaunchReadme
+  Exec '"$INSTDIR\djview.exe" --outline --continuous "$INSTDIR\doc\djvulibre-book-en.djvu"'
+FunctionEnd
+
+
+;---install files
+Section "-!DjVuLibre" scDjVuLibre
+  SectionIn RO
+  SetOutPath "$INSTDIR"
+  SetOverwrite try
+  StrCpy $INST_LOG_REN 0 ;set var to zero
+  StrCpy $TMP_EXT "$INSTDIR\install.log"
+  ${If} ${FileExists} $TMP_EXT
+    Rename $TMP_EXT $INSTDIR\install.kik
+    StrCpy $INST_LOG_REN 1 ;set var to rename was
+  ${EndIf}
+  StrCpy $TMP_EXT "$INSTDIR\uninstall.${PRODUCT_VERSION}"
+  ${If} ${FileExists} $TMP_EXT
+    Rename $INSTDIR\uninstall.${PRODUCT_VERSION} $INSTDIR\install.log
+  ${EndIf}
+  ;; all files are installed now
+  Logset on
+  File "*.exe"
+  File "*.dll"
+  File "*.lib"
+  File /r "include"
+  File /r "doc"
+  File /r "plugins"
+  File /r "share"
+  File "qt.conf"
+  File "djvulibre*.ns?"
+  File "COPYING.txt"
+  Logset off
+SectionEnd
+
+;--- registry
+Section "-registry"
+  SectionIn RO
+  DetailPrint "Updating registry"
+  ;; app registration
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\djview.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "Path" "$INSTDIR"
+  WriteRegStr HKLM "${CLASSES}Applications\djview.exe" "FriendlyAppName" "DjView"
+  WriteRegStr HKLM "${CLASSES}Applications\djview.exe\SupportedTypes\.djvu" "" ""
+  WriteRegStr HKLM "${CLASSES}Applications\djview.exe\SupportedTypes\.djv" "" ""
+  WriteRegStr HKLM "${CLASSES}Applications\djview.exe\shell\open\command" "" '"$INSTDIR\djview.exe" "%1"'
+  ${If} ${AtLeastWin7}
+    WriteRegDWORD HKLM "${PRODUCT_DIR_REGKEY}" "UseUrl" 1
+    WriteRegStr HKLM "${CLASSES}Applications\djview.exe\SupportedProtocols\http" "" ""
+    WriteRegStr HKLM "${CLASSES}Applications\djview.exe\SupportedProtocols\https" "" ""
+  ${EndIf}
+  ;; fileid
+  DeleteRegKey HKLM "${CLASSES}${FILEID}"
+  WriteRegStr HKLM "${CLASSES}${FILEID}" "" "DjVu File"
+  WriteRegStr HKLM "${CLASSES}${FILEID}\DefaultIcon" "" "$INSTDIR\djview.exe,1"
+  WriteRegStr HKLM "${CLASSES}${FILEID}\shell\open\command" "" '"$INSTDIR\djview.exe" "%1"'
+  ;; open with
+  WriteRegStr HKLM "${CLASSES}.djv\OpenWithProgids" ${FILEID} ""
+  WriteRegStr HKLM "${CLASSES}.djvu\OpenWithProgids" ${FILEID} ""
+  ClearErrors
+  ReadRegStr $TMP_EXT HKLM "${CLASSES}DjVu.Document" ""
+  ${IfNot} ${Errors}
+    WriteRegStr HKLM "${CLASSES}.djv\OpenWithProgids" "DjVu.Document" ""
+    WriteRegStr HKLM "${CLASSES}.djvu\OpenWithProgids" "DjVu.Document" ""
+  ${EndIf}
+SectionEnd
+
+;--- associations
+Section "$(secAssoc)" scAssoc
+  DetailPrint "Creating associations"
+  push ".djvu"
+  Call RegisterExt
+  push ".djv"
+  Call RegisterExt
+SectionEnd
+
+;--- shortcuts
+Section "-menuentries"
+  SectionIn RO
+  DetailPrint "Creating menu entries"
+
+  ;clear old menu
+  rmdir /r "$SMPROGRAMS\${MENU_NAME}"
+
+  ;; all menu entries
+  LogSet on
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\${MENU_NAME}"
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\DjView.lnk" "$INSTDIR\djview.exe"
+  CreateDirectory "$SMPROGRAMS\${MENU_NAME}\$(Uninst_DIR)"
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Uninst_DIR)\$(Uninst_LNK).lnk" "$INSTDIR\uninst.exe"
+  CreateDirectory "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)"
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\$(WEB_LNK) Djvu.org.lnk" ${RUN_URL} "${URL_PAR} ${DJVUORG_WEB_SITE}" ${ICO_URL} 0
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\$(WEB_LNK) DjvuLibre.lnk" ${RUN_URL} "${URL_PAR} ${DJVULIBRE_WEB_SITE}" ${ICO_URL} 0
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\$(WEB_LNK) DjVuLibre $(WebDL_LNK).lnk" ${RUN_URL} "${URL_PAR} ${PRODUCT_DOWNLOAD_PAGE}" ${ICO_URL} 0
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\Online documentation.lnk" ${RUN_URL} "${URL_PAR} ${PRODUCT_ONLINEHELP_PAGE}" ${ICO_URL} 0
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\$(Lic_TXT).lnk" "$INSTDIR\COPYING.txt"
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\DjVuLibre documentation.lnk" "$INSTDIR\djview.exe" '${DJVIEW_OPTS} "$INSTDIR\doc\djvulibre-book-en.djvu"'
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\Specification of the DjVu format (v2).lnk" "$INSTDIR\djview.exe" '${DJVIEW_OPTS} "$INSTDIR\doc\djvu2spec.djvu"'
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\Specification of the DjVu format (v3).lnk" "$INSTDIR\djview.exe" '${DJVIEW_OPTS} "$INSTDIR\doc\djvu3spec.djvu"'
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\Specification of the DjVu format (changes).lnk" "$INSTDIR\doc\djvuchanges.txt"
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\Lizardtech License Notes 2002.lnk" "$INSTDIR\djview.exe" '"$INSTDIR\doc\lizard2002.djvu"'
+  CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\Lizardtech License Notes 2007.lnk" "$INSTDIR\djview.exe" '"$INSTDIR\doc\lizard2007.djvu"'
+  ${If} $Language == ${LANG_RUSSIAN}
+    CreateShortCut "$SMPROGRAMS\${MENU_NAME}\$(Doc_DIR)\$(Doc_LNK) ${DJVULIBRE_NAME}.lnk" "$INSTDIR\djview.exe" '${DJVIEW_OPTS} "$INSTDIR\doc\djvulibre-book-ru.djvu"'
+  ${EndIf}
+  LogSet off
+SectionEnd
+
+Section "$(secDesk)" scDesk
+  DetailPrint "Creating desktop shortcut"
+  SetShellVarContext all
+  LogSet on
+  CreateShortCut "$DESKTOP\DjView.lnk" "$INSTDIR\djview.exe"
+  Logset off
+SectionEnd
+  
+Section /o "$(secQuick)" scQuick
+  DetailPrint "Creating quick launch shortcut"
+  SetShellVarContext all
+  LogSet on
+  CreateShortCut "$QUICKLAUNCH\DjView.lnk" "$INSTDIR\djview.exe"
+  LogSet off
+SectionEnd
+
+
+; --- post install
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\djview.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "Path" "$INSTDIR"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME}  ${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\djview.exe,0"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${DJVULIBRE_WEB_SITE}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+  ;protect install log
+  Rename $INSTDIR\install.log $INSTDIR\uninstall.${PRODUCT_VERSION}
+  SetFileAttributes $INSTDIR\uninstall.${PRODUCT_VERSION} HIDDEN|READONLY|SYSTEM
+  ${If} $INST_LOG_REN == "1"
+    Rename $INSTDIR\install.kik $INSTDIR\install.log
+  ${EndIf}
+  DetailPrint "-----------------------------------------------------------------------------------------------"
+  DetailPrint "Installer NSI V.${NSI_VER} by Kravtsov Konstantin Ivanovich, Novokuznetsk, Russia."
+  DetailPrint "-----------------------------------------------------------------------------------------------"
+SectionEnd
+
+
+
+;------------
+; Uninstaller 
+;------------
+
+
+!define UnStrLoc "!insertmacro UnStrLoc"
+!macro UnStrLoc ResultVar String SubString StartPoint
+  Push "${String}"
+  Push "${SubString}"
+  Push "${StartPoint}"
+  Call un.StrLoc
+  Pop "${ResultVar}"
+!macroend
+
+Function un.StrLoc
+  ; After this point:
+  ;  $R0 = StartPoint (input)
+  ;  $R1 = SubString (input)
+  ;  $R2 = String (input)
+  ;  $R3 = SubStringLen (temp)
+  ;  $R4 = StrLen (temp)
+  ;  $R5 = StartCharPos (temp)
+  ;  $R6 = TempStr (temp)*/
+  ;Get input from user
+  Exch $R0
+  Exch
+  Exch $R1
+  Exch 2
+  Exch $R2
+  Push $R3
+  Push $R4
+  Push $R5
+  Push $R6
+  ;Get "String" and "SubString" length
+  StrLen $R3 $R1
+  StrLen $R4 $R2
+  ;Start "StartCharPos" counter
+  StrCpy $R5 0
+  ;Loop until "SubString" is found or "String" reaches its end
+  ${Do}
+    ;Remove everything before and after the searched part ("TempStr")
+    StrCpy $R6 $R2 $R3 $R5
+    ;Compare "TempStr" with "SubString"
+    ${If} $R6 == $R1
+      ${If} $R0 == `<`
+        IntOp $R6 $R3 + $R5
+        IntOp $R0 $R4 - $R6
+      ${Else}
+        StrCpy $R0 $R5
+      ${EndIf}
+      ${ExitDo}
+    ${EndIf}
+    ;If not "SubString", this could be "String"'s end
+    ${If} $R5 >= $R4
+      StrCpy $R0 ``
+      ${ExitDo}
+    ${EndIf}
+    ;If not, continue the loop
+    IntOp $R5 $R5 + 1
+  ${Loop}
+  ;Return output to user
+  Pop $R6
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Exch
+  Pop $R1
+  Exch $R0
+FunctionEnd
+
+Function un.RemoveFiles
+  Exch $R7 ;get  path+filename uninstall log
+  push $0 ;$0 - uninstall log file var
+  push $1 ; string readed from file
+  push $2 ; string cutted from $1
+  push $3 ; int - found str location by StrLoc
+  push $4 ; counter
+  push $5 ; extracted filename
+  DetailPrint "Removing Files.."
+  ${If} ${FileExists} "$R7"
+    ClearErrors
+    FileOpen $0 "$R7" "r"
+    ${Do}
+      ClearErrors
+      FileRead $0 $1
+      ${If} ${Errors}
+         ;check no file or EOF
+         ${ExitDo}
+      ${EndIf}
+      StrCpy $2 $1 11
+      ${If} $2 == "File: wrote"
+        ${UnStrloc} $3 $1 " to " ">"
+        Intop $3 $3 + 5
+        StrCpy $5 $1 -3 $3
+        Delete  /REBOOTOK "$5"
+      ${ElseIf} $2 == "CreateShort"
+        ${UnStrloc} $3 $1 ', in: ' ">"
+        Intop $3 $3 - 22
+        StrCpy $5 $1 $3 22
+        Delete /REBOOTOK "$5"
+      ${EndIf}
+    ${Loop}
+    SetDetailsPrint both
+    ;prepare file
+    FileSeek $0 0
+    ;set counter
+    strcpy $4 0
+    ${Do}
+      ClearErrors
+      FileRead $0 $1
+      ${If} ${Errors}
+         ${ExitDo}
+      ${EndIf}
+      StrCpy $2 $1 -2 -10
+      ${If} $2 == " created"
+        ${UnStrloc} $3 $1 " created" ">"
+        Intop $3 $3 - 18
+        StrCpy $5 $1 $3 18
+        push $5
+        Intop $4 $4 + 1
+      ${EndIf}
+    ${Loop}
+    ${ForEach} $COUNT $4 1 - 1
+      POP $5
+      RmDir  /REBOOTOK "$5"
+    ${Next}
+    FileClose $0
+  ${Else}
+    RMDir /r "$INSTDIR"  ; too bad
+  ${EndIf}
+  pop $5 ; extracted filename
+  pop $4 ; counter
+  pop $3 ; int - found str location by StrLoc
+  pop $2 ; string cutted from $1
+  pop $1 ; string readed from file
+  pop $0 ;$0 - uninstall log file var
+  pop $R7 ; path+filename uninstall log
+FunctionEnd
+
+
+Function un.RegisterExt
+; Kravtsov Konstantin Ivanovich (C) 2013
+; restore assoc from uninst key
+; check if restore really need
+  Pop $Djvu_EXT
+  ClearErrors
+  ReadRegStr $TMP_EXT HKLM "${CLASSES}$Djvu_EXT" ""
+  ${IfNot} ${Errors}
+     ${If} "$TMP_EXT" == ${FILEID}
+       ClearErrors
+       ReadRegStr $TMP_EXT HKLM "${CLASSES}$Djvu_EXT" ${BACKUP_EXT}
+       ${IfNot} ${Errors}
+         ${If} "$TMP_EXT" == "${NO_EXT}"
+           WriteRegStr HKLM "${CLASSES}$Djvu_EXT" "" ""
+         ${Else}
+           WriteRegStr HKLM "${CLASSES}$Djvu_EXT" "" $TMP_EXT
+         ${EndIf}
+         DeleteRegValue HKLM "${CLASSES}$Djvu_EXT" ${BACKUP_EXT}
+       ${EndIf}
+     ${EndIf}
+  ${EndIf}
+FunctionEnd
+
+Function un.onUninstSuccess
+  IfSilent +2
+  MessageBox MB_ICONINFORMATION|MB_OK $(UninstSux_MSG)
+FunctionEnd
+
+Function un.onInit
+  IfSilent +3
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 $(Uninst_MSG) IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall
+  SetShellVarContext all
+  SetFileAttributes $INSTDIR\uninstall.${PRODUCT_VERSION} NORMAL
+  IfSilent +2
+  SetDetailsPrint both
+  ;; remove all files
+  push $INSTDIR\uninstall.${PRODUCT_VERSION}
+  Call un.RemoveFiles
+  Delete "$INSTDIR\uninstall.${PRODUCT_VERSION}"
+  Delete "$INSTDIR\uninst.exe"
+  RMDir "$INSTDIR"
+  ;; clean registry
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  DeleteRegKey HKLM "${CLASSES}${FILEID}"
+  DeleteRegKey HKLM "${CLASSES}Applications\djview.exe"
+  DeleteRegValue HKLM "${CLASSES}.djvu\OpenWithProgIDs" "${FILEID}"
+  DeleteRegValue HKLM "${CLASSES}.djv\OpenWithProgIDs" "${FILEID}"
+;if no windjview key  - delete openwithprogid
+  ClearErrors
+  ReadRegStr $TMP_EXT HKCR "DjVu.Document" ""
+  ${If} ${Errors}
+  DeleteRegValue HKLM "${CLASSES}.djv\OpenWithProgids" "DjVu.Document"
+  DeleteRegValue HKLM "${CLASSES}.djvu\OpenWithProgids" "DjVu.Document"
+  ${EndIf}
+
+
+  Push ".djvu"
+  Call un.RegisterExt
+  Push ".djv"
+  Call un.RegisterExt
+  ;; clean uninstall key
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+;  SetAutoClose true
+  DetailPrint "-----------------------------------------------------------------------------------------------"
+  DetailPrint "DjVuLibre installer script V.${NSI_VER} by Kravtsov Konstantin Ivanovich, Novokuznetsk, Russia."
+  DetailPrint "-----------------------------------------------------------------------------------------------"
+SectionEnd
+
+!include "djvulibrelang-ru.nsh"
+!include "djvulibrelang-en.nsh"
+
+; Section descriptions set
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+!insertmacro MUI_DESCRIPTION_TEXT ${scAssoc} $(DESC_Assoc)
+!insertmacro MUI_DESCRIPTION_TEXT ${scQuick} $(DESC_Quick)
+!insertmacro MUI_DESCRIPTION_TEXT ${scDesk} $(DESC_Desk)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
diff --git a/win32/djvulibre/djvulibre.sln b/win32/djvulibre/djvulibre.sln
new file mode 100644
index 0000000..08f021c
--- /dev/null
+++ b/win32/djvulibre/djvulibre.sln
@@ -0,0 +1,140 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdjvulibre", "libdjvulibre\libdjvulibre.vcxproj", "{AAA67337-AABD-4D04-A3CC-0A7F341F216C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddjvu", "ddjvu\ddjvu.vcxproj", "{BF9D97C9-2C91-4DBB-9DE5-0128E1408990}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvudump", "djvudump\djvudump.vcxproj", "{0AE40A22-9737-4202-88ED-4C242217BA7F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cjb2", "cjb2\cjb2.vcxproj", "{1A387849-BB31-499C-82DF-327D45199766}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvused", "djvused\djvused.vcxproj", "{F295916D-980E-4F7C-9C08-EF5A180C81A0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c44", "c44\c44.vcxproj", "{C709A49C-3BCC-44B9-BD97-7C3E1DC10771}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvm", "djvm\djvm.vcxproj", "{738B89BD-E570-4A9E-8687-F42B71735809}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvups", "djvups\djvups.vcxproj", "{1A607E98-957F-4899-A44D-DC4CD40D0AA7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvmcvt", "djvmcvt\djvmcvt.vcxproj", "{2B567A39-619A-4BCB-808D-514AE7855481}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzz", "bzz\bzz.vcxproj", "{32F68FEC-40AC-4FE7-A221-ED4ACB95D0DE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpaldjvu", "cpaldjvu\cpaldjvu.vcxproj", "{812ABE62-FD6D-4904-9A03-20C1A76E662E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csepdjvu", "csepdjvu\csepdjvu.vcxproj", "{BD6F2207-514D-47A1-98DF-F5BC6D6698C5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvuextract", "djvuextract\djvuextract.vcxproj", "{4ECCCCBF-82A9-4DC6-B167-D8DA3D645168}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvumake", "djvumake\djvumake.vcxproj", "{04B14762-9EC2-4A5E-96C8-ACA1C761C962}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvutxt", "djvutxt\djvutxt.vcxproj", "{CB1E99AD-83FD-4DDD-BCE7-FE16309620BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvuserve", "djvuserve\djvuserve.vcxproj", "{08BBD8A2-A87E-4652-84C5-6A5940427843}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvuxmlparser", "djvuxmlparser\djvuxmlparser.vcxproj", "{A8A8B2E9-DEEF-4CD8-8742-D8C1744925F3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djvutoxml", "djvutoxml\djvutoxml.vcxproj", "{923CCB70-AF1E-472C-99F9-E0FF1D657186}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "libjpeg\libjpeg.vcxproj", "{64BB5626-EEB1-443C-904B-C02EEFB2DD5D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libz", "libz\libz.vcxproj", "{D56B4FFD-8396-43B6-A10E-C0FB04B9BF70}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff\libtiff.vcxproj", "{629EF023-7766-40C3-82BA-39BDD2235096}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AAA67337-AABD-4D04-A3CC-0A7F341F216C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AAA67337-AABD-4D04-A3CC-0A7F341F216C}.Debug|Win32.Build.0 = Debug|Win32
+		{AAA67337-AABD-4D04-A3CC-0A7F341F216C}.Release|Win32.ActiveCfg = Release|Win32
+		{AAA67337-AABD-4D04-A3CC-0A7F341F216C}.Release|Win32.Build.0 = Release|Win32
+		{BF9D97C9-2C91-4DBB-9DE5-0128E1408990}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BF9D97C9-2C91-4DBB-9DE5-0128E1408990}.Debug|Win32.Build.0 = Debug|Win32
+		{BF9D97C9-2C91-4DBB-9DE5-0128E1408990}.Release|Win32.ActiveCfg = Release|Win32
+		{BF9D97C9-2C91-4DBB-9DE5-0128E1408990}.Release|Win32.Build.0 = Release|Win32
+		{0AE40A22-9737-4202-88ED-4C242217BA7F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0AE40A22-9737-4202-88ED-4C242217BA7F}.Debug|Win32.Build.0 = Debug|Win32
+		{0AE40A22-9737-4202-88ED-4C242217BA7F}.Release|Win32.ActiveCfg = Release|Win32
+		{0AE40A22-9737-4202-88ED-4C242217BA7F}.Release|Win32.Build.0 = Release|Win32
+		{1A387849-BB31-499C-82DF-327D45199766}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1A387849-BB31-499C-82DF-327D45199766}.Debug|Win32.Build.0 = Debug|Win32
+		{1A387849-BB31-499C-82DF-327D45199766}.Release|Win32.ActiveCfg = Release|Win32
+		{1A387849-BB31-499C-82DF-327D45199766}.Release|Win32.Build.0 = Release|Win32
+		{F295916D-980E-4F7C-9C08-EF5A180C81A0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F295916D-980E-4F7C-9C08-EF5A180C81A0}.Debug|Win32.Build.0 = Debug|Win32
+		{F295916D-980E-4F7C-9C08-EF5A180C81A0}.Release|Win32.ActiveCfg = Release|Win32
+		{F295916D-980E-4F7C-9C08-EF5A180C81A0}.Release|Win32.Build.0 = Release|Win32
+		{C709A49C-3BCC-44B9-BD97-7C3E1DC10771}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C709A49C-3BCC-44B9-BD97-7C3E1DC10771}.Debug|Win32.Build.0 = Debug|Win32
+		{C709A49C-3BCC-44B9-BD97-7C3E1DC10771}.Release|Win32.ActiveCfg = Release|Win32
+		{C709A49C-3BCC-44B9-BD97-7C3E1DC10771}.Release|Win32.Build.0 = Release|Win32
+		{738B89BD-E570-4A9E-8687-F42B71735809}.Debug|Win32.ActiveCfg = Debug|Win32
+		{738B89BD-E570-4A9E-8687-F42B71735809}.Debug|Win32.Build.0 = Debug|Win32
+		{738B89BD-E570-4A9E-8687-F42B71735809}.Release|Win32.ActiveCfg = Release|Win32
+		{738B89BD-E570-4A9E-8687-F42B71735809}.Release|Win32.Build.0 = Release|Win32
+		{1A607E98-957F-4899-A44D-DC4CD40D0AA7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1A607E98-957F-4899-A44D-DC4CD40D0AA7}.Debug|Win32.Build.0 = Debug|Win32
+		{1A607E98-957F-4899-A44D-DC4CD40D0AA7}.Release|Win32.ActiveCfg = Release|Win32
+		{1A607E98-957F-4899-A44D-DC4CD40D0AA7}.Release|Win32.Build.0 = Release|Win32
+		{2B567A39-619A-4BCB-808D-514AE7855481}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B567A39-619A-4BCB-808D-514AE7855481}.Debug|Win32.Build.0 = Debug|Win32
+		{2B567A39-619A-4BCB-808D-514AE7855481}.Release|Win32.ActiveCfg = Release|Win32
+		{2B567A39-619A-4BCB-808D-514AE7855481}.Release|Win32.Build.0 = Release|Win32
+		{32F68FEC-40AC-4FE7-A221-ED4ACB95D0DE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{32F68FEC-40AC-4FE7-A221-ED4ACB95D0DE}.Debug|Win32.Build.0 = Debug|Win32
+		{32F68FEC-40AC-4FE7-A221-ED4ACB95D0DE}.Release|Win32.ActiveCfg = Release|Win32
+		{32F68FEC-40AC-4FE7-A221-ED4ACB95D0DE}.Release|Win32.Build.0 = Release|Win32
+		{812ABE62-FD6D-4904-9A03-20C1A76E662E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{812ABE62-FD6D-4904-9A03-20C1A76E662E}.Debug|Win32.Build.0 = Debug|Win32
+		{812ABE62-FD6D-4904-9A03-20C1A76E662E}.Release|Win32.ActiveCfg = Release|Win32
+		{812ABE62-FD6D-4904-9A03-20C1A76E662E}.Release|Win32.Build.0 = Release|Win32
+		{BD6F2207-514D-47A1-98DF-F5BC6D6698C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BD6F2207-514D-47A1-98DF-F5BC6D6698C5}.Debug|Win32.Build.0 = Debug|Win32
+		{BD6F2207-514D-47A1-98DF-F5BC6D6698C5}.Release|Win32.ActiveCfg = Release|Win32
+		{BD6F2207-514D-47A1-98DF-F5BC6D6698C5}.Release|Win32.Build.0 = Release|Win32
+		{4ECCCCBF-82A9-4DC6-B167-D8DA3D645168}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4ECCCCBF-82A9-4DC6-B167-D8DA3D645168}.Debug|Win32.Build.0 = Debug|Win32
+		{4ECCCCBF-82A9-4DC6-B167-D8DA3D645168}.Release|Win32.ActiveCfg = Release|Win32
+		{4ECCCCBF-82A9-4DC6-B167-D8DA3D645168}.Release|Win32.Build.0 = Release|Win32
+		{04B14762-9EC2-4A5E-96C8-ACA1C761C962}.Debug|Win32.ActiveCfg = Debug|Win32
+		{04B14762-9EC2-4A5E-96C8-ACA1C761C962}.Debug|Win32.Build.0 = Debug|Win32
+		{04B14762-9EC2-4A5E-96C8-ACA1C761C962}.Release|Win32.ActiveCfg = Release|Win32
+		{04B14762-9EC2-4A5E-96C8-ACA1C761C962}.Release|Win32.Build.0 = Release|Win32
+		{CB1E99AD-83FD-4DDD-BCE7-FE16309620BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CB1E99AD-83FD-4DDD-BCE7-FE16309620BE}.Debug|Win32.Build.0 = Debug|Win32
+		{CB1E99AD-83FD-4DDD-BCE7-FE16309620BE}.Release|Win32.ActiveCfg = Release|Win32
+		{CB1E99AD-83FD-4DDD-BCE7-FE16309620BE}.Release|Win32.Build.0 = Release|Win32
+		{08BBD8A2-A87E-4652-84C5-6A5940427843}.Debug|Win32.ActiveCfg = Debug|Win32
+		{08BBD8A2-A87E-4652-84C5-6A5940427843}.Debug|Win32.Build.0 = Debug|Win32
+		{08BBD8A2-A87E-4652-84C5-6A5940427843}.Release|Win32.ActiveCfg = Release|Win32
+		{08BBD8A2-A87E-4652-84C5-6A5940427843}.Release|Win32.Build.0 = Release|Win32
+		{A8A8B2E9-DEEF-4CD8-8742-D8C1744925F3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A8A8B2E9-DEEF-4CD8-8742-D8C1744925F3}.Debug|Win32.Build.0 = Debug|Win32
+		{A8A8B2E9-DEEF-4CD8-8742-D8C1744925F3}.Release|Win32.ActiveCfg = Release|Win32
+		{A8A8B2E9-DEEF-4CD8-8742-D8C1744925F3}.Release|Win32.Build.0 = Release|Win32
+		{923CCB70-AF1E-472C-99F9-E0FF1D657186}.Debug|Win32.ActiveCfg = Debug|Win32
+		{923CCB70-AF1E-472C-99F9-E0FF1D657186}.Debug|Win32.Build.0 = Debug|Win32
+		{923CCB70-AF1E-472C-99F9-E0FF1D657186}.Release|Win32.ActiveCfg = Release|Win32
+		{923CCB70-AF1E-472C-99F9-E0FF1D657186}.Release|Win32.Build.0 = Release|Win32
+		{64BB5626-EEB1-443C-904B-C02EEFB2DD5D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{64BB5626-EEB1-443C-904B-C02EEFB2DD5D}.Debug|Win32.Build.0 = Debug|Win32
+		{64BB5626-EEB1-443C-904B-C02EEFB2DD5D}.Release|Win32.ActiveCfg = Release|Win32
+		{64BB5626-EEB1-443C-904B-C02EEFB2DD5D}.Release|Win32.Build.0 = Release|Win32
+		{D56B4FFD-8396-43B6-A10E-C0FB04B9BF70}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D56B4FFD-8396-43B6-A10E-C0FB04B9BF70}.Debug|Win32.Build.0 = Debug|Win32
+		{D56B4FFD-8396-43B6-A10E-C0FB04B9BF70}.Release|Win32.ActiveCfg = Release|Win32
+		{D56B4FFD-8396-43B6-A10E-C0FB04B9BF70}.Release|Win32.Build.0 = Release|Win32
+		{629EF023-7766-40C3-82BA-39BDD2235096}.Debug|Win32.ActiveCfg = Debug|Win32
+		{629EF023-7766-40C3-82BA-39BDD2235096}.Debug|Win32.Build.0 = Debug|Win32
+		{629EF023-7766-40C3-82BA-39BDD2235096}.Release|Win32.ActiveCfg = Release|Win32
+		{629EF023-7766-40C3-82BA-39BDD2235096}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/win32/djvulibre/djvulibrelang-en.nsh b/win32/djvulibre/djvulibrelang-en.nsh
new file mode 100644
index 0000000..891564d
--- /dev/null
+++ b/win32/djvulibre/djvulibrelang-en.nsh
@@ -0,0 +1,21 @@
+;Lang strings EN
+
+LangString DESC_Assoc ${LANG_ENGLISH} "Set DjView as default DjVu viewer"
+LangString DESC_Quick ${LANG_ENGLISH} "Create DjView shortcut in the Quick Launch Bar for the current user"
+LangString DESC_Desk ${LANG_ENGLISH} "Create DjView shortcut on the Desktop"
+LangString secAssoc ${LANG_ENGLISH} "Set DjView as default viewer for DjVu files"
+LangString secQuick ${LANG_ENGLISH} "Create shortcut in the Quick Launch bar"
+LangString secDesk ${LANG_ENGLISH} "Create shortcut on the Desktop"
+LangString Uninst_DIR ${LANG_ENGLISH}  "Uninstall"
+LangString Uninst_LNK ${LANG_ENGLISH} "Completely remove ${PRODUCT_NAME}"
+LangString Doc_DIR ${LANG_ENGLISH} "Help"
+LangString WEB_LNK ${LANG_ENGLISH}  "Visit"
+LangString WebDL_LNK ${LANG_ENGLISH}  "download page"
+LangString Doc_LNK ${LANG_ENGLISH} "Documentation"
+LangString Lic_TXT ${LANG_ENGLISH} "License"
+LangString Uninst_MSG ${LANG_ENGLISH} "Are you sure you want to completely remove $(^Name) and all of its components?"
+LangString UninstSux_MSG ${LANG_ENGLISH} "$(^Name) was successfully removed from your computer."
+LangString Launch_LAB ${LANG_ENGLISH} "Launch DjView"
+LangString Message_AlreadyInstalled ${LANG_ENGLISH} "${PRODUCT_NAME} ${PRODUCT_VERSION} is already installed. Uninstall?"
+LangString Message_OldFound ${LANG_ENGLISH} "${PRODUCT_NAME} older version $COUNT is installed. Uninstall?"
+LangString Message_NewFound ${LANG_ENGLISH} "${PRODUCT_NAME} newer version $COUNT is installed. Uninstall?"
diff --git a/win32/djvulibre/djvulibrelang-ru.nsh b/win32/djvulibre/djvulibrelang-ru.nsh
new file mode 100644
index 0000000..164fafa
--- /dev/null
+++ b/win32/djvulibre/djvulibrelang-ru.nsh
@@ -0,0 +1,23 @@
+;WARNING! This is ANSI Win 1251 codepage file
+;�������������! ��� ��������� ANSI Win 1251
+;Lang strings RU
+
+LangString DESC_Assoc ${LANG_RUSSIAN} "��������� ${PRODUCT_NAME} ���������� �� ��������� ��� djv � djvu"
+LangString DESC_Quick ${LANG_RUSSIAN} "������� ����� DjView �� ������ �������� ������� �������� ������������"
+LangString DESC_Desk ${LANG_RUSSIAN} "������� ����� DjView �� ������� �����"
+LangString secAssoc ${LANG_RUSSIAN} "������������� DjView � ������� DjVu"
+LangString secQuick ${LANG_RUSSIAN} '������� ����� �� ������ "������� ������"'
+LangString secDesk ${LANG_RUSSIAN} "������� ����� �� ������� �����"
+LangString Uninst_DIR ${LANG_RUSSIAN} "��������"
+LangString Uninst_LNK ${LANG_RUSSIAN} "������� ��������� ${PRODUCT_NAME}"
+LangString Doc_DIR ${LANG_RUSSIAN} "����������"
+LangString WEB_LNK ${LANG_RUSSIAN} "���-����"
+LangString WebDL_LNK ${LANG_RUSSIAN} "- �������� ��������"
+LangString Doc_LNK ${LANG_RUSSIAN} "������� "
+LangString Lic_TXT ${LANG_RUSSIAN} "��������"
+LangString Uninst_MSG ${LANG_RUSSIAN} "�� ����� ������ ��������� ������� � ���������� $(^Name)?"
+LangString UninstSux_MSG ${LANG_RUSSIAN} "��������� $(^Name) ������������ �������."
+LangString Launch_LAB ${LANG_RUSSIAN} "��������� DjView"
+LangString Message_AlreadyInstalled ${LANG_RUSSIAN} "${PRODUCT_NAME}  ${PRODUCT_VERSION} ��� ����������. �������?"
+LangString Message_OldFound ${LANG_RUSSIAN} "� ��� ����������� ������ ������ ${PRODUCT_NAME} $COUNT. �������?"
+LangString Message_NewFound ${LANG_RUSSIAN} "� ��� ����������� ����� ����� ������ ${PRODUCT_NAME} $COUNT. �������?"
\ No newline at end of file
diff --git a/win32/djvulibre/djvumake/djvumake.vcxproj b/win32/djvulibre/djvumake/djvumake.vcxproj
new file mode 100644
index 0000000..412a206
--- /dev/null
+++ b/win32/djvulibre/djvumake/djvumake.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{04B14762-9EC2-4A5E-96C8-ACA1C761C962}</ProjectGuid>
+    <RootNamespace>djvumake</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvumake.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvumake/djvumake.vcxproj.filters b/win32/djvulibre/djvumake/djvumake.vcxproj.filters
new file mode 100644
index 0000000..1182198
--- /dev/null
+++ b/win32/djvulibre/djvumake/djvumake.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvumake.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvumake/djvumake.vcxproj.user b/win32/djvulibre/djvumake/djvumake.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvumake/djvumake.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvups/djvups.vcxproj b/win32/djvulibre/djvups/djvups.vcxproj
new file mode 100644
index 0000000..0a89c7b
--- /dev/null
+++ b/win32/djvulibre/djvups/djvups.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1A607E98-957F-4899-A44D-DC4CD40D0AA7}</ProjectGuid>
+    <RootNamespace>djvups</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvups.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvups/djvups.vcxproj.filters b/win32/djvulibre/djvups/djvups.vcxproj.filters
new file mode 100644
index 0000000..31ca36b
--- /dev/null
+++ b/win32/djvulibre/djvups/djvups.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvups.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvups/djvups.vcxproj.user b/win32/djvulibre/djvups/djvups.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvups/djvups.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvused/djvused.vcxproj b/win32/djvulibre/djvused/djvused.vcxproj
new file mode 100644
index 0000000..6571985
--- /dev/null
+++ b/win32/djvulibre/djvused/djvused.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F295916D-980E-4F7C-9C08-EF5A180C81A0}</ProjectGuid>
+    <RootNamespace>djvused</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvused.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvused/djvused.vcxproj.filters b/win32/djvulibre/djvused/djvused.vcxproj.filters
new file mode 100644
index 0000000..474696d
--- /dev/null
+++ b/win32/djvulibre/djvused/djvused.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvused.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvused/djvused.vcxproj.user b/win32/djvulibre/djvused/djvused.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvused/djvused.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuserve/djvuserve.vcxproj b/win32/djvulibre/djvuserve/djvuserve.vcxproj
new file mode 100644
index 0000000..20e3902
--- /dev/null
+++ b/win32/djvulibre/djvuserve/djvuserve.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{08BBD8A2-A87E-4652-84C5-6A5940427843}</ProjectGuid>
+    <RootNamespace>djvuserve</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvuserve.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuserve/djvuserve.vcxproj.filters b/win32/djvulibre/djvuserve/djvuserve.vcxproj.filters
new file mode 100644
index 0000000..46851c8
--- /dev/null
+++ b/win32/djvulibre/djvuserve/djvuserve.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvuserve.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuserve/djvuserve.vcxproj.user b/win32/djvulibre/djvuserve/djvuserve.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvuserve/djvuserve.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvutoxml/djvutoxml.vcxproj b/win32/djvulibre/djvutoxml/djvutoxml.vcxproj
new file mode 100644
index 0000000..0b5ab35
--- /dev/null
+++ b/win32/djvulibre/djvutoxml/djvutoxml.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{923CCB70-AF1E-472C-99F9-E0FF1D657186}</ProjectGuid>
+    <RootNamespace>djvutoxml</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\xmltools\djvutoxml.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvutoxml/djvutoxml.vcxproj.filters b/win32/djvulibre/djvutoxml/djvutoxml.vcxproj.filters
new file mode 100644
index 0000000..a4447b7
--- /dev/null
+++ b/win32/djvulibre/djvutoxml/djvutoxml.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\xmltools\djvutoxml.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvutoxml/djvutoxml.vcxproj.user b/win32/djvulibre/djvutoxml/djvutoxml.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvutoxml/djvutoxml.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvutxt/djvutxt.vcxproj b/win32/djvulibre/djvutxt/djvutxt.vcxproj
new file mode 100644
index 0000000..5630eed
--- /dev/null
+++ b/win32/djvulibre/djvutxt/djvutxt.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CB1E99AD-83FD-4DDD-BCE7-FE16309620BE}</ProjectGuid>
+    <RootNamespace>djvutxt</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvutxt.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvutxt/djvutxt.vcxproj.filters b/win32/djvulibre/djvutxt/djvutxt.vcxproj.filters
new file mode 100644
index 0000000..2d227f9
--- /dev/null
+++ b/win32/djvulibre/djvutxt/djvutxt.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\djvutxt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvutxt/djvutxt.vcxproj.user b/win32/djvulibre/djvutxt/djvutxt.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvutxt/djvutxt.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj b/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj
new file mode 100644
index 0000000..142af9c
--- /dev/null
+++ b/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A8A8B2E9-DEEF-4CD8-8742-D8C1744925F3}</ProjectGuid>
+    <RootNamespace>djvuxmlparser</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\tools.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\xmltools\djvuxmlparser.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libdjvulibre\libdjvulibre.vcxproj">
+      <Project>{aaa67337-aabd-4d04-a3cc-0a7f341f216c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj.filters b/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj.filters
new file mode 100644
index 0000000..51c39fc
--- /dev/null
+++ b/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\xmltools\djvuxmlparser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj.user b/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/djvuxmlparser/djvuxmlparser.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libdjvulibre.props b/win32/djvulibre/libdjvulibre.props
new file mode 100644
index 0000000..4ee28f7
--- /dev/null
+++ b/win32/djvulibre/libdjvulibre.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(JpegRoot);$(JpegDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_NAMESPACES;NEED_JPEG_DECODER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj b/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj
new file mode 100644
index 0000000..ac3427d
--- /dev/null
+++ b/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AAA67337-AABD-4D04-A3CC-0A7F341F216C}</ProjectGuid>
+    <RootNamespace>libdjvulibre</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\libdjvulibre.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\libdjvulibre.props" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>DJVUAPI_EXPORT;DDJVUAPI_EXPORT;MINILISPAPI_EXPORT;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDJVULIBRE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>DJVUAPI_EXPORT;DDJVUAPI_EXPORT;MINILISPAPI_EXPORT;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDJVULIBRE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\libdjvu\Arrays.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\atomic.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\BSByteStream.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\BSEncodeByteStream.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\ByteStream.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DataPool.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\ddjvuapi.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\debug.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVmDir.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVmDir0.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVmDoc.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVmNav.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuAnno.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuDocEditor.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuDocument.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuDumpHelper.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuErrorList.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuFile.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuFileCache.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuGlobal.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuGlobalMemory.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuImage.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuInfo.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuMessage.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuMessageLite.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuNavDir.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuPalette.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuPort.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuText.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\DjVuToPS.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GBitmap.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GContainer.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GException.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GIFFManager.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GMapAreas.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GOS.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GPixmap.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GRect.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GScaler.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GSmartPointer.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GString.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GThreads.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GUnicode.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\GURL.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\IFFByteStream.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\IW44EncodeCodec.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\IW44Image.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\JB2EncodeCodec.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\JB2Image.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\JPEGDecoder.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\miniexp.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\MMRDecoder.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\MMX.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\UnicodeByteStream.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\XMLParser.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\XMLTags.cpp" />
+    <ClCompile Include="..\..\..\libdjvu\ZPCodec.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\libdjvu\Arrays.h" />
+    <ClInclude Include="..\..\..\libdjvu\atomic.h" />
+    <ClInclude Include="..\..\..\libdjvu\BSByteStream.h" />
+    <ClInclude Include="..\..\..\libdjvu\ByteStream.h" />
+    <ClInclude Include="..\..\..\libdjvu\DataPool.h" />
+    <ClInclude Include="..\..\..\libdjvu\ddjvuapi.h" />
+    <ClInclude Include="..\..\..\libdjvu\debug.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVmDir.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVmDir0.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVmDoc.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVmNav.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuAnno.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuDocEditor.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuDocument.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuDumpHelper.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuErrorList.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuFile.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuFileCache.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuGlobal.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuImage.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuInfo.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuMessage.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuMessageLite.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuNavDir.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuPalette.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuPort.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuText.h" />
+    <ClInclude Include="..\..\..\libdjvu\DjVuToPS.h" />
+    <ClInclude Include="..\..\..\libdjvu\GBitmap.h" />
+    <ClInclude Include="..\..\..\libdjvu\GContainer.h" />
+    <ClInclude Include="..\..\..\libdjvu\GException.h" />
+    <ClInclude Include="..\..\..\libdjvu\GIFFManager.h" />
+    <ClInclude Include="..\..\..\libdjvu\GMapAreas.h" />
+    <ClInclude Include="..\..\..\libdjvu\GOS.h" />
+    <ClInclude Include="..\..\..\libdjvu\GPixmap.h" />
+    <ClInclude Include="..\..\..\libdjvu\GRect.h" />
+    <ClInclude Include="..\..\..\libdjvu\GScaler.h" />
+    <ClInclude Include="..\..\..\libdjvu\GSmartPointer.h" />
+    <ClInclude Include="..\..\..\libdjvu\GString.h" />
+    <ClInclude Include="..\..\..\libdjvu\GThreads.h" />
+    <ClInclude Include="..\..\..\libdjvu\GURL.h" />
+    <ClInclude Include="..\..\..\libdjvu\IFFByteStream.h" />
+    <ClInclude Include="..\..\..\libdjvu\IW44Image.h" />
+    <ClInclude Include="..\..\..\libdjvu\JB2Image.h" />
+    <ClInclude Include="..\..\..\libdjvu\JPEGDecoder.h" />
+    <ClInclude Include="..\..\..\libdjvu\miniexp.h" />
+    <ClInclude Include="..\..\..\libdjvu\MMRDecoder.h" />
+    <ClInclude Include="..\..\..\libdjvu\MMX.h" />
+    <ClInclude Include="..\..\..\libdjvu\Template.h" />
+    <ClInclude Include="..\..\..\libdjvu\UnicodeByteStream.h" />
+    <ClInclude Include="..\..\..\libdjvu\XMLParser.h" />
+    <ClInclude Include="..\..\..\libdjvu\XMLTags.h" />
+    <ClInclude Include="..\..\..\libdjvu\ZPCodec.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libjpeg\libjpeg.vcxproj">
+      <Project>{64bb5626-eeb1-443c-904b-c02eefb2dd5d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj.filters b/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj.filters
new file mode 100644
index 0000000..3b6c467
--- /dev/null
+++ b/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj.filters
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\libdjvu\Arrays.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\atomic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\BSByteStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\BSEncodeByteStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\ByteStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DataPool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\ddjvuapi.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\debug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVmDir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVmDir0.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVmDoc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVmNav.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuAnno.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuDocEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuDocument.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuDumpHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuErrorList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuFileCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuGlobal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuGlobalMemory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuImage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuMessage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuMessageLite.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuNavDir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuPalette.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuPort.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuText.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\DjVuToPS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GBitmap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GContainer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GIFFManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GMapAreas.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GOS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GPixmap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GRect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GScaler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GSmartPointer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GThreads.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GUnicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\GURL.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\IFFByteStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\IW44EncodeCodec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\IW44Image.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\JB2EncodeCodec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\JB2Image.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\JPEGDecoder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\miniexp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\MMRDecoder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\MMX.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\UnicodeByteStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\XMLParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\XMLTags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libdjvu\ZPCodec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\libdjvu\Arrays.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\atomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\BSByteStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\ByteStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DataPool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\ddjvuapi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVmDir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVmDir0.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVmDoc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVmNav.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuAnno.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuDocEditor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuDocument.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuDumpHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuErrorList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuFileCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuGlobal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuImage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuMessage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuMessageLite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuNavDir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuPalette.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuPort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuText.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\DjVuToPS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GBitmap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GContainer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GIFFManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GMapAreas.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GOS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GPixmap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GRect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GScaler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GSmartPointer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GThreads.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\GURL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\IFFByteStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\IW44Image.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\JB2Image.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\JPEGDecoder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\miniexp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\MMRDecoder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\MMX.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\Template.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\UnicodeByteStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\XMLParser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\XMLTags.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\libdjvu\ZPCodec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj.user b/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/libdjvulibre/libdjvulibre.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libjpeg/libjpeg.vcxproj b/win32/djvulibre/libjpeg/libjpeg.vcxproj
new file mode 100644
index 0000000..f06b156
--- /dev/null
+++ b/win32/djvulibre/libjpeg/libjpeg.vcxproj
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{64BB5626-EEB1-443C-904B-C02EEFB2DD5D}</ProjectGuid>
+    <RootNamespace>libjpeg</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(JpegRoot);$(JpegLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>$(JpegRoot)\libjpeg.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\jpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>$(JpegRoot)\libjpeg.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcapimin.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcapistd.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jccoefct.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jccolor.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcdctmgr.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jchuff.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcinit.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcmainct.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcmarker.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcmaster.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcomapi.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcparam.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcphuff.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcprepct.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcsample.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jctrans.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdapimin.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdapistd.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdatadst.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdatasrc.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdcoefct.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdcolor.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jddctmgr.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdhuff.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdinput.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmainct.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmarker.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmaster.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmerge.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdphuff.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdpostct.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdsample.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdtrans.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jerror.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jfdctflt.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jfdctfst.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jfdctint.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctflt.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctfst.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctint.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctred.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jmemmgr.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jmemnobs.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jquant1.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jquant2.c" />
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jutils.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\jpeg\libjpeg.def" />
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jchuff.h" />
+    <ClInclude Include="..\..\jpeg\jconfig.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jdct.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jdhuff.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jerror.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jinclude.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jmemsys.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jmorecfg.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jpegint.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jpeglib.h" />
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jversion.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libjpeg/libjpeg.vcxproj.filters b/win32/djvulibre/libjpeg/libjpeg.vcxproj.filters
new file mode 100644
index 0000000..1e519bc
--- /dev/null
+++ b/win32/djvulibre/libjpeg/libjpeg.vcxproj.filters
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcapimin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcapistd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jccoefct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jccolor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcdctmgr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jchuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcinit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcmainct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcmarker.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcmaster.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcomapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcparam.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcphuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcprepct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jcsample.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jctrans.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdapimin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdapistd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdatadst.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdatasrc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdcoefct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdcolor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jddctmgr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdhuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdinput.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmainct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmarker.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmaster.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdmerge.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdphuff.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdpostct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdsample.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jdtrans.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jerror.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jfdctflt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jfdctfst.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jfdctint.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctflt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctfst.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctint.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jidctred.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jmemmgr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jmemnobs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jquant1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jquant2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jpeg\jpeg-6b\jutils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\jpeg\libjpeg.def">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jchuff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jconfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jdct.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jdhuff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jerror.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jinclude.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jmemsys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jmorecfg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jpegint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jpeglib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jpeg\jpeg-6b\jversion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libjpeg/libjpeg.vcxproj.user b/win32/djvulibre/libjpeg/libjpeg.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/libjpeg/libjpeg.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libtiff.props b/win32/djvulibre/libtiff.props
new file mode 100644
index 0000000..8fc0f5c
--- /dev/null
+++ b/win32/djvulibre/libtiff.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ZlibRoot);$(ZlibDir);$(JpegRoot);$(JpegDir);$(TiffRoot);$(TiffDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;JPEG_SUPPORT;ZIP_SUPPORT;EXTRASAMPLE_AS_ALPHA_SUPPORT;CHECK_JPEG_YCBCR_SUBSAMPLING;TIF_PLATFORM_CONSOLE;FILLODER_LSB2MSB;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libtiff/libtiff.vcxproj b/win32/djvulibre/libtiff/libtiff.vcxproj
new file mode 100644
index 0000000..449d964
--- /dev/null
+++ b/win32/djvulibre/libtiff/libtiff.vcxproj
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{629EF023-7766-40C3-82BA-39BDD2235096}</ProjectGuid>
+    <RootNamespace>libtiff</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+    <Import Project="..\libtiff.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+    <Import Project="..\libtiff.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTIFF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>$(TiffDir)\libtiff.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTIFF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>$(TiffDir)\libtiff.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\..\tiff\tiff\libtiff\libtiff.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_aux.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_close.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_codec.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_color.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_compress.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dir.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dirinfo.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dirread.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dirwrite.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dumpmode.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_error.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_extension.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_fax3.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_fax3sm.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_flush.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_getimage.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_jpeg.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_luv.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_lzw.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_next.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_ojpeg.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_open.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_packbits.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_pixarlog.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_predict.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_print.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_read.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_strip.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_swab.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_thunder.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_tile.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_unix.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_version.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_warning.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_write.c" />
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_zip.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\t4.h" />
+    <ClInclude Include="..\..\tiff\tif_config.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tif_dir.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tif_fax3.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tif_predict.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiff.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiffio.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiffiop.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiffvers.h" />
+    <ClInclude Include="..\..\tiff\tiff\libtiff\uvcode.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libjpeg\libjpeg.vcxproj">
+      <Project>{64bb5626-eeb1-443c-904b-c02eefb2dd5d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libz\libz.vcxproj">
+      <Project>{d56b4ffd-8396-43b6-a10e-c0fb04b9bf70}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libtiff/libtiff.vcxproj.filters b/win32/djvulibre/libtiff/libtiff.vcxproj.filters
new file mode 100644
index 0000000..ac874a4
--- /dev/null
+++ b/win32/djvulibre/libtiff/libtiff.vcxproj.filters
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\tiff\tiff\libtiff\libtiff.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_aux.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_close.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_codec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_color.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dir.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dirinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dirread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dirwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_dumpmode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_error.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_extension.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_fax3.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_fax3sm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_flush.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_getimage.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_jpeg.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_luv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_lzw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_next.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_ojpeg.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_open.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_packbits.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_pixarlog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_predict.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_print.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_read.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_strip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_swab.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_thunder.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_tile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_unix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_version.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_warning.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_write.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\tiff\tiff\libtiff\tif_zip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\t4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tif_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tif_dir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tif_fax3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tif_predict.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiffio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiffiop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\tiffvers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\tiff\tiff\libtiff\uvcode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libtiff/libtiff.vcxproj.user b/win32/djvulibre/libtiff/libtiff.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/libtiff/libtiff.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libz/libz.vcxproj b/win32/djvulibre/libz/libz.vcxproj
new file mode 100644
index 0000000..435025f
--- /dev/null
+++ b/win32/djvulibre/libz/libz.vcxproj
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D56B4FFD-8396-43B6-A10E-C0FB04B9BF70}</ProjectGuid>
+    <RootNamespace>libz</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\warnings.props" />
+    <Import Project="..\dirs.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(ZlibRoot);$(ZlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>$(ZlibDir)\win32\zlib.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(ZlibRoot);$(ZlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>$(ZlibDir)\win32\zlib.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\zlib\zlib\adler32.c" />
+    <ClCompile Include="..\..\zlib\zlib\compress.c" />
+    <ClCompile Include="..\..\zlib\zlib\crc32.c" />
+    <ClCompile Include="..\..\zlib\zlib\deflate.c" />
+    <ClCompile Include="..\..\zlib\zlib\gzclose.c" />
+    <ClCompile Include="..\..\zlib\zlib\gzlib.c" />
+    <ClCompile Include="..\..\zlib\zlib\gzread.c" />
+    <ClCompile Include="..\..\zlib\zlib\gzwrite.c" />
+    <ClCompile Include="..\..\zlib\zlib\infback.c" />
+    <ClCompile Include="..\..\zlib\zlib\inffast.c" />
+    <ClCompile Include="..\..\zlib\zlib\inflate.c" />
+    <ClCompile Include="..\..\zlib\zlib\inftrees.c" />
+    <ClCompile Include="..\..\zlib\zlib\trees.c" />
+    <ClCompile Include="..\..\zlib\zlib\uncompr.c" />
+    <ClCompile Include="..\..\zlib\zlib\zutil.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\zlib\zlib\win32\zlib.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\zlib\zlib\crc32.h" />
+    <ClInclude Include="..\..\zlib\zlib\deflate.h" />
+    <ClInclude Include="..\..\zlib\zlib\gzguts.h" />
+    <ClInclude Include="..\..\zlib\zlib\inffast.h" />
+    <ClInclude Include="..\..\zlib\zlib\inffixed.h" />
+    <ClInclude Include="..\..\zlib\zlib\inflate.h" />
+    <ClInclude Include="..\..\zlib\zlib\inftrees.h" />
+    <ClInclude Include="..\..\zlib\zlib\trees.h" />
+    <ClInclude Include="..\..\zlib\zlib\zconf.h" />
+    <ClInclude Include="..\..\zlib\zlib\zlib.h" />
+    <ClInclude Include="..\..\zlib\zlib\zutil.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libz/libz.vcxproj.filters b/win32/djvulibre/libz/libz.vcxproj.filters
new file mode 100644
index 0000000..581d3bd
--- /dev/null
+++ b/win32/djvulibre/libz/libz.vcxproj.filters
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\zlib\zlib\adler32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\compress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\deflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\infback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\inffast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\inflate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\inftrees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\trees.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\uncompr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\zutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\gzclose.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\gzlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\gzread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zlib\zlib\gzwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\zlib\zlib\win32\zlib.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\zlib\zlib\crc32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\deflate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\inffast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\inffixed.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\inflate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\inftrees.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\trees.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\zconf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\zlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\zutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\zlib\zlib\gzguts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/libz/libz.vcxproj.user b/win32/djvulibre/libz/libz.vcxproj.user
new file mode 100644
index 0000000..695b5c7
--- /dev/null
+++ b/win32/djvulibre/libz/libz.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/tools.props b/win32/djvulibre/tools.props
new file mode 100644
index 0000000..349f663
--- /dev/null
+++ b/win32/djvulibre/tools.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(DjVuLibreRoot);$(DjVuLibreRoot)\libdjvu;$(DjVuLibreRoot)\tools;$(TiffRoot);$(TiffDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_NAMESPACES;HAVE_TIFF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link />
+    <Link />
+    <Link>
+      <AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/djvulibre/warnings.props b/win32/djvulibre/warnings.props
new file mode 100644
index 0000000..f104794
--- /dev/null
+++ b/win32/djvulibre/warnings.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DisableSpecificWarnings>4275;4996;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/jpeg/.gitignore b/win32/jpeg/.gitignore
new file mode 100644
index 0000000..f0dc8d2
--- /dev/null
+++ b/win32/jpeg/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.gz
+/*.tar.bz2
+/jpeg-6b/
diff --git a/win32/jpeg/README b/win32/jpeg/README
new file mode 100644
index 0000000..e23eea6
--- /dev/null
+++ b/win32/jpeg/README
@@ -0,0 +1,5 @@
+
+UNPACK THE SOURCE CODE OF LIBJPEG HERE.
+ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz
+
+
diff --git a/win32/jpeg/jconfig.h b/win32/jpeg/jconfig.h
new file mode 100644
index 0000000..7e291c7
--- /dev/null
+++ b/win32/jpeg/jconfig.h
@@ -0,0 +1,45 @@
+/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #define void char */
+/* #define const */
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
+#undef NEED_SHORT_EXTERNAL_NAMES
+#undef INCOMPLETE_TYPES_BROKEN
+
+/* Define "boolean" as unsigned char, not int, per Windows custom */
+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
+
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED		/* BMP image file format */
+#define GIF_SUPPORTED		/* GIF image file format */
+#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED		/* Utah RLE image file format */
+#define TARGA_SUPPORTED		/* Targa image file format */
+
+#define TWO_FILE_COMMANDLINE	/* optional */
+#define USE_SETMODE		/* Microsoft has setmode() */
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+#undef PROGRESS_REPORT		/* optional */
+
+#endif /* JPEG_CJPEG_DJPEG */
diff --git a/win32/jpeg/libjpeg.def b/win32/jpeg/libjpeg.def
new file mode 100644
index 0000000..49a72e2
--- /dev/null
+++ b/win32/jpeg/libjpeg.def
@@ -0,0 +1,52 @@
+LIBRARY
+; jpeg data compression library
+
+EXPORTS
+        jpeg_std_error
+        jpeg_CreateCompress
+        jpeg_CreateDecompress
+        jpeg_destroy_compress
+        jpeg_destroy_decompress
+        jpeg_stdio_dest
+        jpeg_stdio_src
+        jpeg_set_defaults
+        jpeg_set_colorspace
+        jpeg_default_colorspace
+        jpeg_set_quality
+        jpeg_set_linear_quality
+        jpeg_add_quant_table
+        jpeg_quality_scaling
+        jpeg_simple_progression
+        jpeg_suppress_tables
+        jpeg_alloc_quant_table
+        jpeg_alloc_huff_table
+        jpeg_start_compress
+        jpeg_write_scanlines
+        jpeg_finish_compress
+        jpeg_write_raw_data
+        jpeg_write_marker
+        jpeg_write_m_header
+        jpeg_write_m_byte
+        jpeg_write_tables
+        jpeg_read_header
+        jpeg_start_decompress
+        jpeg_read_scanlines
+        jpeg_finish_decompress
+        jpeg_read_raw_data
+        jpeg_has_multiple_scans
+        jpeg_start_output
+        jpeg_finish_output
+        jpeg_input_complete
+        jpeg_new_colormap
+        jpeg_consume_input
+        jpeg_calc_output_dimensions
+        jpeg_save_markers
+        jpeg_set_marker_processor
+        jpeg_read_coefficients
+        jpeg_write_coefficients
+        jpeg_copy_critical_parameters
+        jpeg_abort_compress
+        jpeg_abort_decompress
+        jpeg_abort
+        jpeg_destroy
+        jpeg_resync_to_restart
diff --git a/win32/tiff/.gitignore b/win32/tiff/.gitignore
new file mode 100644
index 0000000..db0f6e8
--- /dev/null
+++ b/win32/tiff/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.gz
+/*.tar.bz2
+/tiff/
diff --git a/win32/tiff/README b/win32/tiff/README
new file mode 100644
index 0000000..59c08ba
--- /dev/null
+++ b/win32/tiff/README
@@ -0,0 +1,4 @@
+UNPACK THE SOURCE CODE OF LIBTIFF HERE.
+ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz
+
+Then rename directory "tiff-3.8.2" AS "tiff"
diff --git a/win32/tiff/tif_config.h b/win32/tiff/tif_config.h
new file mode 100644
index 0000000..98e40fa
--- /dev/null
+++ b/win32/tiff/tif_config.h
@@ -0,0 +1,44 @@
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define as 0 or 1 according to the floating point format suported by the
+   machine */
+#define HAVE_IEEEFP 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <io.h> header file. */
+#define HAVE_IO_H 1
+
+/* Define to 1 if you have the <search.h> header file. */
+#define HAVE_SEARCH_H 1
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* Set the native cpu bit order */
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+# ifndef inline
+#  define inline __inline
+# endif
+#endif
+
+#define lfind _lfind
diff --git a/win32/zlib/.gitignore b/win32/zlib/.gitignore
new file mode 100644
index 0000000..e5aedc5
--- /dev/null
+++ b/win32/zlib/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.gz
+/*.tar.bz2
+/zlib/
diff --git a/win32/zlib/README b/win32/zlib/README
new file mode 100644
index 0000000..951347b
--- /dev/null
+++ b/win32/zlib/README
@@ -0,0 +1,5 @@
+UNPACK THE SOURCE CODE OF ZLIB HERE.
+<http://www.zlib.net/zlib-1.2.5.tar.bz2>
+
+Then rename directory "zlib-1.2.5" AS "zlib"
+
diff --git a/xmltools/Makefile.am b/xmltools/Makefile.am
new file mode 100644
index 0000000..c050883
--- /dev/null
+++ b/xmltools/Makefile.am
@@ -0,0 +1,31 @@
+bin_PROGRAMS = djvutoxml djvuxmlparser
+
+AM_CPPFLAGS = -I$(top_srcdir)/libdjvu -I$(top_srcdir)/tools
+AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
+
+djvutoxml_SOURCES = djvutoxml.cpp
+djvutoxml_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+djvuxmlparser_SOURCES = djvuxmlparser.cpp
+djvuxmlparser_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+
+sed_process = \
+$(SED) \
+-e 's,DATADIR,$(datadir),g' \
+< $< > $@ || rm $@
+
+man_verbose = $(man_verbose_@AM_V@)
+man_verbose_ = $(man_verbose_@AM_DEFAULT_V@)
+man_verbose_0 = @echo "  MAN     " $@;
+
+djvuxml.1: djvuxml.1.in Makefile
+	$(AM_V_at)rm -f $@
+	$(man_verbose)$(sed_process)
+
+dist_man1_MANS = djvutoxml.1 djvuxmlparser.1
+man1_MANS = djvuxml.1
+
+EXTRA_DIST = djvuxml.1.in
+
+MOSTLYCLEANFILES = djvuxml.1
diff --git a/xmltools/Makefile.in b/xmltools/Makefile.in
new file mode 100644
index 0000000..e51683d
--- /dev/null
+++ b/xmltools/Makefile.in
@@ -0,0 +1,743 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = djvutoxml$(EXEEXT) djvuxmlparser$(EXEEXT)
+subdir = xmltools
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/config/depcomp $(dist_man1_MANS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/acinclude.m4 \
+	$(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 \
+	$(top_srcdir)/config/pkg.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_djvutoxml_OBJECTS = djvutoxml.$(OBJEXT)
+djvutoxml_OBJECTS = $(am_djvutoxml_OBJECTS)
+am__DEPENDENCIES_1 =
+djvutoxml_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_djvuxmlparser_OBJECTS = djvuxmlparser.$(OBJEXT)
+djvuxmlparser_OBJECTS = $(am_djvuxmlparser_OBJECTS)
+djvuxmlparser_DEPENDENCIES = $(DJLIB) $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(djvutoxml_SOURCES) $(djvuxmlparser_SOURCES)
+DIST_SOURCES = $(djvutoxml_SOURCES) $(djvuxmlparser_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(dist_man1_MANS) $(man1_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CONVERT = @CONVERT@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INKSCAPE = @INKSCAPE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JPEG_CFLAGS = @JPEG_CFLAGS@
+JPEG_LIBS = @JPEG_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+RM = @RM@
+RSVG = @RSVG@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TIFF_CFLAGS = @TIFF_CFLAGS@
+TIFF_LIBS = @TIFF_LIBS@
+TOUCH = @TOUCH@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+version_info = @version_info@
+AM_CPPFLAGS = -I$(top_srcdir)/libdjvu -I$(top_srcdir)/tools
+AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
+djvutoxml_SOURCES = djvutoxml.cpp
+djvutoxml_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+djvuxmlparser_SOURCES = djvuxmlparser.cpp
+djvuxmlparser_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+sed_process = \
+$(SED) \
+-e 's,DATADIR,$(datadir),g' \
+< $< > $@ || rm $@
+
+man_verbose = $(man_verbose_@AM_V@)
+man_verbose_ = $(man_verbose_@AM_DEFAULT_V@)
+man_verbose_0 = @echo "  MAN     " $@;
+dist_man1_MANS = djvutoxml.1 djvuxmlparser.1
+man1_MANS = djvuxml.1
+EXTRA_DIST = djvuxml.1.in
+MOSTLYCLEANFILES = djvuxml.1
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xmltools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu xmltools/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+djvutoxml$(EXEEXT): $(djvutoxml_OBJECTS) $(djvutoxml_DEPENDENCIES) $(EXTRA_djvutoxml_DEPENDENCIES) 
+	@rm -f djvutoxml$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvutoxml_OBJECTS) $(djvutoxml_LDADD) $(LIBS)
+
+djvuxmlparser$(EXEEXT): $(djvuxmlparser_OBJECTS) $(djvuxmlparser_DEPENDENCIES) $(EXTRA_djvuxmlparser_DEPENDENCIES) 
+	@rm -f djvuxmlparser$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(djvuxmlparser_OBJECTS) $(djvuxmlparser_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvutoxml.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/djvuxmlparser.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(dist_man1_MANS) $(man1_MANS)
+	@$(NORMAL_INSTALL)
+	@list1='$(dist_man1_MANS) $(man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_man1_MANS) $(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-man
+
+uninstall-man: uninstall-man1
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-man uninstall-man1
+
+
+djvuxml.1: djvuxml.1.in Makefile
+	$(AM_V_at)rm -f $@
+	$(man_verbose)$(sed_process)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xmltools/djvutoxml.1 b/xmltools/djvutoxml.1
new file mode 100644
index 0000000..6f6d9c3
--- /dev/null
+++ b/xmltools/djvutoxml.1
@@ -0,0 +1 @@
+.so man1/djvuxml.1
diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp
new file mode 100644
index 0000000..2489b03
--- /dev/null
+++ b/xmltools/djvutoxml.cpp
@@ -0,0 +1,213 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "DjVuDocument.h"
+#include "GOS.h"
+#include "DjVuMessage.h"
+#include "ByteStream.h"
+#include "DjVuAnno.h"
+#include "DjVuText.h"
+#include "DjVuImage.h"
+#include "debug.h"
+
+#include "common.h"
+#include <sys/stat.h>
+#include <assert.h>
+#include <ctype.h>
+
+static void
+usage(void)
+{
+  DjVuPrintErrorUTF8("Usage: %s [options] <inputfile> <outputfile>\n"
+                     "Options:\n"
+                     "  --with[out]-anno\n"
+                     "  --with[out]-text\n"
+                     "  --page p\n",
+                     (const char *)GOS::basename(DjVuMessage::programname()));
+}
+
+//------------------------ implementation ------------------------
+int
+main(int argc, char * argv[], char *env[])
+{
+  DJVU_LOCALE;
+  GArray<GUTF8String> dargv(0,argc-1);
+  for(int i=0;i<argc;++i)
+    dargv[i]=GNativeString(argv[i]);
+
+  G_TRY
+  {
+      GUTF8String name_in, name_out;
+      int notext = -1;
+      int noanno = -1;
+      int page_num = -1;
+      
+      for(int i=1;i<argc;i++)
+      {
+        GUTF8String arg(dargv[i]);
+        if (arg == "-" || arg[0] != '-' || arg[1] != '-')
+        {
+          if (!name_in.length())
+          {
+            if (arg == "-")
+            {
+              DjVuMessage::perror( ERR_MSG("DjVuToXML.std_read") );
+              usage();
+              exit(1);
+            }
+            name_in=arg;
+          } 
+          else if (!name_out.length())
+          {
+            name_out=arg;
+          }
+          else
+          {
+            usage();
+            exit(1);
+          }
+        }
+        else if (arg == "--page")
+        {
+          if (i+1>=argc)
+            {
+              DjVuMessage::perror( ERR_MSG("DjVuToXML.no_num") );
+              usage();
+              exit(1);
+            }
+          i++;
+          page_num=dargv[i].toInt() - 1;
+          if (page_num<0)
+            {
+              DjVuMessage::perror( ERR_MSG("DjVuToXML.negative_num") );
+              usage();
+              exit(1);
+            }
+        }
+        else if(arg == "--with-text")
+        {
+          notext=0;
+          if(noanno<0)
+            noanno=1;
+        }
+        else if(arg == "--without-text")
+        {
+          notext=1;
+          if(noanno<0)
+            noanno=0;
+        }
+        else if(arg == "--with-anno")
+        {
+          noanno=0;
+          if(notext<0)
+            notext=1;
+        }
+        else if(arg == "--without-anno")
+        {
+          noanno=1;
+          if(notext<0)
+            notext=0;
+        }
+        else if (arg == "--help")
+        {
+          usage();
+          exit(1);
+        } 
+        else
+        {
+          DjVuMessage::perror( ERR_MSG("DjVuToXML.unrecog_opt") "\t"+arg);
+        }
+      }
+      
+      if (!name_in.length())
+      {
+        DjVuMessage::perror( ERR_MSG("DjVuToXML.no_name") );
+        usage();
+        exit(1);
+      }
+      if (!name_out.length())
+      {
+        name_out="-";
+      }
+      
+      GP<DjVuDocument> doc = 
+        DjVuDocument::create_wait(GURL::Filename::UTF8(name_in));
+
+      GP<ByteStream> gstr_out = 
+        ByteStream::create(GURL::Filename::UTF8(name_out), "w");
+
+      int flags=0;
+      if(noanno > 0)
+        flags |= DjVuImage::NOMAP;
+      if(notext > 0)
+        flags |= DjVuImage::NOTEXT;
+      doc->writeDjVuXML(gstr_out,flags, page_num);
+  }
+  G_CATCH(exc)
+  {
+    exc.perror();
+    exit(1);
+  }
+  G_ENDCATCH;
+  return 0;
+}
+
diff --git a/xmltools/djvuxml.1.in b/xmltools/djvuxml.1.in
new file mode 100644
index 0000000..bb3eb5e
--- /dev/null
+++ b/xmltools/djvuxml.1.in
@@ -0,0 +1,295 @@
+.\" Copyright (c) 2002 Bill C. Riemers
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" GNU General Public License, either Version 2 of the license,
+.\" or (at your option) any later version. The license should have
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual. Otherwise check the web site
+.\" of the Free Software Foundation at http://www.fsf.org.
+.\"
+.\" I, Bill C. Riemers, hereby grant all rights to this code,
+.\" provided usage complies with the GPL or a written exception to 
+.\" the GPL granted by any of Bill C. Riemers, Leon Bottou, 
+.\" Yann Le Cun, or the Free Source Foundation.
+.\"
+.\" ------------------------------------------------------------------
+.\" DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+.\" Lizardtech Software.  Lizardtech Software has authorized us to
+.\" replace the original DjVu(r) Reference Library notice by the following
+.\" text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+.\"
+.\"  ------------------------------------------------------------------
+.\" | DjVu (r) Reference Library (v. 3.5)
+.\" | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+.\" | The DjVu Reference Library is protected by U.S. Pat. No.
+.\" | 6,058,214 and patents pending.
+.\" |
+.\" | This software is subject to, and may be distributed under, the
+.\" | GNU General Public License, either Version 2 of the license,
+.\" | or (at your option) any later version. The license should have
+.\" | accompanied the software or you may obtain a copy of the license
+.\" | from the Free Software Foundation at http://www.fsf.org .
+.\" |
+.\" | The computer code originally released by LizardTech under this
+.\" | license and unmodified by other parties is deemed "the LIZARDTECH
+.\" | ORIGINAL CODE."  Subject to any third party intellectual property
+.\" | claims, LizardTech grants recipient a worldwide, royalty-free, 
+.\" | non-exclusive license to make, use, sell, or otherwise dispose of 
+.\" | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+.\" | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+.\" | General Public License.   This grant only confers the right to 
+.\" | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+.\" | the extent such infringement is reasonably necessary to enable 
+.\" | recipient to make, have made, practice, sell, or otherwise dispose 
+.\" | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+.\" | any greater extent that may be necessary to utilize further 
+.\" | modifications or combinations.
+.\" |
+.\" | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+.\" | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+.\" | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+.\" | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+.\" +------------------------------------------------------------------
+.TH DJVUXML 1 "11/15/2002" "DjVuLibre XML Tools" "DjVuLibre XML Tools"
+.de SS
+.SH \\0\\0\\0\\$*
+..
+.SH NAME
+djvutoxml, djvuxmlparser \- DjVuLibre XML Tools.
+
+.SH SYNOPSIS
+.BI "djvutoxml [" options "] " inputdjvufile " [" outputxmlfile "]"
+.br
+.BI "djvuxmlparser [ -o " djvufile " ] " inputxmlfile 
+
+
+.SH DESCRIPTION
+The DjVuLibre XML Tools provide for editing the
+metadata, hyperlinks and hidden text 
+associated with DjVu files.  Unlike 
+.BR djvused (1)
+the DjVuLibre XML Tools rely on the XML technology
+and can take advantage of XML editors and verifiers.
+
+.SH DJVUTOXML
+Program
+.B djvutoxml
+creates a XML file
+.I outputxmlfile
+containing a reference to the original DjVu document
+.I inputdjvufile
+as well as tags describing the metadata,
+hyperlinks, and hidden text associated with the DjVu file.
+
+The following options are supported:
+.TP
+.BI "--page " "pagenum"
+Select a page in a multi-page document.
+Without this option, 
+.B djvutoxml
+outputs the XML 
+corresponding to all pages of the document.
+.TP 
+.BI "--with-text"
+Specifies the 
+.B HIDDENTEXT 
+element for each page should be included in the output.  
+If specified without the
+.B --with-anno
+flag then the
+.B --without-anno 
+is implied.  If none of the  
+.B --with-text, 
+.B --without-text, 
+.B --with-anno, 
+or
+.B --without-anno, 
+flags are specified, then the  
+.B --with-text 
+and 
+.B --with-anno 
+flags are implied.
+.TP
+.BI "--without-text"
+Specifies not to output the 
+.B HIDDENTEXT 
+element for each page.  If specified without the 
+.B --without-anno 
+flag then the 
+.B --with-anno 
+flag is implied.
+.TP
+.BI "--with-anno"
+Specifies the area 
+.B MAP 
+element for each page should be included in the output.  
+If specified without the
+.B --with-text 
+flag then the
+.B --without-text 
+flag is implied.
+.TP
+.BI "--without-anno"
+Specifies the area 
+.B MAP 
+element for each page should not be included in the output.  
+If specified without the
+.B --without-text 
+flag then the
+.B --with-text 
+flag is implied.
+
+
+.SH DJVUXMLPARSER
+
+Files produced by 
+.B djvutoxml
+can then be modified using 
+either a text editor or a XML editor.
+Program
+.B djvuxmlparser
+parses the XML file 
+.I inputxmlfile
+in order to modify the metadata of the corresponding DjVu file.
+.TP
+.BI "-o " "djvufile"
+In principle the target DjVu file is the file 
+referenced by the
+.I OBJECT 
+element of the XML file. 
+This option provides the means to override the filename
+specified in the 
+.I OBJECT
+element.
+
+.SH DJVUXML DOCUMENT TYPE DEFINITION
+The document type definition file (DTD)
+.IP "" 2
+.B DATADIR/djvu/pubtext/DjVuXML-s.dtd
+.PP
+defines the input and output of the DjVu XML tools.
+
+The DjVuXML-s DTD is a simplification of the HTML DTD:
+.IP "" 2
+.B \%http://www.w3c.org/TR/1998/REC-html40-19980424/sgml/dtd.html
+.PP
+with a few new attributes added specific to DjVu.  Each of the 
+specified pages of a DjVu document are represented as 
+.B OBJECT 
+elements within the 
+.B BODY 
+element of the XML file. 
+Each 
+.B OBJECT
+element may contain multiple 
+.B PARAM 
+elements to specify attributes like page name,
+resolution,
+and gamma factor.
+Each 
+.B OBJECT
+element may also contain one
+.B HIDDENTTEXT
+element to specify the hidden text (usually generated with an OCR engine) 
+within the DjVu page.  In addition each 
+.B OBJECT
+element may reference a single area 
+.B MAP
+element which contains multiple
+.B AREA
+elements to represent all the hyperlink and highlight areas within 
+the DjVu document.
+
+.SS PARAM Elements
+Legal 
+.B PARAM 
+elements of a DjVu 
+.B OBJECT 
+include but are not limited to
+.B PAGE
+for specifying the page-name,
+.B GAMMA
+for specifying the gamma correction factor (normally 2.2), and
+.B DPI
+for specifying the page resolution.
+
+.SS HIDDENTEXT Elements
+The 
+.B HIDDENTEXT
+elements consists of nested elements of 
+.B PAGECOLUMNS,
+.B REGION,
+.B PARAGRAPH,
+.B LINE,
+and
+.B WORD.
+The most deeply nested element specified, should specify the bounding 
+coordinates of the element in top-down orientation.  The body of the 
+most deeply nested element should contain the text.  Most DjVu 
+documents use either 
+.B LINE 
+or 
+.B WORD 
+as the lowest level element, but any element is legal as the lowest 
+level element.  A white space is always added between 
+.B WORD
+elements and a line feed is always added between
+.B LINE
+elements.  Since languages such as Japanese do not use spaces between 
+words, it is quite common for Asian OCR engines to use
+.B WORD
+as characters instead.
+
+.SS MAP Elements
+The body of the 
+.B MAP
+elements consist of 
+.B AREA
+elements.  In addition to the attributes listed in
+.IP "" 2
+.BR \%http://www.w3.org/TR/1998/REC-html40-19980424/struct/objects.html#edef-AREA ,
+.PP
+the attributes
+.BR bordertype ,
+.BR bordercolor ,
+.BR border ,
+and 
+.B highlight
+have been added to specify border type, border color, border width, and 
+highlight colors respectively.  Legal values for each of these attributes 
+are listed in the DjVuXML-s DTD.
+In addition, the shape
+.B oval
+has been added to the legal list of shapes.  An oval uses a rectangular 
+bounding box.
+
+.SH BUGS
+Perhaps it would have been better to use CC2 style sheets 
+with standard HTML elements instead of defining the 
+.B HIDDENTEXT 
+element.
+
+.SH CREDITS
+The DjVu XML tools and DTD were written
+by Bill C. Riemers <docbill@sourceforge.net> 
+and Fred Crary.
+
+.SH SEE ALSO
+.BR djvu (1),
+.BR djvused (1),
+and
+.BR utf8 (7).
diff --git a/xmltools/djvuxmlparser.1 b/xmltools/djvuxmlparser.1
new file mode 100644
index 0000000..6f6d9c3
--- /dev/null
+++ b/xmltools/djvuxmlparser.1
@@ -0,0 +1 @@
+.so man1/djvuxml.1
diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp
new file mode 100644
index 0000000..030fe4c
--- /dev/null
+++ b/xmltools/djvuxmlparser.cpp
@@ -0,0 +1,130 @@
+//C-  -*- C++ -*-
+//C- -------------------------------------------------------------------
+//C- DjVuLibre-3.5
+//C- Copyright (c) 2002  Leon Bottou and Yann Le Cun.
+//C- Copyright (c) 2001  AT&T
+//C-
+//C- This software is subject to, and may be distributed under, the
+//C- GNU General Public License, either Version 2 of the license,
+//C- or (at your option) any later version. The license should have
+//C- accompanied the software or you may obtain a copy of the license
+//C- from the Free Software Foundation at http://www.fsf.org .
+//C-
+//C- This program is distributed in the hope that it will be useful,
+//C- but WITHOUT ANY WARRANTY; without even the implied warranty of
+//C- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//C- GNU General Public License for more details.
+//C- 
+//C- DjVuLibre-3.5 is derived from the DjVu(r) Reference Library from
+//C- Lizardtech Software.  Lizardtech Software has authorized us to
+//C- replace the original DjVu(r) Reference Library notice by the following
+//C- text (see doc/lizard2002.djvu and doc/lizardtech2007.djvu):
+//C-
+//C-  ------------------------------------------------------------------
+//C- | DjVu (r) Reference Library (v. 3.5)
+//C- | Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
+//C- | The DjVu Reference Library is protected by U.S. Pat. No.
+//C- | 6,058,214 and patents pending.
+//C- |
+//C- | This software is subject to, and may be distributed under, the
+//C- | GNU General Public License, either Version 2 of the license,
+//C- | or (at your option) any later version. The license should have
+//C- | accompanied the software or you may obtain a copy of the license
+//C- | from the Free Software Foundation at http://www.fsf.org .
+//C- |
+//C- | The computer code originally released by LizardTech under this
+//C- | license and unmodified by other parties is deemed "the LIZARDTECH
+//C- | ORIGINAL CODE."  Subject to any third party intellectual property
+//C- | claims, LizardTech grants recipient a worldwide, royalty-free, 
+//C- | non-exclusive license to make, use, sell, or otherwise dispose of 
+//C- | the LIZARDTECH ORIGINAL CODE or of programs derived from the 
+//C- | LIZARDTECH ORIGINAL CODE in compliance with the terms of the GNU 
+//C- | General Public License.   This grant only confers the right to 
+//C- | infringe patent claims underlying the LIZARDTECH ORIGINAL CODE to 
+//C- | the extent such infringement is reasonably necessary to enable 
+//C- | recipient to make, have made, practice, sell, or otherwise dispose 
+//C- | of the LIZARDTECH ORIGINAL CODE (or portions thereof) and not to 
+//C- | any greater extent that may be necessary to utilize further 
+//C- | modifications or combinations.
+//C- |
+//C- | The LIZARDTECH ORIGINAL CODE is provided "AS IS" WITHOUT WARRANTY
+//C- | OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+//C- | TO ANY WARRANTY OF NON-INFRINGEMENT, OR ANY IMPLIED WARRANTY OF
+//C- | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+//C- +------------------------------------------------------------------
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if NEED_GNUG_PRAGMAS
+# pragma implementation
+#endif
+
+#include "XMLParser.h"
+#include "XMLTags.h"
+#include "GOS.h"
+#include "GURL.h"
+#include "DjVuDocument.h"
+#include "ByteStream.h"
+#include "DjVuMessage.h"
+#include "common.h"
+
+static void 
+usage(char *argv0)
+{
+  DjVuPrintErrorUTF8("Usage: %s [-o <djvufile>] <xmlfile> ...\n", argv0);
+  exit(1);
+}
+
+static void 
+nofile(char *s)
+{
+  DjVuPrintErrorUTF8("Error: File '%s' does not exist.\n",s);
+  exit(1);
+}
+
+int 
+main(int argc,char *argv[],char *[])
+{
+  DJVU_LOCALE;
+  G_TRY
+    {
+      int i;
+      if (argc < 2)
+        usage(argv[0]);
+      for (i=1; i<argc; i++)
+        {
+          GURL djvufile;
+          GURL *pdjvufile = 0;
+          if (! strcmp(argv[i], "-o"))
+            {
+              if (++i >= argc) 
+                usage(argv[0]);
+              djvufile = GURL::Filename::Native(argv[i]);
+              pdjvufile = &djvufile;
+              if (! djvufile.is_file())
+                nofile(argv[i]);
+              if (++i >= argc) 
+                usage(argv[0]);
+            }
+          GURL xmlfile = GURL::Filename::Native(argv[i]);
+          if (! xmlfile.is_file())
+            nofile(argv[i]);
+          GP<lt_XMLParser> parser(lt_XMLParser::create());
+          GP<lt_XMLTags> tag(lt_XMLTags::create(xmlfile));
+          parser->parse(*tag, pdjvufile);
+          parser->save();
+        }
+    }
+  G_CATCH(ex)
+    {
+      ex.perror();
+      exit(1);
+    }
+  G_ENDCATCH;
+  exit(0);
+#ifdef _WIN32
+  return 0;
+#endif
+}
+