Initial commit of libpict based on libwpg

57 files changed, 9107 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..658cd00
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,5 @@
+CREDITS
+
+Current maintainer and author of libpict
+---------------------------------------------
+Fridrich Strba (fridrich.strba@bluewin.ch)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..bf50f20
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,482 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 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.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, 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 library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, 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 companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, 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 library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+  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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+  If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  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.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+  9. 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 Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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.
+
+  11. 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 Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  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 library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; 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.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..4b48d33
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,30 @@
+pkgconfdir = $(libdir)/pkgconfig
+
+pkgconf_DATA = libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.pc
+
+SUBDIRS = src build docs
+
+EXTRA_DIST = \
+	AUTHORS \
+	COPYING \
+	NEWS \
+	README \
+	autogen.sh \
+	libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.pc.in \
+	libpict-zip.in \
+	libpict.spec \
+	libpict.spec.in
+
+distclean-local:
+	rm -rf *.cache *~
+
+rpm: dist
+	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+	@rm -f $(PACKAGE)-$(VERSION).tar.gz
+
+zip: all install
+	sh libpict-zip 
+
+dist-hook:
+	git log --date=short --pretty="format:@%cd  %an  <%ae>  [%H]%n%n%s%n%n%e%b" | sed -e "s|^\([^@]\)|\t\1|" -e "s|^@||" >$(distdir)/ChangeLog
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/NEWS
@@ -0,0 +1 @@
+ 
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/README
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..779036c
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+TESTLIBTOOLIZE="glibtoolize libtoolize"
+
+LIBTOOLIZEFOUND="0"
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+aclocal --version > /dev/null 2> /dev/null || {
+    echo "error: aclocal not found"
+    exit 1
+}
+automake --version > /dev/null 2> /dev/null || {
+    echo "error: automake not found"
+    exit 1
+}
+
+for i in $TESTLIBTOOLIZE; do
+	if which $i > /dev/null 2>&1; then
+		LIBTOOLIZE=$i
+		LIBTOOLIZEFOUND="1"
+		break
+	fi
+done
+
+if [ "$LIBTOOLIZEFOUND" = "0" ]; then
+	echo "$0: need libtoolize tool to build writerperfect" >&2
+	exit 1
+fi
+
+amcheck=`automake --version | grep 'automake (GNU automake) 1.5'`
+if test "x$amcheck" = "xautomake (GNU automake) 1.5"; then
+    echo "warning: you appear to be using automake 1.5"
+    echo "         this version has a bug - GNUmakefile.am dependencies are not generated"
+fi
+
+rm -rf autom4te*.cache
+
+$LIBTOOLIZE --force --copy || {
+    echo "error: libtoolize failed"
+    exit 1
+}
+aclocal $ACLOCAL_FLAGS || {
+    echo "error: aclocal $ACLOCAL_FLAGS failed"
+    exit 1
+}
+autoheader || {
+    echo "error: autoheader failed"
+    exit 1
+}
+automake -a -c --foreign || {
+    echo "warning: automake failed"
+}
+autoconf || {
+    echo "error: autoconf failed"
+    exit 1
+}
diff --git a/build/Makefile.am b/build/Makefile.am
new file mode 100644
index 0000000..18adc92
--- /dev/null
+++ b/build/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = \
+	win32
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
new file mode 100644
index 0000000..7b5b1f5
--- /dev/null
+++ b/build/win32/Makefile.am
@@ -0,0 +1,7 @@
+EXTRA_DIST = \
+	libpict.dsw \
+	libpict.dsp \
+	pict2raw.dsp \
+	pict2svg.dsp \
+	compile-resource \
+	lt-compile-resource
diff --git a/build/win32/compile-resource b/build/win32/compile-resource
new file mode 100755
index 0000000..6a37565
--- /dev/null
+++ b/build/win32/compile-resource
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Script to compile a resource file for a DLL if there is a .rc file
+# for it. The resource source file is supposed to contain a version
+# info section, that uses the string BUILDNUMBER as the least
+# significant part of the version numbers. This script replaces that
+# string with a "build number" before compiling the binary resource
+# file. The build number is kept between builds in a "stamp" file, and
+# incremented each time. (If there is no stamp file, build number 0 is
+# used.) The intention is that only the "official" maintainer of a DLL
+# keeps such a stamp file, and thus the DLLs he releases have
+# increasing version number resources, which can be used by an
+# installer program to decide whether to replace an existing DLL with
+# the same name.
+
+# This is just my (tml@iki.fi) idea, if somebody comes up with a
+# better way to generate version number resources, don't hesitate to
+# suggest.
+
+# The command line arguments are:
+# $1: the name of the .rc file to check
+# $2: the name of the resource object file to produce, if the rc file exists
+
+# Check if we have a resource file for this DLL.
+rcfile=$1
+resfile=$2
+if [ -f $rcfile ]; then
+    # Check if we have a build number stamp file.
+    basename=`basename $rcfile .rc`
+    if [ -f $basename-build.stamp ]; then
+	read number <$basename-build.stamp
+	buildnumber=$[number]
+	echo Build number $buildnumber
+	rm -rf $basename-build.stamp
+    else
+	echo Using zero as build number
+        buildnumber=0
+    fi
+
+    m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc &&
+	${WINDRES-windres} $$.rc $resfile &&
+	rm $$.rc
+else
+    # Return failure
+    exit 1
+fi
diff --git a/build/win32/libpict.dsp b/build/win32/libpict.dsp
new file mode 100644
index 0000000..95022ce
--- /dev/null
+++ b/build/win32/libpict.dsp
@@ -0,0 +1,242 @@
+# Microsoft Developer Studio Project File - Name="libpict" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=libpict - Win32 Release

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "libpict.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "libpict.mak" CFG="libpict - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "libpict - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "libpict - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "libpict - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"Release\lib\libpict-0.2.lib"

+

+!ELSEIF  "$(CFG)" == "libpict - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /GR /GX /ZI /Od /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_LIB" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"Debug\lib\libpict-0.2.lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "libpict - Win32 Release"

+# Name "libpict - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=..\..\src\lib\Pict1Parser.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\Pict2Parser.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictBinaryData.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictBitmap.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictBrush.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictColor.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictGradient.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictHeader.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictInternalStream.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictPath.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictPen.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictPoint.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictImage.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictRect.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictString.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictSVGGenerator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictXParser.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=..\..\src\lib\libpict.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\libpict_utils.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\Pict1Parser.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\Pict2Parser.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictBinaryData.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictBitmap.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictBrush.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictColor.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictGradient.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictHeader.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictInternalStream.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictPaintInterface.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictPath.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictPen.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictPoint.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictImage.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictRect.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictString.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictSVGGenerator.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\src\lib\PictXParser.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/build/win32/libpict.dsw b/build/win32/libpict.dsw
new file mode 100644
index 0000000..18d4643
--- /dev/null
+++ b/build/win32/libpict.dsw
@@ -0,0 +1,57 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "libpict"=.\libpict.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "pict2svg"=.\pict2svg.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name libpict

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "pict2raw"=.\pict2raw.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name libpict

+    End Project Dependency

+}}}

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/build/win32/lt-compile-resource b/build/win32/lt-compile-resource
new file mode 100755
index 0000000..aeddb44
--- /dev/null
+++ b/build/win32/lt-compile-resource
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Script to compile a resource file for a DLL in the same way that
+# libtool would, if it knew about .rc files.
+
+# This kinda sucks, but the alternative would be to teach autoconf,
+# automake, and libtool about compiling .rc files.  That would be
+# doable, but waiting for those changes to propagate to official
+# versions of those tools would take some time.
+
+# The command line arguments are:
+# $1: the name of the .rc file to compile if it exists
+# $2: the name of the resource libtool object file to produce
+
+rcfile=$1
+lo=$2
+case "$lo" in
+*.lo) 
+    resfile=.libs/`basename $lo .lo`.o
+    ;;
+*)
+    echo libtool object name should end with .lo
+    exit 1
+    ;;
+esac
+d=`dirname $0`
+
+# Create .libs if not there already
+[ ! -d .libs ] && mkdir .libs
+
+# Super-ugly hack: libtool can work in two ways on Win32: Either it
+# uses .lo files which are the real object files in "this" directory,
+# or it creates .o files in the .libs subdirectory, and the .lo file
+# is a small text file. We try to deduce which case this is by
+# checking if there are any .o files in .libs. This requires that the
+# resource file gets built last in the Makefile.
+
+o_files_in_dotlibs=`echo .libs/*.o`
+case "$o_files_in_dotlibs" in
+    .libs/\*.o)
+	use_script=false
+	;;
+    *)  use_script=true
+	;;
+esac
+
+# Another way of working of libtool: When compiling with --enable-static and
+# --disable-shared options, the .lo file can be still a small text file, and
+# the .o files are created in the same directory as the .lo files.
+
+o_files_in_dot=`echo ./*.o`
+case "$o_files_in_dot" in
+    ./\*.o)
+    	use_script=$use_script
+    	;;
+    *)	use_script=true
+    	;;
+esac    	
+
+# Try to compile resource file
+$d/compile-resource $rcfile $resfile && {
+    if [ $use_script = true ]; then
+	# Handcraft a libtool object
+	# libtool checks for a second line matching "Generated by .* libtool"!
+	(echo "# $lo"
+	echo "# Generated by lt-compile-resource, compatible with libtool"
+	echo "pic_object=$resfile"
+	echo "non_pic_object=none") >$lo
+    else
+	mv $resfile $lo
+    fi
+    # Success
+    exit 0
+}
+
+# If unsuccessful (no .rc file, or some error in it) return failure
+
+exit 1
diff --git a/build/win32/pict2raw.dsp b/build/win32/pict2raw.dsp
new file mode 100644
index 0000000..ce636c6
--- /dev/null
+++ b/build/win32/pict2raw.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="pict2raw" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=pict2raw - Win32 Release

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "pict2raw.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "pict2raw.mak" CFG="pict2raw - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "pict2raw - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "pict2raw - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "pict2raw - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD BASE MTL /nologo /win32

+# ADD MTL /nologo /win32

+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

+# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libpict-0.2.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pict2raw.exe" /libpath:"Release\lib"

+# ADD LINK32 libpict-0.2.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pict2raw.exe" /libpath:"Release\lib"

+# SUBTRACT LINK32 /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "pict2raw - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD BASE MTL /nologo /win32

+# ADD MTL /nologo /win32

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "\..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c

+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libpict-0.2.lib libwpd-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pict2raw.exe" /libpath:"Debug\lib"

+# ADD LINK32 libpict-0.2.lib libwpd-stream-0.9.lib kernel32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pict2raw.exe" /libpath:"Debug\lib"

+# SUBTRACT LINK32 /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "pict2raw - Win32 Release"

+# Name "pict2raw - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+# Begin Source File

+

+SOURCE=..\..\src\conv\raw\pict2raw.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/build/win32/pict2svg.dsp b/build/win32/pict2svg.dsp
new file mode 100644
index 0000000..0acc734
--- /dev/null
+++ b/build/win32/pict2svg.dsp
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="pict2svg" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=pict2svg - Win32 Release

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "pict2svg.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "pict2svg.mak" CFG="pict2svg - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "pict2svg - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "pict2svg - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "pict2svg - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD BASE MTL /nologo /win32

+# ADD MTL /nologo /win32

+# ADD BASE CPP /nologo /MT /W3 /GX /Zi /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c

+# ADD CPP /nologo /MT /W3 /GX /I "..\..\src\lib" /I "libwpd-0.9" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libpict-0.2.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pict2svg.exe" /libpath:"Release\lib"

+# ADD LINK32 libpict-0.2.lib libwpd-stream-0.9.lib /nologo /subsystem:console /machine:IX86 /out:"Release\bin\pict2svg.exe" /libpath:"Release\lib"

+# SUBTRACT LINK32 /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "pict2svg - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+MTL=midl.exe

+# ADD BASE MTL /nologo /win32

+# ADD MTL /nologo /win32

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /GZ /c

+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "..\..\src\lib" /I "libwpd-0.9" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /GZ /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 libpict-0.2.lib libwpd-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pict2svg.exe" /libpath:"Debug\lib"

+# ADD LINK32 libpict-0.2.lib libwpd-stream-0.9.lib /nologo /subsystem:console /debug /machine:IX86 /out:"Debug\bin\pict2svg.exe" /libpath:"Debug\lib"

+# SUBTRACT LINK32 /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "pict2svg - Win32 Release"

+# Name "pict2svg - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

+# Begin Source File

+

+SOURCE=..\..\src\conv\svg\pict2svg.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/buildnumber.sh b/buildnumber.sh
new file mode 100644
index 0000000..857c10e
--- /dev/null
+++ b/buildnumber.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Script to create the BUILDNUMBER used by compile-resource. This script
+# needs the script createBuildNumber.pl to be in the same directory.
+
+{ perl ./createBuildNumber.pl \
+	src/lib/libpict-build.stamp \
+	src/lib/libpict-stream-build.stamp \
+	src/conv/raw/pict2raw-build.stamp \
+	src/conv/svg/pict2svg-build.stamp
+#Success
+exit 0
+}
+#unsucessful
+exit 1
diff --git a/configure.in b/configure.in
new file mode 100644
index 0000000..4772320
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,239 @@
+AC_INIT(src/lib/PictImage.cpp)
+AC_PREREQ([2.59c])
+
+AM_CONFIG_HEADER(config.h)
+
+Pict_MAJOR_VERSION=0
+Pict_MINOR_VERSION=1
+Pict_MICRO_VERSION=0
+
+LIBWPD_REQUIRED_VERSION="0.9.0"
+LIBWPG_REQUIRED_VERSION="0.2.0"
+
+Pict_VERSION="$Pict_MAJOR_VERSION.$Pict_MINOR_VERSION.$Pict_MICRO_VERSION"
+
+AC_SUBST(Pict_MAJOR_VERSION)
+AC_SUBST(Pict_MINOR_VERSION)
+AC_SUBST(Pict_MICRO_VERSION)
+AC_SUBST(Pict_VERSION)
+
+dnl # libtool versioning
+dnl LT_RELEASE=$Pict_MAJOR_VERSION.$Pict_MINOR_VERSION
+dnl AC_SUBST(LT_RELEASE)
+
+LT_CURRENT=`expr 100 '*' $Pict_MAJOR_VERSION + $Pict_MINOR_VERSION`
+LT_REVISION=$Pict_MICRO_VERSION
+# For 1.0.0 comment the first line and uncomment the second
+LT_AGE=0
+# LT_AGE=$Pict_MINOR_VERSION
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+
+# initialize automake
+#
+AM_INIT_AUTOMAKE(libpict, $Pict_VERSION)
+
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+AC_LIBTOOL_WIN32_DLL
+AC_ARG_ENABLE([static-tools],[  --enable-static-tools  Link tools statically],[
+       case "${enableval}" in
+          yes) enable_static_tools="yes" ;;
+          no)  enable_static_tools="no" ;;
+            *) AC_MSG_ERROR(bad value ${enableval} for --static-tools) ;;
+       esac
+],[
+       enable_static_tools="no"
+])
+
+AM_CONDITIONAL(STATIC_TOOLS, test x$enable_static_tools = xyes)
+
+if test x$enable_static_tools = xno; then
+	AC_DISABLE_STATIC
+fi
+
+if test x$enable_static_tools = xyes; then
+	enable_static="yes"
+fi
+
+AC_PROG_LIBTOOL
+
+AC_SUBST(Pict_OBJDIR, [$objdir])
+
+AM_PROG_LIBTOOL
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+dnl ***********************************************************************************
+
+PKG_CHECK_MODULES(LIBPict,[
+libwpd-0.9 >= $LIBWPD_REQUIRED_VERSION
+libwpd-stream-0.9 >= $LIBWPD_REQUIRED_VERSION
+libwpg-0.2 >= $LIBWPG_REQUIRED_VERSION
+])
+
+AC_HEADER_STDC
+
+AC_MSG_CHECKING([for native Win32])
+case "$host" in
+  *-*-mingw*)
+    native_win32=yes
+    LIBPict_WIN32_RESOURCE=libpict-win32res.lo
+    Pict2RAW_WIN32_RESOURCE=pict2raw-win32res.lo
+    Pict2SVG_WIN32_RESOURCE=pict2svg-win32res.lo
+    ;;
+  *)
+    native_win32=no
+    LIBPict_WIN32_RESOURCE=
+    Pict2RAW_WIN32_RESOURCE=
+    Pict2SVG_WIN32_RESOURCE=
+    ;;
+esac
+AC_MSG_RESULT([$native_win32])
+AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes)
+AC_SUBST(LIBPict_WIN32_RESOURCE)
+AC_SUBST(Pict2RAW_WIN32_RESOURCE)
+AC_SUBST(Pict2SVG_WIN32_RESOURCE)
+
+test_dummy_bitmaps=false
+AC_ARG_WITH(dummy_bitmaps,
+	[  --with-dummy-bitmaps    Output dummy bitmaps of 1x1 pixels instead of the real bitmaps (speeds up the validation test)],
+	if test "x$withval" = xyes; then
+		test_dummy_bitmaps=true
+	fi
+)
+if test "x$test_dummy_bitmaps" = "xtrue"; then
+	AC_DEFINE([OUTPUT_DUMMY_BITMAPS], [1], [Whether to output dummy bitmaps instead of the real ones])
+fi
+
+
+test_docs=true
+if test "$native_win32" = yes; then
+	test_docs=false
+fi
+AC_ARG_WITH(docs,
+	[  --without-docs          Do not build documentation],
+	if test "x$withval" = xno; then
+		test_docs=false
+	fi
+	if test "x$withval" = xyes; then
+		test_docs=true
+	fi
+)
+
+if test "x$test_docs" = xtrue; then
+	AC_PATH_PROG(DOXYGEN, doxygen)
+	if test -z "$DOXYGEN"; then
+		AC_MSG_WARN([*** Could not find doxygen in your PATH.])
+		AC_MSG_WARN([*** The documentation will not be built.])
+		test_docs=false
+	fi
+fi
+
+AM_CONDITIONAL(WITH_LIBPict_DOCS, $test_docs )
+
+AC_MSG_CHECKING([for Win32 platform in general])
+case "$host" in
+  *-*-mingw*|*-*-cygwin*)
+    platform_win32=yes
+    ;;
+  *)
+    platform_win32=no
+    ;;
+esac
+AC_MSG_RESULT($platform_win32)
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = yes)
+
+AC_ARG_ENABLE(debug,[  --enable-debug    Turn on debugging],[
+	case "${enableval}" in
+	   yes)	debug=true ;
+		DEBUG_CXXFLAGS="-DDEBUG -g" ;;
+	    no)	debug=false ;
+		DEBUG_CXXFLAGS="-DNDEBUG" ;;
+	     *)	AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+	esac
+],[	debug=false
+	DEBUG_CXXFLAGS="-DNDEBUG" 
+])
+
+# AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
+
+# Courtesy of Glib: Ensure MSVC-compatible struct packing convention 
+# is used when compiling for Win32 with gcc.
+# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
+# gcc2 uses "-fnative-struct".
+if test x"$native_win32" = xyes; then
+  AC_CHECK_TOOL(WINDRES, windres)
+  if test x"$GCC" = xyes; then
+    msnative_struct=''
+    AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
+    if test -z "$ac_cv_prog_CC"; then
+      our_gcc="$CC"
+    else
+      our_gcc="$ac_cv_prog_CC"
+    fi
+    case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
+      2.)
+	if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
+	  msnative_struct='-fnative-struct'
+	fi
+	;;
+      *)
+	if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
+	  msnative_struct='-mms-bitfields'
+	fi
+	;;
+    esac
+    if test x"$msnative_struct" = x ; then
+      AC_MSG_RESULT([no way])
+      AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
+    else
+      CFLAGS="$CFLAGS $msnative_struct"
+      CXXFLAGS="$CXXFLAGS $msnative_struct"
+      AC_MSG_RESULT([${msnative_struct}])
+    fi
+  fi
+  CFLAGS="$CFLAGS -Wall -pedantic"
+  CXXFLAGS="$CXXFLAGS -Wall -pedantic"
+else 
+  if test x"$GCC" = xyes; then
+    # Be tough with warnings and produce less careless code
+    CFLAGS="$CFLAGS -Wall -Werror -pedantic"
+    CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic"
+  fi
+fi
+
+LIBPict_CXXFLAGS="$LIBPict_CFLAGS"
+
+AC_SUBST(LIBPict_CXXFLAGS)
+AC_SUBST(DEBUG_CXXFLAGS)
+
+AC_OUTPUT([
+Makefile
+src/Makefile
+src/conv/Makefile
+src/conv/raw/Makefile
+src/conv/raw/pict2raw.rc
+src/conv/svg/Makefile
+src/conv/svg/pict2svg.rc
+src/lib/Makefile
+src/lib/libpict.h
+src/lib/libpict.rc
+build/Makefile
+build/win32/Makefile
+docs/Makefile
+docs/doxygen/Makefile
+libpict-0.1.pc
+libpict.spec
+libpict-zip
+])
+
+case "$debug" in
+     "true" )
+        AC_MSG_RESULT([Configured with debugging symbols.]) ;;
+esac
diff --git a/createBuildNumber.pl b/createBuildNumber.pl
new file mode 100644
index 0000000..6fc2949
--- /dev/null
+++ b/createBuildNumber.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+# ***** BEGIN LICENSE BLOCK *****
+# Version: LGPL 2.1
+#
+# The Original Code is Mozilla Calendar Code.
+#
+# Copyright (C) 2002 Christopher S. Charabaruk (ccharabaruk@meldstar.com).
+# Copyright (C) 2004 Fridrich Strba (fridrich.strba@bluewin.ch).
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser 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
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# For further information visit http://libwpd.sourceforge.net
+#
+#
+# "This product is not manufactured, approved, or supported by 
+# Corel Corporation or Corel Corporation Limited."
+#
+# ***** END LICENSE BLOCK *****
+
+# create a build id to be used by build/win32/compile-resource
+@timevars = localtime(time);
+$buildid  = sprintf("%1.1d%.2d%.2d", ($timevars[5] - 100) , ($timevars[4] + 1) , $timevars[3]);
+
+#print our build id
+print $buildid . "\n";
+
+foreach $file (@ARGV)
+{
+	# print filename
+	print "Working on " . $file . "\n";
+	
+	open(OUT,">" . $file) or die "cannot open " . $file . "-temp for write\n";
+	print OUT $buildid . "\n";
+	close (OUT);
+}
+
+print "All done!\n";
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 0000000..5a86b6d
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = \
+    doxygen
diff --git a/docs/doxygen/Makefile.am b/docs/doxygen/Makefile.am
new file mode 100644
index 0000000..0e16943
--- /dev/null
+++ b/docs/doxygen/Makefile.am
@@ -0,0 +1,30 @@
+EXTRA_DIST =	doxygen.cfg \
+		footer.html.in \
+		header.html.in
+
+if WITH_LIBPict_DOCS
+
+install-data-am:
+	mkdir -p $(DESTDIR)$(docdir)/html
+	$(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/
+	$(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
+	$(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/
+
+uninstall-am:
+	-rm -rf $(DESTDIR)$(docdir)/html
+
+all:
+	test -f header.html.in || $(LN_S) $(srcdir)/header.html.in ./
+	test -f footer.html.in || $(LN_S) $(srcdir)/footer.html.in ./
+	doxygen $(srcdir)/doxygen.cfg
+
+else
+
+all:
+
+endif
+
+distclean-local: clean-local
+
+clean-local:
+	rm -rf html
diff --git a/docs/doxygen/doxygen.cfg b/docs/doxygen/doxygen.cfg
new file mode 100644
index 0000000..ec84eae
--- /dev/null
+++ b/docs/doxygen/doxygen.cfg
@@ -0,0 +1,1258 @@
+# Doxyfile 1.5.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = libpict
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ./
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = ../../src/lib
+
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+
+FILE_PATTERNS          = *.cpp \
+                         *.h
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = yes
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = YES
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 3
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = header.html.in
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = footer.html.in
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen will always 
+# show the root nodes and its direct children regardless of this setting.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/docs/doxygen/footer.html.in b/docs/doxygen/footer.html.in
new file mode 100644
index 0000000..aa67fdb
--- /dev/null
+++ b/docs/doxygen/footer.html.in
@@ -0,0 +1,5 @@
+<hr size="1"><address style="align: right;"><small>
+Generated for $projectname by <a href="http://www.doxygen.org/index.html">
+doxygen</a> $doxygenversion</small></address>
+</body>
+</html>
diff --git a/docs/doxygen/header.html.in b/docs/doxygen/header.html.in
new file mode 100644
index 0000000..f65090b
--- /dev/null
+++ b/docs/doxygen/header.html.in
@@ -0,0 +1,5 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>$title documentation</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
diff --git a/libpict-0.1.pc.in b/libpict-0.1.pc.in
new file mode 100644
index 0000000..a14344a
--- /dev/null
+++ b/libpict-0.1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+                                                                       
+Name: libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@
+Description: Library for importing and converting Corel WordPerfect(tm) Graphics images
+Version: @VERSION@
+Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
+Libs: -L${libdir} -lpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@
+Cflags: -I${includedir}/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@
diff --git a/libpict-zip.in b/libpict-zip.in
new file mode 100644
index 0000000..7d31641
--- /dev/null
+++ b/libpict-zip.in
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Build runtime and developer zipfiles for libpict on Win32.
+
+ZIP=libpict-@Pict_VERSION@-MinGW.zip
+DEVZIP=libpict-devel-@Pict_VERSION@-MinGW.zip
+TOOLSZIP=libpict-tools-@Pict_VERSION@.zip
+
+cd $DESTDIR@prefix@
+
+DLLDIR=lib
+[ -f bin/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.dll ] && \
+DLLDIR=bin
+
+@STRIP@ --strip-all \
+$DLLDIR/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.dll \
+bin/pict2raw.exe \
+bin/pict2svg.exe
+
+upx -qqq --best \
+$DLLDIR/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.dll \
+bin/pict2raw.exe \
+bin/pict2svg.exe
+
+rm -f $ZIP
+zip -q -r $ZIP -@ <<EOF
+$DLLDIR/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.dll
+EOF
+
+rm -f $DEVZIP
+zip -q -r $DEVZIP -@ <<EOF
+include/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@
+lib/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.dll.a
+lib/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.a
+lib/pkgconfig/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.pc
+EOF
+
+rm -f $TOOLSZIP
+zip -q -r -j $TOOLSZIP -@ <<EOF
+bin/pict2raw.exe
+bin/pict2svg.exe
+bin/pict2svgbatch.exe
+EOF
+
+rm -f $TOOLSZIP
+zip -q -r -j $TOOLSZIP -@ <<EOF
+bin/pict2raw.exe
+bin/pict2svg.exe
+bin/pict2svgbatch.pl
+EOF
diff --git a/libpict.spec.in b/libpict.spec.in
new file mode 100644
index 0000000..b9c7e5f
--- /dev/null
+++ b/libpict.spec.in
@@ -0,0 +1,97 @@
+%define name libpict
+%define version @VERSION@
+%define RELEASE 1
+%define release     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+
+Name: %{name}
+Summary: Library for importing and converting Corel WordPerfect(tm) Graphics images
+Version: %{version}
+Release: %{release}
+Source: %{name}-%{version}.tar.gz
+Group: System Environment/Libraries
+URL: http://libpict.sf.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRequires: libwpd-devel >= 0.9.0, gcc-c++, libstdc++-devel, pkgconfig >= 0.9.0
+License: LGPL
+Prefix: %{prefix}
+
+%description
+libpict is a library for reading and converting Pict images
+
+%package tools
+Requires: libpict
+Summary: Tools to convert Pict images into other formats
+Group: Applications/Publishing
+
+%description tools
+Tools to convert Pict images into other formats.
+Currently supported: raw svg
+
+%package devel
+Requires: %{name} >= %{version}
+Requires: libwpd-devel >= 0.9.0
+Summary: Files for developing with libpict.
+Group: Development/Libraries
+
+%description devel
+Includes and definitions for developing with libpict.
+
+%if %{!?_without_docs:1}%{?_without_docs:0}
+%package docs
+Requires: %{name} >= %{version}
+BuildRequires: doxygen
+Summary: Documentation of libpict API
+Group: Development/Documentation
+
+%description docs
+Documentation of libpict API for developing with libpict
+%endif
+
+%prep
+%__rm -rf $RPM_BUILD_ROOT
+
+%setup -q -n %{name}-%{version}
+
+%build
+%configure --prefix=%{_prefix} --libdir=%{_libdir} \
+        %{?_with_debug:--enable-debug}  \
+
+%__make
+
+%install
+umask 022
+
+%__make DESTDIR=$RPM_BUILD_ROOT install
+%__rm -rf $RPM_BUILD_ROOT/%{_libdir}/libpict*.la
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name}
+
+%files
+%defattr(644,root,root,755)
+%{_libdir}/libpict*.so.*
+%doc ChangeLog README COPYING AUTHORS
+
+%files tools
+%defattr(755,root,root,755)
+%{_bindir}/pict2*
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/libpict*.so
+%{_libdir}/pkgconfig/libpict*.pc
+%{_includedir}/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@/libpict
+
+%if %{!?_without_docs:1}%{?_without_docs:0}
+%files docs
+%{_datadir}/*
+%endif
+
+%changelog
+* Fri Apr 20 2007 Fridrich Strba <fridrich.strba@bluewin.ch>
+- Add documentation packaging
+- Make doc and stream optional
+
+* Tue Jan 27 2004 Fridrich Strba <fridrich.strba@bluewin.ch>
+- Create rpm spec according to the rpm spec of libwpD
+- of Rui M. Seabra
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..43a4b31
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,6 @@
+AUTOMAKE_OPTIONS = gnu 1.4
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+SUBDIRS = lib conv
+
diff --git a/src/conv/Makefile.am b/src/conv/Makefile.am
new file mode 100644
index 0000000..c872294
--- /dev/null
+++ b/src/conv/Makefile.am
@@ -0,0 +1,6 @@
+AUTOMAKE_OPTIONS = gnu 1.4
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+SUBDIRS = raw svg
+
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
new file mode 100644
index 0000000..c775269
--- /dev/null
+++ b/src/conv/raw/Makefile.am
@@ -0,0 +1,30 @@
+bin_PROGRAMS = pict2raw
+
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBPict_CXXFLAGS) $(DEBUG_CXXFLAGS)
+
+pict2raw_DEPENDENCIES = @Pict2RAW_WIN32_RESOURCE@
+
+if STATIC_TOOLS
+pict2raw_LDADD = ../../lib/@Pict_OBJDIR@/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.a $(LIBPict_LIBS) @Pict2RAW_WIN32_RESOURCE@
+pict2raw_LDFLAGS = -all-static 
+else
+pict2raw_LDADD = ../../lib/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.la $(LIBPict_LIBS) @Pict2RAW_WIN32_RESOURCE@ 
+endif
+
+pict2raw_SOURCES = \
+	pict2raw.cpp
+
+if OS_WIN32
+
+@Pict2RAW_WIN32_RESOURCE@ : pict2raw.rc $(pict2raw_OBJECTS)
+	chmod +x $(top_srcdir)/build/win32/*compile-resource
+	WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource pict2raw.rc @Pict2RAW_WIN32_RESOURCE@
+endif
+
+EXTRA_DIST = \
+	$(pict2raw_SOURCES) \
+	pict2raw.rc.in
+
+# These may be in the builddir too
+BUILD_EXTRA_DIST = \
+	pict2raw.rc	 
diff --git a/src/conv/raw/pict2raw.cpp b/src/conv/raw/pict2raw.cpp
new file mode 100644
index 0000000..fb69ce4
--- /dev/null
+++ b/src/conv/raw/pict2raw.cpp
@@ -0,0 +1,268 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "libpict.h"
+#include <libwpd-stream/libwpd-stream.h>
+#include <libwpd/libwpd.h>
+
+class RawPainter : public libwpg::WPGPaintInterface {
+public:
+	RawPainter();
+
+	void startGraphics(const ::WPXPropertyList &propList);
+	void endGraphics();
+	void startLayer(const ::WPXPropertyList& propList);
+	void endLayer();
+	void startEmbeddedGraphics(const ::WPXPropertyList& propList);
+	void endEmbeddedGraphics();
+
+	void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector& gradient);
+
+	void drawRectangle(const ::WPXPropertyList &propList);
+	void drawEllipse(const ::WPXPropertyList& propList);
+	void drawPolyline(const ::WPXPropertyListVector& vertices);
+	void drawPolygon(const ::WPXPropertyListVector& vertices);
+	void drawPath(const ::WPXPropertyListVector& path);
+	void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData);
+	void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
+	void endTextObject();
+	void startTextLine(const ::WPXPropertyList &propList);
+	void endTextLine();
+	void startTextSpan(const ::WPXPropertyList &propList);
+	void endTextSpan();
+	void insertText(const ::WPXString &str);
+};
+
+WPXString getPropString(const WPXPropertyList &propList)
+{
+	WPXString propString;
+	WPXPropertyList::Iter i(propList);
+	if (!i.last()) 
+	{
+		propString.append(i.key());
+		propString.append(": ");
+		propString.append(i()->getStr().cstr());
+		for (; i.next(); )
+		{
+			propString.append(", ");
+			propString.append(i.key());
+			propString.append(": ");
+			propString.append(i()->getStr().cstr());
+		}
+	}
+
+	return propString;
+}
+
+WPXString getPropString(const WPXPropertyListVector &itemList)
+{
+	WPXString propString;
+
+	propString.append("(");
+	WPXPropertyListVector::Iter i(itemList);
+
+	if (!i.last())
+	{
+		propString.append("(");
+		propString.append(getPropString(i()));
+		propString.append(")");
+
+		for (; i.next();)
+		{
+			propString.append(", (");
+			propString.append(getPropString(i()));
+			propString.append(")");
+		}
+
+	}
+	propString.append(")");
+
+	return propString;
+}
+
+RawPainter::RawPainter(): libwpg::WPGPaintInterface()
+{
+}
+
+void RawPainter::startGraphics(const ::WPXPropertyList &propList)
+{
+	printf("RawPainter::startGraphics(%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::endGraphics()
+{
+	printf("RawPainter::endGraphics\n");
+}
+
+void RawPainter::startLayer(const ::WPXPropertyList& propList)
+{
+	printf("RawPainter::startLayer (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::endLayer()
+{
+	printf("RawPainter::endLayer\n");
+}
+
+void RawPainter::startEmbeddedGraphics(const ::WPXPropertyList& propList)
+{
+	printf("RawPainter::startEmbeddedGraphics (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::endEmbeddedGraphics()
+{
+	printf("RawPainter::endEmbeddedGraphics \n");
+}
+
+void RawPainter::setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector& gradient)
+{
+	printf("RawPainter::setStyle(%s, gradient: (%s))\n", getPropString(propList).cstr(), getPropString(gradient).cstr());
+}
+
+void RawPainter::drawRectangle(const ::WPXPropertyList &propList)
+{
+	printf("RawPainter::drawRectangle (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::drawEllipse(const ::WPXPropertyList& propList)
+{
+	printf("RawPainter::drawEllipse (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::drawPolyline(const ::WPXPropertyListVector& vertices)
+{
+	printf("RawPainter::drawPolyline (%s)\n", getPropString(vertices).cstr());
+}
+
+void RawPainter::drawPolygon(const ::WPXPropertyListVector& vertices)
+{
+	printf("RawPainter::drawPolygon (%s)\n", getPropString(vertices).cstr());
+}
+
+void RawPainter::drawPath(const ::WPXPropertyListVector& path)
+{
+	printf("RawPainter::drawPath (%s)\n", getPropString(path).cstr());
+}
+
+void RawPainter::drawGraphicObject(const ::WPXPropertyList& propList, const ::WPXBinaryData& /*binaryData*/)
+{
+	printf("RawPainter::drawGraphicObject (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path)
+{
+	printf("RawPainter::startTextObject (%s, path: (%s))\n", getPropString(propList).cstr(), getPropString(path).cstr());
+}
+
+void RawPainter::endTextObject()
+{
+	printf("RawPainter::endTextObject\n");
+}
+
+void RawPainter::startTextLine(const ::WPXPropertyList &propList)
+{
+	printf("RawPainter::startTextLine (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::endTextLine()
+{
+	printf("RawPainter::endTextLine\n");
+}
+
+void RawPainter::startTextSpan(const ::WPXPropertyList &propList)
+{
+	printf("RawPainter::startTextSpan (%s)\n", getPropString(propList).cstr());
+}
+
+void RawPainter::endTextSpan()
+{
+	printf("RawPainter::endTextSpan\n");
+}
+
+void RawPainter::insertText(const ::WPXString &str)
+{
+	printf("RawPainter::insertText (%s)\n", str.cstr());
+}
+
+
+namespace {
+
+int printUsage()
+{
+	printf("Usage: pict2raw [OPTION] <WordPerfect Graphics File>\n");
+	printf("\n");
+	printf("Options:\n");
+	printf("--help                Shows this help message\n");
+	printf("--version             Output pict2raw version \n");
+	return -1;
+}
+
+int printVersion()
+{
+	printf("pict2raw %s\n", LIBPict_VERSION_STRING);
+	return 0;
+}
+
+} // anonymous namespace
+
+int main(int argc, char *argv[])
+{
+	if (argc < 2)
+		return printUsage();
+	
+	char *file = 0;
+
+	for (int i = 1; i < argc; i++)
+	{
+		if (!strcmp(argv[i], "--version"))
+			return printVersion();
+		else if (!file && strncmp(argv[i], "--", 2))
+			file = argv[i];
+		else
+			return printUsage();
+	}
+
+	if (!file)
+		return printUsage();
+		
+	WPXFileStream input(file);
+
+	if (!libpict::PictImage::isSupported(&input))
+	{
+		fprintf(stderr, "ERROR: Unsupported file format (unsupported version) or file is encrypted!\n");
+		return 1;
+	}
+
+	RawPainter painter;
+	libpict::PictImage::parse(&input, &painter);
+
+	return 0;
+}
+
diff --git a/src/conv/raw/pict2raw.rc.in b/src/conv/raw/pict2raw.rc.in
new file mode 100644
index 0000000..9b71033
--- /dev/null
+++ b/src/conv/raw/pict2raw.rc.in
@@ -0,0 +1,31 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @Pict_MAJOR_VERSION@,@Pict_MINOR_VERSION@,@Pict_MICRO_VERSION@,BUILDNUMBER
+  PRODUCTVERSION @Pict_MAJOR_VERSION@,@Pict_MINOR_VERSION@,@Pict_MICRO_VERSION@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_APP
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+	VALUE "CompanyName", "The libpict developer community"
+	VALUE "FileDescription", "pict2raw"
+	VALUE "FileVersion", "@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.@Pict_MICRO_VERSION@.BUILDNUMBER"
+	VALUE "InternalName", "pict2raw"
+	VALUE "LegalCopyright", "Copyright (C) 2004 Marc Oude Kotte, other contributers"
+	VALUE "OriginalFilename", "pict2raw.exe"
+	VALUE "ProductName", "libpict"
+	VALUE "ProductVersion", "@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.@Pict_MICRO_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
+
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
new file mode 100644
index 0000000..9f02a45
--- /dev/null
+++ b/src/conv/svg/Makefile.am
@@ -0,0 +1,31 @@
+bin_PROGRAMS = pict2svg
+
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBPict_CXXFLAGS) $(DEBUG_CXXFLAGS)
+
+pict2svg_DEPENDENCIES = @Pict2SVG_WIN32_RESOURCE@
+
+if STATIC_TOOLS
+pict2svg_LDADD = ../../lib/@Pict_OBJDIR@/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.a $(LIBPict_LIBS) @Pict2SVG_WIN32_RESOURCE@
+pict2svg_LDFLAGS = -all-static 
+else
+pict2svg_LDADD = ../../lib/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.la $(LIBPict_LIBS) @Pict2SVG_WIN32_RESOURCE@ 
+endif
+
+pict2svg_SOURCES = \
+	pict2svg.cpp
+
+if OS_WIN32
+
+@Pict2SVG_WIN32_RESOURCE@ : pict2svg.rc $(pict2svg_OBJECTS)
+	chmod +x $(top_srcdir)/build/win32/*compile-resource
+	WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource pict2svg.rc @Pict2SVG_WIN32_RESOURCE@
+endif
+
+EXTRA_DIST = \
+	$(pict2svg_SOURCES) \
+	pict2svg.rc.in
+
+# These may be in the builddir too
+BUILD_EXTRA_DIST = \
+	pict2svg.rc
+
diff --git a/src/conv/svg/pict2svg.cpp b/src/conv/svg/pict2svg.cpp
new file mode 100644
index 0000000..39b9dc7
--- /dev/null
+++ b/src/conv/svg/pict2svg.cpp
@@ -0,0 +1,91 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include <iostream>
+#include <sstream>
+#include <stdio.h>
+#include <string.h>
+#include "libpict.h"
+#include <libwpd-stream/libwpd-stream.h>
+#include <libwpd/libwpd.h>
+
+namespace {
+
+int printUsage()
+{
+	printf("Usage: pict2svg [OPTION] <WordPerfect Graphics File>\n");
+	printf("\n");
+	printf("Options:\n");
+	printf("--help                Shows this help message\n");
+	printf("--version             Output pict2svg version \n");
+	return -1;
+}
+
+int printVersion()
+{
+	printf("pict2svg %s\n", LIBPict_VERSION_STRING);
+	return 0;
+}
+
+} // anonymous namespace
+
+int main(int argc, char *argv[])
+{
+	if (argc < 2)
+		return printUsage();
+	
+	char *file = 0;
+
+	for (int i = 1; i < argc; i++)
+	{
+		if (!strcmp(argv[i], "--version"))
+			return printVersion();
+		else if (!file && strncmp(argv[i], "--", 2))
+			file = argv[i];
+		else
+			return printUsage();
+	}
+
+	if (!file)
+		return printUsage();
+		
+	WPXFileStream input(file);
+
+	if (!libpict::PictImage::isSupported(&input))
+	{
+		std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
+		return 1;
+	}
+
+	::WPXString output;
+	if (!libpict::PictImage::generateSVG(&input, output))
+	{
+		std::cerr << "ERROR: SVG Generation failed!" << std::endl;
+		return 1;
+	}		
+
+	std::cout << output.cstr() << std::endl;
+	return 0;
+}
diff --git a/src/conv/svg/pict2svg.rc.in b/src/conv/svg/pict2svg.rc.in
new file mode 100644
index 0000000..9ad8dd8
--- /dev/null
+++ b/src/conv/svg/pict2svg.rc.in
@@ -0,0 +1,31 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @Pict_MAJOR_VERSION@,@Pict_MINOR_VERSION@,@Pict_MICRO_VERSION@,BUILDNUMBER
+  PRODUCTVERSION @Pict_MAJOR_VERSION@,@Pict_MINOR_VERSION@,@Pict_MICRO_VERSION@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_APP
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+	VALUE "CompanyName", "The libpict developer community"
+	VALUE "FileDescription", "pict2svg"
+	VALUE "FileVersion", "@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.@Pict_MICRO_VERSION@.BUILDNUMBER"
+	VALUE "InternalName", "pict2svg"
+	VALUE "LegalCopyright", "Copyright (C) 2004 Marc Oude Kotte, other contributers"
+	VALUE "OriginalFilename", "pict2svg.exe"
+	VALUE "ProductName", "libpict"
+	VALUE "ProductVersion", "@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.@Pict_MICRO_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
+
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
new file mode 100644
index 0000000..62296e7
--- /dev/null
+++ b/src/lib/Makefile.am
@@ -0,0 +1,73 @@
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version
+else
+no_undefined =
+version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+endif
+
+if OS_WIN32
+install-libtool-import-lib:
+	$(INSTALL) @Pict_OBJDIR@/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.dll.a $(DESTDIR)$(libdir)
+
+uninstall-libtool-import-lib:
+	-rm $(DESTDIR)$(libdir)/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.dll.a
+
+else
+install-libtool-import-lib:
+uninstall-libtool-import-lib:
+endif
+
+lib_LTLIBRARIES = libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.la
+libpict_@Pict_MAJOR_VERSION@_@Pict_MINOR_VERSION@_includedir = $(includedir)/libpict-@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@/libpict
+libpict_@Pict_MAJOR_VERSION@_@Pict_MINOR_VERSION@_include_HEADERS = \
+	libpict.h \
+	PictImage.h
+
+AM_CXXFLAGS = $(LIBPict_CXXFLAGS) $(DEBUG_CXXFLAGS)
+
+libpict_@Pict_MAJOR_VERSION@_@Pict_MINOR_VERSION@_la_LIBADD  = $(LIBPict_LIBS) @LIBPict_WIN32_RESOURCE@
+libpict_@Pict_MAJOR_VERSION@_@Pict_MINOR_VERSION@_la_DEPENDENCIES = @LIBPict_WIN32_RESOURCE@
+libpict_@Pict_MAJOR_VERSION@_@Pict_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
+libpict_@Pict_MAJOR_VERSION@_@Pict_MINOR_VERSION@_la_SOURCES = \
+	PictImage.cpp \
+	PictDashArray.cpp \
+	PictColor.cpp \
+	PictHeader.cpp \
+	PictSVGGenerator.cpp \
+	PictXParser.cpp \
+	Pict1Parser.cpp \
+	Pict2Parser.cpp \
+	PictBitmap.cpp \
+	libpict.h \
+	libpict_utils.h \
+	PictColor.h \
+	PictDashArray.h \
+	PictHeader.h \
+	PictSVGGenerator.h \
+	PictXParser.h \
+	Pict1Parser.h \
+	Pict2Parser.h \
+	PictBitmap.h
+
+if OS_WIN32
+
+@LIBPict_WIN32_RESOURCE@ : libpict.rc $(libpict_@Pict_MAJOR_VERSION@_@Pict_MINOR_VERSION@_la_OBJECTS)
+	chmod +x $(top_srcdir)/build/win32/*compile-resource
+	WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource libpict.rc @LIBPict_WIN32_RESOURCE@
+
+endif
+
+
+install-data-local: install-libtool-import-lib
+
+uninstall-local: uninstall-libtool-import-lib
+
+EXTRA_DIST = \
+	libpict.h.in \
+	libpict.rc.in \
+	makefile.mk
+
+# These may be in the builddir too
+BUILD_EXTRA_DIST = \
+	libpict.rc
diff --git a/src/lib/Pict1Parser.cpp b/src/lib/Pict1Parser.cpp
new file mode 100644
index 0000000..8c217e0
--- /dev/null
+++ b/src/lib/Pict1Parser.cpp
@@ -0,0 +1,968 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "Pict1Parser.h"
+#include "libpict_utils.h"
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+
+static const unsigned char defaultPict1PaletteRed[] = {
+	0x00, 0x00, 0x00, 0x00, 0x7F, 0x7F, 0x7F, 0x7F,
+	0xC0, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x14, 0x20, 0x2C, 0x38, 0x45, 0x51, 0x61,
+	0x71, 0x82, 0x92, 0xA2, 0xB6, 0xCB, 0xE3, 0xFF,
+	0x00, 0x41, 0x7D, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x7D, 0x41,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x7D, 0x9E, 0xBE, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xBE, 0x9E,
+	0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D,
+	0xB6, 0xC7, 0xDB, 0xEB, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xDB, 0xC7,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+	0x00, 0x1C, 0x38, 0x55, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x55, 0x38, 0x1C,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x45, 0x55, 0x61, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x61, 0x55, 0x45,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x51, 0x59, 0x61, 0x69, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x69, 0x61, 0x59,
+	0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51,
+	0x00, 0x10, 0x20, 0x30, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x30, 0x20, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x20, 0x28, 0x30, 0x38, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x38, 0x30, 0x28,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x3C, 0x30, 0x34, 0x3C, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x3C, 0x34, 0x30,
+	0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const unsigned char defaultPict1PaletteGreen[] = {
+	0x00, 0x00, 0x7F, 0x7F, 0x00, 0x00, 0x3F, 0x7F,
+	0xC0, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF,
+	0x00, 0x14, 0x20, 0x2C, 0x38, 0x45, 0x51, 0x61,
+	0x71, 0x82, 0x92, 0xA2, 0xB6, 0xCB, 0xE3, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x41, 0x7D, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x7D, 0x41,
+	0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D,
+	0x7D, 0x9E, 0xBE, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xBE, 0x9E,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+	0xB6, 0xC7, 0xDB, 0xEB, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xDF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xDB, 0xC7,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x1C, 0x38, 0x55, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x55, 0x38, 0x1C,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x45, 0x55, 0x61, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x61, 0x55, 0x45,
+	0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51,
+	0x51, 0x59, 0x61, 0x69, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x69, 0x61, 0x59,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x10, 0x20, 0x30, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x30, 0x20, 0x10,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x28, 0x30, 0x38, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x38, 0x30, 0x28,
+	0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C,
+	0x3C, 0x30, 0x34, 0x3C, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x3C, 0x34, 0x30,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const unsigned char defaultPict1PaletteBlue[] = {
+	0x00, 0x7F, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x7F,
+	0xC0, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
+	0x00, 0x14, 0x20, 0x2C, 0x38, 0x45, 0x51, 0x61,
+	0x71, 0x82, 0x92, 0xA2, 0xB6, 0xCB, 0xE3, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x7D, 0x41,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x41, 0x7D, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xBE, 0x9E,
+	0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D,
+	0x7D, 0x9E, 0xBE, 0xDF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xDB, 0xC7,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+	0xB6, 0xC7, 0xDB, 0xEB, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x55, 0x38, 0x1C,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x1C, 0x38, 0x55, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x61, 0x55, 0x45,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x45, 0x55, 0x61, 0x71, 0x71, 0x71, 0x71,
+	0x71, 0x71, 0x71, 0x71, 0x71, 0x69, 0x61, 0x59,
+	0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51,
+	0x51, 0x59, 0x61, 0x69, 0x71, 0x71, 0x71, 0x71,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x30, 0x20, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x10, 0x20, 0x30, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x38, 0x30, 0x28,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x28, 0x30, 0x38, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x3C, 0x34, 0x30,
+	0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C,
+	0x2C, 0x30, 0x34, 0x3C, 0x41, 0x41, 0x41, 0x41,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+
+Pict1Parser::Pict1Parser(WPXInputStream *input, libwpg::WPGPaintInterface* painter):
+	PictXParser(input, painter),
+	m_recordLength(0), m_recordEnd(0),
+	m_success(true), m_exit(false), m_graphicsStarted(false),
+	m_width(0), m_height(0), m_style(), 
+	m_penForeColor(0,0,0),
+	m_penBackColor(0xff,0xff,0xff),
+	m_brushForeColor(0,0,0),
+	m_brushBackColor(0xff,0xff,0xff),
+	m_dashArray(), m_gradient()
+{
+	m_style.insert("draw:fill", "solid");
+	m_style.insert("svg:stroke-color", m_penForeColor.getColorString());
+	m_style.insert("svg:stroke-opacity", m_penForeColor.getOpacity(), WPX_PERCENT);
+	m_style.insert("draw:fill-color", m_brushForeColor.getColorString());
+	m_style.insert("draw:opacity", m_brushForeColor.getOpacity(), WPX_PERCENT);
+}
+
+bool Pict1Parser::parse()
+{
+	typedef void (Pict1Parser::*Method)();
+
+	struct RecordHandler
+	{
+		int type;
+		const char *name;
+		Method handler;
+	};
+
+	static const struct RecordHandler handlers[] =
+	{
+		{ 0x01, "Fill Attributes",           &Pict1Parser::handleFillAttributes },	 
+		{ 0x02, "Line Attributes",           &Pict1Parser::handleLineAttributes },	 
+		{ 0x03, "Marker Atttibutes",         0 },	 
+		{ 0x04, "Polymarker",                0 },	 
+		{ 0x05, "Line",                      &Pict1Parser::handleLine },	 
+		{ 0x06, "Polyline",                  &Pict1Parser::handlePolyline },	 
+		{ 0x07, "Rectangle",                 &Pict1Parser::handleRectangle },	 
+		{ 0x08, "Polygon",                   &Pict1Parser::handlePolygon },	 
+		{ 0x09, "Ellipse",                   &Pict1Parser::handleEllipse },	 
+		{ 0x0a, "Reserved",                  0 },	 
+		{ 0x0b, "Bitmap (Type 1)",           &Pict1Parser::handleBitmapTypeOne },	 
+		{ 0x0c, "Graphics Text (Type 1)",    &Pict1Parser::handleGraphicsTextTypeOne },	 
+		{ 0x0d, "Graphics Text Attributes",  &Pict1Parser::handleGraphicsTextAttributes },	 
+		{ 0x0e, "Colormap",                  &Pict1Parser::handleColormap },
+		{ 0x0f, "Start Pict",                 &Pict1Parser::handleStartPict },
+		{ 0x10, "End Pict",                   &Pict1Parser::handleEndPict },
+		{ 0x11, "Postscript Data (Type 1)",  &Pict1Parser::handlePostscriptTypeOne },	 
+		{ 0x12, "Output Attributes",         0 },	 
+		{ 0x13, "Curved Polyline",           &Pict1Parser::handleCurvedPolyline },	 
+		{ 0x14, "Bitmap (Type 2)",           &Pict1Parser::handleBitmapTypeTwo },	 
+		{ 0x15, "Start Figure",              0 },	 
+		{ 0x16, "Start Chart",               0 },	 
+		{ 0x17, "Planperfect Data",          0 },	 
+		{ 0x18, "Graphics Text (Type 2)",    &Pict1Parser::handleGraphicsTextTypeTwo },	 
+		{ 0x19, "Start Pict (Type 2)",        0 },	 
+		{ 0x1a, "Graphics Text (Type 3)",    0 },	 
+		{ 0x1b, "Postscript Data (Type 2)",  &Pict1Parser::handlePostscriptTypeTwo },	 
+		{ 0x00, 0, 0 } // end marker
+	};	 
+
+	// initialization
+	m_recordLength = 0;
+	m_recordEnd = 0;
+	m_success = true;
+	m_exit = false;
+	m_graphicsStarted = false;
+	
+	// default style
+	m_penForeColor = libpict::PictColor(0,0,0);
+	m_penBackColor = libpict::PictColor(0,0,0);
+	m_style.insert("svg:stroke-width", 0.001);
+	// m_dashArray.height = 0.001;
+	m_style.insert("libpict:stroke-solid", true);
+	m_dashArray = libpict::PictDashArray();
+	m_brushForeColor = libpict::PictColor(0,0,0);
+	m_brushBackColor = libpict::PictColor(0,0,0);
+	m_style.insert("svg:stroke-color", m_penForeColor.getColorString());
+	m_style.insert("svg:stroke-opacity", m_penForeColor.getOpacity(), WPX_PERCENT);
+	m_style.insert("draw:fill-color", m_brushForeColor.getColorString());
+	m_style.insert("draw:opacity", m_brushForeColor.getOpacity(), WPX_PERCENT);
+	resetPalette();
+
+	while(!m_input->atEOS())
+	{
+#ifdef DEBUG
+		long recordPos = m_input->tell();
+#endif
+		int recordType = readU8();
+		if (recordType == 0)
+			break;
+		m_recordLength = readVariableLengthInteger();
+		m_recordEnd = m_input->tell() + m_recordLength - 1;
+
+		// search function to handler this record
+		int index = -1;
+		for(int i = 0; (index < 0) && handlers[i].name; i++)
+			if(handlers[i].type == recordType)
+				index = i;
+				
+		Pict_DEBUG_MSG(("\n"));
+		if(index < 0)
+			Pict_DEBUG_MSG(("Unknown record type 0x%02x at %li  size %d\n", 
+				recordType, recordPos, m_recordLength));
+		else
+		{
+			Method recordHandler = handlers[index].handler;
+			if(!recordHandler)
+				Pict_DEBUG_MSG(("Record '%s' (ignored) type 0x%02x at %li  size %d\n", 
+					handlers[index].name, recordType, recordPos, m_recordLength));
+			else
+			{
+				Pict_DEBUG_MSG(("Record '%s' type 0x%02x at %li  size %d\n", 
+					handlers[index].name, recordType, recordPos, m_recordLength));
+					
+				// invoke the handler for this record
+				(this->*recordHandler)();
+			}
+		}
+
+		//if(m_input->tell() > m_recordEnd+1)
+		{
+			//Pict_DEBUG_MSG(("Record 0x%x consumes more bytes than necessary!\n", recordType));
+			Pict_DEBUG_MSG(("Current stream position: %li\n", m_input->tell()));
+		}
+	
+		if(m_exit) break;
+		
+		m_input->seek(m_recordEnd+1, WPX_SEEK_SET);
+	}
+
+	if (!m_exit)
+		handleEndPict();
+
+	return m_success;
+}
+
+void Pict1Parser::handleStartPict()
+{
+	if (m_graphicsStarted)
+	{
+		handleEndPict();
+		return;
+	}
+	// unsigned char version = readU8();
+	// unsigned char bitFlags = readU8();
+	m_input->seek(2, WPX_SEEK_CUR);
+	m_width = readU16();
+	m_height = readU16();
+	
+	::WPXPropertyList propList;
+	propList.insert("svg:width", (double)m_width/1200.0);
+	propList.insert("svg:height", (double)m_height/1200.0);
+	m_painter->startGraphics(propList);
+	m_graphicsStarted = true;
+
+	Pict_DEBUG_MSG(("StartPict\n"));
+}
+
+void Pict1Parser::handleEndPict()
+{
+	if (!m_graphicsStarted)
+		return;
+	m_painter->endGraphics();
+	m_exit = true;
+	
+	Pict_DEBUG_MSG(("EndPict\n"));
+}
+
+void Pict1Parser::handleColormap()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned startIndex = readU16();
+	unsigned numEntries = readU16();
+	if (startIndex > 255 || numEntries > 256 || startIndex + numEntries > 256)
+		return;
+
+	Pict_DEBUG_MSG(("Colormap\n"));
+	for(unsigned int i = 0; i < numEntries; i++)
+	{
+		unsigned char red = readU8();
+		unsigned char green = readU8();
+		unsigned char blue = readU8();
+		libpict::PictColor color(red, green, blue);
+		m_colorPalette[startIndex+i] = color;
+		Pict_DEBUG_MSG(("Index#%d: RGB %s\n", startIndex+i, color.getColorString().cstr()));
+	}
+}
+
+void Pict1Parser::handleFillAttributes()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned char style = readU8();
+	unsigned char color = readU8();
+
+	if(style == 0)
+		m_style.insert("draw:fill", "none");
+	if(style == 1)
+		m_style.insert("draw:fill", "solid");
+
+	m_brushForeColor = m_colorPalette[color];
+	m_style.insert("draw:fill-color", m_brushForeColor.getColorString());
+	m_style.insert("draw:opacity", m_brushForeColor.getOpacity(), WPX_PERCENT);
+
+	Pict_DEBUG_MSG(("Fill Attributes\n"));
+	Pict_DEBUG_MSG(("         Fill style: %d\n", style));
+	Pict_DEBUG_MSG(("   Fill color index: %d\n", color));
+}
+
+void Pict1Parser::handleLineAttributes()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned char style = readU8();
+	unsigned char color = readU8();
+	unsigned int width = readU16();
+
+	m_style.insert("libpict:stroke-solid", style);
+	m_penForeColor = m_colorPalette[color];
+	m_style.insert("svg:stroke-color", m_penForeColor.getColorString());
+	m_style.insert("svg:stroke-opacity", m_penForeColor.getOpacity(), WPX_PERCENT);
+
+	if (!m_style["svg:stroke-width"]->getInt() && m_style["libpict:stroke-solid"]->getInt())
+		m_style.insert("svg:stroke-width", 0.001);
+	else
+		m_style.insert("svg:stroke-width", (double)width / 1200.0);
+
+	Pict_DEBUG_MSG(("Line Attributes\n"));
+	Pict_DEBUG_MSG(("         Line style: %d\n", style));
+	Pict_DEBUG_MSG(("   Line color index: %d\n", color));
+	Pict_DEBUG_MSG(("         Line width: %d\n", width));
+}
+
+void Pict1Parser::handleLine()
+{
+	if (!m_graphicsStarted)
+		return;
+	int sx = readS16();
+	int sy = readS16();
+	int ex = readS16();
+	int ey = readS16();
+
+	::WPXPropertyListVector points;
+	::WPXPropertyList point;
+	point.insert("svg:x", (double)sx/1200.0);
+	point.insert("svg:y", (double)(m_height-sy)/1200.0);
+	points.append(point);
+	point.clear();
+	point.insert("svg:x", (double)ex/1200.0);
+	point.insert("svg:y", (double)(m_height-ey)/1200.0);
+	points.append(point);
+
+	m_painter->setStyle(m_style, m_gradient);
+	
+	m_painter->drawPolyline(points);
+
+	Pict_DEBUG_MSG(("Line\n"));
+	Pict_DEBUG_MSG(("    Starting point: %d,%d\n", sx, sy));
+	Pict_DEBUG_MSG(("         End point: %d,%d\n", ex, ey));
+}
+
+void Pict1Parser::handlePolyline()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned int count = readU16();
+
+	::WPXPropertyListVector points;
+	::WPXPropertyList point;
+	for(unsigned int i = 0; i < count; i++ )
+	{
+		point.clear();
+		long x = readS16();
+		long y = readS16();
+		point.insert("svg:x", (double)x/1200.0);
+		point.insert("svg:y", (double)(m_height-y)/1200.0);
+		points.append(point);
+	}
+
+	m_painter->setStyle(m_style, ::WPXPropertyListVector());
+
+	m_painter->drawPolyline(points);
+
+	Pict_DEBUG_MSG(("Polyline\n"));
+}
+
+void Pict1Parser::handleRectangle()
+{
+	if (!m_graphicsStarted)
+		return;
+	int x = readS16();
+	int y = readS16();
+	int w = readS16();
+	int h = readS16();
+
+	::WPXPropertyList propList;
+	propList.insert("svg:x", (double)x/1200.0);
+	// in Pict, we have the coordinate of lower left point, in SVG-ish coordinates we have to get upper left
+	propList.insert("svg:y", (double)(m_height - h - y)/1200.0);
+	propList.insert("svg:width", (double)w/1200.0);
+	propList.insert("svg:height",(double)h/1200.0);
+
+	m_painter->setStyle(m_style, m_gradient);
+
+	m_painter->drawRectangle(propList);
+
+	Pict_DEBUG_MSG(("Line\n"));
+	Pict_DEBUG_MSG(("    Corner point: %d,%d\n", x, y));
+	Pict_DEBUG_MSG(("           Width: %d\n", w));
+	Pict_DEBUG_MSG(("          Height: %d\n", h));
+}
+
+void Pict1Parser::handlePolygon()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned int count = readU16();
+
+	::WPXPropertyListVector points;
+	::WPXPropertyList point;
+	for(unsigned int i = 0; i < count; i++ )
+	{
+		point.clear();
+		long x = readS16();
+		long y = readS16();
+		point.insert("svg:x", (double)x/1200.0);
+		point.insert("svg:y", (double)(m_height-y)/1200.0);
+		points.append(point);
+	}
+
+	m_painter->setStyle(m_style, m_gradient);
+
+	m_painter->drawPolygon(points);
+
+	Pict_DEBUG_MSG(("Polygon\n"));
+}
+
+void Pict1Parser::handleEllipse()
+{
+	if (!m_graphicsStarted)
+		return;
+
+	::WPXPropertyList propList;
+	propList.insert("svg:cx", (double)readS16()/1200.0);
+	propList.insert("svg:cy", (double)(m_height-readS16())/1200.0);
+	propList.insert("svg:rx", (double)readS16()/1200.0);
+	propList.insert("svg:ry", (double)readS16()/1200.0);
+	propList.insert("libpict:rotate", (double)readS16());
+
+#if 0
+	int beginAngle = readS16();
+	int endAngle = readS16();
+	unsigned flags = readU16();
+#endif
+	m_painter->setStyle(m_style, m_gradient);
+
+	m_painter->drawEllipse(propList);
+
+	Pict_DEBUG_MSG(("Ellipse\n"));
+	Pict_DEBUG_MSG(("    Center point: %s,%s\n", propList["svg:cx"]->getStr().cstr(), propList["svg:cy"]->getStr().cstr()));
+	Pict_DEBUG_MSG(("        Radius x: %s\n", propList["svg:rx"]->getStr().cstr()));
+	Pict_DEBUG_MSG(("        Radius y: %s\n", propList["svg:ry"]->getStr().cstr()));
+}
+
+void Pict1Parser::handleCurvedPolyline()
+{
+	if (!m_graphicsStarted)
+		return;
+	readU32();
+	unsigned int count = readU16();
+	if (!count)
+		return;
+	::WPXPropertyListVector path;
+	::WPXPropertyList element;
+
+	long xInitial = readS16();
+	long yInitial = readS16();
+	element.insert("libpict:path-action", "M");
+	element.insert("svg:x", (double)xInitial/1200.0);
+	element.insert("svg:y", (double)(m_height-yInitial)/1200.0);
+	path.append(element);
+	for (unsigned i = 1; i < (count-1)/3; i++)
+	{
+		long xControl1 = readS16();
+		long yControl1 = readS16();
+		long xControl2 = readS16();
+		long yControl2 = readS16();
+		long xCoordinate = readS16();
+		long yCoordinate = readS16();
+		
+		element.clear();
+		element.insert("libpict:path-action", "C");
+		element.insert("svg:x1", (double)xControl1/1200.0);
+		element.insert("svg:y1", (double)(m_height-yControl1)/1200.0);
+		element.insert("svg:x2", (double)xControl2/1200.0);
+		element.insert("svg:y2", (double)(m_height-yControl2)/1200.0);
+		element.insert("svg:x", (double)xCoordinate/1200.0);
+		element.insert("svg:y", (double)(m_height-yCoordinate)/1200.0);
+		path.append(element);
+		
+	}
+	
+	m_painter->setStyle(m_style, m_gradient);
+
+	m_painter->drawPath(path);
+	
+	Pict_DEBUG_MSG(("Curved Polyline\n"));
+}
+
+void Pict1Parser::decodeRLE(std::vector<unsigned char>& buffer, unsigned width, unsigned height, unsigned depth)
+{
+	buffer.clear();
+
+	// This are the known depth values for Pict1, no point to try to decode others since they are likely to indicate corruption
+	if (depth != 8 && depth != 4 && depth != 2 && depth != 1)
+		return;
+
+	// round to the next byte
+	unsigned scanline_width = (width * depth + 7)/8;
+	unsigned tmpBufferSize = scanline_width * height;
+	Pict_DEBUG_MSG(("Scanline width: %d\n", scanline_width));
+	Pict_DEBUG_MSG(("Output size: %d\n", scanline_width * height));
+
+	Pict_DEBUG_MSG(("Decoding RLE data\n"));
+
+	buffer.reserve(tmpBufferSize);
+ 	while (m_input->tell() < m_recordEnd && !m_input->atEOS() && buffer.size() < tmpBufferSize)
+	{
+		unsigned char opcode = readU8();
+
+		if(opcode & 0x80)
+		{
+			// run of byte
+			int count = (int)(opcode & 0x7f);
+			unsigned char pixel = (count > 0) ? readU8() : 0xff;
+			if(count == 0)
+				count = (int)readU8();
+			for( ; count ; --count)
+				buffer.push_back( pixel );
+		}
+		else
+		{
+			int count = (int)(opcode & 0x7f);
+			if(count > 0)
+			{
+				// literal byte copy
+				for( ; count ; --count)
+					buffer.push_back( readU8() );
+			}
+			else
+			{
+				// copy entire scan line
+				count = (int)readU8();
+				if (buffer.size() < scanline_width )
+				{
+					Pict_DEBUG_MSG(("Cannot copy the scanline, not enough data %li\n", (long)buffer.size()));
+					break;
+				}
+				unsigned raster_source = buffer.size() - scanline_width;
+				for( ; count; --count)
+					for(unsigned r = 0; r < scanline_width ; r++)
+					{
+						unsigned char pixel = buffer[raster_source + r];
+						buffer.push_back( pixel );
+					}
+			}
+		}
+	}
+	Pict_DEBUG_MSG(("Finish decoding RLE data\n"));
+	Pict_DEBUG_MSG(("Buffer length: %li\n", (long)buffer.size()));
+	
+	while (buffer.size() < tmpBufferSize)
+		buffer.push_back(0);
+}
+
+void Pict1Parser::fillPixels(libpict::PictBitmap& bitmap, const unsigned char* buffer, unsigned width, unsigned height, unsigned depth)
+{
+	// sanity
+	if(!buffer)
+		return;
+
+	if (depth != 8 && depth != 4 && depth != 2 && depth != 1)
+		return;
+
+	// round to the next byte
+	unsigned scanline_width = (width * depth + 7)/8;
+
+	// 1-bit image: black and white
+	if(depth == 1)
+	{
+		libpict::PictColor black(0, 0, 0);
+		libpict::PictColor white(255, 255, 255);
+		for(unsigned y = 0; y < height; y++)
+		{
+			const unsigned char* buf = buffer + y * scanline_width;
+			for(unsigned x = 0; x < width; x++)
+				if(buf[x/8] & (0x80 >> (x & 7)))
+					bitmap.setPixel(x, y, white);
+				else
+					bitmap.setPixel(x, y, black);
+		}
+	}
+	// 2-bit image: 4-color bitmap (indexed)
+	else if(depth == 2)
+	{
+		unsigned i = 0;
+		for (unsigned y = 0; y < height; y++)
+		for (unsigned x = 0; x < width; x++, i++)
+		{
+			if ((x==0) && (i % 4 != 0))
+				i = (i/4 + 1) * 4;
+			unsigned index = ((buffer[i/4] & (0x03 << 2*(3 - (i % 4)))) >> 2*(3 - (i % 4)));
+			const libpict::PictColor& color = m_colorPalette[index];
+			bitmap.setPixel(x, y, color);
+		}
+	}
+	// 4 -bit image: 16-colour bitmap (indexed)
+	else if(depth == 4)
+	{
+		unsigned i = 0;
+		for (unsigned y = 0; y < height; y++)
+		for (unsigned x = 0; x < width; x++, i++)
+		{
+			if ((x==0) && (i % 2 != 0))
+				i = (i/2 + 1) * 2;
+			unsigned index = ((buffer[i/2] & (0x0f << 4*(1 - (i % 2)))) >> 4*(1 - (i % 2)));
+			const libpict::PictColor& color = m_colorPalette[index];
+			bitmap.setPixel(x, y, color);
+		}
+	}
+	// 8-bit image: 256-colour image (indexed)
+	else if(depth == 8)
+	{
+		for(unsigned y = 0; y < height; y++)
+		{
+			const unsigned char* buf = buffer + y * scanline_width;
+			for(unsigned x = 0; x < width; x++)
+			{
+				const libpict::PictColor& color = m_colorPalette[buf[x]];
+				bitmap.setPixel(x, y, color);
+			}
+		}
+
+	}
+}
+
+void Pict1Parser::handleBitmapTypeOne()
+{
+	if (!m_graphicsStarted)
+		return;
+	int width = readS16();
+	int height = readS16();
+	int depth = readS16();
+	int hres = readS16();
+	int vres = readS16();
+	
+	Pict_DEBUG_MSG(("Bitmap\n"));
+	Pict_DEBUG_MSG(("                Width: %d\n", width));
+	Pict_DEBUG_MSG(("               Height: %d\n", height));
+	Pict_DEBUG_MSG(("                Depth: %d\n", depth));
+	Pict_DEBUG_MSG(("Horizontal resolution: %d\n", hres));
+	Pict_DEBUG_MSG(("  Vertical resolution: %d\n", vres));
+
+	// if this happens, likely corruption, bail out.
+	if (depth != 1 && depth != 2 && depth != 4 && depth != 8)
+		return;
+		
+	// Sanity checks
+	if(hres <= 0)
+		hres = 72;
+	if(vres <= 0)
+		vres = 72;
+	if (width < 0)
+		width = 0;
+	if (height < 0)
+		height = 0;
+	if (depth < 0)
+		depth = 0;
+
+	// Bitmap Type 1 does not specify position
+	// Assume on the corner (0,0)
+	
+	libpict::PictBitmap bitmap(width, height, vres, hres);
+	::WPXPropertyList propList;
+	propList.insert("svg:x", 0.0);
+	propList.insert("svg:y", 0.0);
+	propList.insert("svg:width", (double)width/(double)hres);
+	propList.insert("svg:height", (double)height/(double)vres);
+	propList.insert("libpict:mime-type", "image/bmp");
+
+	std::vector<unsigned char> buffer;
+	decodeRLE(buffer, width, height, depth);
+	if (buffer.size() && buffer.size() == (unsigned long)((width*depth + 7)/8)*height)
+	{
+		fillPixels(bitmap, &buffer[0], width, height, depth);
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+}
+
+void Pict1Parser::handleBitmapTypeTwo()
+{
+	if (!m_graphicsStarted)
+		return;
+	int rotation = readS16();
+	int x1 = readS16();
+	int y1 = readS16();
+	int x2 = readS16();
+	int y2 = readS16();
+	int width = readS16();
+	int height = readS16();
+	int depth = readS16();
+	int hres = readS16();
+	int vres = readS16();
+	
+	Pict_DEBUG_MSG(("Bitmap\n"));
+	Pict_DEBUG_MSG(("       Rotation Angle: %d\n", rotation));
+	Pict_DEBUG_MSG(("      Top left corner: %d,%d\n", x1, y1));
+	Pict_DEBUG_MSG(("  Bottom right corner: %d,%d\n", x2, y2));
+	Pict_DEBUG_MSG(("                Width: %d\n", width));
+	Pict_DEBUG_MSG(("               Height: %d\n", height));
+	Pict_DEBUG_MSG(("                Depth: %d\n", depth));
+	Pict_DEBUG_MSG(("Horizontal resolution: %d\n", hres));
+	Pict_DEBUG_MSG(("  Vertical resolution: %d\n", vres));
+
+	// if this happens, likely corruption, bail out.
+	if (rotation < 0 || rotation > 359)
+		return;
+	if (depth != 1 && depth != 2 && depth != 4 && depth != 8)
+		return;
+		
+	// Sanity checks
+	if(hres <= 0)
+		hres = 72;
+	if(vres <= 0)
+		vres = 72;
+	if (width < 0)
+		width = 0;
+	if (height < 0)
+		height = 0;
+	if (depth < 0)
+		depth = 0;
+
+	y1 = m_height - y1;
+	y2 = m_height - y2;
+
+	long xs1 = (x1 <= x2) ? x1 : x2;
+	long xs2 = (x1 <= x2) ? x2 : x1;
+	long ys1 = (y1 <= y2) ? y1 : y2;
+	long ys2 = (y1 <= y2) ? y2 : y1;
+	Pict_DEBUG_MSG(("%li %li   %li %li\n", xs1, ys1, xs2, ys2));
+
+	libpict::PictBitmap bitmap(width, height, vres, hres);
+	::WPXPropertyList propList;
+	propList.insert("svg:x", (double)xs1/(double)hres);
+	propList.insert("svg:y", (double)(ys1)/(double)vres);
+	propList.insert("svg:width", (double)(xs2-xs1)/(double)hres);
+	propList.insert("svg:height", (double)(ys2-ys1)/(double)vres);
+	propList.insert("libpict:mime-type", "image/bmp");
+
+	std::vector<unsigned char> buffer;
+	decodeRLE(buffer, width, height, depth);
+	if (buffer.size()  && buffer.size() == (unsigned long)((width*depth + 7)/8)*height)
+	{
+		fillPixels(bitmap, &buffer[0], width, height, depth);
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+}
+
+void Pict1Parser::handlePostscriptTypeOne()
+{
+	if (!m_graphicsStarted)
+		return;
+	long x1 = readS16();
+	long y1 = readS16();
+	long x2 = readS16();
+	long y2 = readS16();
+	
+	::WPXPropertyList propList;
+
+	propList.insert("svg:x", (double)x1/72.0);
+	propList.insert("svg:y", (double)m_height/1200.0 - (double)y1/72.0);
+	propList.insert("svg:width", ((double)x2 - (double)x1)/72.0);
+	propList.insert("svg:height", ((double)y1 - (double)y2)/72.0); 
+	propList.insert("libpict:mime-type", "application/x-postscript");
+	
+	::WPXBinaryData data;
+	data.clear();
+	while (!m_input->atEOS() && m_input->tell() <= m_recordEnd)
+		data.append((char)readU8());
+	if (data.size())
+		m_painter->drawGraphicObject(propList, data);
+}
+
+void Pict1Parser::handlePostscriptTypeTwo()
+{
+	if (!m_graphicsStarted)
+		return;
+#ifdef DEBUG
+	unsigned lengthOfData = readU32();
+	int rotation = readS16();
+#else
+	readU32();
+	readS16();
+#endif
+	int x1 = readS16();
+	int y1 = readS16();
+	int x2 = readS16();
+	int y2 = readS16();
+
+	Pict_DEBUG_MSG(("Postscript (Type 2)\n"));
+	Pict_DEBUG_MSG(("       Length of Data: %d\n", lengthOfData));
+	Pict_DEBUG_MSG(("       Rotation Angle: %d\n", rotation));
+	Pict_DEBUG_MSG(("   Bottom left corner: %d,%d\n", x1, y1));
+	Pict_DEBUG_MSG(("     Top right corner: %d,%d\n", x2, y2));
+
+	y1 = m_height - y1;
+	y2 = m_height - y2;
+
+	long xs1 = (x1 <= x2) ? x1 : x2;
+	long xs2 = (x1 <= x2) ? x2 : x1;
+	long ys1 = (y1 <= y2) ? y1 : y2;
+	long ys2 = (y1 <= y2) ? y2 : y1;
+	Pict_DEBUG_MSG(("%li %li   %li %li\n", xs1, ys1, xs2, ys2));
+
+	::WPXPropertyList propList;
+	
+	propList.insert("svg:x", (double)xs1/1200.0);
+	propList.insert("svg:y", (double)(ys1)/1200.0);
+	
+	propList.insert("svg:width", ((double)xs2 - (double)xs1)/1200.0);
+	propList.insert("svg:height", ((double)ys2 -(double)ys1)/1200.0);
+	
+	propList.insert("libpict:mime-type", "image/x-eps");
+
+	m_input->seek(48, WPX_SEEK_CUR);
+	
+	::WPXBinaryData data;
+	data.clear();
+	while (!m_input->atEOS() && m_input->tell() <= m_recordEnd)
+		data.append((char)readU8());
+	if (data.size())
+		m_painter->drawGraphicObject(propList, data);
+}
+
+void Pict1Parser::handleGraphicsTextAttributes()
+{
+	if (!m_graphicsStarted)
+		return;
+}
+
+void Pict1Parser::handleGraphicsTextTypeOne()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned short textLength = readU16();
+	int x = readS16();
+	int y = readS16();
+	WPXString textString;
+	for (unsigned short i=0; i < textLength; i++)
+		textString.append(readU8());
+
+	Pict_DEBUG_MSG(("Graphics Text (Type 1)\n"));
+	Pict_DEBUG_MSG(("  Length of String: %d\n", textLength));
+	Pict_DEBUG_MSG(("   String position: %d,%d\n", x, y));
+	Pict_DEBUG_MSG(("            String: %s\n", textString.cstr()));
+
+	y = m_height - y;
+
+	::WPXPropertyList propList;
+	
+	propList.insert("svg:x", (double)x/1200.0);
+	propList.insert("svg:y", (double)(y)/1200.0);
+	
+	m_painter->startTextObject(propList, ::WPXPropertyListVector());
+	
+	m_painter->insertText(textString);
+	
+	m_painter->endTextObject();
+}
+
+void Pict1Parser::handleGraphicsTextTypeTwo()
+{
+	if (!m_graphicsStarted)
+		return;
+#ifdef DEBUG
+	int sizeEquivalentData = readU32();
+	short rotationAngle = readS16();
+#endif
+	unsigned short textLength = readU16();
+#ifdef DEBUG
+	int x1 = readS16();
+	int y1 = readS16();
+	int x2 = readS16();
+	int y2 = readS16();
+	int sx = readS16();
+	int sy = readS16();
+	unsigned char type = readU8();
+#endif
+	WPXBinaryData textString;
+	for (unsigned short i=0; i < textLength; i++)
+		textString.append(readU8());
+
+	Pict_DEBUG_MSG(("Graphics Text (Type 1)\n"));
+	Pict_DEBUG_MSG(("  Size of Equivalent data: %d\n", sizeEquivalentData));
+	Pict_DEBUG_MSG(("           Rotation Angle: %d\n", rotationAngle));
+	Pict_DEBUG_MSG(("         Length of String: %d\n", textLength));
+	Pict_DEBUG_MSG(("           Start position: %d,%d\n", x1, y1));
+	Pict_DEBUG_MSG(("             End position: %d,%d\n", x2, y2));
+	Pict_DEBUG_MSG(("             Scale factor: %d,%d\n", sx, sy));
+	Pict_DEBUG_MSG(("                     Type: %d\n", type));
+	
+//	PictTextDataHandler handler(m_painter);
+//	WPDocument::parseSubDocument(const_cast<WPXInputStream *>(textString.getDataStream()), &handler, WPD_FILE_FORMAT_WP5);
+}
+
+void Pict1Parser::resetPalette()
+{
+	m_colorPalette.clear();
+	for (int i=0; i<256; i++)
+	{
+		unsigned char red = defaultPict1PaletteRed[i];
+		unsigned char green = defaultPict1PaletteGreen[i];
+		unsigned char blue = defaultPict1PaletteBlue[i];
+		libpict::PictColor color(red, green, blue);
+		m_colorPalette[i] = color;
+	}
+}
+
diff --git a/src/lib/Pict1Parser.h b/src/lib/Pict1Parser.h
new file mode 100644
index 0000000..780dbbf
--- /dev/null
+++ b/src/lib/Pict1Parser.h
@@ -0,0 +1,90 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __Pict1PARSER_H__
+#define __Pict1PARSER_H__
+
+#include "PictXParser.h"
+#include "PictDashArray.h"
+#include "PictBitmap.h"
+#include <libwpd/libwpd.h>
+#include <vector>
+
+class Pict1Parser : public PictXParser
+{
+public:
+	Pict1Parser(WPXInputStream *input, libwpg::WPGPaintInterface* painter);
+	bool parse();
+
+private:
+	void handleStartPict();
+	void handleEndPict();
+
+	void handleFillAttributes();
+	void handleLineAttributes();
+	void handleColormap();
+
+	void handleLine();
+	void handlePolyline();
+	void handleRectangle();
+	void handlePolygon();
+	void handleEllipse();
+	
+	void handleCurvedPolyline();
+
+	void decodeRLE(std::vector<unsigned char>& buffer, unsigned width, unsigned height, unsigned depth);
+	void fillPixels(libpict::PictBitmap& bitmap, const unsigned char* buffer, unsigned width, unsigned height, unsigned depth);
+	void handleBitmapTypeOne();
+	void handleBitmapTypeTwo();
+	void handlePostscriptTypeOne();
+	void handlePostscriptTypeTwo();
+	
+	void handleGraphicsTextAttributes();
+	void handleGraphicsTextTypeOne();
+	void handleGraphicsTextTypeTwo();
+	void handleGraphicsTextTypeThree();
+
+	void resetPalette();
+
+	// parsing context
+	int m_recordLength;
+	long m_recordEnd;
+	bool m_success;
+	bool m_exit;
+	bool m_graphicsStarted;
+	int m_width;
+	int m_height;
+	::WPXPropertyList m_style;
+	libpict::PictColor m_penForeColor;
+	libpict::PictColor m_penBackColor;
+	libpict::PictColor m_brushForeColor;
+	libpict::PictColor m_brushBackColor;
+	libpict::PictDashArray m_dashArray;
+	::WPXPropertyListVector m_gradient;
+};
+
+#endif // __Pict1PARSER_H__
diff --git a/src/lib/Pict2Parser.cpp b/src/lib/Pict2Parser.cpp
new file mode 100644
index 0000000..19cb03b
--- /dev/null
+++ b/src/lib/Pict2Parser.cpp
@@ -0,0 +1,2292 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005-2007 Fridrich Strba (fridrich.strba@bluewin.ch)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "Pict2Parser.h"
+#include "libpict_utils.h"
+
+#include <libwpg/libwpg.h>
+#include <math.h>
+#include <vector>
+
+// MSVC++ 6.0 does not have the macro defined, so we define it
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#define DUMP_BINARY_DATA 0
+
+#if DUMP_BINARY_DATA
+#include <sstream>
+#endif
+
+namespace {
+
+static double fixedPointToDouble(const unsigned int fixedPointNumber)
+{
+	short fixedPointNumberIntegerPart = (short)((fixedPointNumber & 0xFFFF0000) >> 16);
+	double fixedPointNumberFractionalPart = (double)((double)(fixedPointNumber & 0x0000FFFF)/(double)0xFFFF);
+	return ((fixedPointNumberIntegerPart >= 0) ?
+		((double)fixedPointNumberIntegerPart + fixedPointNumberFractionalPart) :
+		((double)fixedPointNumberIntegerPart - fixedPointNumberFractionalPart));
+}
+}	
+
+static const unsigned char defaultPict2PaletteRed[] = {
+	0x00, 0xFF, 0x7F, 0xBF, 0x00, 0x00, 0x00, 0x7F,
+	0x7F, 0x7F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF,
+	0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+	0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x3D, 0x48, 0x53, 0x5E, 0x69, 0x74, 0x7F, 0x8A,
+	0x95, 0xA0, 0xAB, 0xB6, 0xC1, 0xCC, 0xD7, 0xE2,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x3D, 0x48, 0x53, 0x5E, 0x69, 0x74, 0x7F, 0x8A,
+	0x95, 0xA0, 0xAB, 0xB6, 0xC1, 0xCC, 0xD7, 0xE2,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE4, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE4, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x33, 0x47, 0x61, 0x73, 0x87, 0x9C, 0xB0, 0xC7,
+	0xCC, 0xD4, 0xDB, 0xE3, 0xE8, 0xF0, 0xF7, 0xFF,
+};
+
+static const unsigned char defaultPict2PaletteGreen[] = {
+	0x00, 0xFF, 0x7F, 0xBF, 0x00, 0x7F, 0x7F, 0x00,
+	0x00, 0x7F, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF,
+	0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+	0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x3D, 0x48, 0x53, 0x5E, 0x69, 0x74, 0x7F, 0x8A,
+	0x95, 0xA0, 0xAB, 0xB6, 0xC1, 0xCC, 0xD7, 0xE2,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x56, 0x64, 0x72, 0x80, 0x8E, 0x9C, 0xAA, 0xB1,
+	0xB8, 0xBF, 0xC6, 0xCD, 0xD4, 0xDB, 0xE2, 0xE9,
+	0x2B, 0x32, 0x39, 0x40, 0x47, 0x4E, 0x55, 0x63,
+	0x71, 0x7F, 0x8D, 0x9B, 0xA9, 0xB7, 0xC5, 0xD3,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x29, 0x38, 0x45, 0x4F, 0x5C, 0x63, 0x69, 0xD4,
+	0x87, 0x8F, 0x9C, 0xA8, 0xB3, 0xC4, 0xCF, 0xE0,
+};
+
+static const unsigned char defaultPict2PaletteBlue[] = {
+	0x00, 0xFF, 0x7F, 0xBF, 0x7F, 0x00, 0x7F, 0x00,
+	0x7F, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00,
+	0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+	0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
+	0x2C, 0x42, 0x58, 0x6E, 0x84, 0x9A, 0xB0, 0xC6,
+	0x3D, 0x48, 0x53, 0x5E, 0x69, 0x74, 0x7F, 0x8A,
+	0x95, 0xA0, 0xAB, 0xB6, 0xC1, 0xCC, 0xD7, 0xE2,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE9, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xB0, 0xD3, 0xE4, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE4, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE4, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE4, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x7B, 0x91, 0xA7, 0xBD, 0xD3, 0xE4, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x3D, 0x48, 0x53, 0x5E, 0x69, 0x74, 0x7F, 0x8A,
+	0x95, 0xA0, 0xAB, 0xB6, 0xC1, 0xCC, 0xD7, 0xE2,
+	0x11, 0x17, 0x1C, 0x24, 0x29, 0x2B, 0x2B, 0x30,
+	0x47, 0x57, 0x69, 0x78, 0x8C, 0x9C, 0xB0, 0xC7,
+};
+
+class Pict2Parser::ObjectCharacterization
+{
+public:
+	bool taper;
+	bool translate;
+	bool skew;
+	bool scale;
+	bool rotate;
+	bool hasObjectId;
+	bool editLock;
+	bool windingRule;
+	bool filled;
+	bool closed;
+	bool framed;
+
+	unsigned long objectId;
+	unsigned long lockFlags;
+	double rotationAngle;
+	long sxcos;
+	long sycos;
+	long kxsin;
+	long kysin;
+	long txinteger;
+	unsigned short txfraction;
+	long tyinteger;
+	unsigned short tyfraction;
+	long px;
+	long py;
+
+	Pict2TransformMatrix matrix;
+
+	ObjectCharacterization():
+		taper(false),
+		translate(false),
+		skew(false),
+		scale(false),
+		rotate(false),
+		hasObjectId(false),
+		editLock(false),
+		windingRule(false),
+		filled(false),
+		closed(false),
+		framed(true),
+		objectId(0),
+		lockFlags(0),
+		rotationAngle(0.0),
+		sxcos(0),
+		sycos(0),
+		kxsin(0),
+		kysin(0),
+		txinteger(0),
+		txfraction(0),
+		tyinteger(0),
+		tyfraction(0),
+		px(0),
+		py(0),
+		matrix()
+			{}
+};
+
+Pict2Parser::Pict2Parser(WPXInputStream *input, libwpg::WPGPaintInterface* painter, bool isEmbedded):
+	PictXParser(input, painter),
+	m_recordLength(0),
+	m_recordEnd(0),
+	m_success(true), m_exit(false), m_graphicsStarted(isEmbedded),
+	m_xres(1200), m_yres(1200),
+	m_xofs(0), m_yofs(0),
+	m_width(0), m_height(0),
+	m_doublePrecision(false),
+	m_style(),
+	m_penForeColor(0,0,0),
+	m_penBackColor(0xff,0xff,0xff),
+	m_brushForeColor(0,0,0),
+	m_brushBackColor(0xff,0xff,0xff),
+	m_dashArray(),
+	m_gradient(),
+	m_dashArrayStyles(),
+	m_layerOpened(false), m_layerId(0),
+	m_matrix(),
+	m_gradientAngle(0.0),
+	m_gradientRef(),
+	m_groupStack(),
+	m_compoundMatrix(),
+	m_compoundWindingRule(false),
+	m_compoundFilled(false),
+	m_compoundFramed(true),
+	m_compoundClosed(false),
+	m_bitmap(),
+	m_binaryData(),
+	m_hFlipped(false),
+	m_vFlipped(false),
+	m_textData(),
+	m_drawTextData(false),
+	m_binaryId(0),
+	m_embedded(isEmbedded)
+{
+	m_style.insert("draw:fill", "solid");
+	// default style
+	m_penForeColor = ::libpict::PictColor(0,0,0);
+	m_penBackColor = ::libpict::PictColor(0xff,0xff,0xff);
+	m_style.insert("svg:stroke-width", 0.001);
+//	m_pen.height = 0.0;
+	m_style.insert("libpict:stroke-solid", true);
+	m_dashArray = libpict::PictDashArray();
+	m_brushForeColor = ::libpict::PictColor(0,0,0);
+	m_brushBackColor = ::libpict::PictColor(0xff,0xff,0xff);
+
+	m_style.insert("svg:stroke-color", m_penForeColor.getColorString());
+	m_style.insert("svg:stroke-opacity", m_penForeColor.getOpacity(), WPX_PERCENT);
+	m_style.insert("draw:fill-color", m_brushForeColor.getColorString());
+	m_style.insert("draw:opacity", m_brushForeColor.getOpacity(), WPX_PERCENT);
+
+	resetPalette();
+	m_style.insert("draw:fill", "solid");
+}
+
+bool Pict2Parser::parse()
+{
+	typedef void (Pict2Parser::*Method)();
+
+	struct RecordHandler
+	{
+		int type;
+		const char *name;
+		Method handler;
+	};
+
+	static const struct RecordHandler handlers[] =
+	{
+		{ 0x01, "Start Pict",            &Pict2Parser::handleStartPict },
+		{ 0x02, "End Pict",              &Pict2Parser::handleEndPict },
+		{ 0x03, "Form Settings",        &Pict2Parser::handleFormSettings },
+		{ 0x04, "Ruler Settings",       0 },     // ignored
+		{ 0x05, "Grid Settings",        0 },     // ignored
+		{ 0x06, "Layer",                &Pict2Parser::handleLayer },
+		{ 0x08, "Pen Style Definition", &Pict2Parser::handlePenStyleDefinition },
+		{ 0x09, "Pattern Definition",   0 },
+		{ 0x0a, "Comment",              0 },     // ignored
+		{ 0x0b, "Color Transfer",       0 },
+		{ 0x0c, "Color Palette",        &Pict2Parser::handleColorPalette },
+		{ 0x0d, "DP Color Palette",     &Pict2Parser::handleDPColorPalette },
+		{ 0x0e, "Bitmap Data",          &Pict2Parser::handleBitmapData },
+		{ 0x0f, "Text Data",            &Pict2Parser::handleTextData },
+		{ 0x10, "Chart Style",          0 },     // ignored
+		{ 0x11, "Chart Data",           0 },     // ignored
+		{ 0x12, "Object Image",         &Pict2Parser::handleObjectImage },
+		{ 0x15, "Polyline",             &Pict2Parser::handlePolyline },
+		{ 0x16, "Polyspline",           &Pict2Parser::handlePolyspline },
+		{ 0x17, "Polycurve",            &Pict2Parser::handlePolycurve },
+		{ 0x18, "Rectangle",            &Pict2Parser::handleRectangle },
+		{ 0x19, "Arc",                  &Pict2Parser::handleArc },
+		{ 0x1a, "Compound Polygon",     &Pict2Parser::handleCompoundPolygon },
+		{ 0x1b, "Bitmap",               &Pict2Parser::handleBitmap },
+		{ 0x1c, "Text Line",            &Pict2Parser::handleTextLine },
+		{ 0x1d, "Text Block",           &Pict2Parser::handleTextBlock },
+		{ 0x1e, "Text Path",            &Pict2Parser::handleTextPath },
+		{ 0x1f, "Chart",                0 },
+		{ 0x20, "Group",                0 },
+		{ 0x21, "Object Capsule",       &Pict2Parser::handleObjectCapsule },
+		{ 0x22, "Font Settings",        0 },
+		{ 0x25, "Pen Fore Color",       &Pict2Parser::handlePenForeColor },
+		{ 0x26, "DP Pen Fore Color",    &Pict2Parser::handleDPPenForeColor },
+		{ 0x27, "Pen Back Color",       &Pict2Parser::handlePenBackColor },
+		{ 0x28, "DP Pen Back Color",    &Pict2Parser::handleDPPenBackColor },
+		{ 0x29, "Pen Style",            &Pict2Parser::handlePenStyle },
+		{ 0x2a, "Pen Pattern",          0 },
+		{ 0x2b, "Pen Size",             &Pict2Parser::handlePenSize },
+		{ 0x2c, "DP Pen Size",          &Pict2Parser::handleDPPenSize  },
+		{ 0x2d, "Line Cap",             &Pict2Parser::handleLineCap },
+		{ 0x2e, "Line Join",            &Pict2Parser::handleLineJoin },
+		{ 0x2f, "Brush Gradient",       &Pict2Parser::handleBrushGradient },
+		{ 0x30, "DP Brush Gradient",    &Pict2Parser::handleDPBrushGradient },
+		{ 0x31, "Brush Fore Color",     &Pict2Parser::handleBrushForeColor },
+		{ 0x32, "DP Brush Fore Color",  &Pict2Parser::handleDPBrushForeColor },
+		{ 0x33, "Brush Back Color",     &Pict2Parser::handleBrushBackColor },
+		{ 0x34, "DP Brush Back Color",  &Pict2Parser::handleDPBrushBackColor },
+		{ 0x35, "Brush Pattern",        &Pict2Parser::handleBrushPattern },
+		{ 0x36, "Horizontal Line",      0 },
+		{ 0x37, "Vertical Line",        0 },
+		{ 0x38, "Poster Settings",      0 },
+		{ 0x39, "Image State",          0 },
+		{ 0x3a, "Envelope Definition",  0 },
+		{ 0x3b, "Envelope",             0 },
+		{ 0x3c, "Texture Definition",   0 },
+		{ 0x3d, "Brush Texture",        0 },
+		{ 0x3e, "Texture Alignment",    0 },
+		{ 0x3f, "Pen Texture ",         0 },
+		{ 0x00, 0, 0 } // end marker
+	};
+	
+	while(!m_input->atEOS())
+	{
+#ifdef DEBUG
+		long recordPos = m_input->tell();
+#endif
+		readU8();
+		int recordType = readU8();
+		if (recordType == 0 || recordType > (int)0x3f)
+			break;
+		int extension = readVariableLengthInteger();
+		m_recordLength = readVariableLengthInteger();
+		m_recordEnd = m_input->tell() + m_recordLength - 1;
+
+		// inside a subgroup, one less sub record
+		if(!m_groupStack.empty())
+			m_groupStack.top().subIndex--;
+
+		// search function to handler this record
+		int index = -1;
+		for(int i = 0; (index < 0) && handlers[i].name; i++)
+			if(handlers[i].type == recordType)
+				index = i;
+
+		Pict_DEBUG_MSG(("\n"));
+		if(index < 0)
+		{
+			Pict_DEBUG_MSG(("Unknown record type 0x%02x at %li  size %d  extension %d\n",
+				recordType, recordPos, m_recordLength, extension));
+		}
+		else
+		{
+			Method recordHandler = handlers[index].handler;
+
+			if(!recordHandler)
+				Pict_DEBUG_MSG(("Record '%s' (ignored) type 0x%02x at %li  size %d  extension %d\n",
+					handlers[index].name, recordType, recordPos, m_recordLength, extension));
+			else
+			{
+				Pict_DEBUG_MSG(("Record '%s' type 0x%02x at %li  size %d  extension %d\n",
+					handlers[index].name, recordType, recordPos, m_recordLength, extension));
+
+				// invoke the handler for this record
+				(this->*recordHandler)();
+			}
+		}
+
+		// the last subgroup
+		if(!m_groupStack.empty())
+		{
+			PictGroupContext& context = m_groupStack.top();
+			if(context.subIndex == 0)
+			{
+				if(context.isCompoundPolygon())
+					flushCompoundPolygon();
+				m_groupStack.pop();
+			}
+		}
+
+		// we enter another subgroup, save the context to stack
+		if(extension > 0)
+		{
+			PictGroupContext context;
+			context.parentType = recordType;
+			context.subIndex = extension;
+			if(context.isCompoundPolygon())
+			{
+				context.compoundMatrix = m_compoundMatrix;
+				context.compoundFilled = m_compoundFilled;
+				context.compoundFramed = m_compoundFramed;
+				context.compoundClosed = m_compoundClosed;
+			}
+			m_groupStack.push(context);
+		}
+
+		//if(m_input->tell() > m_recordEnd+1)
+		{
+			//Pict_DEBUG_MSG(("Record 0x%x consumes more bytes than necessary!\n", recordType));
+			Pict_DEBUG_MSG(("Current stream position: %li\n", m_input->tell()));
+		}
+
+		if(m_exit) break;
+
+		m_input->seek(m_recordEnd+1, WPX_SEEK_SET);
+	}
+	
+	if (!m_exit)
+		handleEndPict();
+
+	return m_success;
+}
+
+#ifdef DEBUG
+static const char* describePrecision(unsigned char precision)
+{
+	const char* result = "Unknown";
+	switch(precision)
+	{
+		case 0: result = "single"; break;
+		case 1: result = "double"; break;
+		default: break;
+	}
+	return result;
+}
+
+static const char* describeGradient(unsigned char gradientType)
+{
+	const char* result = "Unknown";
+	switch(gradientType)
+	{
+		case 0: result = "None"; break;
+		case 1: result = "Linear"; break;
+		case 2: result = "Polygonal"; break;
+		case 3: result = "Concentric Circles"; break;
+		case 4: result = "Convergent Circles"; break;
+		case 5: result = "Concentric Ellipses"; break;
+		case 6: result = "Convergent Ellipses"; break;
+		case 7: result = "Concentric Squares"; break;
+		case 8: result = "Convergent Squares"; break;
+		case 9: result = "Concentric Rectangles"; break;
+		case 10: result = "Convergent Rectangles"; break;
+		default: break;
+	}
+	return result;
+}
+#endif
+
+#define TO_DOUBLE(x) ( (m_doublePrecision) ? ((double)(x)/65536.0) : (double)(x) )
+#define TRANSFORM_XY(x,y) { m_matrix.transform((x),(y)); (x)-= m_xofs; (y)-= m_yofs; (y)=m_height-(y); }
+
+void Pict2Parser::handleStartPict()
+{
+	if (m_graphicsStarted) // second start pict in the document == possible corruption, bail out
+	{
+		handleEndPict();
+		return;
+	}
+		
+	unsigned int horizontalUnit = readU16();
+	unsigned int verticalUnit = readU16();
+	unsigned char precision = readU8();
+
+	// sanity check
+	m_xres = horizontalUnit;
+	m_yres = verticalUnit;
+	if((horizontalUnit==0) || (verticalUnit==0))
+	{
+		m_xres = m_yres = 1200;
+		Pict_DEBUG_MSG(("Warning ! Insane unit of measure"));
+	}
+
+	// danger if we do not recognize the precision code
+	if(precision != 0 && precision != 1)
+	{
+		m_success = false;
+		m_exit = true;
+		return;
+	}
+	m_doublePrecision = (precision == 1);
+
+#ifdef DEBUG
+	long viewportX1 = (m_doublePrecision) ? readS32() : readS16();
+	long viewportY1 = (m_doublePrecision) ? readS32() : readS16();
+	long viewportX2 = (m_doublePrecision) ? readS32() : readS16();
+	long viewportY2 = (m_doublePrecision) ? readS32() : readS16();
+#else
+	m_input->seek(((m_doublePrecision) ? 16 : 8), WPX_SEEK_CUR);
+#endif
+	long imageX1 = (m_doublePrecision) ? readS32() : readS16();
+	long imageY1 = (m_doublePrecision) ? readS32() : readS16();
+	long imageX2 = (m_doublePrecision) ? readS32() : readS16();
+	long imageY2 = (m_doublePrecision) ? readS32() : readS16();
+
+	// used to adjust coordinates
+	m_xofs = (imageX1 < imageX2) ? imageX1 : imageX2;
+	m_yofs = (imageY1 < imageY2) ? imageY1 : imageX2;
+	m_width = (imageX2 > imageX1 ) ? imageX2-imageX1 : imageX1-imageX2;
+	m_height = (imageY2 > imageY1) ? imageY2-imageY1 : imageY1-imageY2;
+
+	Pict_DEBUG_MSG(("StartPict 2\n"));
+	Pict_DEBUG_MSG(("  Horizontal unit of measure : %d pixels/inch\n", horizontalUnit));
+	Pict_DEBUG_MSG(("    Vertical unit of measure : %d pixels/inch\n", verticalUnit));
+	Pict_DEBUG_MSG(("              Data precision : %d (%s)\n", precision, describePrecision(precision)));
+	Pict_DEBUG_MSG(("                 Viewport X1 : %li\n", viewportX1));
+	Pict_DEBUG_MSG(("                 Viewport Y1 : %li\n", viewportY1));
+	Pict_DEBUG_MSG(("                 Viewport X2 : %li\n", viewportX2));
+	Pict_DEBUG_MSG(("                 Viewport Y2 : %li\n", viewportY2));
+	Pict_DEBUG_MSG(("                    Image X1 : %li\n", imageX1));
+	Pict_DEBUG_MSG(("                    Image Y1 : %li\n", imageY1));
+	Pict_DEBUG_MSG(("                    Image X2 : %li\n", imageX2));
+	Pict_DEBUG_MSG(("                    Image Y2 : %li\n", imageY2));
+	Pict_DEBUG_MSG(("                    X offset : %li\n", m_xofs));
+	Pict_DEBUG_MSG(("                    Y offset : %li\n", m_yofs));
+	Pict_DEBUG_MSG(("                       width : %li\n", m_width));
+	Pict_DEBUG_MSG(("                      height : %li\n", m_height));
+
+	::WPXPropertyList propList;
+	propList.insert("svg:width", ((TO_DOUBLE(m_width)) / m_xres));
+	propList.insert("svg:height", ((TO_DOUBLE(m_height)) / m_yres));
+
+	m_painter->startGraphics(propList);
+
+	static const int Pict2_defaultPenDashes[] = {
+		1,   291,  0,                            // style #0 (actually solid)
+		1,   218, 73,                            // style #1
+		1,   145, 73,                            // style #2
+		1,    73, 73,                            // style #3
+		1,    36, 36,                            // style #4
+		1,    18, 18,                            // style #5
+		1,    18, 55,                            // style #6
+		3,    18, 55,  18, 55, 18, 127,          // style #7
+		2,   164, 55,  18, 55,                   // style #8
+		3,   145, 36, 138, 36, 18,  36,          // style #9
+		3,    91, 55,  91, 55, 18,  55,          // style #10
+		4,    91, 36,  91, 36, 18,  36, 18, 36,  // style #11
+		2,   182, 73,  73, 73,                   // style #12
+		3,   182, 36,  55, 36, 55,  36,          // style #13
+		3,   255, 73, 255, 73, 73,  73,          // style #14
+		4,   273, 36, 273, 36, 55,  36, 55, 36,  // style #15
+		0 // end marker
+	};
+
+	// create default pen styles
+	int styleNo = 0;
+	for(int i = 0; (long)i < (long)(sizeof(Pict2_defaultPenDashes)/sizeof(Pict2_defaultPenDashes[0]));)
+	{
+		int segments = 2 * Pict2_defaultPenDashes[i++];
+		if(segments == 0) break;
+		libpict::PictDashArray dashArray;
+		for(int j = 0; j < segments; j++, i++)
+			dashArray.add(Pict2_defaultPenDashes[i]*3.6/218.0);
+		m_dashArrayStyles[styleNo] = dashArray;
+		styleNo++;
+	}
+	m_graphicsStarted = true;
+}
+
+void Pict2Parser::handleEndPict()
+{
+	if (!m_graphicsStarted)
+		return;
+	// sentinel
+	if(m_layerOpened)
+		m_painter->endLayer();
+
+	m_painter->endGraphics();
+	m_exit = true;
+}
+
+void Pict2Parser::handleFormSettings()
+{
+#ifdef DEBUG
+	unsigned int w = (m_doublePrecision) ? readU32() : readU16();
+	unsigned int h = (m_doublePrecision) ? readU32() : readU16();
+	double width = (TO_DOUBLE(w)) / m_xres;
+	double height = (TO_DOUBLE(h)) / m_yres;
+	m_input->seek(((m_doublePrecision) ? 4 : 2), WPX_SEEK_CUR);
+	unsigned int ml = (m_doublePrecision) ? readU32() : readU16();
+	unsigned int mr = (m_doublePrecision) ? readU32() : readU16();
+	unsigned int mt = (m_doublePrecision) ? readU32() : readU16();
+	unsigned int mb = (m_doublePrecision) ? readU32() : readU16();
+	double margL = (TO_DOUBLE(ml)) / m_xres;
+	double margR = (TO_DOUBLE(mr)) / m_xres;
+	double margT = (TO_DOUBLE(mt)) / m_xres;
+	double margB = (TO_DOUBLE(mb)) / m_xres;
+	
+	Pict_DEBUG_MSG(("Form Settings: width: %f height : %f\n", width, height));
+	Pict_DEBUG_MSG(("Form Margins:  left: %f right : %f top: %f bottom: %f\n", margL, margR, margT, margB));
+#endif
+}
+
+void Pict2Parser::handleLayer()
+{
+	if (!m_graphicsStarted)
+		return;
+	WPXPropertyList propList;
+	propList.insert("svg:id", (int)readU16());
+
+	// close previous one
+	if(m_layerOpened)
+		m_painter->endLayer();
+
+	m_painter->startLayer(propList);
+	m_layerOpened = true;
+
+	Pict_DEBUG_MSG(("  Layer Id: %d\n", m_layerId));
+}
+
+void Pict2Parser::handleCompoundPolygon()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+
+	m_compoundWindingRule = objCh.windingRule;
+	m_compoundMatrix = objCh.matrix;
+	m_compoundFilled = objCh.filled;
+	m_compoundFramed = objCh.framed;
+	m_compoundClosed = objCh.closed;
+}
+
+void Pict2Parser::flushCompoundPolygon()
+{
+	if (!m_graphicsStarted)
+		return;
+	PictGroupContext& context = m_groupStack.top();
+
+	WPXPropertyList tmpStyle = m_style;
+	
+	if (!context.compoundFilled)
+		tmpStyle.insert("draw:fill", "none");
+
+	if(context.compoundWindingRule)
+		tmpStyle.insert("svg:fill-rule", "nonzero");
+	else
+		tmpStyle.insert("svg:fill-rule", "evenodd");
+
+	m_painter->setStyle( tmpStyle, context.compoundFilled ? m_gradient : ::WPXPropertyListVector() );
+
+	if (context.compoundClosed)
+	{
+		WPXPropertyList element;
+		element.insert("libpict:path-action", "Z");
+		context.compoundPath.append(element);
+	}
+	m_painter->drawPath(context.compoundPath);
+}
+
+void Pict2Parser::handlePenStyleDefinition()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned int style = readU16();
+	unsigned int segments = readU16();
+
+	libpict::PictDashArray dashArray;
+	for(unsigned i = 0; i < segments; i++)
+	{
+		unsigned int p = (m_doublePrecision) ? readU32() : readU16();
+		unsigned int q = (m_doublePrecision) ? readU32() : readU16();
+		dashArray.add(TO_DOUBLE(p)*3.6/218.0);
+		dashArray.add(TO_DOUBLE(q)*3.6/218.0);
+	}
+	m_dashArrayStyles[style] = dashArray;
+
+	Pict_DEBUG_MSG(("          Style : %d\n", style));
+	Pict_DEBUG_MSG(("  Segment pairs : %d\n", segments));
+}
+
+#if 0
+// TODO
+void Pict2Parser::handlePatternDefinition()
+{
+	if (!m_graphicsStarted)
+		return;
+	Pict_DEBUG_MSG(("PatternDefinition\n"));
+}
+#endif
+
+void Pict2Parser::handleColorPalette()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned startIndex = readU16();
+	unsigned numEntries = readU16();
+
+	for(unsigned i = 0; i < numEntries; i++)
+	{
+		unsigned char red = readU8();
+		unsigned char green = readU8();
+		unsigned char blue = readU8();
+		unsigned char alpha = 0xff - readU8();
+		libpict::PictColor color(red, green, blue, alpha);
+		m_colorPalette[startIndex+i] = color;
+		Pict_DEBUG_MSG(("Index#%d: RGB %s\n", startIndex+i, color.getColorString().cstr()));
+	}
+}
+
+void Pict2Parser::handleDPColorPalette()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned startIndex = readU16();
+	unsigned numEntries = readU16();
+
+	for(unsigned int i = 0; i < numEntries; i++)
+	{
+		unsigned char red = readU16() >> 8 ;
+		unsigned char green = readU16() >> 8 ;
+		unsigned char blue = readU16() >> 8 ;
+		unsigned char alpha = 0xff - (readU16() >> 8) ;
+		libpict::PictColor color(red, green, blue, alpha);
+		m_colorPalette[startIndex+i] = color;
+		Pict_DEBUG_MSG(("Index#%d: RGB %s\n", startIndex+i, color.getColorString().cstr()));
+	}
+}
+
+void Pict2Parser::handlePenForeColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned char red = readU8();
+	unsigned char green = readU8();
+	unsigned char blue = readU8();
+	unsigned char alpha = 0xff - readU8();
+
+	m_penForeColor = libpict::PictColor(red, green, blue, alpha);
+
+	Pict_DEBUG_MSG(("   Foreground color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+}
+
+void Pict2Parser::handleDPPenForeColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	// we just ignore the least significant 8 bits
+	unsigned char red = (m_doublePrecision)   ? readU16()>>8 : readU8();
+	unsigned char green = (m_doublePrecision) ? readU16()>>8 : readU8();
+	unsigned char blue = (m_doublePrecision)  ? readU16()>>8 : readU8();
+	unsigned char alpha = 0xff - (m_doublePrecision) ? readU16()>>8 : readU8();
+
+	m_style.insert("svg:stroke-color", libpict::PictColor(red, green, blue, alpha).getColorString());
+	m_style.insert("svg:stroke-opacity", libpict::PictColor(red, green, blue, alpha).getOpacity(), WPX_PERCENT);
+	m_penForeColor = libpict::PictColor(red, green, blue, alpha);
+
+	Pict_DEBUG_MSG(("   Foreground color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+}
+
+void Pict2Parser::handlePenBackColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if (!m_groupStack.empty() && m_groupStack.top().isCompoundPolygon())
+		return;
+#if 0
+	unsigned char red = readU8();
+	unsigned char green = readU8();
+	unsigned char blue = readU8();
+	unsigned char alpha = 0xff - readU8();
+
+	m_penBackColor = libpict::PictColor(red, green, blue, alpha);
+
+	m_dashArray.backColor = libpict::PictColor(red, green, blue, alpha);
+	m_style.insert("svg:stroke-color", m_penForeColor.getColorString());
+	m_style.insert("svg:stroke-opacity", m_penForeColor.getOpacity(), WPX_PERCENT);
+
+	Pict_DEBUG_MSG(("   Background color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+#endif
+}
+
+void Pict2Parser::handleDPPenBackColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if (!m_groupStack.empty() && m_groupStack.top().isCompoundPolygon())
+		return;
+#if 0
+	// we just ignore the least significant 8 bits
+	unsigned int red = (m_doublePrecision)   ? readU16()>>8 : readU8();
+	unsigned int green = (m_doublePrecision) ? readU16()>>8 : readU8();
+	unsigned int blue = (m_doublePrecision)  ? readU16()>>8 : readU8();
+	unsigned int alpha = 0xff - (m_doublePrecision) ? readU16()>>8 : readU8();
+
+	m_penBackColor = libpict::PictColor(red, green, blue, alpha);
+
+	m_dashArray.backColor = libpict::PictColor(red, green, blue, alpha);
+	m_style.insert("svg:stroke-color", m_penForeColor.getColorString());
+	m_style.insert("svg:stroke-opacity", m_penForeColor.getOpacity(), WPX_PERCENT);
+
+	Pict_DEBUG_MSG(("   Background color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+#endif
+}
+
+void Pict2Parser::handlePenStyle()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned int style = readU16();
+
+	m_dashArray = m_dashArrayStyles[style];
+	
+	if (!style)
+		m_style.insert("draw:stroke", "solid");
+
+	Pict_DEBUG_MSG(("   Pen style : %d\n", style));
+	Pict_DEBUG_MSG(("   Segments : %d\n", m_dashArray.count()));
+}
+
+void Pict2Parser::handlePenSize()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned int width = readU16();
+
+	m_style.insert("svg:stroke-width", (TO_DOUBLE(width) / m_xres));
+
+	Pict_DEBUG_MSG(("   Width: %d\n", width));
+}
+
+void Pict2Parser::handleDPPenSize()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned long width = readU32();
+
+	m_style.insert("svg:stroke-width", TO_DOUBLE(width) / m_xres / 256);
+//	m_pen.height = TO_DOUBLE(height) / m_yres / 256;
+
+	Pict_DEBUG_MSG(("   Width: %li\n", width));
+}
+
+void Pict2Parser::handleLineCap()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+//	Pict_DEBUG_MSG(("   Line cap : %d\n", style));
+}
+
+void Pict2Parser::handleLineJoin()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+//	Pict_DEBUG_MSG(("   Line join : %d\n", style));
+}
+
+void Pict2Parser::handleBrushGradient()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned angleFraction = readU16();
+	unsigned angleInteger = readU16();
+	unsigned xref = readU16();
+	unsigned yref = readU16();
+#ifdef DEBUG
+	unsigned flag = readU16();
+	bool granular = ((flag & (1<<6))>>6) == 1;
+	bool anchor = ((flag & (1<<7))>>7) == 1;
+#else
+	readU16();
+#endif
+
+	// TODO: get gradient extent
+
+	m_gradientAngle = angleInteger + (double)angleFraction/65536.0;
+	m_gradientRef.insert("svg:x", (double)xref);
+	m_gradientRef.insert("svg:y", (double)yref);
+
+	Pict_DEBUG_MSG(("       Gradient angle : %d.%d\n", angleInteger, angleFraction));
+	Pict_DEBUG_MSG(("   Gradient reference : %d.%d\n", xref, yref));
+	Pict_DEBUG_MSG(("   Granular : %s\n", (granular ? "yes" : "no")));
+	Pict_DEBUG_MSG(("   Anchored : %s\n", (anchor ? "yes" : "no")));
+}
+
+void Pict2Parser::handleDPBrushGradient()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned angleFraction = readU16();
+	unsigned angleInteger = readU16();
+	unsigned xref = readU16();
+	unsigned yref = readU16();
+#ifdef DEBUG
+	unsigned flag = readU16();
+	bool granular = (flag & (1<<6)) == 1;
+	bool anchor = (flag & (1<<7)) == 1;
+#else
+	readU16();
+#endif
+
+	// TODO: get gradient extent (in double precision)
+
+	m_gradientAngle = angleFraction + (double)angleInteger/65536.0;
+	m_gradientRef.insert("svg:x", (double)xref);
+	m_gradientRef.insert("svg:y", (double)yref);
+
+	Pict_DEBUG_MSG(("       Gradient angle : %d.%d\n", angleInteger, angleFraction));
+	Pict_DEBUG_MSG(("   Gradient reference : %d.%d\n", xref, yref));
+	Pict_DEBUG_MSG(("   Granular : %s\n", (granular ? "yes" : "no")));
+	Pict_DEBUG_MSG(("   Anchored : %s\n", (anchor ? "yes" : "no")));
+}
+
+void Pict2Parser::handleBrushForeColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned char gradientType = readU8();
+	Pict_DEBUG_MSG(("   Gradient type : %d (%s)\n", gradientType, describeGradient(gradientType)));
+
+	if(gradientType == 0)
+	{
+		unsigned char red = readU8();
+		unsigned char green = readU8();
+		unsigned char blue = readU8();
+		unsigned char alpha = 0xff - readU8();
+		Pict_DEBUG_MSG(("   Foreground color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+
+		m_brushForeColor = libpict::PictColor(red, green, blue, alpha);
+		
+		m_style.insert("draw:fill-color", m_brushForeColor.getColorString());
+		m_style.insert("draw:opacity", m_brushForeColor.getOpacity(), WPX_PERCENT);
+
+		if(!m_style["draw:fill"] || m_style["draw:fill"]->getStr() != "gradient")
+			m_style.insert("draw:fill", "solid");
+	}
+	else
+	{
+		unsigned count = readU16();
+		std::vector<libpict::PictColor> colors;
+		std::vector<double> positions;
+		Pict_DEBUG_MSG(("  Gradient colors : %d\n", count));
+
+		if (count > 0)
+		{
+			for(unsigned i = 0; i < count; i++)
+			{
+				unsigned char red = readU8();
+				unsigned char green = readU8();
+				unsigned char blue = readU8();
+				unsigned char alpha = 0xff - readU8();
+				libpict::PictColor color(red, green, blue, alpha);
+				colors.push_back(color);
+				Pict_DEBUG_MSG(("   Color #%d (RGBA): %d %d %d %d\n", i+1, red, green, blue, alpha));
+			}
+
+			for(unsigned j = 0; j < count-1; j++)
+			{
+				unsigned pos = readU16();
+				positions.push_back(TO_DOUBLE(pos));
+				Pict_DEBUG_MSG(("   Position #%d : %d\n", j+1, pos));
+			}
+		}
+
+		// looks like Corel Presentations only create 2 colors gradient
+		// and they are actually in reverse order
+		if(count == 2)
+		{
+			double xref = m_gradientRef["svg:x"]->getDouble()/65536.0;
+			double yref = m_gradientRef["svg:y"]->getDouble()/65536.0;
+			double angle = m_gradientAngle*M_PI/180.0;
+			double tanangle = tan(angle);
+			double ref = (tanangle < 1e2 && tanangle > -1e2) ? (yref+xref*tanangle)/(1+tanangle) : xref;
+			::WPXPropertyListVector gradient;
+			m_style.insert("draw:angle", (int)(-m_gradientAngle)); // upside down
+			WPXPropertyList propList;
+			propList.insert("svg:offset", 0.0, WPX_PERCENT);
+			propList.insert("svg:stop-color", colors[1].getColorString());
+			propList.insert("svg:stop-opacity", colors[1].getOpacity(), WPX_PERCENT);
+			gradient.append(propList);
+			propList.clear();
+			propList.insert("svg:offset", ref, WPX_PERCENT);
+			propList.insert("svg:stop-color", colors[0].getColorString());
+			propList.insert("svg:stop-opacity", colors[0].getOpacity(), WPX_PERCENT);
+			gradient.append(propList);
+			propList.clear();
+			if((m_gradientRef["svg:x"]->getInt() != 65535) && (m_gradientRef["svg:y"]->getInt() != 65535))
+			{
+				propList.insert("svg:offset", 1.0, WPX_PERCENT);
+				propList.insert("svg:stop-color", colors[1].getColorString());
+				propList.insert("svg:stop-opacity", colors[1].getOpacity(), WPX_PERCENT);
+				gradient.append(propList);
+			}
+			m_gradient = gradient;
+			m_style.insert("draw:fill", "gradient");
+		}
+	}
+}
+
+void Pict2Parser::handleDPBrushForeColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+	unsigned char gradientType = readU8();
+	Pict_DEBUG_MSG(("   Gradient type : %d (%s)\n", gradientType, describeGradient(gradientType)));
+
+	if(gradientType == 0)
+	{
+		unsigned char red = (m_doublePrecision)   ? readU16()>>8 : readU8();
+		unsigned char green = (m_doublePrecision)   ? readU16()>>8 : readU8();
+		unsigned char blue = (m_doublePrecision)   ? readU16()>>8 : readU8();
+		unsigned char alpha = 0xff - (m_doublePrecision)   ? readU16()>>8 : readU8();
+		Pict_DEBUG_MSG(("   Foreground color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+
+		m_brushForeColor = libpict::PictColor(red, green, blue, alpha);
+
+		m_style.insert("draw:fill-color", m_brushForeColor.getColorString());
+		m_style.insert("draw:opacity", m_brushForeColor.getOpacity(), WPX_PERCENT);
+
+		if(!m_style["draw:fill"] || m_style["draw:fill"]->getStr() != "none")
+			m_style.insert("draw:fill", "solid");
+	}
+	else
+	{
+		unsigned count = readU16();
+		std::vector<libpict::PictColor> colors;
+		std::vector<double> positions;
+		Pict_DEBUG_MSG(("  Gradient colors : %d\n", count));
+
+		if (count > 0)
+		{
+			for(unsigned i = 0; i < count; i++)
+			{
+				unsigned char red = (m_doublePrecision)   ? readU16()>>8 : readU8();
+				unsigned char green = (m_doublePrecision)   ? readU16()>>8 : readU8();
+				unsigned char blue = (m_doublePrecision)   ? readU16()>>8 : readU8();
+				unsigned char alpha = 0xff - (m_doublePrecision)   ? readU16()>>8 : readU8();
+				libpict::PictColor color(red, green, blue, alpha);
+				colors.push_back(color);
+				Pict_DEBUG_MSG(("   Color #%d (RGBA): %d %d %d %d\n", i+1, red, green, blue, alpha));
+			}
+
+			for(unsigned j = 0; j < count-1; j++)
+			{
+				unsigned pos = readU16();
+				positions.push_back(TO_DOUBLE(pos));
+				Pict_DEBUG_MSG(("   Position #%d : %d\n", j+1, pos));
+			}
+		}
+
+		// looks like Corel Presentations only create 2 colors gradient
+		// and they are actually in reverse order
+		if(count == 2)
+		{
+			double xref = m_gradientRef["svg:x"]->getDouble()/65536.0;
+			double yref = m_gradientRef["svg:y"]->getDouble()/65536.0;
+			double angle = m_gradientAngle*M_PI/180.0;
+			double tanangle = tan(angle);
+			double ref = (tanangle<1e2) ? (yref+xref*tanangle)/(1+tanangle) : xref;
+			::WPXPropertyListVector gradient;
+			m_style.insert("draw:angle", (int)(-m_gradientAngle));
+
+			WPXPropertyList propList;
+			propList.insert("svg:offset", 0.0, WPX_PERCENT);
+			propList.insert("svg:stop-color", colors[1].getColorString());
+			propList.insert("svg:stop-opacity", colors[1].getOpacity(), WPX_PERCENT);
+			gradient.append(propList);
+			propList.clear();
+			propList.insert("svg:offset", ref, WPX_PERCENT);
+			propList.insert("svg:stop-color", colors[0].getColorString());
+			propList.insert("svg:stop-opacity", colors[0].getOpacity(), WPX_PERCENT);
+			gradient.append(propList);
+			propList.clear();
+			if((m_gradientRef["svg:x"]->getInt() != 65535) && (m_gradientRef["svg:y"]->getInt() != 65535))
+			{
+				propList.insert("svg:offset", 1.0, WPX_PERCENT);
+				propList.insert("svg:stop-color", colors[1].getColorString());
+				propList.insert("svg:stop-opacity", colors[1].getOpacity(), WPX_PERCENT);
+				gradient.append(propList);
+			}
+			m_gradient = gradient;
+		}
+		m_style.insert("draw:fill", "gradient");
+	}
+}
+
+void Pict2Parser::handleBrushBackColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if (!m_groupStack.empty() && m_groupStack.top().isCompoundPolygon())
+		return;
+#if 0
+	unsigned char red = readU8();
+	unsigned char green = readU8();
+	unsigned char blue = readU8();
+	unsigned char alpha = 0xff - readU8();
+
+	m_brushBackColor = libpict::PictColor(red, green, blue, alpha);
+
+	m_gradient.backColor = libpict::PictColor(red, green, blue, alpha);
+	if(m_gradient.style == libpict::PictGradient::NoBrush)
+		m_gradient.style = libpict::PictGradient::Solid;
+
+	Pict_DEBUG_MSG(("   Backround color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+#endif
+}
+
+void Pict2Parser::handleDPBrushBackColor()
+{
+	if (!m_graphicsStarted)
+		return;
+	if (!m_groupStack.empty() && m_groupStack.top().isCompoundPolygon())
+		return;
+#if 0
+	// we just ignore the least significant 8 bits
+	unsigned int red = (m_doublePrecision)   ? readU16()>>8 : readU8();
+	unsigned int green = (m_doublePrecision) ? readU16()>>8 : readU8();
+	unsigned int blue = (m_doublePrecision)  ? readU16()>>8 : readU8();
+	unsigned int alpha = 0xff - (m_doublePrecision) ? readU16()>>8 : readU8();
+
+	m_brushBackColor = libpict::PictColor(red, green, blue, alpha);
+
+	m_style.insert("draw:fill-color", m_brushForeColor.getColorString());
+	m_style.insert("draw:opacity", m_brushForeColor.getOpacity(), WPX_PERCENT);
+
+	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "none")
+		m_style.insert("draw:fill", "solid");
+
+	Pict_DEBUG_MSG(("   Background color (RGBA): %d %d %d %d\n", red, green, blue, alpha));
+#endif
+}
+
+void Pict2Parser::handleBrushPattern()
+{
+	if (!m_graphicsStarted)
+		return;
+	if(!m_groupStack.empty())
+	{
+		if (m_groupStack.top().isCompoundPolygon())
+			return;
+		if (m_groupStack.top().parentType == 0x01) // we don't handle Page Attributes for now
+			return;
+	}
+#ifdef DEBUG
+	unsigned int pattern = readU16();
+#endif
+
+	// TODO
+
+	Pict_DEBUG_MSG(("   Pattern : %d\n", pattern));
+}
+
+void Pict2Parser::parseCharacterization(ObjectCharacterization* ch)
+{
+	// sanity check
+	if(!ch) return;
+
+	// identity
+	ch->matrix = Pict2TransformMatrix();
+
+	unsigned int flags = readU16();
+	ch->taper = (flags & 0x01) != 0;
+	ch->translate = (flags & 0x02) != 0;
+	ch->skew = (flags & 0x04) != 0;
+	ch->scale = (flags & 0x08) != 0;
+	ch->rotate = (flags & 0x10) != 0;
+	ch->hasObjectId = (flags & 0x20) != 0;
+	ch->editLock = (flags & 0x80) != 0;
+	ch->windingRule = (flags & (1<<12)) != 0;
+	ch->filled = (flags & (1<<13)) != 0;
+	ch->closed = (flags & (1<<14)) != 0;
+	ch->framed = (flags & (1<<15)) != 0;
+
+	if(ch->editLock) ch->lockFlags = readU32();
+
+	// object ID can be 2 or 4 bytes
+	if(ch->hasObjectId) ch->objectId = readU16();
+	if(ch->objectId >> 15) ch->objectId = ((ch->objectId  & 0x7fff) << 16) | readU16();
+
+	if(ch->rotate) ch->rotationAngle = fixedPointToDouble(readU32());
+
+	if(ch->rotate || ch->scale)
+	{
+		ch->sxcos = readS32();
+		ch->sycos = readS32();
+		ch->matrix.element[0][0] = (double)(ch->sxcos)/65536;
+		ch->matrix.element[1][1] = (double)(ch->sxcos)/65536;
+	}
+
+	if(ch->rotate || ch->skew)
+	{
+		ch->kxsin = readS32();
+		ch->kysin = readS32();
+		ch->matrix.element[1][0] = (double)(ch->kxsin)/65536;
+		ch->matrix.element[0][1] = (double)(ch->kysin)/65536;
+	}
+
+	if(ch->translate)
+	{
+		ch->txfraction = readU16();
+		ch->txinteger = readS32();
+		ch->tyfraction = readU16();
+		ch->tyinteger = readS32();
+		ch->matrix.element[2][0] = (double)(ch->txinteger);
+		ch->matrix.element[2][1] = (double)(ch->tyinteger);
+	}
+
+	if(ch->taper)
+	{
+		ch->px = readS32();
+		ch->py = readS32();
+		ch->matrix.element[0][2] = (double)(ch->px);
+		ch->matrix.element[1][2] = (double)(ch->py);
+	}
+
+	Pict_DEBUG_MSG(("ObjectCharacterization\n"));
+	Pict_DEBUG_MSG(("       taper : %s\n", (ch->taper ? "yes" : "no")));
+	Pict_DEBUG_MSG(("   translate : %s\n", (ch->translate ? "yes" : "no")));
+	Pict_DEBUG_MSG(("        skew : %s\n", (ch->skew ? "yes" : "no")));
+	Pict_DEBUG_MSG(("       scale : %s\n", (ch->scale ? "yes" : "no")));
+	Pict_DEBUG_MSG(("      rotate : %s\n", (ch->rotate ? "yes" : "no")));
+	Pict_DEBUG_MSG((" hasObjectId : %s\n", (ch->hasObjectId ? "yes" : "no")));
+	Pict_DEBUG_MSG(("    editLock : %s\n", (ch->editLock ? "yes" : "no")));
+	Pict_DEBUG_MSG(("      closed : %s\n", (ch->closed ? "yes" : "no")));
+	Pict_DEBUG_MSG(("      framed : %s\n", (ch->framed ? "yes" : "no")));
+	Pict_DEBUG_MSG(("      filled : %s\n", (ch->filled ? "yes" : "no")));
+#ifdef DEBUG
+	if(ch->editLock) Pict_DEBUG_MSG(("  lock flags : 0x%x\n", (unsigned)ch->lockFlags));
+	if(ch->hasObjectId) Pict_DEBUG_MSG(("   object ID : 0x%x\n", (unsigned)ch->objectId));
+	if(ch->translate) Pict_DEBUG_MSG(("    tx : %li %d\n", ch->txinteger, ch->txfraction));
+	if(ch->translate) Pict_DEBUG_MSG(("    ty : %li %d\n", ch->tyinteger, ch->tyfraction));
+#endif
+	Pict_DEBUG_MSG(("transform matrix:\n"));
+	Pict_DEBUG_MSG(("%f %f %f\n", ch->matrix.element[0][0], ch->matrix.element[0][1],ch->matrix.element[0][2]));
+	Pict_DEBUG_MSG(("%f %f %f\n", ch->matrix.element[1][0], ch->matrix.element[1][1],ch->matrix.element[1][2]));
+	Pict_DEBUG_MSG(("%f %f %f\n", ch->matrix.element[2][0], ch->matrix.element[2][1],ch->matrix.element[2][2]));
+}
+
+void Pict2Parser::handlePolyline()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	m_matrix = objCh.matrix;
+
+	WPXPropertyList tmpStyle = m_style;
+	
+	if (!objCh.filled)
+		tmpStyle.insert("draw:fill", "none");
+
+	bool insideCompound = m_groupStack.empty() ? false :
+		m_groupStack.top().isCompoundPolygon();
+
+	// inside a compound, so take the parent transformation into account
+	if(insideCompound)
+		m_matrix.transformBy(m_groupStack.top().compoundMatrix);
+
+	unsigned long count = readU16();
+
+	::WPXPropertyListVector points;
+	::WPXPropertyList point;
+	for(unsigned long i = 0; i < count; i++ )
+	{
+		point.clear();
+		long x = (m_doublePrecision) ? readS32() : readS16();
+		long y = (m_doublePrecision) ? readS32() : readS16();
+		TRANSFORM_XY(x,y);
+		point.insert("svg:x", (TO_DOUBLE(x)/m_xres));
+		point.insert("svg:y", (TO_DOUBLE(y)/m_yres));
+		points.append(point);
+	}
+
+	if(insideCompound)
+	{
+		if(count > 0)
+		{
+			// inside a compound ? convert it into path because for compound
+			// we will only use paths
+			::WPXPropertyListVector& path = m_groupStack.top().compoundPath;
+			::WPXPropertyList element;
+			element = points[0];
+			element.insert("libpict:path-action", "M");
+			path.append(element);
+			for(unsigned long ii = 1; ii < count; ii++)
+			{
+				element.clear();
+				element = points[ii];
+				element.insert("libpict:path-action", "L");
+				path.append(element);
+			}
+		}
+	}
+	else
+	{
+		// otherwise draw directly
+		if (count > 2)
+		{
+			if(objCh.windingRule)
+				tmpStyle.insert("svg:fill-rule", "nonzero");
+			else
+				tmpStyle.insert("svg:fill-rule", "evenodd");
+
+			m_painter->setStyle( tmpStyle, objCh.filled ? m_gradient : ::WPXPropertyListVector() );
+
+			if (objCh.filled || objCh.closed)
+				m_painter->drawPolygon(points);
+			else
+				m_painter->drawPolyline(points);
+		}
+		else
+		{
+		
+			m_painter->setStyle( tmpStyle, ::WPXPropertyListVector() );
+			m_painter->drawPolyline(points);
+		}
+	}
+
+	Pict_DEBUG_MSG(("   Vertices count : %li\n", count));
+	for(unsigned int j = 0; j < count; j++ )
+		Pict_DEBUG_MSG(("        Point #%d : %g,%g\n", j+1, points[j]["svg:x"]->getDouble(), points[j]["svg:x"]->getDouble()));
+}
+
+void Pict2Parser::handlePolyspline()
+{
+	// fprintf(stderr, "This is actually not an error, just a crash so that we know ");
+	// fprintf(stderr, "that there is an actual document containing the Polyspline record\n");
+	// crash here !!!
+	// *((int *)NULL) = 0;
+	if (!m_graphicsStarted)
+		return;
+	// We have never seen a polyspline in a Pict file and we are not even able to generate
+	// one, so, we draw a polyline instead and wait for bug reports :)
+	handlePolyline();
+}
+
+void Pict2Parser::handlePolycurve()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	m_matrix = objCh.matrix;
+
+	WPXPropertyList tmpStyle = m_style;
+	
+	if (!objCh.filled)
+		tmpStyle.insert("draw:fill", "none");
+
+	bool insideCompound = m_groupStack.empty() ? false :
+		m_groupStack.top().isCompoundPolygon();
+
+	// inside a compound, so take the parent transformation into account
+	if(insideCompound)
+		m_matrix.transformBy(m_groupStack.top().compoundMatrix);
+
+	unsigned int count = readU16();
+
+	::WPXPropertyListVector path;
+	::WPXPropertyList element;
+	::WPXPropertyListVector vertices;
+	::WPXPropertyListVector controlPoints;
+	for(unsigned int i = 0; i < count; i++ )
+	{
+		long ix = (m_doublePrecision) ? readS32() : readS16();
+		long iy = (m_doublePrecision) ? readS32() : readS16();
+		TRANSFORM_XY(ix,iy);
+
+		long ax = (m_doublePrecision) ? readS32() : readS16();
+		long ay = (m_doublePrecision) ? readS32() : readS16();
+		TRANSFORM_XY(ax,ay);
+
+		long tx = (m_doublePrecision) ? readS32() : readS16();
+		long ty = (m_doublePrecision) ? readS32() : readS16();
+		TRANSFORM_XY(tx,ty);
+
+		element.insert("svg:x", (TO_DOUBLE(ax)/m_xres));
+		element.insert("svg:y", (TO_DOUBLE(ay)/m_yres));
+		if (i == 0)
+			element.insert("libpict:path-action", "M");
+		else
+		{
+			element.insert("svg:x2", (TO_DOUBLE(ix)/m_xres));
+			element.insert("svg:y2", (TO_DOUBLE(iy)/m_yres));
+			element.insert("libpict:path-action", "C");
+		}
+		path.append(element);
+		element.insert("svg:x1", (TO_DOUBLE(tx)/m_xres));
+		element.insert("svg:y1", (TO_DOUBLE(ty)/m_yres));
+	}
+
+	element.clear();
+	if (objCh.closed)
+	{
+		element.insert("libpict:path-action", "Z");
+		path.append(element);
+	}
+
+	if(insideCompound)
+		// inside a compound ? just collect the path together
+		m_groupStack.top().compoundPath.append(path);
+	else
+	{
+		// otherwise draw directly
+		if(objCh.windingRule)
+			tmpStyle.insert("svg:fill-rule", "nonzero");
+		else
+			tmpStyle.insert("svg:fill-rule", "evenodd");
+		m_painter->setStyle( tmpStyle, objCh.filled ? m_gradient : ::WPXPropertyListVector() );
+		m_painter->drawPath(path);
+	}
+}
+
+void Pict2Parser::handleRectangle()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	m_matrix = objCh.matrix;
+
+	WPXPropertyList tmpStyle = m_style;
+	
+	if (!objCh.filled)
+		tmpStyle.insert("draw:fill", "none");
+
+	long x1 = (m_doublePrecision) ? readS32() : readS16();
+	long y1 = (m_doublePrecision) ? readS32() : readS16();
+	TRANSFORM_XY(x1,y1);
+
+	long x2 = (m_doublePrecision) ? readS32() : readS16();
+	long y2 = (m_doublePrecision) ? readS32() : readS16();
+	TRANSFORM_XY(x2,y2);
+
+	long xs1 = (x1 <= x2) ? x1 : x2;
+	long xs2 = (x1 <= x2) ? x2 : x1;
+	long ys1 = (y1 <= y2) ? y1 : y2;
+	long ys2 = (y1 <= y2) ? y2 : y1;
+
+	long rx = (m_doublePrecision) ? readS32() : readS16();
+	long ry = (m_doublePrecision) ? readS32() : readS16();
+
+	::WPXPropertyList propList;
+	propList.insert("svg:x", (TO_DOUBLE(xs1) / m_xres));
+	propList.insert("svg:width", (TO_DOUBLE(xs2-xs1) / m_xres));
+	propList.insert("svg:y", (TO_DOUBLE(ys1) / m_yres));
+	propList.insert("svg:height", (TO_DOUBLE(ys2-ys1) / m_yres));
+
+	propList.insert("svg:rx", (TO_DOUBLE(rx)/m_xres));
+	propList.insert("svg:ry", (TO_DOUBLE(ry)/m_yres));
+
+	m_painter->setStyle( tmpStyle, objCh.filled ? m_gradient : ::WPXPropertyListVector() );
+	m_painter->drawRectangle(propList);
+
+	Pict_DEBUG_MSG(("      X1 : %li\n", x1));
+	Pict_DEBUG_MSG(("      Y1 : %li\n", y1));
+	Pict_DEBUG_MSG(("      X2 : %li\n", x2));
+	Pict_DEBUG_MSG(("      Y2 : %li\n", y2));
+	Pict_DEBUG_MSG((" Round X : %li\n", rx));
+	Pict_DEBUG_MSG((" Round Y : %li\n", ry));
+}
+
+void Pict2Parser::handleArc()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	m_matrix = objCh.matrix;
+
+	WPXPropertyList tmpStyle = m_style;
+	
+	if (!objCh.filled)
+		tmpStyle.insert("draw:fill", "none");
+
+	long cx = (m_doublePrecision) ? readS32() : readS16();
+	long cy = (m_doublePrecision) ? readS32() : readS16();
+
+	long radx = (m_doublePrecision) ? readS32() : readS16();
+	long rady = (m_doublePrecision) ? readS32() : readS16();
+
+	long ix = (m_doublePrecision) ? readS32() : readS16();
+	ix += cx;
+	long iy = (m_doublePrecision) ? readS32() : readS16();
+	iy += cy;
+
+	long ex = (m_doublePrecision) ? readS32() : readS16();
+	ex += cx;
+	long ey = (m_doublePrecision) ? readS32() : readS16();
+	ey += cy;
+
+	TRANSFORM_XY(cx,cy);
+	TRANSFORM_XY(ix,iy);
+	TRANSFORM_XY(ex,ey);
+
+	m_painter->setStyle( tmpStyle, objCh.filled ? m_gradient : ::WPXPropertyListVector() );
+
+	if (ix == ex && iy == ey)
+	{
+		::WPXPropertyList propList;
+		propList.insert("svg:cx", (TO_DOUBLE(cx) / m_xres));
+		propList.insert("svg:cy", (TO_DOUBLE(cy) / m_xres));
+		propList.insert("svg:rx", (TO_DOUBLE(radx) / m_xres));
+		propList.insert("svg:ry", (TO_DOUBLE(rady) / m_xres));
+		if (objCh.rotate)
+			propList.insert("libpict:rotate", objCh.rotationAngle, WPX_GENERIC);
+
+		m_painter->drawEllipse(propList);
+	}
+	else
+	{
+		::WPXPropertyList element;
+		::WPXPropertyListVector path;
+
+		element.insert("libpict:path-action", "M");
+		element.insert("svg:x", (TO_DOUBLE(ix)/m_xres));
+		element.insert("svg:y", (TO_DOUBLE(iy)/m_yres));
+		path.append(element);
+		element.clear();
+		
+		element.insert("libpict:path-action", "A");
+		element.insert("svg:rx", (TO_DOUBLE(radx)/m_xres));
+		element.insert("svg:ry", (TO_DOUBLE(rady)/m_yres));
+		element.insert("svg:x", (TO_DOUBLE(ex)/m_xres));
+		element.insert("svg:y", (TO_DOUBLE(ey)/m_yres));
+		if (objCh.rotate)
+			element.insert("libpict:rotate", objCh.rotationAngle, WPX_GENERIC);
+		path.append(element);
+		
+		m_painter->drawPath(path);
+	}
+
+	Pict_DEBUG_MSG(("   Center point x : %li\n", cx));
+	Pict_DEBUG_MSG(("   Center point y : %li\n", cy));
+	Pict_DEBUG_MSG(("         Radius x : %li\n", radx));
+	Pict_DEBUG_MSG(("         Radius y : %li\n", rady));
+	Pict_DEBUG_MSG(("  Initial point x : %li\n", ix));
+	Pict_DEBUG_MSG(("  Initial point y : %li\n", iy));
+	Pict_DEBUG_MSG(("      End point x : %li\n", ex));
+	Pict_DEBUG_MSG(("      End point y : %li\n", ey));
+}
+
+void Pict2Parser::handleBitmap()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	
+	if (objCh.scale)
+	{
+		if (objCh.sxcos < 0)
+			m_hFlipped = true;
+		if (objCh.sycos < 0)
+			m_vFlipped = true;
+	}
+	m_matrix = objCh.matrix;
+
+	long x1 = (m_doublePrecision) ? readS32() : readS16();
+	long y1 = (m_doublePrecision) ? readS32() : readS16();
+	long x2 = (m_doublePrecision) ? readS32() : readS16();
+	long y2 = (m_doublePrecision) ? readS32() : readS16();
+	TRANSFORM_XY(x1,y1);
+	TRANSFORM_XY(x2,y2);
+
+	long hres = (m_doublePrecision) ? readS32() : readS16();
+	long vres = (m_doublePrecision) ? readS32() : readS16();
+
+	long xs1 = (x1 <= x2) ? x1 : x2;
+	long xs2 = (x1 <= x2) ? x2 : x1;
+	long ys1 = (y1 <= y2) ? y1 : y2;
+	long ys2 = (y1 <= y2) ? y2 : y1;
+
+	m_bitmap.x1 = TO_DOUBLE(xs1) / m_xres;
+	m_bitmap.y1 = TO_DOUBLE(ys1) / m_yres;
+	m_bitmap.x2 = TO_DOUBLE(xs2) / m_xres;
+	m_bitmap.y2 = TO_DOUBLE(ys2) / m_yres;
+	if (hres == 0)
+		hres = 72;
+	m_bitmap.hres = hres;
+	if (vres == 0)
+		vres = 72;
+	m_bitmap.vres = vres;
+
+	Pict_DEBUG_MSG(("   x1 : %li\n", x1));
+	Pict_DEBUG_MSG(("   y1 : %li\n", y1));
+	Pict_DEBUG_MSG(("   x2 : %li\n", x2));
+	Pict_DEBUG_MSG(("   y2 : %li\n", y2));
+	Pict_DEBUG_MSG((" hres : %li (pixel per inch)\n", hres));
+	Pict_DEBUG_MSG((" vres : %li (pixel per inch)\n", vres));
+}
+
+void Pict2Parser::handleBitmapData()
+{
+	if (!m_graphicsStarted)
+		return;
+	unsigned width = readU16();
+	unsigned height = readU16();
+	unsigned color_format = readU8();
+	unsigned compression_format = readU8();
+
+	Pict_DEBUG_MSG(("     dimension : %g, %g  %g, %g\n", m_bitmap.x1, m_bitmap.y1, m_bitmap.x2, m_bitmap.y2));
+	Pict_DEBUG_MSG(("         width : %i pixels\n", width));
+	Pict_DEBUG_MSG(("        height : %i pixels\n", height));
+	Pict_DEBUG_MSG(("  color format : %d\n", color_format));
+	Pict_DEBUG_MSG(("   compression : %d (%s)\n", compression_format,
+		(compression_format==0) ? "uncompressed":
+		(compression_format==1) ? "run-length encoding" : "unknown"));
+
+	if (color_format > 12) // not documented and we are likely not knowing what to do with this
+		return;
+	unsigned tmpBufferSize;
+	unsigned raster_len = width;
+	if (color_format == 1)
+	{
+		tmpBufferSize = (width/8+1)*height;
+		raster_len = width/8 + ((width % 8) ? 1 : 0);
+	}
+	else if (color_format == 2)
+	{
+		tmpBufferSize = (width/4+1)*height;
+		raster_len = width/4 + ((width % 4) ? 1 : 0);
+	}
+	else if (color_format == 3)
+	{
+		tmpBufferSize = (width/2+1)*height;
+		raster_len = width/2 + ((width % 2) ? 1 : 0);
+	}
+	else if (color_format == 5 || color_format == 6 || color_format == 7)
+		tmpBufferSize = 2*width*height;
+	else if (color_format == 8)
+		tmpBufferSize = 3*width*height;
+	else if (color_format == 9)
+		tmpBufferSize = 4*width*height;
+	else if (color_format == 10)
+		tmpBufferSize = 6*width*height;
+	else if (color_format == 11)
+		tmpBufferSize = 8*width*height;
+	else
+		tmpBufferSize = width*height;
+	
+	
+	std::vector<unsigned char> buffer;
+	buffer.reserve(tmpBufferSize);
+
+	// plain data, uncompression
+	if(compression_format==0)
+		for(unsigned ii=0; ii < tmpBufferSize && !m_input->atEOS() && m_input->tell() <= m_recordEnd; ii++)
+			buffer.push_back( readU8() );
+	// run-length encoding
+	else if(compression_format==1)
+	{
+		unsigned char data[256];
+		bool xor_raster = false;
+		unsigned next_scanline = 0;
+		unsigned data_size = 1;
+
+		Pict_DEBUG_MSG(("Decoding RLE data\n"));
+
+		// FIXME check for ptr, it should not go out of bound!!
+		while (m_input->tell() <= m_recordEnd && !m_input->atEOS() && buffer.size() < tmpBufferSize)
+		{
+			unsigned char opcode = readU8();
+			// specify data size
+			if(opcode == 0x7d)
+			{
+				unsigned new_data_size = readU8();
+				if(new_data_size != data_size)
+				{
+					data_size = new_data_size;
+					if (tmpBufferSize < data_size*width*height)
+					{
+						tmpBufferSize = data_size*width*height;
+						buffer.reserve(tmpBufferSize);
+					}
+					raster_len = data_size*width;
+				}
+			}
+
+			// a run of black (index #0)
+			else if(opcode == 0x7f)
+			{
+				unsigned count = 1 + readU8();
+				for( ; count ; --count )
+					for(unsigned j = 0; j < data_size && !m_input->atEOS(); j++)
+						buffer.push_back( 0 );
+				
+			}
+
+			// a run of white (index #255)
+			else if(opcode == 0xff)
+			{
+				unsigned count = 1 + readU8();
+
+				for( ; count ; --count )
+					for(unsigned j = 0; j < data_size && !m_input->atEOS(); j++)
+						buffer.push_back( 255 );
+			}
+
+			// extend previous run
+			else if(opcode == 0xfd)
+			{
+				unsigned count = 1 + readU8();
+				for( ; count; --count)
+					for(unsigned j = 0; j < data_size && !m_input->atEOS(); j++)
+						buffer.push_back( data[j] );
+			}
+
+			// repeat raster
+			else if(opcode == 0xfe)
+			{
+				unsigned count = 1 + readU8();
+				if ( buffer.size() < raster_len )
+					break;
+				unsigned raster_source = buffer.size() - raster_len;
+				for( ; count; --count)
+					for(unsigned long r = 0; r < raster_len; r++)
+					{
+						unsigned char pixel = buffer[raster_source + r];
+						buffer.push_back( pixel );
+					}
+			}
+
+			// XOR
+			else if(opcode == 0x7e)
+			{
+				// Xor-ing will happen when about to enter next raster
+				// see after the last if down below
+				xor_raster = true;
+				next_scanline = buffer.size() + raster_len;
+			}
+
+			// NOTE: the following two IFs here must be the last ones
+
+			// a run of data
+			else if(opcode >= 0x80)
+			{
+				unsigned count = 1 + (opcode & 0x7f);
+				for(unsigned i = 0; i < data_size && !m_input->atEOS(); i++)
+					data[i] = readU8();
+				for( ; count; --count)
+					for(unsigned j = 0; j < data_size; j++)
+						buffer.push_back( data[j] );
+			}
+
+			// simple copy
+			else if(opcode <= 0x7f)
+			{
+				unsigned count = opcode + 1;
+				for( ; count; --count)
+					for(unsigned j = 0; j < data_size && !m_input->atEOS(); j++)
+						buffer.push_back( readU8() );
+			}
+
+			// unreachable: only sentinel
+			else 
+			{
+				Pict_DEBUG_MSG(("  ! unknown opcode %02x\n", opcode));
+				break;
+			}
+
+			// new raster/scanline? if necessary do the XOR now
+			if(xor_raster && buffer.size() >= next_scanline)
+			{
+				// reset, because XOR in one raster at a time
+				xor_raster = false;
+
+				// current raster must be XORed with previous raster
+				unsigned current = next_scanline - raster_len;
+				unsigned previous = current - raster_len;
+				if (current >= buffer.size() || previous >= buffer.size())
+					return;
+				for( unsigned r = 0; r < raster_len; r++)
+					buffer[current++] ^= buffer[previous++];
+
+			}
+
+		}
+
+		Pict_DEBUG_MSG(("Finish decoding RLE data\n"));
+	} 
+	
+	// no buffer? format is unknown 
+	if(!buffer.size()) return;
+	
+	while (buffer.size() < tmpBufferSize)
+		buffer.push_back(0);
+
+	// prepare the bitmap structure for the listener
+	libpict::PictBitmap bitmap(width, height, m_vFlipped, m_hFlipped);
+	::WPXPropertyList propList;
+	propList.insert("svg:x", (double)m_bitmap.x1);
+	propList.insert("svg:y", (double)m_bitmap.y1);
+	propList.insert("svg:width", (m_bitmap.x2 - m_bitmap.x1));
+	propList.insert("svg:height", (m_bitmap.y2 - m_bitmap.y1));
+	propList.insert("libpict:mime-type", "image/bmp");
+
+	// format 1: each byte represents 8 pixels, the color fetched from the palette
+	if(color_format == 1)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			if ((x==0) && (i % 8 != 0))
+				i = (i/8 + 1) * 8;
+			unsigned index = ((buffer[i/8] & (0x01 << (7 - (i % 8)))) >> (7 - (i % 8)));
+			const libpict::PictColor& color = m_colorPalette[index];
+			bitmap.setPixel(x, y, color);
+		}
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	// format 2: each byte represents 4 pixels, the color fetched from the palette
+	else if(color_format == 2)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			if ((x==0) && (i % 4 != 0))
+				i = (i/4 + 1) * 4;
+			unsigned index = ((buffer[i/4] & (0x03 << 2*(3 - (i % 4)))) >> 2*(3 - (i % 4)));
+			const libpict::PictColor& color = m_colorPalette[index];
+			bitmap.setPixel(x, y, color);
+		}
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	// format 3: each byte represents 2 pixels, the color fetched from the palette
+	else if(color_format == 3)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			if ((x==0) && (i % 2 != 0))
+				i = (i/2 + 1) * 2;
+			unsigned index = ((buffer[i/2] & (0x0f << 4*(1 - (i % 2)))) >> 4*(1 - (i % 2)));
+			const libpict::PictColor& color = m_colorPalette[index];
+			bitmap.setPixel(x, y, color);
+		}
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	// format 4: each byte represents a pixel, the color fetched from the palette
+	else if(color_format == 4)
+	{
+		int i = 0;
+		for(unsigned long y = 0; y < height; y++)
+		for(unsigned long x = 0; x < width; x++, i++)
+		{
+			const libpict::PictColor& color = m_colorPalette[buffer[i]];
+			bitmap.setPixel(x, y, color);
+		}
+
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	// format 5: greyscale of 16 bits
+	else if (color_format == 5)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			
+			const libpict::PictColor color(buffer[2*i+1], buffer[2*i+1], buffer[2*i+1]);
+			bitmap.setPixel(x, y, color);
+		}
+
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	// format 6: RGB, with 5 bits per colour
+	else if (color_format == 6)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			unsigned short tmpColor = (unsigned short)(buffer[2*i] | (buffer[2*i+1] << 8));
+			const libpict::PictColor color((tmpColor >> 10) & 0x1f, (tmpColor >> 5) & 0x1f, tmpColor & 0x1f);
+			bitmap.setPixel(x, y, color);
+		}
+
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	// format 7: 
+	else if (color_format == 7)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			unsigned short tmpColor = (unsigned short)(buffer[2*i] | (buffer[2*i+1] << 8));
+			const libpict::PictColor color(tmpColor & 0x0f, (tmpColor >> 4) & 0x0f, (tmpColor >> 8) & 0x0f, (tmpColor >> 12) & 0x0f);
+			bitmap.setPixel(x, y, color);
+		}
+
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	else if (color_format == 8)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			const libpict::PictColor color(buffer[3*i+2] & 0xff, buffer[3*i+1] & 0xff, buffer[3*i] & 0xff);
+			bitmap.setPixel(x, y, color);
+		}
+
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	else if (color_format == 9)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			const libpict::PictColor color(buffer[4*i+3], buffer[4*i+2] & 0xff, buffer[4*i+1] & 0xff, buffer[4*i] & 0xff);
+			bitmap.setPixel(x, y, color);
+		}
+
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	else if (color_format == 12)
+	{
+		int i = 0;
+		for (unsigned long y = 0; y < height; y++)
+		for (unsigned long x = 0; x < width; x++, i++)
+		{
+			
+			const libpict::PictColor color(buffer[i], buffer[i], buffer[i]);
+			bitmap.setPixel(x, y, color);
+		}
+
+		m_painter->drawGraphicObject(propList, bitmap.getDIB());
+	}
+	
+}
+
+void Pict2Parser::handleObjectCapsule()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	m_matrix = objCh.matrix;
+
+	long x1 = (m_doublePrecision) ? readS32() : readS16();
+	long y1 = (m_doublePrecision) ? readS32() : readS16();
+	long x2 = (m_doublePrecision) ? readS32() : readS16();
+	long y2 = (m_doublePrecision) ? readS32() : readS16();
+	TRANSFORM_XY(x1,y1);
+	TRANSFORM_XY(x2,y2);
+
+	long xs1 = (x1 <= x2) ? x1 : x2;
+	long xs2 = (x1 <= x2) ? x2 : x1;
+	long ys1 = (y1 <= y2) ? y1 : y2;
+	long ys2 = (y1 <= y2) ? y2 : y1;
+
+	m_binaryData.x1 = TO_DOUBLE(xs1) / m_xres;
+	m_binaryData.y1 = TO_DOUBLE(ys1) / m_yres;
+	m_binaryData.x2 = TO_DOUBLE(xs2) / m_xres;
+	m_binaryData.y2 = TO_DOUBLE(ys2) / m_yres;
+	
+	unsigned long numDescriptions = readU16();
+	
+	m_binaryData.mimeTypes.clear();
+	m_binaryData.mimeTypes.reserve(numDescriptions);
+	
+	static const char* mimeTypesMap[] =
+	{
+		"", // 0
+		"", // "image/x-pict",
+		"", // "image/x-pict",
+		"",
+		"",
+		"", // 5
+		"image/bmp",
+		"image/cgm",
+		"",
+		"image/x-dxf",
+		"image/x-eps", // 0xA
+		"",
+		"image/gif",
+		"application/vnd.hp-hpgl",
+		"",
+		"", // 0xF
+		"", // 0x10
+		"",
+		"",
+		"image/x-pcx ",
+		"image/x-lotus-pic",
+		"", // Ox15
+		"",
+		"image/x-quicktime",
+		"",
+		"application/x-postscript",
+		"", // 0x1A
+		"",
+		"image/x-targa",
+		"image/tiff",
+		"",
+		"image/wmf", // 0x1f
+		"", // 0x20
+		"",
+		"",
+		"",
+		"",
+		"image/png",
+		"image/gif" // 0x26
+	};
+
+	for (unsigned long i = 0; m_input->tell() <= m_recordEnd && !m_input->atEOS() && i < numDescriptions; i++)
+	{
+		unsigned char description = readU8();
+		if (description < 0x27)
+			m_binaryData.mimeTypes.push_back(WPXString(mimeTypesMap[description]));
+		m_input->seek(7, WPX_SEEK_CUR);
+	}
+
+	m_binaryData.objectIndex = 0;
+
+	Pict_DEBUG_MSG(("             x1 : %li\n", x1));
+	Pict_DEBUG_MSG(("             y1 : %li\n", y1));
+	Pict_DEBUG_MSG(("             x2 : %li\n", x2));
+	Pict_DEBUG_MSG(("             y2 : %li\n", y2));
+	Pict_DEBUG_MSG(("numDescriptions : %li\n", numDescriptions));
+}
+
+void Pict2Parser::handleObjectImage()
+{
+	if (!m_graphicsStarted)
+		return;
+	if ((unsigned long)m_binaryData.objectIndex >= m_binaryData.mimeTypes.size())
+		return;
+	unsigned accessoryDataLength = readU16();
+	m_input->seek(accessoryDataLength, WPX_SEEK_CUR);
+
+	::WPXPropertyList propList;
+	propList.insert("svg:x", (double)m_binaryData.x1);
+	propList.insert("svg:y", (double)m_binaryData.y1);
+	propList.insert("svg:width", (m_binaryData.x2 - m_binaryData.x1));
+	propList.insert("svg:height", (m_binaryData.y2 - m_binaryData.y1));
+	propList.insert("libpict:mime-type", m_binaryData.mimeTypes[m_binaryData.objectIndex]);
+	
+	Pict_DEBUG_MSG(("Image Object Mime Type : %s\n", propList["libpict:mime-type"]->getStr().cstr()));
+
+	::WPXBinaryData binaryData;
+	while (!m_input->atEOS() && m_input->tell() <= m_recordEnd)
+		binaryData.append((char)readU8());
+	Pict_DEBUG_MSG(("     Image Object Size : %li\n", (unsigned long)binaryData.size()));
+
+	// temporary for debug - dump the binary data (need to have write access in the current directory
+#if DUMP_BINARY_DATA
+	std::ostringstream filename;
+	filename << "binarydump" << m_binaryId++ << ".bin";
+	FILE *f = fopen(filename.str().c_str(), "wb");
+	if (f)
+	{
+		const char *tmpBinaryBuffer = binaryData.getDataBuffer();
+		unsigned long tmpBufferSize = binaryData.size();
+		for (unsigned long k = 0; k < tmpBufferSize; k++)
+			fprintf(f, "%c",tmpBinaryBuffer[k]);
+		fclose(f);
+	}
+#endif
+
+
+	m_painter->drawGraphicObject(propList, binaryData);
+	m_binaryData.objectIndex++;
+}
+
+void Pict2Parser::handleTextLine()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	m_matrix = objCh.matrix;
+	
+	unsigned short textFlags = readU16();
+	long x = (m_doublePrecision) ? readS32() : readS16();
+	long y = (m_doublePrecision) ? readS32() : readS16();
+	TRANSFORM_XY(x,y);
+
+	unsigned char horizontalAlignment = readU8();
+	unsigned char verticalAlignment = readU8();
+	
+	double baseLineAngle = fixedPointToDouble(readU32());
+	
+	Pict_DEBUG_MSG(("            text flags : 0x%.4x\n", textFlags));
+	Pict_DEBUG_MSG(("                     x : %li\n", x));
+	Pict_DEBUG_MSG(("                     y : %li\n", y));
+	Pict_DEBUG_MSG(("  horizontal alignment : 0x%.2x\n", horizontalAlignment));
+	Pict_DEBUG_MSG(("    vertical alignment : 0x%.2x\n", verticalAlignment));
+	Pict_DEBUG_MSG(("        baseline angle : %.4f\n", baseLineAngle));
+
+	m_textData.x1 = TO_DOUBLE(x)/m_xres;
+	m_textData.y1 = TO_DOUBLE(y)/m_yres;
+	m_textData.x2 = TO_DOUBLE(x)/m_xres;
+	m_textData.y2 = TO_DOUBLE(y)/m_yres;
+	m_textData.flags = textFlags;
+	m_textData.horAlign = horizontalAlignment;
+	m_textData.vertAlign = verticalAlignment;
+	m_textData.baseLineAngle = baseLineAngle;
+	
+	m_drawTextData = true;
+}
+
+void Pict2Parser::handleTextBlock()
+{
+	if (!m_graphicsStarted)
+		return;
+	ObjectCharacterization objCh;
+	parseCharacterization(&objCh);
+	m_matrix = objCh.matrix;
+
+	long x1 = (m_doublePrecision) ? readS32() : readS16();
+	long y1 = (m_doublePrecision) ? readS32() : readS16();
+	long x2 = (m_doublePrecision) ? readS32() : readS16();
+	long y2 = (m_doublePrecision) ? readS32() : readS16();
+	TRANSFORM_XY(x1,y1);
+	TRANSFORM_XY(x2,y2);
+
+	long xs1 = (x1 <= x2) ? x1 : x2;
+	long xs2 = (x1 <= x2) ? x2 : x1;
+	long ys1 = (y1 <= y2) ? y1 : y2;
+	long ys2 = (y1 <= y2) ? y2 : y1;
+
+	Pict_DEBUG_MSG(("             x1 : %li\n", xs1));
+	Pict_DEBUG_MSG(("             y1 : %li\n", ys1));
+	Pict_DEBUG_MSG(("             x2 : %li\n", xs2));
+	Pict_DEBUG_MSG(("             y2 : %li\n", ys2));
+
+	m_textData.x1 = TO_DOUBLE(xs1)/m_xres;
+	m_textData.y1 = TO_DOUBLE(ys1)/m_yres;
+	m_textData.x2 = TO_DOUBLE(xs2)/m_xres;
+	m_textData.y2 = TO_DOUBLE(ys2)/m_yres;
+	m_textData.flags = 0;
+	m_textData.horAlign = 0;
+	m_textData.vertAlign = 0;
+	m_textData.baseLineAngle = 0.0;
+	
+	m_drawTextData = false;
+}
+
+void Pict2Parser::handleTextPath()
+{
+	if (!m_graphicsStarted)
+		return;
+	
+	m_drawTextData = false;
+}
+
+void Pict2Parser::handleTextData()
+{
+	if (!m_graphicsStarted)
+		return;
+	if (!m_drawTextData)
+		return;
+
+	::WPXBinaryData textData;
+	while (!m_input->atEOS() && m_input->tell() <= m_recordEnd)
+		textData.append((char)readU8());
+	PictTextDataHandler handler(m_painter);
+	::WPXPropertyList propList;
+	
+	propList.insert("svg:x", (double)m_textData.x1);
+	propList.insert("svg:y", (double)m_textData.y1);
+	if (m_textData.x1 != m_textData.x2 && m_textData.y1 != m_textData.y2)
+	{
+		propList.insert("svg:width", (m_textData.x2 - m_textData.x1));
+		propList.insert("svg:height", (m_textData.y2 - m_textData.y1));
+	}
+	
+	m_painter->startTextObject(propList, ::WPXPropertyListVector());
+	
+	WPDocument::parseSubDocument(const_cast<WPXInputStream *>(textData.getDataStream()), &handler, WPD_FILE_FORMAT_WP6);
+	
+	m_painter->endTextObject();
+
+	m_drawTextData = false;
+}
+
+void Pict2Parser::resetPalette()
+{
+	m_colorPalette.clear();
+	for (int i=0; i<256; i++)
+	{
+		unsigned char red = defaultPict2PaletteRed[i];
+		unsigned char green = defaultPict2PaletteGreen[i];
+		unsigned char blue = defaultPict2PaletteBlue[i];
+		libpict::PictColor color(red, green, blue);
+		m_colorPalette[i] = color;
+	}
+}
diff --git a/src/lib/Pict2Parser.h b/src/lib/Pict2Parser.h
new file mode 100644
index 0000000..d1c39c1
--- /dev/null
+++ b/src/lib/Pict2Parser.h
@@ -0,0 +1,267 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __Pict2PARSER_H__
+#define __Pict2PARSER_H__
+
+#include "PictXParser.h"
+#include "PictDashArray.h"
+#include "PictBitmap.h"
+#include <libwpd/libwpd.h>
+
+#include <map>
+#include <stack>
+#include <vector>
+
+class Pict2TransformMatrix
+{
+public:
+	double element[3][3];
+
+	Pict2TransformMatrix()
+	{
+		// identity transformation
+		element[0][0] = element[1][1] = 1; element[2][2] = 1;
+		element[0][1] = element[0][2] = 0;
+		element[1][0] = element[1][2] = 0;
+		element[2][0] = element[2][1] = 0;
+	}
+
+	void transform(long& x, long& y) const
+	{
+		long rx = (long)(element[0][0]*x + element[1][0]*y + element[2][0]);
+		long ry = (long)(element[0][1]*x + element[1][1]*y + element[2][1]);
+		x = rx;
+		y = ry;
+	}
+
+	::WPXPropertyList transformPoint(const ::WPXPropertyList& p) const
+	{
+		::WPXPropertyList propList;
+		propList.insert("svg:x", (element[0][0]*p["svg:x"]->getDouble() + element[1][0]*p["svg:y"]->getDouble() + element[2][0]));
+		propList.insert("svg:y", (element[0][1]*p["svg:x"]->getDouble() + element[1][1]*p["svg:y"]->getDouble() + element[2][1]));
+		return propList;
+	}
+
+	::WPXPropertyList transformRect(const ::WPXPropertyList& r) const
+	{
+		::WPXPropertyList propList;
+		double oldx1 = r["svg:x"]->getDouble();
+		double oldy1 = r["svg:y"]->getDouble();
+		double oldx2 = r["svg:x"]->getDouble() + r["svg:width"]->getDouble();
+		double oldy2 = r["svg:y"]->getDouble() + r["svg:height"]->getDouble();
+		
+		double newx1 = element[0][0]*oldx1 + element[1][0]*oldy1 + element[2][0];
+		double newy1 = element[0][1]*oldx1 + element[1][1]*oldy1 + element[2][1];
+		double newx2 = element[0][0]*oldx2 + element[1][0]*oldy2 + element[2][0];
+		double newy2 = element[0][1]*oldx2 + element[1][1]*oldy2 + element[2][1];
+		
+		propList.insert("svg:x", (double)newx1);
+		propList.insert("svg:y", (double)newy1);
+		propList.insert("svg:width", (newx2-newx1));
+		propList.insert("svg:height", (newy2-newy1));
+		return propList;
+	}
+
+	Pict2TransformMatrix& transformBy(const Pict2TransformMatrix& m)
+	{
+		double result[3][3];
+
+		for(int i = 0; i < 3; i++)
+			for(int j = 0; j < 3; j++)
+			{
+				result[i][j] = 0;
+				for(int k = 0; k < 3; k++)
+					result[i][j] += m.element[i][k]*element[k][j];
+			}
+
+		for(int x = 0; x < 3; x++)
+			for(int y = 0; y < 3; y++)
+				element[x][y] = result[x][y];
+
+		return *this;
+	}
+};
+
+class PictCompoundPolygon
+{
+public:
+	Pict2TransformMatrix matrix;
+	bool isFilled;
+	bool isFramed;
+	bool isClosed;
+
+	PictCompoundPolygon(): matrix(), isFilled(true), isFramed(true), isClosed(true) {}
+};
+
+class PictGroupContext
+{
+public:
+	unsigned subIndex;
+	int parentType;
+	::WPXPropertyListVector compoundPath;
+	Pict2TransformMatrix compoundMatrix;
+	bool compoundWindingRule;
+	bool compoundFilled;
+	bool compoundFramed;
+	bool compoundClosed;
+
+	PictGroupContext(): subIndex(0), parentType(0),
+	compoundPath(), compoundMatrix(), compoundWindingRule(false),
+	compoundFilled(false), compoundFramed(true), compoundClosed(false)	{}
+
+	bool isCompoundPolygon() const { return parentType == 0x1a; }
+};
+
+class PictBitmapContext
+{
+public:
+	double x1, y1, x2, y2;
+	long hres, vres;
+	PictBitmapContext(): x1(0), y1(0), x2(0), y2(0), hres(100), vres(100) {}
+};
+
+class PictBinaryDataContext
+{
+public:
+	double x1, y1, x2, y2;
+	int numObjects, objectIndex;
+	std::vector<WPXString> mimeTypes;
+	PictBinaryDataContext(): x1(0), y1(0), x2(0), y2(0), numObjects(0), objectIndex(0), mimeTypes() {}
+};
+
+class PictTextDataContext
+{
+public:
+	double x1, y1, x2, y2;
+	unsigned short flags;
+	unsigned char vertAlign;
+	unsigned char horAlign;
+	double baseLineAngle;
+	PictTextDataContext(): x1(0), y1(0), x2(0), y2(0), flags(), vertAlign(), horAlign(), baseLineAngle(0.0) {}
+};
+
+class Pict2Parser : public PictXParser
+{
+public:
+	Pict2Parser(WPXInputStream *input, libwpg::WPGPaintInterface* painter, bool isEmbedded = false);
+	bool parse();
+
+private:
+	void handleStartPict();
+	void handleEndPict();
+	void handleFormSettings();
+	void handleLayer();
+	void handleCompoundPolygon();
+
+	void handlePenStyleDefinition();
+//	void handlePatternDefinition();
+	void handleColorPalette();
+	void handleDPColorPalette();
+	void handlePenForeColor();
+	void handleDPPenForeColor();
+	void handlePenBackColor();
+	void handleDPPenBackColor();
+	void handlePenStyle();
+	void handlePenSize();
+	void handleDPPenSize();
+	void handleLineCap();
+	void handleLineJoin();
+	void handleBrushGradient();
+	void handleDPBrushGradient();
+	void handleBrushForeColor();
+	void handleDPBrushForeColor();
+	void handleBrushBackColor();
+	void handleDPBrushBackColor();
+	void handleBrushPattern();
+
+	void handlePolyline();
+	void handlePolyspline();
+	void handlePolycurve();
+	void handleRectangle();
+	void handleArc();
+
+	void handleBitmap();
+	void handleBitmapData();
+	
+	void handleTextData();
+	void handleTextLine();
+	void handleTextBlock();
+	void handleTextPath();
+	
+	void handleObjectCapsule();
+	void handleObjectImage();
+
+	void resetPalette();
+	void flushCompoundPolygon();
+
+	// parsing context
+	int m_recordLength;
+	long m_recordEnd;
+	bool m_success;
+	bool m_exit;
+	bool m_graphicsStarted;
+	unsigned int m_xres;
+	unsigned int m_yres;
+	long m_xofs;
+	long m_yofs;
+	long m_width;
+	long m_height;
+	bool m_doublePrecision;
+	::WPXPropertyList m_style;
+	libpict::PictColor m_penForeColor;
+	libpict::PictColor m_penBackColor;
+	libpict::PictColor m_brushForeColor;
+	libpict::PictColor m_brushBackColor;
+	libpict::PictDashArray m_dashArray;
+	::WPXPropertyListVector m_gradient;
+	std::map<unsigned int,libpict::PictDashArray> m_dashArrayStyles;
+	bool m_layerOpened;
+	unsigned int m_layerId;
+	Pict2TransformMatrix m_matrix;
+	double m_gradientAngle;
+	::WPXPropertyList m_gradientRef;
+	std::stack<PictGroupContext> m_groupStack;
+	Pict2TransformMatrix m_compoundMatrix;
+	bool m_compoundWindingRule;
+	bool m_compoundFilled;
+	bool m_compoundFramed;
+	bool m_compoundClosed;
+	PictBitmapContext m_bitmap;
+	PictBinaryDataContext m_binaryData;
+	bool m_hFlipped, m_vFlipped;
+	PictTextDataContext m_textData;
+	bool m_drawTextData;
+
+	class ObjectCharacterization;
+	void parseCharacterization(ObjectCharacterization*);
+	unsigned m_binaryId;
+	
+	bool m_embedded;
+};
+
+#endif // __Pict2PARSER_H__
diff --git a/src/lib/PictBitmap.cpp b/src/lib/PictBitmap.cpp
new file mode 100644
index 0000000..3cf29e4
--- /dev/null
+++ b/src/lib/PictBitmap.cpp
@@ -0,0 +1,276 @@
+/* libpict
+ * Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictBitmap.h"
+#include "libpict_utils.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define DUMP_BITMAP 0
+
+#if DUMP_BITMAP
+static unsigned bitmapId = 0;
+#include <sstream>
+#endif
+
+namespace
+{
+void writeU16(unsigned char *buffer, unsigned &position, const int value)
+{
+	buffer[position++] = (unsigned char)(value & 0xFF);
+	buffer[position++] = (unsigned char)((value >> 8) & 0xFF);
+}
+
+void writeU32(unsigned char *buffer, unsigned &position, const int value)
+{
+	buffer[position++] = (unsigned char)(value & 0xFF);
+	buffer[position++] = (unsigned char)((value >> 8) & 0xFF);
+	buffer[position++] = (unsigned char)((value >> 16) & 0xFF);
+	buffer[position++] = (unsigned char)((value >> 24) & 0xFF);
+}
+
+void writeU8(unsigned char *buffer, unsigned &position, const int value)
+{
+	buffer[position++] = (unsigned char)(value & 0xFF);
+}
+
+}
+
+class libpict::PictBitmap::Private
+{
+public:
+	int width;
+	int height;
+	int vRes;
+	int hRes;
+	bool vFlip;
+	bool hFlip;
+	PictColor* pixels;
+	::WPXBinaryData dib;
+
+	Private(int w, int h): width(w), height(h), vRes(72), hRes(72), vFlip(false), hFlip(false), pixels(0), dib() {}
+};
+
+libpict::PictBitmap::PictBitmap(int w, int h, int verticalResolution, int horizontalResolution, bool verticalFlip, bool horizontalFlip) :
+	d(new Private(w, h))
+{
+	d->vRes = verticalResolution;
+	d->hRes = horizontalResolution;
+	d->vFlip = verticalFlip;
+	d->hFlip = horizontalFlip;
+	d->pixels = new PictColor[w*h];
+}
+
+libpict::PictBitmap::~PictBitmap()
+{
+	if (d)
+	{
+		if (d->pixels)
+			delete [] d->pixels;
+		delete d;
+	}
+}
+
+libpict::PictBitmap::PictBitmap(const PictBitmap& bitmap): d(new Private(0,0))
+{
+	copyFrom(bitmap);
+}
+
+libpict::PictBitmap& libpict::PictBitmap::operator=(const PictBitmap& bitmap)
+{
+	copyFrom(bitmap);
+	return *this;
+}
+
+void libpict::PictBitmap::copyFrom(const PictBitmap& bitmap)
+{
+	d->width = bitmap.d->width;
+	d->height = bitmap.d->height;
+	delete [] d->pixels;
+	d->pixels = new PictColor[d->width*d->height];
+	for(int i=0; i < d->width*d->height; i++)
+		d->pixels[i] = bitmap.d->pixels[i];
+}
+
+int libpict::PictBitmap::width() const
+{
+	return d->width;
+}
+
+int libpict::PictBitmap::height() const
+{
+	return d->height;
+}
+
+int libpict::PictBitmap::vres() const
+{
+	return d->vRes;
+}
+
+int libpict::PictBitmap::hres() const
+{
+	return d->hRes;
+}
+
+void libpict::PictBitmap::setPixel(int x, int y, const libpict::PictColor& color)
+{
+	if((x < 0) || (y <0) || (x >= d->width) || (y >= d->height))
+		return;
+
+	d->pixels[y*d->width + x] = color;
+}
+
+const ::WPXBinaryData & libpict::PictBitmap::getDIB() const
+{
+	if (d->dib.size() || d->height <= 0 || d->width <= 0)
+		return d->dib;
+
+#ifndef OUTPUT_DUMMY_BITMAPS
+	unsigned tmpPixelSize = (unsigned)(d->height * d->width);
+	if (tmpPixelSize < (unsigned)d->height) // overflow
+		return d->dib;
+#else
+	unsigned tmpPixelSize = 1;
+#endif
+
+	unsigned tmpBufferPosition = 0;
+
+	unsigned tmpDIBImageSize = tmpPixelSize * 4;
+	if (tmpPixelSize > tmpDIBImageSize) // overflow !!!
+		return d->dib;
+
+	unsigned tmpDIBOffsetBits = 14 + 40;
+	unsigned tmpDIBFileSize = tmpDIBOffsetBits + tmpDIBImageSize;
+	if (tmpDIBImageSize > tmpDIBFileSize) // overflow !!!
+		return d->dib;
+
+	unsigned char *tmpDIBBuffer = new unsigned char[tmpDIBFileSize];
+
+	// Create DIB file header
+	writeU16(tmpDIBBuffer, tmpBufferPosition, 0x4D42);  // Type
+	writeU32(tmpDIBBuffer, tmpBufferPosition, tmpDIBFileSize); // Size
+	writeU16(tmpDIBBuffer, tmpBufferPosition, 0); // Reserved1
+	writeU16(tmpDIBBuffer, tmpBufferPosition, 0); // Reserved2
+	writeU32(tmpDIBBuffer, tmpBufferPosition, tmpDIBOffsetBits); // OffsetBits
+	
+	Pict_DEBUG_MSG(("PictBitmap: DIB file header end = %i\n", tmpBufferPosition - 1));
+
+	// Create DIB Info header
+	writeU32(tmpDIBBuffer, tmpBufferPosition, 40); // Size
+#ifndef OUTPUT_DUMMY_BITMAPS
+	writeU32(tmpDIBBuffer, tmpBufferPosition, width());  // Width
+	writeU32(tmpDIBBuffer, tmpBufferPosition, height()); // Height
+#else
+	writeU32(tmpDIBBuffer, tmpBufferPosition, 1);  // Width
+	writeU32(tmpDIBBuffer, tmpBufferPosition, 1); // Height
+#endif
+	writeU16(tmpDIBBuffer, tmpBufferPosition, 1); // Planes
+	writeU16(tmpDIBBuffer, tmpBufferPosition, 32); // BitCount 
+	writeU32(tmpDIBBuffer, tmpBufferPosition, 0); // Compression
+	writeU32(tmpDIBBuffer, tmpBufferPosition, tmpDIBImageSize); // SizeImage
+	writeU32(tmpDIBBuffer, tmpBufferPosition, (int)(hres()*100.0/2.54)); // XPelsPerMeter
+	writeU32(tmpDIBBuffer, tmpBufferPosition, (int)(vres()*100.0/2.54)); // YPelsPerMeter
+	writeU32(tmpDIBBuffer, tmpBufferPosition, 0); // ColorsUsed
+	writeU32(tmpDIBBuffer, tmpBufferPosition, 0); // ColorsImportant
+	
+	Pict_DEBUG_MSG(("PictBitmap: DIB info header end = %i\n", tmpBufferPosition - 1));
+
+	// Write DIB Image data
+
+#ifndef OUTPUT_DUMMY_BITMAPS
+	int i = 0; int j = 0;
+	if (d->vFlip)
+		for	(i = 0; i < d->height && tmpBufferPosition < tmpDIBFileSize; i++)
+		{
+			if (d->hFlip)
+				for (j = d->width - 1; j >= 0 && tmpBufferPosition < tmpDIBFileSize; j--)
+				{
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].blue);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].green);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].red);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].alpha);
+				}
+			else
+				for (j = 0; j < d->width && tmpBufferPosition < tmpDIBFileSize; j++)
+				{
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].blue);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].green);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].red);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].alpha);
+				}
+		}
+	else
+		for (i = d->height - 1; i >= 0 && tmpBufferPosition < tmpDIBFileSize; i--)
+		{
+			if (d->hFlip)
+				for (j = d->width - 1; j >= 0 && tmpBufferPosition < tmpDIBFileSize; j--)
+				{
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].blue);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].green);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].red);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].alpha);
+				}
+			else
+				for (j = 0; j < d->width && tmpBufferPosition < tmpDIBFileSize; j++)
+				{
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].blue);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].green);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].red);
+					writeU8(tmpDIBBuffer, tmpBufferPosition, d->pixels[i*d->width + j].alpha);
+				}
+		}
+
+	Pict_DEBUG_MSG(("PictBitmap: DIB file size = %i\n", tmpBufferPosition - 1));
+
+#else
+	writeU8(tmpDIBBuffer, tmpBufferPosition, 0x7F);
+	writeU8(tmpDIBBuffer, tmpBufferPosition, 0x7F);
+	writeU8(tmpDIBBuffer, tmpBufferPosition, 0x7F);
+	writeU8(tmpDIBBuffer, tmpBufferPosition, 0x7F);
+#endif
+
+	d->dib.append(tmpDIBBuffer, tmpDIBFileSize);
+
+	// temporary for debug - dump the binary bmp (need to have write access in the current directory
+#if DUMP_BITMAP
+	std::ostringstream filename;
+	filename << "binarydump" << bitmapId++ << ".bmp";
+	FILE *f = fopen(filename.str().c_str(), "wb");
+	if (f)
+	{
+		for (unsigned k = 0; k < tmpDIBFileSize; k++)
+			fprintf(f, "%c",tmpDIBBuffer[k]);
+		fclose(f);
+	}
+#endif
+
+	// Cleanup things before returning
+	delete [] tmpDIBBuffer;
+	
+	return d->dib;
+}
diff --git a/src/lib/PictBitmap.h b/src/lib/PictBitmap.h
new file mode 100644
index 0000000..daa0db4
--- /dev/null
+++ b/src/lib/PictBitmap.h
@@ -0,0 +1,72 @@
+/* libpict
+ * Copyright (C) 2007 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __PictBITMAP_H__
+#define __PictBITMAP_H__
+
+#include "PictColor.h"
+#include <libwpd/libwpd.h>
+
+namespace libpict
+{
+
+class PictBitmap
+{
+public:
+	PictBitmap(int width, int height, int verticalResolution, int horizontalResolution, bool verticalFlip=false, bool horizontalFlip=false);
+
+	PictBitmap(const PictBitmap&);
+
+	PictBitmap& operator=(const PictBitmap&);
+
+	void copyFrom(const PictBitmap&);
+
+	~PictBitmap();
+
+	// return width in pixel
+	int width() const;
+
+	// return height in pixel
+	int height() const;
+	
+	// return vertical resolution in pixels per inch
+	int vres() const;
+
+	// return horizontal resolution in pixels per inch
+	int hres() const;
+	
+	void setPixel(int x, int y, const PictColor& color);
+	
+	const ::WPXBinaryData& getDIB() const;
+
+private:
+	class Private;
+	Private* const d;
+};
+
+} // namespace libpict
+
+#endif // __PictBITMAP_H__
diff --git a/src/lib/PictColor.cpp b/src/lib/PictColor.cpp
new file mode 100644
index 0000000..4b7de3b
--- /dev/null
+++ b/src/lib/PictColor.cpp
@@ -0,0 +1,75 @@
+/* libpict
+ * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictColor.h"
+
+libpict::PictColor::PictColor():
+	red(0),
+	green(0),
+	blue(0),
+	alpha(0xff)
+{}
+
+libpict::PictColor::PictColor(int r, int g, int b):
+	red(r),
+	green(g),
+	blue(b),
+	alpha(0xff)
+{}
+
+libpict::PictColor::PictColor(int r, int g, int b, int a):
+	red(r),
+	green(g),
+	blue(b),
+	alpha(a)
+{}
+
+libpict::PictColor::PictColor(const PictColor& color):
+	red(color.red),
+	green(color.green),
+	blue(color.blue),
+	alpha(color.alpha)
+{}
+
+libpict::PictColor& libpict::PictColor::operator=(const libpict::PictColor& color)
+{
+	red = color.red;
+	green = color.green;
+	blue = color.blue;
+	alpha = color.alpha;
+	return *this;
+}
+
+const ::WPXString libpict::PictColor::getColorString() const
+{
+	::WPXString sColor;
+	sColor.sprintf("#%.2x%.2x%.2x", red, green, blue);
+	return sColor;
+}
+
+double libpict::PictColor::getOpacity() const
+{
+	return ((double)alpha/255.0);
+}
diff --git a/src/lib/PictColor.h b/src/lib/PictColor.h
new file mode 100644
index 0000000..828e7a1
--- /dev/null
+++ b/src/lib/PictColor.h
@@ -0,0 +1,56 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __PictCOLOR_H__
+#define __PictCOLOR_H__
+
+#include <libwpd/libwpd.h>
+
+namespace libpict
+{
+
+class PictColor
+{
+public:
+	int red, green, blue, alpha;
+	
+	PictColor();
+	
+	PictColor(int r, int g, int b);
+	
+	PictColor(int r, int g, int b, int a);
+
+	PictColor(const PictColor& color);
+	
+	PictColor& operator=(const PictColor& color);
+	
+	const ::WPXString getColorString() const;
+	
+	double getOpacity() const;
+};
+
+} // namespace libpict
+
+#endif // __PictCOLOR_H__
diff --git a/src/lib/PictDashArray.cpp b/src/lib/PictDashArray.cpp
new file mode 100644
index 0000000..c294512
--- /dev/null
+++ b/src/lib/PictDashArray.cpp
@@ -0,0 +1,74 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictDashArray.h"
+
+#include <vector>
+
+namespace libpict
+{
+class PictDashArrayPrivate
+{
+public:
+    PictDashArrayPrivate() : dashes(std::vector<double>()) {};
+	std::vector<double> dashes;
+};
+}
+	
+libpict::PictDashArray::PictDashArray() : d(new libpict::PictDashArrayPrivate())
+{
+}
+
+libpict::PictDashArray::~PictDashArray()
+{
+	delete d;
+}
+
+libpict::PictDashArray::PictDashArray(const libpict::PictDashArray& dash):
+	d(new libpict::PictDashArrayPrivate())
+{
+	d->dashes = dash.d->dashes;
+}
+
+libpict::PictDashArray& libpict::PictDashArray::operator=(const libpict::PictDashArray& dash)
+{
+	d->dashes = dash.d->dashes;
+	return *this;
+}
+
+unsigned libpict::PictDashArray::count() const
+{
+	return d->dashes.size();
+}
+
+double libpict::PictDashArray::at(unsigned i) const
+{
+	return d->dashes[i];
+}
+
+void libpict::PictDashArray::add(double p)
+{
+	d->dashes.push_back(p);
+}
diff --git a/src/lib/PictDashArray.h b/src/lib/PictDashArray.h
new file mode 100644
index 0000000..b60c490
--- /dev/null
+++ b/src/lib/PictDashArray.h
@@ -0,0 +1,52 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __PictDASHARRAY_H__
+#define __PictDASHARRAY_H__
+
+namespace libpict
+{
+
+class PictDashArrayPrivate;
+
+class PictDashArray
+{
+public:
+	PictDashArray();
+	~PictDashArray();
+	PictDashArray(const PictDashArray&);
+	PictDashArray& operator=(const PictDashArray&);
+	unsigned count() const;
+	double at(unsigned i) const;
+	void add(double p);
+
+private:
+	PictDashArrayPrivate *d;
+};
+
+} // namespace libpict
+
+
+#endif // __PictDASHARRAY_H__
diff --git a/src/lib/PictGradient.cpp b/src/lib/PictGradient.cpp
new file mode 100644
index 0000000..f408833
--- /dev/null
+++ b/src/lib/PictGradient.cpp
@@ -0,0 +1,102 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictGradient.h"
+
+#include <vector>
+
+namespace libpict
+{
+
+class PictGradientStop
+{
+public:
+	double offset;
+	::WPXString color;
+	double opacity;
+	
+	PictGradientStop(): offset(0), color("#000000"), opacity(1.0) {}
+	
+	PictGradientStop(double ofs, const ::WPXString& c, double opa): offset(ofs), color(c), opacity(opa) {}
+};
+
+class PictGradientPrivate
+{
+public:
+    PictGradientPrivate() :
+	gradientStops() {};
+
+	std::vector<PictGradientStop> gradientStops;
+};
+
+} // namespace libpict
+
+libpict::PictGradient::PictGradient() :
+    d(new PictGradientPrivate())
+{
+}
+
+libpict::PictGradient::~PictGradient()
+{
+	delete d;
+}
+
+libpict::PictGradient::PictGradient(const libpict::PictGradient& g) :
+    d(new libpict::PictGradientPrivate())
+{
+	d->gradientStops = g.d->gradientStops;
+}
+	
+libpict::PictGradient& libpict::PictGradient::operator=(const libpict::PictGradient& g)
+{
+	d->gradientStops = g.d->gradientStops;
+	return *this;
+}
+
+unsigned libpict::PictGradient::count() const
+{
+	return d->gradientStops.size();
+}
+
+double libpict::PictGradient::stopOffset(unsigned index) const
+{
+	return d->gradientStops[index].offset;
+}
+
+::WPXString libpict::PictGradient::stopColor(unsigned index) const
+{
+	return d->gradientStops[index].color;
+}
+
+double libpict::PictGradient::stopOpacity(unsigned index) const
+{
+	return d->gradientStops[index].opacity;
+}
+
+void libpict::PictGradient::addStop(double offset, const ::WPXString& color, double opacity)
+{
+	libpict::PictGradientStop stop(offset, color, opacity);
+	d->gradientStops.push_back(stop);
+}
diff --git a/src/lib/PictHeader.cpp b/src/lib/PictHeader.cpp
new file mode 100644
index 0000000..a916e61
--- /dev/null
+++ b/src/lib/PictHeader.cpp
@@ -0,0 +1,80 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictHeader.h"
+#include "libpict_utils.h"
+
+namespace
+{
+static inline unsigned short readU16( const void* p )
+{
+	const unsigned char* ptr = (const unsigned char*) p;
+	return (unsigned short)(ptr[0]+(ptr[1]<<8));
+}
+
+static inline unsigned long readU32( const void* p )
+{
+	const unsigned char* ptr = (const unsigned char*) p;
+	return ptr[0]+(ptr[1]<<8)+(ptr[2]<<16)+(ptr[3]<<24);
+}
+}
+
+PictHeader::PictHeader() :
+	m_fileSize(0),
+	m_xUpperLeftAt72(0),
+	m_yUpperLeftAt72(0),
+	m_xLowerRightAt72(0),
+	m_yLoverRightAt72(0),
+	m_pictVersion(0),
+	m_resolutionX(72),
+	m_resolutionY(72),
+	m_xUpperLeft(0),
+	m_yUpperLeft(0),
+	m_xLowerRight(0),
+	m_yLowerRigth(0)
+{
+}
+
+bool PictHeader::load(WPXInputStream *input)
+{
+        return false;
+}
+
+bool PictHeader::isSupported() const
+{
+
+	return false;
+}
+
+unsigned long PictHeader::startOfDocument() const
+{
+	return 0;
+}
+
+int PictHeader::getVersion() const
+{
+	return m_pictVersion;
+}
diff --git a/src/lib/PictHeader.h b/src/lib/PictHeader.h
new file mode 100644
index 0000000..460508d
--- /dev/null
+++ b/src/lib/PictHeader.h
@@ -0,0 +1,59 @@
+/* libpict
+ * Copyright (C) 2011 Fridrich Strba <fridrich.strba@bluewin.ch>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __PictHEADER_H__
+#define __PictHEADER_H__
+
+#include <libwpd-stream/WPXStream.h>
+
+class PictHeader 
+{
+public:
+	PictHeader();
+	
+	bool load(WPXInputStream *input);
+	
+	bool isSupported() const;
+	
+	unsigned long startOfDocument() const;
+	
+	int getVersion() const;
+
+private:
+	unsigned short m_fileSize;
+	unsigned short m_xUpperLeftAt72;
+	unsigned short m_yUpperLeftAt72;
+	unsigned short m_xLowerRightAt72;
+	unsigned short m_yLoverRightAt72;
+	unsigned char m_pictVersion;
+	unsigned long m_resolutionX;
+	unsigned long m_resolutionY;
+	unsigned short m_xUpperLeft;
+	unsigned short m_yUpperLeft;
+	unsigned short m_xLowerRight;
+	unsigned short m_yLowerRigth;
+};
+
+#endif // PictHEADER
diff --git a/src/lib/PictImage.cpp b/src/lib/PictImage.cpp
new file mode 100644
index 0000000..25d3410
--- /dev/null
+++ b/src/lib/PictImage.cpp
@@ -0,0 +1,149 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictImage.h"
+#include "PictHeader.h"
+#include "PictXParser.h"
+#include "Pict1Parser.h"
+#include "Pict2Parser.h"
+#include "libpict_utils.h"
+#include "PictSVGGenerator.h"
+#include <libwpg/libwpg.h>
+#include <sstream>
+
+/**
+Analyzes the content of an input stream to see if it can be parsed
+\param input The input stream
+\return A value that indicates whether the content from the input
+stream is a WordPerfect Graphics that libpict is able to parse
+*/
+bool libpict::PictImage::isSupported(WPXInputStream* input)
+{
+	input->seek(0, WPX_SEEK_SET);
+
+	PictHeader header;
+	if(!header.load(input))
+		return false;
+	
+	bool retVal = header.isSupported();
+	
+	return retVal;
+}
+
+/**
+Parses the input stream content. It will make callbacks to the functions provided by a
+PictPaintInterface class implementation when needed. This is often commonly called the
+'main parsing routine'.
+\param input The input stream
+\param painter A PictPainterInterface implementation
+\return A value that indicates whether the parsing was successful
+*/
+bool libpict::PictImage::parse(::WPXInputStream* input, libwpg::WPGPaintInterface* painter, libpict::PictFileFormat fileFormat)
+{
+	PictXParser *parser = 0;
+	
+	input->seek(0, WPX_SEEK_SET);
+
+	Pict_DEBUG_MSG(("Loading header...\n"));
+	unsigned char tmpMajorVersion = 0x00;
+	if (fileFormat == Pict_Pict1)
+		tmpMajorVersion = 0x01;
+	else if (fileFormat == Pict_Pict2)
+		tmpMajorVersion = 0x02;
+	PictHeader header;
+	if(!header.load(input))
+		return false;
+	
+	if(!header.isSupported())
+	{
+		Pict_DEBUG_MSG(("Unsupported file format!\n"));
+		return false;  
+	}
+	else
+	{
+		// seek to the start of document
+		input->seek(header.startOfDocument(), WPX_SEEK_SET);
+		tmpMajorVersion = (unsigned char)(header.getVersion());
+		if (tmpMajorVersion == 0x01)
+		{
+			unsigned long returnPosition = header.startOfDocument();
+			/* Due to a bug in dumping mechanism, we produced
+			 * invalid Pict files by prepending a Pict1 header
+			 * to a valid WP file. Let us check this kind of files,
+			 * so that we can load our own mess too. */
+			if (header.load(input) && header.isSupported())
+			{
+				Pict_DEBUG_MSG(("An invalid input we produced :(\n"));
+				input->seek(header.startOfDocument() + 16, WPX_SEEK_SET);
+				tmpMajorVersion = (unsigned char)(header.getVersion());
+			}
+			else
+				input->seek(returnPosition, WPX_SEEK_SET);
+			
+		}
+	}
+
+	bool retval;
+	switch (tmpMajorVersion) {
+		case 0x01: // Pict1
+			Pict_DEBUG_MSG(("Parsing Pict1\n"));
+			parser = new Pict1Parser(input, painter);
+			retval = parser->parse();
+			break;
+		case 0x02: // Pict2
+			Pict_DEBUG_MSG(("Parsing Pict2\n"));
+			parser = new Pict2Parser(input, painter);
+			retval = parser->parse();
+			break;
+		default: // other :-)
+			Pict_DEBUG_MSG(("Unknown format\n"));
+			return false;
+	}
+	
+	if (parser)
+		delete parser;
+	
+	return retval;
+}
+
+/**
+Parses the input stream content and generates a valid Scalable Vector Graphics
+Provided as a convenience function for applications that support SVG internally.
+\param input The input stream
+\param output The output string whose content is the resulting SVG
+\return A value that indicates whether the SVG generation was successful.
+*/
+bool libpict::PictImage::generateSVG(::WPXInputStream* input, WPXString& output, libpict::PictFileFormat fileFormat)
+{
+	std::ostringstream tmpOutputStream;
+	libpict::PictSVGGenerator generator(tmpOutputStream);
+	bool result = libpict::PictImage::parse(input, &generator, fileFormat);
+	if (result)
+		output = WPXString(tmpOutputStream.str().c_str());
+	else
+		output = WPXString("");
+	return result;
+}
diff --git a/src/lib/PictImage.h b/src/lib/PictImage.h
new file mode 100644
index 0000000..31cca01
--- /dev/null
+++ b/src/lib/PictImage.h
@@ -0,0 +1,51 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __PictRAPHICS_H__
+#define __PictRAPHICS_H__
+
+#include <libwpd/libwpd.h>
+#include <libwpd-stream/libwpd-stream.h>
+#include <libwpg/libwpg.h>
+
+
+namespace libpict
+{
+enum PictFileFormat { Pict_AUTODETECT = 0, Pict_Pict1, Pict_Pict2 };
+
+class PictImage
+{
+public:
+	
+	static bool isSupported(WPXInputStream* input);
+	
+	static bool parse(WPXInputStream* input, libwpg::WPGPaintInterface* painter, PictFileFormat fileFormat = Pict_AUTODETECT);
+
+	static bool generateSVG(WPXInputStream* input, WPXString& output, PictFileFormat fileFormat = Pict_AUTODETECT);
+};
+
+} // namespace libpict
+
+#endif //  __PictRAPHICS_H__
diff --git a/src/lib/PictSVGGenerator.cpp b/src/lib/PictSVGGenerator.cpp
new file mode 100644
index 0000000..392e718
--- /dev/null
+++ b/src/lib/PictSVGGenerator.cpp
@@ -0,0 +1,349 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictSVGGenerator.h"
+#include <locale.h>
+#include <sstream>
+#include <string>
+
+static std::string doubleToString(const double value)
+{
+  std::ostringstream tempStream;
+  tempStream << value;
+  std::string decimalPoint(localeconv()->decimal_point);
+  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+    return tempStream.str();
+  std::string stringValue(tempStream.str());
+  if (!stringValue.empty())
+  {
+    std::string::size_type pos;
+    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
+          stringValue.replace(pos,decimalPoint.size(),".");
+  }
+  return stringValue;
+}
+
+
+libpict::PictSVGGenerator::PictSVGGenerator(std::ostream & output_sink): m_gradient(), m_style(), m_gradientIndex(1), m_outputSink(output_sink)
+{
+}
+
+libpict::PictSVGGenerator::~PictSVGGenerator()
+{
+}
+
+void libpict::PictSVGGenerator::startGraphics(const WPXPropertyList &propList)
+{
+	m_outputSink << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
+	m_outputSink << "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"";
+	m_outputSink << " \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n";
+
+	m_outputSink << "<!-- Created with pict2svg/libpict " << LIBPict_VERSION_STRING << " -->\n";
+
+	m_outputSink << "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" ";
+	m_outputSink << "xmlns:xlink=\"http://www.w3.org/1999/xlink\" ";
+	if (propList["svg:width"])
+		m_outputSink << "width=\"" << doubleToString(72*(propList["svg:width"]->getDouble())) << "\" ";
+	if (propList["svg:height"])
+		m_outputSink << "height=\"" << doubleToString(72*(propList["svg:height"]->getDouble())) << "\"";
+	m_outputSink << " >\n";
+
+	m_gradientIndex = 1;
+}
+
+void libpict::PictSVGGenerator::endGraphics()
+{
+	m_outputSink << "</svg>\n";
+}
+
+void libpict::PictSVGGenerator::setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector& gradient)
+{
+	m_style = propList;
+
+	m_gradient = gradient;
+
+	if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient" && m_gradient.count())
+	{
+		double angle = (m_style["draw:angle"] ? m_style["draw:angle"]->getDouble() : 0.0);
+
+		m_outputSink << "<defs>\n";
+		m_outputSink << "  <linearGradient id=\"grad" << m_gradientIndex++ << "\" >\n";
+		for(unsigned c = 0; c < m_gradient.count(); c++)
+		{
+			m_outputSink << "    <stop offset=\"" << m_gradient[c]["svg:offset"]->getStr().cstr() << "\"";
+
+			m_outputSink << " stop-color=\"" << m_gradient[c]["svg:stop-color"]->getStr().cstr() << "\"";
+			m_outputSink << " stop-opacity=\"" << m_gradient[c]["svg:stop-opacity"]->getStr().cstr() << "\" />" << std::endl;
+
+		}
+		m_outputSink << "  </linearGradient>\n";
+
+		// not a simple horizontal gradient
+		if(angle != -90)
+		{
+			m_outputSink << "  <linearGradient xlink:href=\"#grad" << m_gradientIndex-1 << "\"";
+			m_outputSink << " id=\"grad" << m_gradientIndex++ << "\" ";
+			m_outputSink << "x1=\"0\" y1=\"0\" x2=\"0\" y2=\"1\" ";
+			m_outputSink << "gradientTransform=\"rotate(" << angle << ")\" ";
+			m_outputSink << "gradientUnits=\"objectBoundingBox\" >\n";
+			m_outputSink << "  </linearGradient>\n";
+		}
+
+		m_outputSink << "</defs>\n";
+	}
+
+}
+
+void libpict::PictSVGGenerator::startLayer(const ::WPXPropertyList& propList)
+{
+	m_outputSink << "<g id=\"Layer" << propList["svg:id"]->getInt() << "\" >\n";
+}
+
+void libpict::PictSVGGenerator::endLayer()
+{
+	m_outputSink << "</g>\n";
+}
+
+void libpict::PictSVGGenerator::drawRectangle(const ::WPXPropertyList& propList)
+{
+	m_outputSink << "<rect ";
+	m_outputSink << "x=\"" << doubleToString(72*propList["svg:x"]->getDouble()) << "\" y=\"" << doubleToString(72*propList["svg:y"]->getDouble()) << "\" ";
+	m_outputSink << "width=\"" << doubleToString(72*propList["svg:width"]->getDouble()) << "\" height=\"" << doubleToString(72*propList["svg:height"]->getDouble()) << "\" ";
+	if((propList["svg:rx"] && propList["svg:rx"]->getInt() !=0) || (propList["svg:ry"] && propList["svg:ry"]->getInt() !=0))
+		m_outputSink << "rx=\"" << doubleToString(72*propList["svg:rx"]->getDouble()) << "\" ry=\"" << doubleToString(72*propList["svg:ry"]->getDouble()) << "\" ";
+	writeStyle();
+	m_outputSink << "/>\n";
+}
+
+void libpict::PictSVGGenerator::drawEllipse(const WPXPropertyList& propList)
+{
+	m_outputSink << "<ellipse ";
+	m_outputSink << "cx=\"" << doubleToString(72*propList["svg:cx"]->getDouble()) << "\" cy=\"" << doubleToString(72*propList["svg:cy"]->getDouble()) << "\" ";
+	m_outputSink << "rx=\"" << doubleToString(72*propList["svg:rx"]->getDouble()) << "\" ry=\"" << doubleToString(72*propList["svg:ry"]->getDouble()) << "\" ";
+	writeStyle();
+	if (propList["libpict:rotate"] && propList["libpict:rotate"]->getDouble() != 0.0)
+		m_outputSink << " transform=\" translate(" << doubleToString(72*propList["svg:cx"]->getDouble()) << ", " << doubleToString(72*propList["svg:cy"]->getDouble())
+		<< ") rotate(" << doubleToString(-propList["libpict:rotate"]->getDouble())
+		<< ") translate(" << doubleToString(-72*propList["svg:cx"]->getDouble())
+		<< ", " << doubleToString(-72*propList["svg:cy"]->getDouble())
+		<< ")\" ";
+	m_outputSink << "/>\n";
+}
+
+void libpict::PictSVGGenerator::drawPolyline(const ::WPXPropertyListVector& vertices)
+{
+	drawPolySomething(vertices, false);
+}
+
+void libpict::PictSVGGenerator::drawPolygon(const ::WPXPropertyListVector& vertices)
+{
+	drawPolySomething(vertices, true);
+}
+
+void libpict::PictSVGGenerator::drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed)
+{
+	if(vertices.count() < 2)
+		return;
+
+	if(vertices.count() == 2)
+	{
+		m_outputSink << "<line ";
+		m_outputSink << "x1=\"" << doubleToString(72*(vertices[0]["svg:x"]->getDouble())) << "\"  y1=\"" << doubleToString(72*(vertices[0]["svg:y"]->getDouble())) << "\" ";
+		m_outputSink << "x2=\"" << doubleToString(72*(vertices[1]["svg:x"]->getDouble())) << "\"  y2=\"" << doubleToString(72*(vertices[1]["svg:y"]->getDouble())) << "\"\n";
+		writeStyle();
+		m_outputSink << "/>\n";
+	}
+	else
+	{
+		if (isClosed)
+			m_outputSink << "<polygon ";
+		else
+			m_outputSink << "<polyline ";
+
+		m_outputSink << "points=\"";
+		for(unsigned i = 0; i < vertices.count(); i++)
+		{
+			m_outputSink << doubleToString(72*(vertices[i]["svg:x"]->getDouble())) << " " << doubleToString(72*(vertices[i]["svg:y"]->getDouble()));
+			if (i < vertices.count()-1)
+				m_outputSink << ", ";
+		}
+		m_outputSink << "\"\n";
+		writeStyle(isClosed);
+		m_outputSink << "/>\n";
+	}
+}
+
+void libpict::PictSVGGenerator::drawPath(const ::WPXPropertyListVector& path)
+{
+	m_outputSink << "<path d=\" ";
+	bool isClosed = false;
+	unsigned i=0;
+	for(i=0; i < path.count(); i++)
+	{
+		WPXPropertyList propList = path[i];
+		if (propList["libpict:path-action"] && propList["libpict:path-action"]->getStr() == "M")
+		{
+			m_outputSink << "\nM";
+			m_outputSink << doubleToString(72*(propList["svg:x"]->getDouble())) << "," << doubleToString(72*(propList["svg:y"]->getDouble()));
+		}
+		else if (propList["libpict:path-action"] && propList["libpict:path-action"]->getStr() == "L")
+		{
+			m_outputSink << "\nL";
+			m_outputSink << doubleToString(72*(propList["svg:x"]->getDouble())) << "," << doubleToString(72*(propList["svg:y"]->getDouble()));
+		}
+		else if (propList["libpict:path-action"] && propList["libpict:path-action"]->getStr() == "C")
+		{
+			m_outputSink << "\nC";
+			m_outputSink << doubleToString(72*(propList["svg:x1"]->getDouble())) << "," << doubleToString(72*(propList["svg:y1"]->getDouble())) << " ";
+			m_outputSink << doubleToString(72*(propList["svg:x2"]->getDouble())) << "," << doubleToString(72*(propList["svg:y2"]->getDouble())) << " ";
+			m_outputSink << doubleToString(72*(propList["svg:x"]->getDouble())) << "," << doubleToString(72*(propList["svg:y"]->getDouble()));
+		}
+		else if (propList["libpict:path-action"] && propList["libpict:path-action"]->getStr() == "A")
+		{
+			m_outputSink << "\nA";
+			m_outputSink << doubleToString(72*(propList["svg:rx"]->getDouble())) << "," << doubleToString(72*(propList["svg:ry"]->getDouble())) << " ";
+			m_outputSink << (propList["libpict:rotate"] ? propList["libpict:rotate"]->getStr().cstr() : "0") << " ";
+			m_outputSink << "0,0 ";
+			m_outputSink << doubleToString(72*(propList["svg:x"]->getDouble())) << "," << doubleToString(72*(propList["svg:y"]->getDouble()));
+		}
+		else if ((i >= path.count()-1 && i > 2) && propList["libpict:path-action"] && propList["libpict:path-action"]->getStr() == "Z" )
+		{
+			isClosed = true;
+			m_outputSink << "\nZ";
+		}
+	}
+
+	m_outputSink << "\" \n";
+	writeStyle(isClosed);
+	m_outputSink << "/>\n";
+}
+
+void libpict::PictSVGGenerator::drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData)
+{
+	if (!propList["libpict:mime-type"] || propList["libpict:mime-type"]->getStr().len() <= 0)
+		return;
+	WPXString base64 = binaryData.getBase64Data();
+	m_outputSink << "<image ";
+	if (propList["svg:x"] && propList["svg:y"] && propList["svg:width"] && propList["svg:height"])
+	m_outputSink << "x=\"" << doubleToString(72*(propList["svg:x"]->getDouble())) << "\" y=\"" << doubleToString(72*(propList["svg:y"]->getDouble())) << "\" ";
+	m_outputSink << "width=\"" << doubleToString(72*(propList["svg:width"]->getDouble())) << "\" height=\"" << doubleToString(72*(propList["svg:height"]->getDouble())) << "\" ";
+	m_outputSink << "xlink:href=\"data:" << propList["libpict:mime-type"]->getStr().cstr() << ";base64,";
+	m_outputSink << base64.cstr();
+	m_outputSink << "\" />\n";
+}
+
+void libpict::PictSVGGenerator::startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector & /* path */)
+{
+	m_outputSink << "<text ";
+	if (propList["svg:x"] && propList["svg:y"])
+	m_outputSink << "x=\"" << doubleToString(72*(propList["svg:x"]->getDouble())) << "\" y=\"" << doubleToString(72*(propList["svg:y"]->getDouble())) << "\">\n";
+}
+
+void libpict::PictSVGGenerator::endTextObject()
+{
+	m_outputSink << "</text>\n";
+}
+
+void libpict::PictSVGGenerator::startTextSpan(const ::WPXPropertyList &propList)
+{
+	m_outputSink << "<tspan ";
+	if (propList["style:font-name"])
+		m_outputSink << "font-family=\"" << propList["style:font-name"]->getStr().cstr() << "\" ";
+	if (propList["fo:font-style"])
+		m_outputSink << "font-style=\"" << propList["fo:font-style"]->getStr().cstr() << "\" ";
+	if (propList["fo:font-weight"])
+		m_outputSink << "font-weight=\"" << propList["fo:font-weight"]->getStr().cstr() << "\" ";
+	if (propList["fo:font-variant"])
+		m_outputSink << "font-variant=\"" << propList["fo:font-weight"]->getStr().cstr() << "\" ";
+	if (propList["fo:font-size"])
+		m_outputSink << "font-size=\"" << propList["fo:font-size"]->getStr().cstr() << "\" ";
+	if (propList["fo:color"])
+		m_outputSink << "fill=\"" << propList["fo:color"]->getStr().cstr() << "\" ";
+	m_outputSink << ">\n";
+}
+
+void libpict::PictSVGGenerator::endTextSpan()
+{
+	m_outputSink << "</tspan>\n";
+}
+
+void libpict::PictSVGGenerator::insertText(const ::WPXString &str)
+{
+	WPXString tempUTF8(str, true);
+	m_outputSink << tempUTF8.cstr() << "\n";
+}
+
+// create "style" attribute based on current pen and brush
+void libpict::PictSVGGenerator::writeStyle(bool /* isClosed */)
+{
+	m_outputSink << "style=\"";
+
+	if (m_style["svg:stroke-width"])
+		m_outputSink << "stroke-width: " << doubleToString(72*m_style["svg:stroke-width"]->getDouble()) << "; ";
+
+	if((m_style["svg:stroke-width"] && m_style["svg:stroke-width"]->getDouble() > 0.0) || (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "solid"))
+	{
+		if (m_style["svg:stroke-color"])
+			m_outputSink << "stroke: " << m_style["svg:stroke-color"]->getStr().cstr()  << "; ";
+		if(m_style["svg:stroke-opacity"] &&  m_style["svg:stroke-opacity"]->getInt()!= 1)
+			m_outputSink << "stroke-opacity: " << doubleToString(m_style["svg:stroke-opacity"]->getDouble()) << "; ";
+	}
+
+	if(!m_style["draw:stroke"] || !(m_style["draw:stroke"]->getStr() == "solid"))
+	{
+#if 0
+		if (m_dashArray.count())
+		{
+			m_outputSink << "stroke-dasharray: ";
+			for(unsigned i = 0; i < m_dashArray.count(); i++)
+			{
+				m_outputSink << doubleToString(72*m_dashArray.at(i)*m_style["svg:stroke_width"]->getDouble());
+				if(i < m_dashArray.count()-1)
+					m_outputSink << ", ";
+			}
+			m_outputSink << "; ";
+		}
+#endif
+	}
+
+	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "none")
+		m_outputSink << "fill: none; ";
+
+	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "bitmap")
+		if(m_style["svg:fill-rule"])
+			m_outputSink << "fill-rule: " << m_style["svg:fill-rule"]->getStr().cstr() << "; ";
+
+	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "gradient")
+		m_outputSink << "fill: url(#grad" << m_gradientIndex-1 << "); ";
+		if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "gradient")
+			m_outputSink << "fill: url(#grad" << m_gradientIndex-1 << "); ";
+
+	if(m_style["draw:fill"] && m_style["draw:fill"]->getStr() == "solid")
+		if (m_style["draw:fill-color"])
+			m_outputSink << "fill: " << m_style["draw:fill-color"]->getStr().cstr() << "; ";
+
+	m_outputSink << "\""; // style
+}
diff --git a/src/lib/PictSVGGenerator.h b/src/lib/PictSVGGenerator.h
new file mode 100644
index 0000000..3e56914
--- /dev/null
+++ b/src/lib/PictSVGGenerator.h
@@ -0,0 +1,79 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __PictSVGGENERATOR_H__
+#define __PictSVGGENERATOR_H__
+
+#include <stdio.h>
+#include <iostream>
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+#include "libpict.h"
+
+namespace libpict
+{
+
+class PictSVGGenerator : public libwpg::WPGPaintInterface {
+public:
+	PictSVGGenerator(std::ostream & output_sink);
+	~PictSVGGenerator();
+
+	void startGraphics(const ::WPXPropertyList &propList);
+	void endGraphics();
+	void startLayer(const ::WPXPropertyList& propList);
+	void endLayer();
+	void startEmbeddedGraphics(const ::WPXPropertyList & /*propList*/) {}
+	void endEmbeddedGraphics() {}
+
+	void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
+
+	void drawRectangle(const ::WPXPropertyList &propList);
+	void drawEllipse(const ::WPXPropertyList &propList);
+	void drawPolyline(const ::WPXPropertyListVector &vertices);
+	void drawPolygon(const ::WPXPropertyListVector &vertices);
+	void drawPath(const ::WPXPropertyListVector &path);
+	void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
+	void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
+	void endTextObject();
+	void startTextLine(const ::WPXPropertyList & /* propList */) {}
+	void endTextLine() {}
+	void startTextSpan(const ::WPXPropertyList &propList);
+	void endTextSpan();
+	void insertText(const ::WPXString &str);
+
+private:
+	::WPXPropertyListVector m_gradient;
+	::WPXPropertyList m_style;
+	int m_gradientIndex;
+	void writeStyle(bool isClosed=true);
+	void drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed);
+
+	std::ostream & m_outputSink;
+};
+
+} // namespace libpict
+
+#endif // __PictSVGGENERATOR_H__
diff --git a/src/lib/PictXParser.cpp b/src/lib/PictXParser.cpp
new file mode 100644
index 0000000..0609cb9
--- /dev/null
+++ b/src/lib/PictXParser.cpp
@@ -0,0 +1,164 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+ 
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "PictXParser.h"
+#include "libpict_utils.h"
+
+PictXParser::PictXParser(WPXInputStream *input, libwpg::WPGPaintInterface* painter):
+  m_input(input), m_painter(painter), m_colorPalette(std::map<int,libpict::PictColor>())
+{
+}
+
+PictXParser::PictXParser(const PictXParser& parser):
+  m_input(parser.m_input), m_painter(parser.m_painter),
+  m_colorPalette(parser.m_colorPalette)
+{
+}
+
+unsigned char PictXParser::readU8()
+{
+	if (!m_input || m_input->atEOS())
+		return (unsigned char)0;
+	unsigned long numBytesRead;
+	unsigned char const * p = m_input->read(sizeof(unsigned char), numBytesRead);
+	
+	if (p && numBytesRead == 1)
+		return *(unsigned char const *)(p);
+	return (unsigned char)0;
+}
+
+unsigned short PictXParser::readU16()
+{
+	unsigned short p0 = (unsigned short)readU8();
+	unsigned short p1 = (unsigned short)readU8();
+	return (unsigned short)(p0|(p1<<8));
+}
+
+unsigned int PictXParser::readU32()
+{
+	unsigned int p0 = (unsigned int)readU8();
+	unsigned int p1 = (unsigned int)readU8();
+	unsigned int p2 = (unsigned int)readU8();
+	unsigned int p3 = (unsigned int)readU8();
+	return (unsigned long)(p0|(p1<<8)|(p2<<16)|(p3<<24));
+}
+
+short PictXParser::readS16()
+{
+	return (short)readU16();
+}
+
+int PictXParser::readS32()
+{
+	return (int)readU32();
+}
+
+unsigned int PictXParser::readVariableLengthInteger()
+{
+	// read a byte
+	unsigned char value8 = readU8();
+	// if it's in the range 0-0xFE, then we have a 8-bit value
+	if (value8<=0xFE) {
+		return (unsigned int)value8;
+	} else {
+		// now read a 16 bit value
+		unsigned short value16 = readU16();
+		// if the MSB is 1, we have a 32 bit value
+		if (value16>>15) {
+			// read the next 16 bit value (LSB part, in value16 resides the MSB part)
+			unsigned long lvalue16 = readU16();
+			unsigned long value32 = value16 & 0x7fff;  // mask out the MSB
+			return (value32<<16)+lvalue16;
+		} else {
+			// we have a 16 bit value, return it
+			return (unsigned int)value16;
+		}
+	}
+}
+
+PictXParser& PictXParser::operator=(const PictXParser& parser)
+{
+    m_input = parser.m_input;
+    m_painter = parser.m_painter;
+    m_colorPalette = parser.m_colorPalette;
+    return *this;
+}
+
+void PictTextDataHandler::endSubDocument()
+{
+	Pict_DEBUG_MSG(("PictTextDataHandler::endSubDocument\n"));
+}
+
+void PictTextDataHandler::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector & /* tabStops */)
+{
+	m_painter->startTextLine(propList);
+}
+
+void PictTextDataHandler::closeParagraph()
+{
+	m_painter->endTextLine();
+}
+
+void PictTextDataHandler::openSpan(const WPXPropertyList &propList)
+{
+	m_painter->startTextSpan(propList);
+}
+
+void PictTextDataHandler::closeSpan()
+{
+	m_painter->endTextSpan();
+}
+
+void PictTextDataHandler::insertTab()
+{
+	Pict_DEBUG_MSG(("PictTextDataHandler::insertTab\n"));
+}
+
+void PictTextDataHandler::insertSpace()
+{
+	m_painter->insertText(" ");
+}
+
+void PictTextDataHandler::insertText(const WPXString &text)
+{
+	m_painter->insertText(text);
+}
+
+void PictTextDataHandler::insertLineBreak()
+{
+	Pict_DEBUG_MSG(("PictTextDataHandler::insertLineBreak\n"));
+}
+
+void PictTextDataHandler::openListElement(const WPXPropertyList & propList, const WPXPropertyListVector &/*tabStops*/)
+{
+	m_painter->startTextLine(propList);
+}
+
+void PictTextDataHandler::closeListElement()
+{
+	Pict_DEBUG_MSG(("PictTextDataHandler::closeListElement\n"));
+}
diff --git a/src/lib/PictXParser.h b/src/lib/PictXParser.h
new file mode 100644
index 0000000..c17e433
--- /dev/null
+++ b/src/lib/PictXParser.h
@@ -0,0 +1,150 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __PictXPARSER_H__
+#define __PictXPARSER_H__
+
+#include <libwpg/libwpg.h>
+#include <libwpd-stream/WPXStream.h>
+#include <libwpd/libwpd.h>
+#include "PictColor.h"
+
+#include <map>
+
+class PictXParser
+{
+public:
+	PictXParser(WPXInputStream *input, libwpg::WPGPaintInterface* painter);
+	PictXParser(const PictXParser& parser);
+	virtual ~PictXParser() {};
+	virtual bool parse() = 0;
+	
+	unsigned char readU8();
+	unsigned short readU16();  
+	unsigned int readU32();  
+	short readS16();  
+	int readS32();  
+	unsigned int readVariableLengthInteger();
+	PictXParser& operator=(const PictXParser& parser);
+
+protected:
+	WPXInputStream* m_input;
+	libwpg::WPGPaintInterface* m_painter;
+	std::map<int,libpict::PictColor> m_colorPalette;
+};
+
+class PictTextDataHandler : public ::WPXDocumentInterface
+{
+public:
+	PictTextDataHandler(libwpg::WPGPaintInterface* painter) :
+		m_painter(painter),
+		m_x(0.0),
+		m_y(0.0),
+		m_width(0.0),
+		m_height(0.0),
+		m_fontName("Times New Roman"),
+		m_fontSize(12.0),
+		m_paragraphStyle(),
+		m_textStyle() {}
+		
+	~PictTextDataHandler() {}
+ 	void setDocumentMetaData(const WPXPropertyList & /* propList */) {}
+
+ 	void startDocument() {}
+ 	void endDocument() {}
+
+ 	void startSubDocument() {}
+ 	void endSubDocument();
+
+ 	void definePageStyle(const WPXPropertyList & /* propList */) {}
+ 	void openPageSpan(const WPXPropertyList & /* propList */) {}
+ 	void closePageSpan() {}
+ 	void openHeader(const WPXPropertyList & /* propList */) {}
+ 	void closeHeader() {}
+ 	void openFooter(const WPXPropertyList & /* propList */) {}
+ 	void closeFooter() {}
+
+ 	void defineParagraphStyle(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* tabStops */) {}
+ 	void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
+ 	void closeParagraph();
+
+ 	void defineCharacterStyle(const WPXPropertyList & /* propList */) {}
+ 	void openSpan(const WPXPropertyList &propList);
+ 	void closeSpan();
+
+ 	void defineSectionStyle(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* columns */) {}
+ 	void openSection(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* columns */) {}
+ 	void closeSection() {}
+
+ 	void insertTab();
+ 	void insertSpace();
+ 	void insertText(const WPXString &text);
+ 	void insertLineBreak();
+	void insertField(const WPXString & /* type */, const WPXPropertyList & /* propList */) {}
+
+ 	void defineOrderedListLevel(const WPXPropertyList & /* propList */) {}
+ 	void defineUnorderedListLevel(const WPXPropertyList & /* propList */) {}
+ 	void openOrderedListLevel(const WPXPropertyList & /* propList */) {}
+ 	void openUnorderedListLevel(const WPXPropertyList & /* propList */) {}
+ 	void closeOrderedListLevel() {}
+ 	void closeUnorderedListLevel() {}
+ 	void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
+ 	void closeListElement();
+
+ 	void openFootnote(const WPXPropertyList & /* propList */) {}
+ 	void closeFootnote() {}
+ 	void openEndnote(const WPXPropertyList & /* propList */) {}
+ 	void closeEndnote() {}
+ 	void openComment(const WPXPropertyList & /* propList */) {}
+ 	void closeComment() {}
+ 	void openTextBox(const WPXPropertyList & /* propList */) {}
+ 	void closeTextBox() {}
+
+ 	void openTable(const WPXPropertyList & /* propList */, const WPXPropertyListVector & /* columns */) {}
+ 	void openTableRow(const WPXPropertyList & /* propList */) {}
+ 	void closeTableRow() {}
+ 	void openTableCell(const WPXPropertyList & /* propList */) {}
+ 	void closeTableCell() {}
+ 	void insertCoveredTableCell(const WPXPropertyList & /* propList */) {}
+ 	void closeTable() {}
+
+ 	void openFrame(const WPXPropertyList & /* propList */) {}
+ 	void closeFrame() {}
+	
+ 	void insertBinaryObject(const WPXPropertyList & /* propList */, const WPXBinaryData & /* data */) {}
+ 	void insertEquation(const WPXPropertyList & /* propList */, const WPXString & /* data */) {}
+
+private:
+	libwpg::WPGPaintInterface *m_painter;
+	double m_x, m_y, m_width, m_height;
+	::WPXString m_fontName;
+	double m_fontSize;
+	::WPXPropertyList m_paragraphStyle, m_textStyle;
+};
+
+
+#endif // __PictXPARSER_H__
diff --git a/src/lib/libpict.h.in b/src/lib/libpict.h.in
new file mode 100644
index 0000000..ee886fd
--- /dev/null
+++ b/src/lib/libpict.h.in
@@ -0,0 +1,37 @@
+/* libpict
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __LIBPict_H__
+#define __LIBPict_H__
+
+#define LIBPict_VERSION_MAJOR     @Pict_MAJOR_VERSION@
+#define LIBPict_VERSION_MINOR     @Pict_MINOR_VERSION@
+#define LIBPict_VERSION_REVISION  @Pict_MICRO_VERSION@
+#define LIBPict_VERSION_STRING    "@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.@Pict_MICRO_VERSION@"
+
+#include "PictImage.h"
+
+#endif
diff --git a/src/lib/libpict.rc.in b/src/lib/libpict.rc.in
new file mode 100644
index 0000000..5fbd713
--- /dev/null
+++ b/src/lib/libpict.rc.in
@@ -0,0 +1,31 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @Pict_MAJOR_VERSION@,@Pict_MINOR_VERSION@,@Pict_MICRO_VERSION@,BUILDNUMBER
+  PRODUCTVERSION @Pict_MAJOR_VERSION@,@Pict_MINOR_VERSION@,@Pict_MICRO_VERSION@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+	VALUE "CompanyName", "The libpict developer community"
+	VALUE "FileDescription", "libpict"
+	VALUE "FileVersion", "@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.@Pict_MICRO_VERSION@.BUILDNUMBER"
+	VALUE "InternalName", "libpict-0.1"
+	VALUE "LegalCopyright", "Copyright (C) 2004 Marc Oude Kotte, other contributers"
+	VALUE "OriginalFilename", "libpict-0.1.dll"
+	VALUE "ProductName", "libpict"
+	VALUE "ProductVersion", "@Pict_MAJOR_VERSION@.@Pict_MINOR_VERSION@.@Pict_MICRO_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
+
diff --git a/src/lib/libpict_utils.h b/src/lib/libpict_utils.h
new file mode 100644
index 0000000..7d83329
--- /dev/null
+++ b/src/lib/libpict_utils.h
@@ -0,0 +1,50 @@
+/* libpict
+ * Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libpict.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef __LIBPict_UTILS_H__
+#define __LIBPict_UTILS_H__
+
+#include <stdio.h>
+
+//#define DEBUG // FIXME !
+
+// debug message includes source file and line number
+//#define VERBOSE_DEBUG 1
+
+// do nothing with debug messages in a release compile
+#ifdef DEBUG
+	#ifdef VERBOSE_DEBUG
+		#define Pict_DEBUG_MSG(M) printf("%15s:%5d: ", __FILE__, __LINE__); printf M
+		#define Pict_DEBUG(M) M
+	#else
+		#define Pict_DEBUG_MSG(M) printf M
+		#define Pict_DEBUG(M) M
+	#endif
+#else
+	#define Pict_DEBUG_MSG(M)
+	#define Pict_DEBUG(M)
+#endif
+
+#endif // __LIBPict_UTILS_H__
diff --git a/src/lib/makefile.mk b/src/lib/makefile.mk
new file mode 100644
index 0000000..1641dd9
--- /dev/null
+++ b/src/lib/makefile.mk
@@ -0,0 +1,41 @@
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+
+PRJ=..$/..$/..$/..$/..$/..
+
+PRJNAME=libpict
+TARGET=pictlib
+ENABLE_EXCEPTIONS=TRUE
+LIBTARGET=NO
+
+.INCLUDE :  settings.mk
+
+.IF "$(GUI)"=="WNT"
+CFLAGS+=-GR
+.ENDIF
+.IF "$(COM)"=="GCC"
+CFLAGSCXX+=-frtti
+.ENDIF
+
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+INCPRE+=$(LIBWPD_CFLAGS) -I..
+.ELSE
+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+.ENDIF
+
+SLOFILES= \
+        $(SLO)$/Pict1Parser.obj \
+        $(SLO)$/Pict2Parser.obj \
+        $(SLO)$/PictBitmap.obj \
+        $(SLO)$/PictColor.obj \
+	$(SLO)$/PictDashArray.obj \
+        $(SLO)$/PictHeader.obj \
+        $(SLO)$/PictInternalStream.obj \
+        $(SLO)$/PictImage.obj \
+        $(SLO)$/PictSVGGenerator.obj \
+        $(SLO)$/PictXParser.obj
+
+LIB1ARCHIV=$(LB)$/libpictlib.a
+LIB1TARGET=$(SLB)$/$(TARGET).lib
+LIB1OBJFILES= $(SLOFILES)
+
+.INCLUDE :  target.mk