diff --git a/.classpath b/.classpath
deleted file mode 100644
index 5ff85634a441fe874f468dea57fe91cb4d253828..0000000000000000000000000000000000000000
--- a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/javacsv.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index ed4534fcfc343d6b8b57c04f47cb3b20dc29976e..605b24b215bfeb7640b111d64a0fd5cf16ebc128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-/test.ods
 /build
 /bin
 /testReader.ods
-/test
+*~
diff --git a/.kdev4/libodsstream.kdev4 b/.kdev4/libodsstream.kdev4
new file mode 100644
index 0000000000000000000000000000000000000000..30b2e36e1fc5cc62dfb72c1a15697fa8cbd1ad02
--- /dev/null
+++ b/.kdev4/libodsstream.kdev4
@@ -0,0 +1,22 @@
+[Buildset]
+BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00)
+
+[CMake]
+Build Directory Count=1
+CMakeDir=/usr/share/cmake-2.8/Modules
+Current Build Directory Index=0
+ProjectRootRelative=./
+
+[CMake][CMake Build Directory 0]
+Build Directory Path=file:///home/olivier/eclipse/git/libodsstream/build
+Build Type=
+CMake Binary=file:///usr/bin/cmake
+Install Directory=file:///usr/local
+
+[Defines And Includes][Compiler]
+Name=GCC
+Path=gcc
+Type=GCC
+
+[Project]
+VersionControlSupport=kdevgit
diff --git a/.project b/.project
index 3550a937562513175879f9ea9a4090d71f486545..1788e6ee3bf149926307703b1aa863228127eb5d 100644
--- a/.project
+++ b/.project
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>libodsstream</name>
+	<name>cpplibodsstream</name>
 	<comment></comment>
 	<projects>
 	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
 </projectDescription>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0ee96753754432a209c68b42654ee1c2c3d69b5..81e09dac8f5f1b46f25575214097d1073b8a59d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,47 +1,221 @@
-PROJECT(libodsstream Java)
-
-FIND_PACKAGE( Java REQUIRED )
-#FIND_PACKAGE( JNI REQUIRED )
-INCLUDE(UseJava)
-#message ("compiler : ${CMAKE_CXX_COMPILER} ")
-
-
-cmake_minimum_required(VERSION 2.6)
-
-SET (LIBODSSTREAM_VERSION "0.1.0")
-
-SET(CPACK_PACKAGE_VERSION ${LIBODSSTREAM_VERSION})
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(CPACK_RESOURCE_FILE_LICENSE ./COPYING)
-SET(CPACK_RESOURCE_FILE_README ./README)
-#SET(CPACK_RESOURCE_FILE_WELCOME ${libodsstream_SOURCE_DIR}/INSTALL)
-SET(CPACK_SOURCE_GENERATOR "TGZ;TZ")
-SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "./CPackSourceConfig.cmake")
-SET(CPACK_SOURCE_STRIP_FILES "")
-
-
-if (NOT CMAKE_INSTALL_PREFIX)
-	SET (CMAKE_INSTALL_PREFIX /usr/local)
-endif (NOT CMAKE_INSTALL_PREFIX)
-
-#set(CMAKE_JNI_TARGET TRUE)
-#set(CMAKE_JAVA_TARGET_VERSION 1.6.0)
-
-FILE(GLOB srcJava
-	src/fr/inra/pappso/libodsstream/*.java 
-	src/fr/inra/pappso/libodsstream/buffer/*.java
-	src/fr/inra/pappso/libodsstream/reader/*.java
-	src/fr/inra/pappso/libodsstream/saxreader/*.java
-	src/fr/inra/pappso/libodsstream/structure/*.java
-	src/test/*.java 
-	)
-
-message ("Java source files : ${srcJava}")
-
-SET (RESOURCE_FILES ./COPYING ./README)
-
-message ("resource files : ${RESOURCE_FILES}")
-
-add_jar(libodsstream  ${srcJava} ${RESOURCE_FILES})
+# cmake helps to compile "libodsstream"
+# please install the cmake package depending on your linux distribution
+# and type in the libodsstream root directory :
+# cmake .
+# make
+# make install
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(libodsstream CXX C)
+
+
+IF(NOT USEQT4)
+  IF(NOT USEQT5)
+    SET (USEQT4 1)
+  ENDIF(NOT USEQT5)
+ENDIF(NOT USEQT4)
+
+# Project version
+# 
+
+SET (LIBODSSTREAM_MAJOR_VERSION 0)
+SET (LIBODSSTREAM_MINOR_VERSION 4)
+SET (LIBODSSTREAM_PATCH_LEVEL   4)
+SET (LIBODSSTREAM_VERSION
+  "${LIBODSSTREAM_MAJOR_VERSION}.${LIBODSSTREAM_MINOR_VERSION}.${LIBODSSTREAM_PATCH_LEVEL}")
+SET (LIBODSSTREAM_LIB_NAME "libodsstream")
+SET (LIBODSSTREAM_LIB_VERSION ${LIBODSSTREAM_VERSION})
+SET (LIBODSSTREAM_LIB_SOVERSION ${LIBODSSTREAM_MAJOR_VERSION})
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+if (NOT CMAKE_INSTALL_PREFIX)
+  SET (CMAKE_INSTALL_PREFIX /usr/local)
+endif (NOT CMAKE_INSTALL_PREFIX)
+
+if (NOT CMAKE_BUILD_TYPE)
+#SET(CMAKE_BUILD_TYPE "Release")
+#SET(CMAKE_BUILD_TYPE "RelWithDebInfo")
+SET( CMAKE_BUILD_TYPE "Debug")
+endif (NOT CMAKE_BUILD_TYPE)
+MESSAGE("CMAKE_BUILD_TYPE : ${CMAKE_BUILD_TYPE}")
+
+IF(CMAKE_BUILD_TYPE MATCHES "Release")
+  MESSAGE("compiling as release version")
+  ADD_DEFINITIONS("-DQT_NO_DEBUG_OUTPUT")
+ENDIF( CMAKE_BUILD_TYPE MATCHES "Release" )
+
+IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+  MESSAGE("compiling as debug version")
+ENDIF( CMAKE_BUILD_TYPE MATCHES "Debug" )
+
+IF(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
+  MESSAGE("compiling as release with debug info version")
+ENDIF( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" )
+
+
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
+SET(CPACK_OUTPUT_CONFIG_FILE "./CPackConfig.cmake")
+#SET(CPACK_PACKAGE_DESCRIPTION_FILE ${LIBODSSTREAM_SOURCE_DIR}/COPYING)
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "library to read and write ODS files using streams")
+SET(CPACK_PACKAGE_EXECUTABLES "libodsstream")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "libodsstream-${LIBODSSTREAM_VERSION}")
+SET(CPACK_SYSTEM_NAME "Linux-i686")
+SET(CPACK_PACKAGE_FILE_NAME "libodsstream-${LIBODSSTREAM_VERSION}-${CPACK_SYSTEM_NAME}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "libodsstream ${LIBODSSTREAM_VERSION}")
+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "libodsstream ${LIBODSSTREAM_VERSION}")
+SET(CPACK_PACKAGE_NAME "libodsstream")
+SET(CPACK_PACKAGE_VENDOR "PAPPSO")
+SET(CPACK_PACKAGE_VERSION ${LIBODSSTREAM_VERSION})
+SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/debian/copyright)
+SET(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README)
+SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README)
+SET(CPACK_SOURCE_GENERATOR "TGZ;TZ")
+SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "./CPackSourceConfig.cmake")
+SET(CPACK_SOURCE_STRIP_FILES "")
+SET(CPACK_SYSTEM_NAME "Linux-i686")
+SET(CPACK_TOPLEVEL_TAG "Linux-i686")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "libodsstream-${LIBODSSTREAM_VERSION}")
+
+
+SET(CPACK_SOURCE_IGNORE_FILES 
+  ".*\\\\.tar\\\\.gz"
+  "moc_.*cxx"
+  "\\\\.#.*"
+  ".*\\\\.aux"
+  ".*\\\\.bbl"
+  ".*\\\\.blg"
+  ".*\\\\.log"
+  ".*\\\\.out"
+  ".*\\\\.toc"
+  "/devel_archives/"
+  "/doc\\\\/html/"
+  "/doc\\\\/latex/"
+  "Makefile"
+  "install_manifest.txt"
+  "CMakeCache.txt"
+  "CPackConfig.cmake"
+  "CPackSourceConfig.cmake"
+  "/CMakeFiles/"
+  "/_CPack_Packages/"
+  "/Debug/"
+  "/Release/"
+  "/tests/"
+  "/\\\\.externalToolBuilders/"
+  "/\\\\.git/"
+  "/\\\\.kdev4/"
+  "/\\\\.settings/"
+  "Makefile"
+  "\\\\.gitignore"
+  "\\\\.cdtbuild"
+  "\\\\.cdtproject"
+  "\\\\.project"
+  "\\\\.cproject"
+  "/win32/"
+  "/build/"
+  "/buildmingw/"
+  "libodsstream.so"
+  "OpenDocument-v1.0-os.pdf"
+  )
+# to create a TGZ archive of the  source code type shell command
+# cpack -G TGZ --config CPackSourceConfig.cmake 
+
+# dpkg-buildpackage -rfakeroot -k7BEF3B25
+
+#.dput.cf
+#[olivier-langella]
+#fqdn = ppa.launchpad.net
+#method = ftp
+#incoming = ~olivier-langella/ubuntu/
+#login = olivier-langella
+#allow_unsigned_uploads = 0
+#
+#  debuild -S -sa
+# dput -f olivier-langella *changes
+
+
+#dch -Djessie "message"
+#cmake ..
+#make deb
+# scp libodsstream* proteus:/var/www/apt/incoming
+# reprepro -Vb /var/www/apt processincoming default
+
+
+#dpkg-deb -x libodsstream-qt4_0.3.0-3_amd64.deb libodsstream-qt4_0.3.0-3
+#dpkg-gensymbols -v0 -plibodsstream-qt4 -Plibodsstream-qt4_0.3.0-3 -Osymbols
+#cp symbols ../debian/libodsstream-qt4.symbols
+#dpkg-deb -x libodsstream-qt5_0.3.0-3_amd64.deb libodsstream-qt5_0.3.0-3
+#dpkg-gensymbols -v0 -plibodsstream-qt5 -Plibodsstream-qt5_0.3.0-3 -Osymbols
+#cp symbols ../debian/libodsstream-qt5.symbols
+
+#MESSAGE("configuring file ${LIBODSSTREAM_SOURCE_DIR}/src/config.h.cmake")
+
+#configure_file (${LIBODSSTREAM_SOURCE_DIR}/src/config.h.cmake ${LIBODSSTREAM_SOURCE_DIR}/src/config.h)
+
+
+
+SET(CPACK_PACKAGE_EXECUTABLES "libodsstream" "libodsstream")
+
+
+# for debian package :
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Olivier Langella <Olivier.Langella@moulon.inra.fr>")
+SET(DEBIAN_PACKAGE_BUILDS_DEPENDS "Olivier Langella <Olivier.Langella@moulon.inra.fr>")
+
+
+INCLUDE(CPack)
+
+
+add_subdirectory (src)
+
+add_subdirectory (doc)
+
+add_custom_target(targz
+	cpack -G TGZ --config CPackSourceConfig.cmake && tar xvfz libodsstream-${LIBODSSTREAM_VERSION}.tar.gz
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "Creating .tar.gz" VERBATIM
+)
+
+
+add_custom_target(deb
+	cd libodsstream-${LIBODSSTREAM_VERSION} && dpkg-buildpackage 
+	DEPENDS targz
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "Creating Debian package" VERBATIM
+)
+
+
+	
+SET(DCH_VERSION "1")
+
+add_custom_target(symbolsqt5
+	dpkg-deb -x libodsstream-qt5_${LIBODSSTREAM_VERSION}-${DCH_VERSION}_amd64.deb libodsstream-qt5-untar && dpkg-gensymbols -v0 -plibodsstream-qt5 -Plibodsstream-qt5-untar -Osymbols && cp symbols ../debian/libodsstream-qt5.symbols
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "symbolsqt5 " VERBATIM
+)
+	
+add_custom_target(symbolsqt4
+	dpkg-deb -x libodsstream-qt4_${LIBODSSTREAM_VERSION}-${DCH_VERSION}_amd64.deb libodsstream-qt4-untar && dpkg-gensymbols -v0 -plibodsstream-qt4 -Plibodsstream-qt4-untar -Osymbols && cp symbols ../debian/libodsstream-qt4.symbols
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "symbolsqt4" VERBATIM
+)
+	
+add_custom_target(symbols
+	DEPENDS symbolsqt4 symbolsqt5
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	COMMENT "symbols generation" VERBATIM
+)
+
+
+IF(NOT CMAKE_BUILD_TYPE MATCHES "Release")
+  ENABLE_TESTING()
+  INCLUDE(CTest)
+  IF (BUILD_TESTING)
+    ADD_SUBDIRECTORY(test)
+  ENDIF(BUILD_TESTING)
+ENDIF(NOT CMAKE_BUILD_TYPE MATCHES "Release" )
+
+
+
+# Install cmake module
+INSTALL(FILES modules/FindOdsstream.cmake DESTINATION share/cmake-3.0/Modules)
diff --git a/COPYING b/COPYING
index 94a9ed024d3859793618152ea559a168bbcbb5e2..65c5ca88a67c30becee01c5a8816d964b03862f9 100644
--- a/COPYING
+++ b/COPYING
@@ -1,674 +1,165 @@
-                    GNU GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  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 that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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 as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/README b/README
index a613bcfca23ed29b26645c28b089ef97eeaed888..672a2a2170ddbe8d1df572ec252050fcdf0b236e 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@
  * This file is part of libOdsStream.
  * 
  *     libOdsStream is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
+ *     it under the terms of the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
  * 
@@ -13,7 +13,7 @@
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *     GNU General Public License for more details.
  * 
- *     You should have received a copy of the GNU General Public License
+ *     You should have received a copy of the GNU Lesser General Public License
  *     along with libOdsStream.  If not, see <http://www.gnu.org/licenses/>.
  * 
  * Contributors:
diff --git a/buildwin32.cmd b/buildwin32.cmd
new file mode 100755
index 0000000000000000000000000000000000000000..93e4ab40c60767991dfd651831bdb2934466260f
--- /dev/null
+++ b/buildwin32.cmd
@@ -0,0 +1,28 @@
+rem Dependency paths:
+set CMAKE=C:\Program Files\CMake 2.6\bin\cmake.exe
+rem used for headers only; we get the lib from the libpng build
+rem set ZLIBDIR=c:\developer\lib\zlib
+rem provides both png and zlib .libs
+rem set PNGDIR=C:\developer\lib\lpng1220-vc\
+set QTDIR=C:\Qt\4.8.6\
+set QWT_ROOT=C:\qwt-5.2.3
+set QT_PLUGIN_PATH="${QWT_ROOT}\designer\plugins\designer:$QT_PLUGIN_PATH"
+rem set CAIRODIR=C:\developer\lib\cairo-1.6.0
+rem set LCMSDIR=c:\developer\lib\lcms-1.16-vc
+rem set JPEGDIR=c:\developer\lib\jpeg-6b-vc
+rem set FREETYPEDIR=c:\developer\lib\freetype-2.3.5
+rem set TIFFDIR=c:\developer\lib\tiff-3.8.2-vc
+rem set PODOFODIR=c:\developer\podofo\050-vs-inst
+rem set PODOFOSHARED=1
+rem set LIBXMLDIR=c:\developer\lib\libxml2-2.6.30.win32
+rem set SCRIBUSINSTALLDIR=c:\developer\scribus-bin
+rem
+rem
+set PATH=C:\mingw32\bin;C:\Qt\4.8.6\bin;C:\Qt\4.8.6\plugins\designer;%PATH%
+set 
+rem set PATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;%QTDIR%\bin
+set INCLUDE=
+set LIB=
+rem set SCPNGPROJ=%PNGDIR%\projects\visualc71\
+del cmakecache.txt
+rem %CMAKE%" -G "MinGW Makefiles" -DCMAKE_INCLUDE_PATH:PATH=%QTDIR%\src\3rdparty\zlib;%QTDIR%\src\3rdparty\libpng;%ZLIBDIR%;%ZLIBDIR%\include;%PNGDIR%;%PNGDIR%\include;%CAIRODIR%;%CAIRODIR%\include;%LCMSDIR%\include;%JPEGDIR%;%JPEGDIR%\include;%TIFFDIR%\libtiff;%TIFFDIR%\include;%FREETYPEDIR%\include;%FREETYPEDIR%\include\freetype2;%PODOFODIR%\include;%LIBXMLDIR%\include -DCMAKE_LIBRARY_PATH:PATH=%ZLIBDIR%\lib;%SCPNGPROJ%\Win32_DLL_Debug\Zlib;%SCPNGPROJ%\Win32_DLL_Release\Zlib;%PNGDIR%\lib;%SCPNGPROJ%\Win32_DLL_Debug;%SCPNGPROJ%\Win32_DLL_Release;%LCMSDIR%\lib;%LCMSDIR%\Lib\MS;%LCMSDIR%\Lib\MS\dll;%JPEGDIR%;%JPEGDIR%\lib;%TIFFDIR%\libtiff;%TIFFDIR%\lib;%FREETYPEDIR%\objs;%FREETYPEDIR%\lib;%PODOFODIR%\lib;%LIBXMLDIR%\lib -DCMAKE_INSTALL_PREFIX=c:\
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..6a2d6deae89a558e9d810ffa669510292f743c15
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,102 @@
+libodsstream (0.4.4-1) jessie; urgency=medium
+
+  * write annotations in cells
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Fri, 19 Aug 2016 15:29:35 +0200
+
+libodsstream (0.4.3-1) jessie; urgency=medium
+
+  * better flush and close
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Thu, 21 Apr 2016 19:12:02 +0200
+
+libodsstream (0.4.2-1) jessie; urgency=medium
+
+  * virtual destructor for calc writer interface
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Tue, 19 Apr 2016 22:09:16 +0200
+
+libodsstream (0.4.1-1) jessie; urgency=medium
+
+  * API to write ODS directly in file
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Tue, 12 Apr 2016 21:07:25 +0200
+
+libodsstream (0.4.0-1) jessie; urgency=medium
+
+  * switch licence from GPLv3 to LGPLv3
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Fri, 16 Oct 2015 14:19:06 +0200
+
+libodsstream (0.3.0-3) jessie; urgency=medium
+
+  * SOVERSION number fixed
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Thu, 20 Aug 2015 21:36:18 +0200
+
+libodsstream (0.3.0-2) jessie; urgency=medium
+
+  * library informations added in debian package (symbols, shlibs)
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Thu, 20 Aug 2015 21:23:15 +0200
+
+libodsstream (0.3.0-1) jessie; urgency=medium
+
+  * first cell style support API
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Mon, 17 Aug 2015 17:04:04 +0200
+
+libodsstream (0.2.1-1) jessie; urgency=medium
+
+  * TSV output stream
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Mon, 13 Jul 2015 08:57:58 +0200
+
+libodsstream (0.2.0-2) jessie; urgency=medium
+
+  * make calc writer interface public
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Wed, 24 Jun 2015 22:28:32 +0200
+
+libodsstream (0.2.0-1) jessie; urgency=medium
+
+  * write tsv directory
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Wed, 24 Jun 2015 19:51:01 +0200
+
+libodsstream (0.1.3-1) jessie; urgency=medium
+
+  * write empty cell
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Tue, 16 Jun 2015 21:00:21 +0200
+
+libodsstream (0.1.2-2) jessie; urgency=medium
+
+  * endif bug fixed
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Fri, 12 Jun 2015 10:37:27 +0200
+
+libodsstream (0.1.2-1) jessie; urgency=medium
+
+  * double compilation qt4 and qt5
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Fri, 12 Jun 2015 10:16:02 +0200
+
+libodsstream (0.1.1-2) jessie; urgency=medium
+
+  * writeLine bug fixed
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr>  Wed, 10 Jun 2015 13:27:22 +0200
+
+libodsstream (0.1.1-1) jessie; urgency=medium
+
+  * new version using Qt5
+
+ -- Olivier Langella <olivier.langella@moulon.inra.fr>  Wed, 10 Jun 2015 07:56:44 +0200
+
+libodsstream (0.0.1-1) wheezy; urgency=low
+
+  * first debian package
+
+ -- Olivier Langella <olivier.langella@moulon.inra.fr>  Sat, 6 Jul 2013 06:18:51 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000000000000000000000000000000000000..ec635144f60048986bc560c5576355344005e6e7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..aa7898eb39232fe597b175c12005460ecbe9b0a2
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,47 @@
+Source: libodsstream
+Maintainer: Olivier Langella <Olivier.Langella@moulon.inra.fr>
+Homepage: http://pappso.inra.fr/bioinfo
+Section: libs
+Priority: optional
+Build-Depends: debhelper (>= 9), libqt4-dev (>= 4.6.3), qt5-default, libquazip-qt5-dev, qtbase5-dev
+Standards-Version: 3.9.4
+
+Package: libodsstream-qt4
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: C++ library to read or write ODS files
+ libodsstream provides a simple way to read and write Open 
+ Document Spreadsheet files using streams only to be memory efficient.
+
+Package: libodsstream-qt5
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: C++ library to read or write ODS files
+ libodsstream provides a simple way to read and write Open 
+ Document Spreadsheet files using streams only to be memory efficient.
+
+Package: libodsstream-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: libodsstream-qt4 (= ${binary:Version}), libodsstream-qt5 (= ${binary:Version}),
+         ${misc:Depends},
+         libquazip-dev
+Description: C++ library to read or write ODS files
+ libodsstream provides a simple way to read and write Open 
+ Document Spreadsheet files using streams only to be memory efficient.
+
+Package: libodsstream-doc
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: ${misc:Depends}
+Description: doxygen documentation of the ODSstream library
+ libodsstream provides a simple way to read and write Open 
+ Document Spreadsheet files using streams only to be memory efficient.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..55b27e23ac5c352f7c176e5356555b1b8d525c3c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,7 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: libodsstream
+Source: https://sourcesup.renater.fr/scm/browser.php?group_id=875
+
+Files: *
+Copyright: Olivier Langella <olivier.langella@moulon.inra.fr>
+License: LGPL-3.0+	   
diff --git a/debian/libodsstream-dev.install b/debian/libodsstream-dev.install
new file mode 100644
index 0000000000000000000000000000000000000000..72eb985336deffca23ecc3ed999e89ece15a76bf
--- /dev/null
+++ b/debian/libodsstream-dev.install
@@ -0,0 +1,2 @@
+usr/include/odsstream/*
+usr/share/cmake-3.0/Modules/FindOdsstream.cmake
diff --git a/debian/libodsstream-doc.install b/debian/libodsstream-doc.install
new file mode 100644
index 0000000000000000000000000000000000000000..fea56bd465a906399dc2dee01d032ac8c17f014c
--- /dev/null
+++ b/debian/libodsstream-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libodsstream/*
\ No newline at end of file
diff --git a/debian/libodsstream-qt4.install b/debian/libodsstream-qt4.install
new file mode 100644
index 0000000000000000000000000000000000000000..3f853083dfc1e985b8998d4be720f968ebc5ce81
--- /dev/null
+++ b/debian/libodsstream-qt4.install
@@ -0,0 +1 @@
+usr/lib/*/libodsstream-qt4*
diff --git a/debian/libodsstream-qt4.shlibs b/debian/libodsstream-qt4.shlibs
new file mode 100644
index 0000000000000000000000000000000000000000..a97a7b9cd6566632ced5b2b3bbda1c93f52fd165
--- /dev/null
+++ b/debian/libodsstream-qt4.shlibs
@@ -0,0 +1 @@
+libodsstream-qt4 0 libodsstream-qt4
\ No newline at end of file
diff --git a/debian/libodsstream-qt4.symbols b/debian/libodsstream-qt4.symbols
new file mode 100644
index 0000000000000000000000000000000000000000..7a52f2da601b7c8d093117196b82aafb8a65eef4
--- /dev/null
+++ b/debian/libodsstream-qt4.symbols
@@ -0,0 +1,262 @@
+libodsstream-qt4.so.0 libodsstream-qt4 #MINVER#
+ _ZN10ContentXml10writeSheetERK7QString@Base 0
+ _ZN10ContentXml10writeSheetEv@Base 0
+ _ZN10ContentXml11WriteHeaderEv@Base 0
+ _ZN10ContentXml14writeCellFloatERK7QStringS2_S2_@Base 0
+ _ZN10ContentXml14writeEmptyCellERK7QString@Base 0
+ _ZN10ContentXml15writeAnnotationERK7QString@Base 0
+ _ZN10ContentXml16_xsdNamespaceURIE@Base 0
+ _ZN10ContentXml16_xsiNamespaceURIE@Base 0
+ _ZN10ContentXml16startSpreadsheetEv@Base 0
+ _ZN10ContentXml18writeFontFaceDeclsEv@Base 0
+ _ZN10ContentXml20getTableCellStyleRefERK17OdsTableCellStyle@Base 0
+ _ZN10ContentXml20setTableCellStyleRefEP28OdsTableCellStyleRefInternal@Base 0
+ _ZN10ContentXml20writeAutomaticStylesEv@Base 0
+ _ZN10ContentXml5closeEv@Base 0
+ _ZN10ContentXml9writeCellERK4QUrlRK7QStringS5_@Base 0
+ _ZN10ContentXml9writeCellERK5QDateRK7QString@Base 0
+ _ZN10ContentXml9writeCellERK7QStringS2_@Base 0
+ _ZN10ContentXml9writeCellERK9QDateTimeRK7QString@Base 0
+ _ZN10ContentXml9writeCellEbRK7QString@Base 0
+ _ZN10ContentXml9writeCellEdRK7QString@Base 0
+ _ZN10ContentXml9writeCellEiRK7QString@Base 0
+ _ZN10ContentXml9writeLineEv@Base 0
+ _ZN10ContentXmlC1EP6QuaZip@Base 0
+ _ZN10ContentXmlC2EP6QuaZip@Base 0
+ _ZN10ContentXmlD0Ev@Base 0
+ _ZN10ContentXmlD1Ev@Base 0
+ _ZN10ContentXmlD2Ev@Base 0
+ _ZN11ManifestXml11WriteHeaderEv@Base 0
+ _ZN11ManifestXml13_namespaceURIE@Base 0
+ _ZN11ManifestXmlC1EP6QuaZip@Base 0
+ _ZN11ManifestXmlC2EP6QuaZip@Base 0
+ _ZN11ManifestXmlD0Ev@Base 0
+ _ZN11ManifestXmlD1Ev@Base 0
+ _ZN11ManifestXmlD2Ev@Base 0
+ _ZN12OdsDocReader13setInsideCellERK7OdsCell@Base 0
+ _ZN12OdsDocReader15startInsideLineEv@Base 0
+ _ZN12OdsDocReader5parseEP9QIODevice@Base 0
+ _ZN12OdsDocReader5parseER5QFile@Base 0
+ _ZN12OdsDocReaderC1ER22OdsDocHandlerInterface@Base 0
+ _ZN12OdsDocReaderC2ER22OdsDocHandlerInterface@Base 0
+ _ZN12OdsDocReaderD0Ev@Base 0
+ _ZN12OdsDocReaderD1Ev@Base 0
+ _ZN12OdsDocReaderD2Ev@Base 0
+ _ZN12OdsDocWriter10openDeviceEP9QIODevice@Base 0
+ _ZN12OdsDocWriter10writeSheetERK7QString@Base 0
+ _ZN12OdsDocWriter14writeEmptyCellEv@Base 0
+ _ZN12OdsDocWriter15clearAnnotationEv@Base 0
+ _ZN12OdsDocWriter17setCellAnnotationERK7QString@Base 0
+ _ZN12OdsDocWriter20getTableCellStyleRefERK17OdsTableCellStyle@Base 0
+ _ZN12OdsDocWriter20setTableCellStyleRefEP28OdsTableCellStyleRefInternal@Base 0
+ _ZN12OdsDocWriter5closeEv@Base 0
+ _ZN12OdsDocWriter9writeCellEPKc@Base 0
+ _ZN12OdsDocWriter9writeCellERK4QUrlRK7QString@Base 0
+ _ZN12OdsDocWriter9writeCellERK5QDate@Base 0
+ _ZN12OdsDocWriter9writeCellERK7QString@Base 0
+ _ZN12OdsDocWriter9writeCellERK9QDateTime@Base 0
+ _ZN12OdsDocWriter9writeCellEb@Base 0
+ _ZN12OdsDocWriter9writeCellEd@Base 0
+ _ZN12OdsDocWriter9writeCellEf@Base 0
+ _ZN12OdsDocWriter9writeCellEi@Base 0
+ _ZN12OdsDocWriter9writeLineEv@Base 0
+ _ZN12OdsDocWriterC1EP9QIODevice@Base 0
+ _ZN12OdsDocWriterC1ERK7QString@Base 0
+ _ZN12OdsDocWriterC2EP9QIODevice@Base 0
+ _ZN12OdsDocWriterC2ERK7QString@Base 0
+ _ZN12OdsDocWriterD0Ev@Base 0
+ _ZN12OdsDocWriterD1Ev@Base 0
+ _ZN12OdsDocWriterD2Ev@Base 0
+ _ZN12OdsExceptionC1E7QString@Base 0
+ _ZN12OdsExceptionC2E7QString@Base 0
+ _ZN12OdsExceptionD0Ev@Base 0
+ _ZN12OdsExceptionD1Ev@Base 0
+ _ZN12OdsExceptionD2Ev@Base 0
+ _ZN13QuaZipNewInfoD1Ev@Base 0
+ _ZN13QuaZipNewInfoD2Ev@Base 0
+ _ZN15TsvOutputStream10writeSheetERK7QString@Base 0
+ _ZN15TsvOutputStream5closeEv@Base 0
+ _ZN15TsvOutputStreamC1ER11QTextStream@Base 0
+ _ZN15TsvOutputStreamC2ER11QTextStream@Base 0
+ _ZN15TsvOutputStreamD0Ev@Base 0
+ _ZN15TsvOutputStreamD1Ev@Base 0
+ _ZN15TsvOutputStreamD2Ev@Base 0
+ _ZN17OdsTableCellStyle12setTextColorERK6QColor@Base 0
+ _ZN17OdsTableCellStyle18setBackgroundColorERK6QColor@Base 0
+ _ZN17OdsTableCellStyleC1Ev@Base 0
+ _ZN17OdsTableCellStyleC2Ev@Base 0
+ _ZN17OdsTableCellStyleD1Ev@Base 0
+ _ZN17OdsTableCellStyleD2Ev@Base 0
+ _ZN18TsvDirectoryWriter10writeSheetERK7QString@Base 0
+ _ZN18TsvDirectoryWriter11ensureSheetEv@Base 0
+ _ZN18TsvDirectoryWriter14writeEmptyCellEv@Base 0
+ _ZN18TsvDirectoryWriter17setCellAnnotationERK7QString@Base 0
+ _ZN18TsvDirectoryWriter5closeEv@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEPKc@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK4QUrlRK7QString@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK5QDate@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK7QString@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK9QDateTime@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEb@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEd@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEf@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEi@Base 0
+ _ZN18TsvDirectoryWriter9writeLineEv@Base 0
+ _ZN18TsvDirectoryWriterC1ERK4QDir@Base 0
+ _ZN18TsvDirectoryWriterC1Ev@Base 0
+ _ZN18TsvDirectoryWriterC2ERK4QDir@Base 0
+ _ZN18TsvDirectoryWriterC2Ev@Base 0
+ _ZN18TsvDirectoryWriterD0Ev@Base 0
+ _ZN18TsvDirectoryWriterD1Ev@Base 0
+ _ZN18TsvDirectoryWriterD2Ev@Base 0
+ _ZN19CalcWriterInterface20getTableCellStyleRefERK17OdsTableCellStyle@Base 0
+ _ZN19CalcWriterInterface20setTableCellStyleRefEP28OdsTableCellStyleRefInternal@Base 0
+ _ZN19CalcWriterInterface9writeCellEj@Base 0
+ _ZN20SaxHandlerContentXml10charactersERK7QString@Base 0
+ _ZN20SaxHandlerContentXml10endElementERK7QStringS2_S2_@Base 0
+ _ZN20SaxHandlerContentXml10fatalErrorERK18QXmlParseException@Base 0
+ _ZN20SaxHandlerContentXml11endDocumentEv@Base 0
+ _ZN20SaxHandlerContentXml12startElementERK7QStringS2_S2_RK14QXmlAttributes@Base 0
+ _ZN20SaxHandlerContentXml13end_element_pEv@Base 0
+ _ZN20SaxHandlerContentXml15start_element_pERK14QXmlAttributes@Base 0
+ _ZN20SaxHandlerContentXml22end_element_table_cellEv@Base 0
+ _ZN20SaxHandlerContentXml24start_element_table_cellERK14QXmlAttributes@Base 0
+ _ZN20SaxHandlerContentXmlC1ER12OdsDocReader@Base 0
+ _ZN20SaxHandlerContentXmlC2ER12OdsDocReader@Base 0
+ _ZN20SaxHandlerContentXmlD0Ev@Base 0
+ _ZN20SaxHandlerContentXmlD1Ev@Base 0
+ _ZN20SaxHandlerContentXmlD2Ev@Base 0
+ _ZN28OdsTableCellStyleRefInternalC1Ej@Base 0
+ _ZN28OdsTableCellStyleRefInternalC2Ej@Base 0
+ _ZN5QHashI7QStringS0_E11deleteNode2EPN9QHashData4NodeE@Base 0
+ _ZN5QHashI7QStringS0_E13duplicateNodeEPN9QHashData4NodeEPv@Base 0
+ _ZN5QHashI7QStringS0_E6insertERKS0_S3_@Base 0
+ _ZN7MetaXml11WriteHeaderEv@Base 0
+ _ZN7MetaXml15getNamespaceURIERK7QString@Base 0
+ _ZN7MetaXml19_p_hashNamespaceURIE@Base 0
+ _ZN7MetaXmlC1EP6QuaZip@Base 0
+ _ZN7MetaXmlC2EP6QuaZip@Base 0
+ _ZN7MetaXmlD0Ev@Base 0
+ _ZN7MetaXmlD1Ev@Base 0
+ _ZN7MetaXmlD2Ev@Base 0
+ _ZN7OdsCell12setDateValueERK9QDateTime@Base 0
+ _ZN7OdsCell14setValueDoubleEd@Base 0
+ _ZN7OdsCell14setValueStringERK7QString@Base 0
+ _ZN7OdsCell15setValueBooleanEb@Base 0
+ _ZN7OdsCell18setOfficeValueTypeERK7QString@Base 0
+ _ZN7OdsCellC1Ev@Base 0
+ _ZN7OdsCellC2Ev@Base 0
+ _ZN7OdsCellD0Ev@Base 0
+ _ZN7OdsCellD1Ev@Base 0
+ _ZN7OdsCellD2Ev@Base 0
+ _ZN7QStringC1ERKS_@Base 0
+ _ZN7QStringC2ERKS_@Base 0
+ _ZN7QStringD1Ev@Base 0
+ _ZN7QStringD2Ev@Base 0
+ _ZN9StylesXml11WriteHeaderER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml15getNamespaceURIERK7QString@Base 0
+ _ZN9StylesXml17WriteMasterStylesER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml17WriteOfficeStylesER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml18WriteFontFaceDeclsER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml19_p_hashNamespaceURIE@Base 0
+ _ZN9StylesXml20WriteAutomaticStylesER16QXmlStreamWriter@Base 0
+ _ZN9StylesXmlC1EP6QuaZip@Base 0
+ _ZN9StylesXmlC2EP6QuaZip@Base 0
+ _ZN9StylesXmlD0Ev@Base 0
+ _ZN9StylesXmlD1Ev@Base 0
+ _ZN9StylesXmlD2Ev@Base 0
+ _ZNK12OdsException4whatEv@Base 0
+ _ZNK12OdsException5qwhatEv@Base 0
+ _ZNK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZNK20SaxHandlerContentXml17end_element_tableEv@Base 0
+ _ZNK20SaxHandlerContentXml19start_element_tableERK14QXmlAttributes@Base 0
+ _ZNK20SaxHandlerContentXml21end_element_table_rowEv@Base 0
+ _ZNK20SaxHandlerContentXml23start_element_table_rowERK14QXmlAttributes@Base 0
+ _ZNK5QHashI7QStringS0_E8findNodeERKS0_Pj@Base 0
+ _ZNK7OdsCell14getDoubleValueEv@Base 0
+ _ZNK7OdsCell14getStringValueEv@Base 0
+ _ZNK7OdsCell15getBooleanValueEv@Base 0
+ _ZNK7OdsCell16getDateTimeValueEv@Base 0
+ _ZNK7OdsCell18getOfficeValueTypeEv@Base 0
+ _ZNK7OdsCell6isDateEv@Base 0
+ _ZNK7OdsCell7isEmptyEv@Base 0
+ _ZNK7OdsCell8isDoubleEv@Base 0
+ _ZNK7OdsCell8isStringEv@Base 0
+ _ZNK7OdsCell8toStringEv@Base 0
+ _ZNK7OdsCell9isBooleanEv@Base 0
+ _ZNSt6vectorI17OdsTableCellStyleSaIS0_EE19_M_emplace_back_auxIIRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorI17OdsTableCellStyleSaIS0_EE19_M_emplace_back_auxIJRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorI7QStringSaIS0_EE19_M_emplace_back_auxIIRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorI7QStringSaIS0_EE19_M_emplace_back_auxIJRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorIP28OdsTableCellStyleRefInternalSaIS1_EE19_M_emplace_back_auxIIRKS1_EEEvDpOT_@Base 0
+ _ZNSt6vectorIP28OdsTableCellStyleRefInternalSaIS1_EE19_M_emplace_back_auxIJRKS1_EEEvDpOT_@Base 0
+ _ZTI10ContentXml@Base 0
+ _ZTI11ManifestXml@Base 0
+ _ZTI12OdsDocReader@Base 0
+ _ZTI12OdsDocWriter@Base 0
+ _ZTI12OdsException@Base 0
+ _ZTI14QXmlDTDHandler@Base 0
+ _ZTI15QXmlDeclHandler@Base 0
+ _ZTI15TsvOutputStream@Base 0
+ _ZTI16QXmlErrorHandler@Base 0
+ _ZTI18QXmlContentHandler@Base 0
+ _ZTI18QXmlEntityResolver@Base 0
+ _ZTI18QXmlLexicalHandler@Base 0
+ _ZTI18TsvDirectoryWriter@Base 0
+ _ZTI19CalcWriterInterface@Base 0
+ _ZTI20SaxHandlerContentXml@Base 0
+ _ZTI7MetaXml@Base 0
+ _ZTI7OdsCell@Base 0
+ _ZTI9StylesXml@Base 0
+ _ZTS10ContentXml@Base 0
+ _ZTS11ManifestXml@Base 0
+ _ZTS12OdsDocReader@Base 0
+ _ZTS12OdsDocWriter@Base 0
+ _ZTS12OdsException@Base 0
+ _ZTS14QXmlDTDHandler@Base 0
+ _ZTS15QXmlDeclHandler@Base 0
+ _ZTS15TsvOutputStream@Base 0
+ _ZTS16QXmlErrorHandler@Base 0
+ _ZTS18QXmlContentHandler@Base 0
+ _ZTS18QXmlEntityResolver@Base 0
+ _ZTS18QXmlLexicalHandler@Base 0
+ _ZTS18TsvDirectoryWriter@Base 0
+ _ZTS19CalcWriterInterface@Base 0
+ _ZTS20SaxHandlerContentXml@Base 0
+ _ZTS7MetaXml@Base 0
+ _ZTS7OdsCell@Base 0
+ _ZTS9StylesXml@Base 0
+ _ZTV10ContentXml@Base 0
+ _ZTV11ManifestXml@Base 0
+ _ZTV12OdsDocReader@Base 0
+ _ZTV12OdsDocWriter@Base 0
+ _ZTV12OdsException@Base 0
+ _ZTV14QXmlDTDHandler@Base 0
+ _ZTV15QXmlDeclHandler@Base 0
+ _ZTV15TsvOutputStream@Base 0
+ _ZTV16QXmlErrorHandler@Base 0
+ _ZTV18QXmlContentHandler@Base 0
+ _ZTV18QXmlEntityResolver@Base 0
+ _ZTV18QXmlLexicalHandler@Base 0
+ _ZTV18TsvDirectoryWriter@Base 0
+ _ZTV19CalcWriterInterface@Base 0
+ _ZTV20SaxHandlerContentXml@Base 0
+ _ZTV7MetaXml@Base 0
+ _ZTV7OdsCell@Base 0
+ _ZTV9StylesXml@Base 0
+ _ZThn16_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn16_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn16_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn24_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn24_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn24_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn32_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn32_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn32_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn40_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn40_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn40_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn8_N20SaxHandlerContentXml10fatalErrorERK18QXmlParseException@Base 0
+ _ZThn8_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn8_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn8_NK20SaxHandlerContentXml11errorStringEv@Base 0
diff --git a/debian/libodsstream-qt5.install b/debian/libodsstream-qt5.install
new file mode 100644
index 0000000000000000000000000000000000000000..7c977d828686400301caad8457f6b28e6e0bea96
--- /dev/null
+++ b/debian/libodsstream-qt5.install
@@ -0,0 +1 @@
+usr/lib/*/libodsstream-qt5*
diff --git a/debian/libodsstream-qt5.shlibs b/debian/libodsstream-qt5.shlibs
new file mode 100644
index 0000000000000000000000000000000000000000..55c5afc62b9e0db748ad51396badf71da46e23ee
--- /dev/null
+++ b/debian/libodsstream-qt5.shlibs
@@ -0,0 +1 @@
+libodsstream-qt5 0 libodsstream-qt5
diff --git a/debian/libodsstream-qt5.symbols b/debian/libodsstream-qt5.symbols
new file mode 100644
index 0000000000000000000000000000000000000000..b63619774885913e24901e77da04e28e1604ef9f
--- /dev/null
+++ b/debian/libodsstream-qt5.symbols
@@ -0,0 +1,242 @@
+libodsstream-qt5.so.0 libodsstream-qt5 #MINVER#
+ _ZN10ContentXml10writeSheetERK7QString@Base 0
+ _ZN10ContentXml10writeSheetEv@Base 0
+ _ZN10ContentXml11WriteHeaderEv@Base 0
+ _ZN10ContentXml14writeCellFloatERK7QStringS2_S2_@Base 0
+ _ZN10ContentXml14writeEmptyCellERK7QString@Base 0
+ _ZN10ContentXml15writeAnnotationERK7QString@Base 0
+ _ZN10ContentXml16_xsdNamespaceURIE@Base 0
+ _ZN10ContentXml16_xsiNamespaceURIE@Base 0
+ _ZN10ContentXml16startSpreadsheetEv@Base 0
+ _ZN10ContentXml18writeFontFaceDeclsEv@Base 0
+ _ZN10ContentXml20getTableCellStyleRefERK17OdsTableCellStyle@Base 0
+ _ZN10ContentXml20setTableCellStyleRefEP28OdsTableCellStyleRefInternal@Base 0
+ _ZN10ContentXml20writeAutomaticStylesEv@Base 0
+ _ZN10ContentXml5closeEv@Base 0
+ _ZN10ContentXml9writeCellERK4QUrlRK7QStringS5_@Base 0
+ _ZN10ContentXml9writeCellERK5QDateRK7QString@Base 0
+ _ZN10ContentXml9writeCellERK7QStringS2_@Base 0
+ _ZN10ContentXml9writeCellERK9QDateTimeRK7QString@Base 0
+ _ZN10ContentXml9writeCellEbRK7QString@Base 0
+ _ZN10ContentXml9writeCellEdRK7QString@Base 0
+ _ZN10ContentXml9writeCellEiRK7QString@Base 0
+ _ZN10ContentXml9writeLineEv@Base 0
+ _ZN10ContentXmlC1EP6QuaZip@Base 0
+ _ZN10ContentXmlC2EP6QuaZip@Base 0
+ _ZN10ContentXmlD0Ev@Base 0
+ _ZN10ContentXmlD1Ev@Base 0
+ _ZN10ContentXmlD2Ev@Base 0
+ _ZN11ManifestXml11WriteHeaderEv@Base 0
+ _ZN11ManifestXml13_namespaceURIE@Base 0
+ _ZN11ManifestXmlC1EP6QuaZip@Base 0
+ _ZN11ManifestXmlC2EP6QuaZip@Base 0
+ _ZN11ManifestXmlD0Ev@Base 0
+ _ZN11ManifestXmlD1Ev@Base 0
+ _ZN11ManifestXmlD2Ev@Base 0
+ _ZN12OdsDocReader13setInsideCellERK7OdsCell@Base 0
+ _ZN12OdsDocReader15startInsideLineEv@Base 0
+ _ZN12OdsDocReader5parseEP9QIODevice@Base 0
+ _ZN12OdsDocReader5parseER5QFile@Base 0
+ _ZN12OdsDocReaderC1ER22OdsDocHandlerInterface@Base 0
+ _ZN12OdsDocReaderC2ER22OdsDocHandlerInterface@Base 0
+ _ZN12OdsDocReaderD0Ev@Base 0
+ _ZN12OdsDocReaderD1Ev@Base 0
+ _ZN12OdsDocReaderD2Ev@Base 0
+ _ZN12OdsDocWriter10openDeviceEP9QIODevice@Base 0
+ _ZN12OdsDocWriter10writeSheetERK7QString@Base 0
+ _ZN12OdsDocWriter14writeEmptyCellEv@Base 0
+ _ZN12OdsDocWriter15clearAnnotationEv@Base 0
+ _ZN12OdsDocWriter17setCellAnnotationERK7QString@Base 0
+ _ZN12OdsDocWriter20getTableCellStyleRefERK17OdsTableCellStyle@Base 0
+ _ZN12OdsDocWriter20setTableCellStyleRefEP28OdsTableCellStyleRefInternal@Base 0
+ _ZN12OdsDocWriter5closeEv@Base 0
+ _ZN12OdsDocWriter9writeCellEPKc@Base 0
+ _ZN12OdsDocWriter9writeCellERK4QUrlRK7QString@Base 0
+ _ZN12OdsDocWriter9writeCellERK5QDate@Base 0
+ _ZN12OdsDocWriter9writeCellERK7QString@Base 0
+ _ZN12OdsDocWriter9writeCellERK9QDateTime@Base 0
+ _ZN12OdsDocWriter9writeCellEb@Base 0
+ _ZN12OdsDocWriter9writeCellEd@Base 0
+ _ZN12OdsDocWriter9writeCellEf@Base 0
+ _ZN12OdsDocWriter9writeCellEi@Base 0
+ _ZN12OdsDocWriter9writeLineEv@Base 0
+ _ZN12OdsDocWriterC1EP9QIODevice@Base 0
+ _ZN12OdsDocWriterC1ERK7QString@Base 0
+ _ZN12OdsDocWriterC2EP9QIODevice@Base 0
+ _ZN12OdsDocWriterC2ERK7QString@Base 0
+ _ZN12OdsDocWriterD0Ev@Base 0
+ _ZN12OdsDocWriterD1Ev@Base 0
+ _ZN12OdsDocWriterD2Ev@Base 0
+ _ZN12OdsExceptionC1E7QString@Base 0
+ _ZN12OdsExceptionC2E7QString@Base 0
+ _ZN12OdsExceptionD0Ev@Base 0
+ _ZN12OdsExceptionD1Ev@Base 0
+ _ZN12OdsExceptionD2Ev@Base 0
+ _ZN13QuaZipNewInfoD1Ev@Base 0
+ _ZN13QuaZipNewInfoD2Ev@Base 0
+ _ZN15TsvOutputStream10writeSheetERK7QString@Base 0
+ _ZN15TsvOutputStream5closeEv@Base 0
+ _ZN15TsvOutputStreamC1ER11QTextStream@Base 0
+ _ZN15TsvOutputStreamC2ER11QTextStream@Base 0
+ _ZN15TsvOutputStreamD0Ev@Base 0
+ _ZN15TsvOutputStreamD1Ev@Base 0
+ _ZN15TsvOutputStreamD2Ev@Base 0
+ _ZN17OdsTableCellStyle12setTextColorERK6QColor@Base 0
+ _ZN17OdsTableCellStyle18setBackgroundColorERK6QColor@Base 0
+ _ZN17OdsTableCellStyleC1Ev@Base 0
+ _ZN17OdsTableCellStyleC2Ev@Base 0
+ _ZN17OdsTableCellStyleD1Ev@Base 0
+ _ZN17OdsTableCellStyleD2Ev@Base 0
+ _ZN18TsvDirectoryWriter10writeSheetERK7QString@Base 0
+ _ZN18TsvDirectoryWriter11ensureSheetEv@Base 0
+ _ZN18TsvDirectoryWriter14writeEmptyCellEv@Base 0
+ _ZN18TsvDirectoryWriter17setCellAnnotationERK7QString@Base 0
+ _ZN18TsvDirectoryWriter5closeEv@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEPKc@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK4QUrlRK7QString@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK5QDate@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK7QString@Base 0
+ _ZN18TsvDirectoryWriter9writeCellERK9QDateTime@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEb@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEd@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEf@Base 0
+ _ZN18TsvDirectoryWriter9writeCellEi@Base 0
+ _ZN18TsvDirectoryWriter9writeLineEv@Base 0
+ _ZN18TsvDirectoryWriterC1ERK4QDir@Base 0
+ _ZN18TsvDirectoryWriterC1Ev@Base 0
+ _ZN18TsvDirectoryWriterC2ERK4QDir@Base 0
+ _ZN18TsvDirectoryWriterC2Ev@Base 0
+ _ZN18TsvDirectoryWriterD0Ev@Base 0
+ _ZN18TsvDirectoryWriterD1Ev@Base 0
+ _ZN18TsvDirectoryWriterD2Ev@Base 0
+ _ZN19CalcWriterInterface20getTableCellStyleRefERK17OdsTableCellStyle@Base 0
+ _ZN19CalcWriterInterface20setTableCellStyleRefEP28OdsTableCellStyleRefInternal@Base 0
+ _ZN19CalcWriterInterface9writeCellEj@Base 0
+ _ZN20SaxHandlerContentXml10charactersERK7QString@Base 0
+ _ZN20SaxHandlerContentXml10endElementERK7QStringS2_S2_@Base 0
+ _ZN20SaxHandlerContentXml10fatalErrorERK18QXmlParseException@Base 0
+ _ZN20SaxHandlerContentXml11endDocumentEv@Base 0
+ _ZN20SaxHandlerContentXml12startElementERK7QStringS2_S2_RK14QXmlAttributes@Base 0
+ _ZN20SaxHandlerContentXml13end_element_pEv@Base 0
+ _ZN20SaxHandlerContentXml15start_element_pERK14QXmlAttributes@Base 0
+ _ZN20SaxHandlerContentXml22end_element_table_cellEv@Base 0
+ _ZN20SaxHandlerContentXml24start_element_table_cellERK14QXmlAttributes@Base 0
+ _ZN20SaxHandlerContentXmlC1ER12OdsDocReader@Base 0
+ _ZN20SaxHandlerContentXmlC2ER12OdsDocReader@Base 0
+ _ZN20SaxHandlerContentXmlD0Ev@Base 0
+ _ZN20SaxHandlerContentXmlD1Ev@Base 0
+ _ZN20SaxHandlerContentXmlD2Ev@Base 0
+ _ZN28OdsTableCellStyleRefInternalC1Ej@Base 0
+ _ZN28OdsTableCellStyleRefInternalC2Ej@Base 0
+ _ZN5QHashI7QStringS0_E11deleteNode2EPN9QHashData4NodeE@Base 0
+ _ZN5QHashI7QStringS0_E13duplicateNodeEPN9QHashData4NodeEPv@Base 0
+ _ZN5QHashI7QStringS0_E6insertERKS0_S3_@Base 0
+ _ZN7MetaXml11WriteHeaderEv@Base 0
+ _ZN7MetaXml15getNamespaceURIERK7QString@Base 0
+ _ZN7MetaXml19_p_hashNamespaceURIE@Base 0
+ _ZN7MetaXmlC1EP6QuaZip@Base 0
+ _ZN7MetaXmlC2EP6QuaZip@Base 0
+ _ZN7MetaXmlD0Ev@Base 0
+ _ZN7MetaXmlD1Ev@Base 0
+ _ZN7MetaXmlD2Ev@Base 0
+ _ZN7OdsCell12setDateValueERK9QDateTime@Base 0
+ _ZN7OdsCell14setValueDoubleEd@Base 0
+ _ZN7OdsCell14setValueStringERK7QString@Base 0
+ _ZN7OdsCell15setValueBooleanEb@Base 0
+ _ZN7OdsCell18setOfficeValueTypeERK7QString@Base 0
+ _ZN7OdsCellC1Ev@Base 0
+ _ZN7OdsCellC2Ev@Base 0
+ _ZN7OdsCellD0Ev@Base 0
+ _ZN7OdsCellD1Ev@Base 0
+ _ZN7OdsCellD2Ev@Base 0
+ _ZN7QStringD1Ev@Base 0
+ _ZN7QStringD2Ev@Base 0
+ _ZN9StylesXml11WriteHeaderER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml15getNamespaceURIERK7QString@Base 0
+ _ZN9StylesXml17WriteMasterStylesER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml17WriteOfficeStylesER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml18WriteFontFaceDeclsER16QXmlStreamWriter@Base 0
+ _ZN9StylesXml19_p_hashNamespaceURIE@Base 0
+ _ZN9StylesXml20WriteAutomaticStylesER16QXmlStreamWriter@Base 0
+ _ZN9StylesXmlC1EP6QuaZip@Base 0
+ _ZN9StylesXmlC2EP6QuaZip@Base 0
+ _ZN9StylesXmlD0Ev@Base 0
+ _ZN9StylesXmlD1Ev@Base 0
+ _ZN9StylesXmlD2Ev@Base 0
+ _ZNK12OdsException4whatEv@Base 0
+ _ZNK12OdsException5qwhatEv@Base 0
+ _ZNK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZNK20SaxHandlerContentXml17end_element_tableEv@Base 0
+ _ZNK20SaxHandlerContentXml19start_element_tableERK14QXmlAttributes@Base 0
+ _ZNK20SaxHandlerContentXml21end_element_table_rowEv@Base 0
+ _ZNK20SaxHandlerContentXml23start_element_table_rowERK14QXmlAttributes@Base 0
+ _ZNK5QHashI7QStringS0_E8findNodeERKS0_Pj@Base 0
+ _ZNK7OdsCell14getDoubleValueEv@Base 0
+ _ZNK7OdsCell14getStringValueEv@Base 0
+ _ZNK7OdsCell15getBooleanValueEv@Base 0
+ _ZNK7OdsCell16getDateTimeValueEv@Base 0
+ _ZNK7OdsCell18getOfficeValueTypeEv@Base 0
+ _ZNK7OdsCell6isDateEv@Base 0
+ _ZNK7OdsCell7isEmptyEv@Base 0
+ _ZNK7OdsCell8isDoubleEv@Base 0
+ _ZNK7OdsCell8isStringEv@Base 0
+ _ZNK7OdsCell8toStringEv@Base 0
+ _ZNK7OdsCell9isBooleanEv@Base 0
+ _ZNSt6vectorI17OdsTableCellStyleSaIS0_EE19_M_emplace_back_auxIIRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorI17OdsTableCellStyleSaIS0_EE19_M_emplace_back_auxIJRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorI7QStringSaIS0_EE19_M_emplace_back_auxIIRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorI7QStringSaIS0_EE19_M_emplace_back_auxIJRKS0_EEEvDpOT_@Base 0
+ _ZNSt6vectorIP28OdsTableCellStyleRefInternalSaIS1_EE19_M_emplace_back_auxIIRKS1_EEEvDpOT_@Base 0
+ _ZNSt6vectorIP28OdsTableCellStyleRefInternalSaIS1_EE19_M_emplace_back_auxIJRKS1_EEEvDpOT_@Base 0
+ _ZTI10ContentXml@Base 0
+ _ZTI11ManifestXml@Base 0
+ _ZTI12OdsDocReader@Base 0
+ _ZTI12OdsDocWriter@Base 0
+ _ZTI12OdsException@Base 0
+ _ZTI15TsvOutputStream@Base 0
+ _ZTI18TsvDirectoryWriter@Base 0
+ _ZTI19CalcWriterInterface@Base 0
+ _ZTI20SaxHandlerContentXml@Base 0
+ _ZTI7MetaXml@Base 0
+ _ZTI7OdsCell@Base 0
+ _ZTI9StylesXml@Base 0
+ _ZTS10ContentXml@Base 0
+ _ZTS11ManifestXml@Base 0
+ _ZTS12OdsDocReader@Base 0
+ _ZTS12OdsDocWriter@Base 0
+ _ZTS12OdsException@Base 0
+ _ZTS15TsvOutputStream@Base 0
+ _ZTS18TsvDirectoryWriter@Base 0
+ _ZTS19CalcWriterInterface@Base 0
+ _ZTS20SaxHandlerContentXml@Base 0
+ _ZTS7MetaXml@Base 0
+ _ZTS7OdsCell@Base 0
+ _ZTS9StylesXml@Base 0
+ _ZTV10ContentXml@Base 0
+ _ZTV11ManifestXml@Base 0
+ _ZTV12OdsDocReader@Base 0
+ _ZTV12OdsDocWriter@Base 0
+ _ZTV12OdsException@Base 0
+ _ZTV15TsvOutputStream@Base 0
+ _ZTV18TsvDirectoryWriter@Base 0
+ _ZTV19CalcWriterInterface@Base 0
+ _ZTV20SaxHandlerContentXml@Base 0
+ _ZTV7MetaXml@Base 0
+ _ZTV7OdsCell@Base 0
+ _ZTV9StylesXml@Base 0
+ _ZThn16_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn16_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn16_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn24_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn24_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn24_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn32_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn32_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn32_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn40_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn40_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn40_NK20SaxHandlerContentXml11errorStringEv@Base 0
+ _ZThn8_N20SaxHandlerContentXml10fatalErrorERK18QXmlParseException@Base 0
+ _ZThn8_N20SaxHandlerContentXmlD0Ev@Base 0
+ _ZThn8_N20SaxHandlerContentXmlD1Ev@Base 0
+ _ZThn8_NK20SaxHandlerContentXml11errorStringEv@Base 0
diff --git a/debian/libodsstream.manpages b/debian/libodsstream.manpages
new file mode 100644
index 0000000000000000000000000000000000000000..9f3770d0652f5e54d1c79cdc5a6d69dd12b3ebd8
--- /dev/null
+++ b/debian/libodsstream.manpages
@@ -0,0 +1,2 @@
+debian/libodsstream0.1
+
diff --git a/debian/libodsstream0.1 b/debian/libodsstream0.1
new file mode 100644
index 0000000000000000000000000000000000000000..c23afe02bf9766999738b894973c28492790b8e2
--- /dev/null
+++ b/debian/libodsstream0.1
@@ -0,0 +1,27 @@
+.TH QuaZIP 1 "01 June 2012"
+.SH NAME
+quazip - C++/Qt wrapper for UNZIP/ZIP
+.SH SYNOPSIS
+.B quazip
+.SH DESCRIPTION
+.B QuaZIP
+is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
+.
+.B QuaZIP
+allows you to access files inside ZIP archives using QIODevice API,
+and that means that you can also use QTextStream, QDataStream or
+whatever you would like to use on your zipped files.
+.
+.B QuaZIP
+provides complete abstraction of the ZIP/UNZIP API, for both reading
+from and writing to ZIP archives.
+.SH SEE ALSO
+.BR minizip (1),
+.BR miniunzip (1),
+.BR zlib (3),
+.BR zip (1).
+.SH AUTHOR
+This program was written by Sergey A. Tachenov.
+This manual page was written by Eric Maeker <eric.maeker@gmail.com>.
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000000000000000000000000000000000000..47a418aae747d438af3e645a4b878c4249b1ee6a
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,84 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export DESTDIR=$(CURDIR)/debian/tmp
+
+#%:
+#	dh $@ --buildsystem=cmake --parallel
+
+configure: configure-stamp
+configure-stamp:
+	cmake -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DCMAKE_INSTALL_PREFIX=/usr -DUSEQT4=1 -DUSEQT5=1 -DCMAKE_BUILD_TYPE=Release .
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	$(MAKE) doc
+	#docbook-to-man debian/beads.sgml > beads.1
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp CMakeCache.txt
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	$(MAKE) DESTDIR=$(DESTDIR) install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_install --sourcedir=$(DESTDIR) --list-missing
+#	dh_install
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+	dh_makeshlibs
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/doc/.gitignore b/doc/.gitignore
index 39c9ac1496c5a5f4e01928fdb6b3a819ca4d4c26..92390659c61fb0495b3167df6a6ceff4b1fe76b5 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -16,3 +16,5 @@
 /fr
 /test_gnumeric.ods
 /overview-tree.html
+/html
+/latex
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..35e1d25c6a5426add41132a60b54a2132c956e13
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+# add a target to generate API documentation with Doxygen
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+add_custom_target(doc
+${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
+COMMENT "Generating API documentation with Doxygen" VERBATIM
+)
+INSTALL(DIRECTORY  ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/libodsstream)
+
+endif(DOXYGEN_FOUND)
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
new file mode 100644
index 0000000000000000000000000000000000000000..c8c25aeb71a27abf45f6eb7bb584decc805211fc
--- /dev/null
+++ b/doc/Doxyfile.in
@@ -0,0 +1,1792 @@
+# Doxyfile 1.8.1.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 sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME           = "@PROJECT_NAME@"
+
+# 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         = "@PAPPSOMSTOOLS_VERSION@"
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# 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       = "@CMAKE_CURRENT_BINARY_DIR@"
+
+# 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, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+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 if your file system
+# 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 regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# 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 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                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =
+
+# 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
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
+# 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 makes 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
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# 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
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+SYMBOL_CACHE_SIZE      = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# 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            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# 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 this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = 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 FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# 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_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = 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
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = 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 macro 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 macros 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
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# 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    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# 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
+
+# The WARN_NO_PARAMDOC option can be enabled 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                  =
+
+# 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++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          =
+
+# 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 be
+# 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.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system 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      = NO
+
+# 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 or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+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
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# 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, C++ and Fortran comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# 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 documentation.
+
+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    = 5
+
+# 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. Note that when using a custom header you are responsible
+#  for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER            =
+
+# 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            =
+
+# 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
+# style sheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# 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 compiled 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 CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# 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
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value 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 (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# 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
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# 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         = YES
+
+# 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.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+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, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4
+
+# 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           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           =
+
+# 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         = YES
+
+# 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           = YES
+
+# 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
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# 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 style sheet 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
+# pointed to by INCLUDE_PATH will be searched when 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 that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these 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. For each
+# tag file the location of the external documentation should be added. 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. 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 also works with HAVE_DOT disabled, but 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
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH           =
+
+# 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
+# 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 the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# 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 options 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 generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH 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 svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG        = NO
+
+# 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 MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS           =
+
+# The 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 if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. 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      = YES
+
+# 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
diff --git a/generateJar.jardesc b/generateJar.jardesc
deleted file mode 100644
index 11291070889b3e0ecf6339e7a544213a8a4d5bbd..0000000000000000000000000000000000000000
--- a/generateJar.jardesc
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jardesc>
-    <jar path="libodsstream/lib/libodsstream.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/libodsstream/generateJar.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
-    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
-    <selectedProjects/>
-    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-        <javaElement handleIdentifier="=libodsstream/src&lt;fr.inra.pappso.libodsstream.reader"/>
-        <file path="/libodsstream/.classpath"/>
-        <file path="/libodsstream/test.ods"/>
-        <file path="/libodsstream/.project"/>
-        <file path="/libodsstream/javadoc.xml"/>
-        <javaElement handleIdentifier="=libodsstream/src&lt;fr.inra.pappso.libodsstream.saxreader"/>
-        <javaElement handleIdentifier="=libodsstream/src&lt;fr.inra.pappso.libodsstream"/>
-        <javaElement handleIdentifier="=libodsstream/src&lt;fr.inra.pappso.libodsstream.buffer"/>
-        <file path="/libodsstream/generateJar.jardesc"/>
-        <javaElement handleIdentifier="=libodsstream/src&lt;fr.inra.pappso.libodsstream.structure"/>
-        <file path="/libodsstream/.gitignore"/>
-    </selectedElements>
-</jardesc>
diff --git a/javadoc.xml b/javadoc.xml
deleted file mode 100644
index 87ca5f2e11b27cdd960287872e323ba8422b1c60..0000000000000000000000000000000000000000
--- a/javadoc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
-	<target name="javadoc">
-		<javadoc access="public" author="true" classpath="." destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="fr.inra.pappso.libodsstream,fr.inra.pappso.libodsstream.reader,test" source="1.6" sourcepath="src" splitindex="true" use="true" version="true" />
-	</target>
-</project>
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 3ffb9e86fde1635a5f548ca65543897674edec06..0000000000000000000000000000000000000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/libodsstream.jar
diff --git a/libodsstream.kdev4 b/libodsstream.kdev4
new file mode 100644
index 0000000000000000000000000000000000000000..b93577d698faf6aacfe1638f3672602b499b415b
--- /dev/null
+++ b/libodsstream.kdev4
@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=libodsstream
diff --git a/modules/FindOdsstream.cmake b/modules/FindOdsstream.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..ff604ed7794c46ceb50d2257ea513a9695d4c303
--- /dev/null
+++ b/modules/FindOdsstream.cmake
@@ -0,0 +1,44 @@
+# Copyright : Olivier Langella (CNRS)
+# License : GPL-3.0+
+# Authors : Olivier Langella
+
+FIND_PATH( ODSSTREAM_INCLUDE_DIR odsstream/odsdocreader.h
+               PATHS /usr/local/include /usr/include
+               PATH_SUFFIXES odsstream libodsstream ENV PATH)
+
+FIND_LIBRARY(ODSSTREAM_QT4_LIBRARY NAMES odsstream-qt4)
+IF (ODSSTREAM_INCLUDE_DIR AND ODSSTREAM_QT4_LIBRARY)
+  MESSAGE(STATUS "XXXXXXXXXXXXX ${ODSSTREAM_LIBRARY} XXXXXXXXXXXXXXX")
+  SET(ODSSTREAM_QT4_FOUND TRUE)
+ENDIF (ODSSTREAM_INCLUDE_DIR AND ODSSTREAM_QT4_LIBRARY)
+
+IF (ODSSTREAM_QT4_FOUND)
+  # show which CppUnit was found only if not quiet
+  IF (NOT ODSSTREAM_FIND_QUIETLY)
+    MESSAGE(STATUS "Found ODSSTREAM_QT4_LIBRARY: ${ODSSTREAM_QT4_LIBRARY}")
+  ENDIF (NOT ODSSTREAM_FIND_QUIETLY)
+ENDIF (ODSSTREAM_QT4_FOUND)
+
+
+FIND_LIBRARY(ODSSTREAM_QT5_LIBRARY NAMES odsstream-qt5)
+IF (ODSSTREAM_INCLUDE_DIR AND ODSSTREAM_QT5_LIBRARY)
+  MESSAGE(STATUS "XXXXXXXXXXXXX ${ODSSTREAM_LIBRARY} XXXXXXXXXXXXXXX")
+  SET(ODSSTREAM_QT5_FOUND TRUE)
+ENDIF (ODSSTREAM_INCLUDE_DIR AND ODSSTREAM_QT5_LIBRARY)
+
+IF (ODSSTREAM_QT5_FOUND)
+  # show which CppUnit was found only if not quiet
+  IF (NOT ODSSTREAM_FIND_QUIETLY)
+    MESSAGE(STATUS "Found ODSSTREAM_QT5_LIBRARY: ${ODSSTREAM_QT5_LIBRARY}")
+  ENDIF (NOT ODSSTREAM_FIND_QUIETLY)
+ENDIF (ODSSTREAM_QT5_FOUND)
+
+# fatal error if CppUnit is required but not found
+IF (NOT ODSSTREAM_QT4_FOUND)
+  IF (NOT ODSSTREAM_QT5_FOUND)
+    # fatal error if CppUnit is required but not found
+    IF (PAPPSOMSPP_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find ODSSTREAM Qt4 or Qt5 please do specify the ODSSTREAM_INCLUDE_DIR, ODSSTREAM_QT4_LIBRARY and  ODSSTREAM_QT5_LIBRARY variables using ccmake!")
+    ENDIF (PAPPSOMSPP_FIND_REQUIRED)
+  ENDIF (NOT ODSSTREAM_QT5_FOUND)
+ENDIF (NOT ODSSTREAM_QT4_FOUND)
diff --git a/modules/FindQuaZip.cmake b/modules/FindQuaZip.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..5b704cdcba2c01c9cce08e275287d7e3840890d1
--- /dev/null
+++ b/modules/FindQuaZip.cmake
@@ -0,0 +1,47 @@
+# QUAZIP_FOUND - QuaZip library was found
+# QUAZIP_INCLUDE_DIR - Path to QuaZip include dir
+# QUAZIP_INCLUDE_DIRS - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+# QUAZIP_LIBRARIES - List of QuaZip libraries
+# QUAZIP_ZLIB_INCLUDE_DIR - The include dir of zlib headers
+
+
+IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+  # in cache already
+  SET(QUAZIP_FOUND TRUE)
+ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+  IF (WIN32)
+    FIND_PATH(QUAZIP_LIBRARY_DIR
+      WIN32_DEBUG_POSTFIX d
+      NAMES libquazip.dll
+      HINTS "C:/Programme/" "C:/Program Files"
+      PATH_SUFFIXES QuaZip/lib
+    )
+    FIND_LIBRARY(QUAZIP_QT4_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR})
+    FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES quazip)
+    FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
+  ELSE(WIN32)
+    FIND_PACKAGE(PkgConfig)
+    # pkg_check_modules(PC_QCA2 QUIET qca2)
+    pkg_check_modules(PC_QUAZIP quazip)
+    FIND_LIBRARY(QUAZIP_QT5_LIBRARIES
+      WIN32_DEBUG_POSTFIX d
+      NAMES quazip-qt5 quazip5
+      HINTS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
+    )
+    SET(QUAZIP_LIBRARIES ${QUAZIP_QT5_LIBRARIES})
+    FIND_LIBRARY(QUAZIP_QT4_LIBRARIES
+      WIN32_DEBUG_POSTFIX d
+      NAMES quazip
+      HINTS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu
+    )
+    SET(QUAZIP_LIBRARIES ${QUAZIP_LIBRARIES} ${QUAZIP_QT4_LIBRARIES})
+    FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+    HINTS /usr/include /usr/local/include
+    PATH_SUFFIXES quazip
+    )
+    FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+  ENDIF (WIN32)
+  INCLUDE(FindPackageHandleStandardArgs)
+  SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+  find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
+ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
\ No newline at end of file
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b87e7312c8775881c41dfc0ee2a3ea8bd29cb00a
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,2 @@
+/html
+/latex
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..03dcf7edb55a20d8298788d8cc8eb5ba9611154e
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,126 @@
+
+#find zlib
+FIND_PACKAGE(ZLIB REQUIRED)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/modules)
+FIND_PACKAGE(QuaZip REQUIRED)
+
+INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+#INCLUDE_DIRECTORIES(${QUAZIP_INCLUDE_DIRS})
+
+
+#SET (QT_USE_QTXMLPATTERNS true)
+
+
+
+SET(CPP_FILES 
+  odsstream/reader/odscell.cpp
+  odsstream/odsexception.h 
+  odsstream/saxreader/saxhandlercontentxml.cpp 
+  odsstream/odsdocreader.cpp
+  odsstream/structure/stylesxml.cpp
+  odsstream/structure/contentxml.cpp
+  odsstream/structure/metaxml.cpp
+  odsstream/structure/manifestxml.cpp
+  odsstream/odsdocwriter.cpp
+  odsstream/tsvdirectorywriter.cpp
+  odsstream/tsvoutputstream.cpp
+  odsstream/odstablecellstyle.cpp
+  odsstream/odstablecellstyleref.cpp
+)
+
+
+IF (USEQT5)
+  #qt5-default qtbase5-dev
+  FIND_PACKAGE( Qt5Xml REQUIRED )
+  FIND_PACKAGE( Qt5Gui REQUIRED )
+
+  # Build the static lib
+  ADD_LIBRARY(odsstream-static-qt5 STATIC ${CPP_FILES})
+  target_include_directories (odsstream-static-qt5 PUBLIC ${Qt5Xml_INCLUDES}  ${Qt5Gui_INCLUDES})
+    
+    SET_TARGET_PROPERTIES(odsstream-static-qt5
+      PROPERTIES OUTPUT_NAME odsstream-qt5
+      CLEAN_DIRECT_OUTPUT 1
+      CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}"
+    )
+  TARGET_LINK_LIBRARIES(odsstream-static-qt5 ${LIBS} ${Qt5Xml_LIBRARIES}  ${QUAZIP_QT5_LIBRARIES} ${Qt5Gui_LIBRARIES})
+
+  # Build the shared lib
+  ADD_LIBRARY(odsstream-shared-qt5 SHARED ${CPP_FILES})
+  target_include_directories (odsstream-shared-qt5 PUBLIC ${Qt5Xml_INCLUDES} ${Qt5Gui_INCLUDES})
+  SET_TARGET_PROPERTIES(odsstream-shared-qt5
+    PROPERTIES OUTPUT_NAME odsstream-qt5
+    CLEAN_DIRECT_OUTPUT 1
+    VERSION ${LIBODSSTREAM_VERSION}
+    SOVERSION ${LIBODSSTREAM_MAJOR_VERSION}
+    CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}"
+    )
+  TARGET_LINK_LIBRARIES(odsstream-shared-qt5 ${LIBS} ${Qt5Xml_LIBRARIES}  ${QUAZIP_QT5_LIBRARIES} ${Qt5Gui_LIBRARIES})
+
+  # Install libs
+  INSTALL(TARGETS odsstream-static-qt5 odsstream-shared-qt5 DESTINATION lib${LIB_SUFFIX})
+
+ENDIF(USEQT5)
+
+
+IF (USEQT4)
+  #qt5-default qtbase5-dev
+  FIND_PACKAGE( Qt4 COMPONENTS QTCORE QTXML QTGUI REQUIRED )
+  
+  MESSAGE ("QT_DEFINITIONS ${QT_DEFINITIONS}" )
+  MESSAGE ("QT_INCLUDE_DIR ${QT_INCLUDE_DIR}" )
+  MESSAGE ("QT_QTCORE_INCLUDE_DIR ${QT_QTCORE_INCLUDE_DIR}" )
+  MESSAGE ("QT_QTXML_INCLUDE_DIR ${QT_QTXML_INCLUDE_DIR}" )
+  
+
+  # Build the static lib
+  ADD_LIBRARY(odsstream-static-qt4 STATIC ${CPP_FILES})
+  target_include_directories (odsstream-static-qt4 PUBLIC ${QUAZIP_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR})
+  IF (MINGW)
+    SET_TARGET_PROPERTIES(odsstream-static-qt4
+      PROPERTIES OUTPUT_NAME odsstream-qt4
+      CLEAN_DIRECT_OUTPUT 1
+      )
+  ELSE (MINGW)
+    SET_TARGET_PROPERTIES(odsstream-static-qt4
+      PROPERTIES OUTPUT_NAME odsstream-qt4
+      CLEAN_DIRECT_OUTPUT 1
+      COMPILE_DEFINITIONS "${QT_DEFINITIONS}"
+      #INCLUDE_DIRECTORIES "${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}"
+      )
+  ENDIF (MINGW)
+  TARGET_LINK_LIBRARIES(odsstream-static-qt4 ${LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY}  ${QUAZIP_QT4_LIBRARIES} ${QT_QTGUI_LIBRARY})
+
+  # Build the shared lib
+  ADD_LIBRARY(odsstream-shared-qt4 SHARED ${CPP_FILES})
+  target_include_directories (odsstream-shared-qt4 PUBLIC ${QUAZIP_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR})
+  IF(MINGW)
+    SET_TARGET_PROPERTIES(odsstream-shared-qt4
+      PROPERTIES OUTPUT_NAME odsstream-qt4
+      CLEAN_DIRECT_OUTPUT 1
+      VERSION ${LIBODSSTREAM_VERSION}
+      SOVERSION ${LIBODSSTREAM_MAJOR_VERSION}
+      #INCLUDE_DIRECTORIES "${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}"
+      )
+  ELSE (MINGW)
+    SET_TARGET_PROPERTIES(odsstream-shared-qt4
+      PROPERTIES OUTPUT_NAME odsstream-qt4
+      CLEAN_DIRECT_OUTPUT 1
+      VERSION ${LIBODSSTREAM_VERSION}
+      SOVERSION ${LIBODSSTREAM_MAJOR_VERSION}
+      COMPILE_DEFINITIONS "${QT_DEFINITIONS}"
+      #INCLUDE_DIRECTORIES "${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}"
+      )
+  ENDIF (MINGW)
+  TARGET_LINK_LIBRARIES(odsstream-shared-qt4 ${LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY}  ${QUAZIP_QT4_LIBRARIES} ${QT_QTGUI_LIBRARY})
+
+  # Install libs
+  INSTALL(TARGETS odsstream-static-qt4 odsstream-shared-qt4 DESTINATION lib${LIB_SUFFIX})
+
+ENDIF(USEQT4)
+
+
+
+# Install headers
+INSTALL(DIRECTORY odsstream/ DESTINATION include/odsstream FILES_MATCHING PATTERN "*.h")
+
diff --git a/src/fr/inra/pappso/libodsstream/buffer/OdsBuffer.java b/src/fr/inra/pappso/libodsstream/buffer/OdsBuffer.java
deleted file mode 100644
index 05d8994cc2045ca9f757afac909521aa1e64ccc5..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/buffer/OdsBuffer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package fr.inra.pappso.libodsstream.buffer;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.stream.XMLStreamException;
-
-import fr.inra.pappso.libodsstream.OdsDocWriter;
-import fr.inra.pappso.libodsstream.buffer.OdsSheetBuffer;
-
-
-public class OdsBuffer {
-
-	private OdsDocWriter odsDoc;
-	
-	private ArrayList<OdsSheetBuffer> listOdsSheetBuffer = new ArrayList<OdsSheetBuffer>();
-
-	public OdsBuffer(String outputFilename) throws IOException, XMLStreamException, DatatypeConfigurationException {
-		odsDoc = new OdsDocWriter(outputFilename);
-	}
-
-	public OdsBuffer(OutputStream out) throws IOException, XMLStreamException, DatatypeConfigurationException {
-		odsDoc = new OdsDocWriter(out);
-	}
-
-	public OdsSheetBuffer newOdsSheetBuffer(String sheetName) throws Exception {
-		if (sheetName == null) {
-			throw new Exception("sheetName is null");
-		}
-		return new OdsSheetBuffer(this, sheetName);
-	}
-
-	protected void addOdsSheetBuffer(OdsSheetBuffer odsSheetBuffer) throws Exception {
-		if (odsSheetBuffer == null) {
-			throw new Exception("odsSheetBuffer is null");
-		}
-		listOdsSheetBuffer.add(odsSheetBuffer);
-	}
-	
-
-	public void close() throws Exception {
-		for (OdsSheetBuffer odsSheetBuffer:listOdsSheetBuffer) {
-			if (odsSheetBuffer == null) {
-				throw new Exception("odsSheetBuffer is null");
-			}
-			odsSheetBuffer.close();
-		}
-		
-		this.odsDoc.close();
-	}
-
-	protected OdsDocWriter getOdsDoc() {
-		return this.odsDoc;
-	}
-
-}
diff --git a/src/fr/inra/pappso/libodsstream/buffer/OdsLineBuffer.java b/src/fr/inra/pappso/libodsstream/buffer/OdsLineBuffer.java
deleted file mode 100644
index 2a08ff516ebdf1b528e9075ba0e4cf6d989b74bd..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/buffer/OdsLineBuffer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package fr.inra.pappso.libodsstream.buffer;
-
-import java.util.ArrayList;
-
-import fr.inra.pappso.libodsstream.OdsDocWriter;
-
-public class OdsLineBuffer {
-	private ArrayList<Object> listItem = new ArrayList<Object>();
-	OdsSheetBuffer odsSheetBuffer;
-
-	protected OdsLineBuffer(OdsSheetBuffer odsSheetBuffer) {
-		this.odsSheetBuffer = odsSheetBuffer;
-		odsSheetBuffer.addOdsLineBuffer(this);
-	}
-
-	public void close() throws Exception {
-		OdsDocWriter odsDoc = this.odsSheetBuffer.getOdsBuffer().getOdsDoc();
-		odsDoc.writeLine();
-		for (Object object : listItem) {
-			odsDoc.writeCell(object);
-		}
-		listItem = null;
-	}
-
-	public void add(Object o) {
-		listItem.add(o);
-	}
-
-	public int size() {
-		return listItem.size();
-	}
-
-	public void writeAtPos(int pos, Object obj) throws Exception {
-		if (pos < 0) {
-			throw new Exception("pos must be positive");
-		}
-		if (pos >= this.size()) {
-			throw new Exception("pos bigger than line size");
-		}
-		this.listItem.set(pos, obj);
-	}
-
-}
diff --git a/src/fr/inra/pappso/libodsstream/buffer/OdsSheetBuffer.java b/src/fr/inra/pappso/libodsstream/buffer/OdsSheetBuffer.java
deleted file mode 100644
index 45d1b849bedc11f94d81f1c4eb943f3d479e2ef4..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/buffer/OdsSheetBuffer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package fr.inra.pappso.libodsstream.buffer;
-
-import java.util.ArrayList;
-
-public class OdsSheetBuffer {
-
-	private String sheetName;
-	OdsBuffer odsBuffer;
-	private ArrayList<OdsLineBuffer> listOdsLineBuffer = new ArrayList<OdsLineBuffer>();
-
-	protected OdsSheetBuffer(OdsBuffer odsBuffer, String sheetName) throws Exception {
-		this.odsBuffer = odsBuffer;
-		this.sheetName = sheetName;
-		if (odsBuffer == null) {
-			throw new Exception("odsBuffer is null");
-		}
-		odsBuffer.addOdsSheetBuffer(this);
-	}
-
-	public OdsLineBuffer newOdsLineBuffer() throws Exception {
-		if (this == null) {
-			throw new Exception("this OdsSheetBuffer is null");
-		}
-		return new OdsLineBuffer(this);
-	}
-
-	public void close() throws Exception {
-		
-		odsBuffer.getOdsDoc().writeSheet(sheetName);
-		
-		this.writeSheetContent();
-		//odsBuffer.close();
-	}
-
-	private void writeSheetContent() throws Exception {
-		for (OdsLineBuffer odsLineBuffer:listOdsLineBuffer) {
-			odsLineBuffer.close();
-		}
-	}
-
-	public void addOdsLineBuffer(OdsLineBuffer odsLineBuffer) {
-		this.listOdsLineBuffer.add(odsLineBuffer);
-	}
-
-	protected OdsBuffer getOdsBuffer() {
-		return this.odsBuffer;
-	}
-
-	
-}
diff --git a/src/fr/inra/pappso/libodsstream/reader/OdsSheet.java b/src/fr/inra/pappso/libodsstream/reader/OdsSheet.java
deleted file mode 100644
index 4c299f0e620d1904949d0707e43995cdc0c331e8..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/reader/OdsSheet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Olivier Langella <Olivier.Langella@moulon.inra.fr>.
- * 
- * This file is part of libOdsStream.
- * 
- *     libOdsStream is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     libOdsStream is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with libOdsStream.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     Olivier Langella <Olivier.Langella@moulon.inra.fr> - initial API and implementation
- ******************************************************************************/
-package fr.inra.pappso.libodsstream.reader;
-
-
-/** represents the description of a data sheet, this is produced by the OdsDocReader
- * 
- * @see OdsDocReader
- * @author Olivier Langella <Olivier.Langella@moulon.inra.fr>
- *
- */
-public class OdsSheet {
-
-	protected String name;
-
-	protected OdsSheet(String name) {
-		this.name = name;
-	}
-
-	/** gets the name of the datasheet
-	 * 
-	 * @return
-	 */
-	public String getName() {
-		return name;
-	}
-
-}
diff --git a/src/fr/inra/pappso/libodsstream/saxreader/MyErrorHandler.java b/src/fr/inra/pappso/libodsstream/saxreader/MyErrorHandler.java
deleted file mode 100644
index aab4287a5e91115724d75b3a14cf66c4ea8e1d42..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/saxreader/MyErrorHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Olivier Langella <Olivier.Langella@moulon.inra.fr>.
- * 
- * This file is part of libOdsStream.
- * 
- *     libOdsStream is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     libOdsStream is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with libOdsStream.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     Olivier Langella <Olivier.Langella@moulon.inra.fr> - initial API and implementation
- ******************************************************************************/
-package fr.inra.pappso.libodsstream.saxreader;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class MyErrorHandler implements ErrorHandler {
-
-	public void warning(SAXParseException exception) throws SAXException {
-		// Bring things to a crashing halt
-		/*logger.warn("**Parsing Warning**" + "\n\t Line:    "
-				+ exception.getLineNumber() + "\n\t URI:	"
-				+ exception.getSystemId() + "\n\t Message: "
-				+ exception.getMessage());*/
-		// throw new SAXException("Warning encountered");
-	}
-
-	public void error(SAXParseException exception) throws SAXException {
-		// Bring things to a crashing halt
-		/*logger.error("**Parsing Error**" + "\n\t Line:    "
-				+ exception.getLineNumber() + "\n\t URI:     "
-				+ exception.getSystemId() + "\n\t Message: "
-				+ exception.getMessage());*/
-		// throw new SAXException("Error encou*ntered");
-	}
-
-	public void fatalError(SAXParseException exception) throws SAXException {
-		// Bring things to a crashing halt
-		/*logger.fatal("**Parsing Fatal Error**" + "\n\t Line:    "
-				+ exception.getLineNumber() + "\n\t URI:     "
-				+ exception.getSystemId() + "\n\t Message: "
-				+ exception.getMessage());*/
-		System.out.println("**Parsing Fatal Error**" + "\n\t Line:    "
-				+ exception.getLineNumber() + "\n\t URI:     "
-				+ exception.getSystemId() + "\n\t Message: "
-				+ exception.getMessage());
-		throw new SAXException("ERROR at line "+ exception.getLineNumber()+ " column "+ exception.getColumnNumber()+" : "+ exception.getMessage());
-	}
-}
\ No newline at end of file
diff --git a/src/fr/inra/pappso/libodsstream/saxreader/SaxBaseHandler.java b/src/fr/inra/pappso/libodsstream/saxreader/SaxBaseHandler.java
deleted file mode 100644
index 201bdbc72fb5de6964d0b00265ff1c5d94fb00fd..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/saxreader/SaxBaseHandler.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Olivier Langella <Olivier.Langella@moulon.inra.fr>.
- * 
- * This file is part of libOdsStream.
- * 
- *     libOdsStream is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     libOdsStream is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with libOdsStream.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     Olivier Langella <Olivier.Langella@moulon.inra.fr> - initial API and implementation
- ******************************************************************************/
-package fr.inra.pappso.libodsstream.saxreader;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Stack;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @brief attention ça ne marche pas encore
- * 
- *        base class to build sax parser : define a stack to store tags and use
- *        reflexion to look for functions associated to tag names
- * 
- * @author olivier
- * 
- */
-
-public class SaxBaseHandler extends DefaultHandler {
-	protected StringBuffer data;
-	protected Stack<String> stack;
-	protected Locator xml_location;
-
-	public SaxBaseHandler() {
-		super();
-		stack = new Stack<String>();
-	}
-
-	public void setDocumentLocator(Locator locator) {
-		this.xml_location = locator;
-	}
-
-	public void startElement(String nameSpaceUri, String sName, String qName,
-			Attributes attrs) throws SAXException {
-		String tag = sName;
-		if ("".equals(tag))
-			tag = qName;
-		tag = tag.replaceAll("-", "");
-		// System.out.println(tag);
-
-		stack.push(tag);
-		data = new StringBuffer();
-		// String nameSpaceUri, String tag,Attributes attrs
-		@SuppressWarnings("rawtypes")
-		Class params[] = new Class[] { String.class, Attributes.class };
-
-		try {
-			Method m = this.getClass().getDeclaredMethod("startElement" + tag,
-					params);
-
-			m.invoke(this, nameSpaceUri, attrs);
-
-		} catch (SecurityException e) {
-			e.printStackTrace();
-			throw new SAXException("SecurityException for method "
-					+ "startElement" + tag + " at line "
-					+ this.xml_location.getLineNumber());
-		} catch (NoSuchMethodException e) {
-			// System.out.println("method not found " + "startElement" + tag);
-			// this function for this tag does not exist, no problem
-			try {
-				this.startUnknownElement(nameSpaceUri, sName, qName, attrs);
-			} catch (SAXNotRecognizedException e1) {
-				// e1.printStackTrace();
-				throw new SAXNotRecognizedException(
-						"this handler does not recognize this file format\n"
-								+ e.getMessage());
-			}
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-			throw new SAXException("illegal argument for method "
-					+ "startElement" + tag + " at line "
-					+ this.xml_location.getLineNumber());
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-			throw new SAXException("illegal access for method "
-					+ "startElement" + tag + " at line "
-					+ this.xml_location.getLineNumber());
-		} catch (InvocationTargetException e) {
-			String message = "InvocationTargetException for method "
-					+ "startElement" + tag + " " + this.getPosition() + "\n"
-					+ e.getTargetException().getMessage();
-			throw new SAXException(message, (Exception) e.getTargetException());
-		}
-	}
-
-	protected String getPosition() {
-		return " at line " + this.getLineNumber() + " column "
-				+ this.getColumnNumber();
-	}
-
-	protected String getColumnNumber() {
-		return "" + this.xml_location.getColumnNumber();
-	}
-
-	protected String getLineNumber() {
-		return "" + this.xml_location.getLineNumber();
-	}
-
-	/**
-	 * @brief launch if the element is unknown to the handler
-	 * 
-	 * @param nameSpaceUri
-	 * @param sName
-	 * @param qName
-	 * @param attrs
-	 * @throws SAXException
-	 * @throws ProticPortException
-	 */
-	protected void startUnknownElement(String nameSpaceUri, String sName,
-			String qName, Attributes attrs) throws SAXException {
-
-	}
-
-	public void endElement(String nameSpaceUri, String sName, String qName)
-			throws SAXException {
-		String tag = sName;
-		tag = tag.replaceAll("-", "");
-		@SuppressWarnings("rawtypes")
-		Class params[] = new Class[] { String.class, String.class };
-		if ("".equals(tag))
-			tag = qName;
-		try {
-			Method m = this.getClass().getDeclaredMethod("endElement" + tag,
-					params);
-
-			if (data != null) {
-				m.invoke(this, nameSpaceUri, data.toString());
-			} else {
-				m.invoke(this, nameSpaceUri, null);
-			}
-
-		} catch (SecurityException e) {
-			e.printStackTrace();
-			throw new SAXException("SecurityException for method "
-					+ "endElement" + tag + " at line "
-					+ this.xml_location.getLineNumber());
-		} catch (NoSuchMethodException e) {
-			// System.out.println("method not found " + "startElement" + tag);
-			// this function for this tag does not exist, no problem
-			try {
-				this.endUnknownElement(nameSpaceUri, sName, qName,
-						data.toString());
-			} catch (Exception e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-				String message = "Error reading file at end of " + tag
-						+ " at line " + this.xml_location.getLineNumber()
-						+ "\n" + e1.getMessage();
-				throw new SAXException(message, e1);
-			}
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-			throw new SAXException("illegal argument for method "
-					+ "endElement" + tag + " at line "
-					+ this.xml_location.getLineNumber());
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-			throw new SAXException("illegal access for method " + "endElement"
-					+ tag + " at line " + this.xml_location.getLineNumber());
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-			String message = "InvocationTargetException for method "
-					+ "endElement" + tag + " " + this.getPosition() + "\n"
-					+ e.getTargetException().getMessage();
-			throw new SAXException(message, (Exception) e.getTargetException());
-
-		}
-
-		stack.pop();
-	}
-
-	protected void endUnknownElement(String nameSpaceUri, String sName,
-			String qName, String data) throws Exception {
-
-	}
-
-	/**
-	 * this method reads the element content
-	 */
-	public void characters(char buf[], int offset, int len) throws SAXException {
-		data.append(buf, offset, len);
-	}
-
-}
diff --git a/src/fr/inra/pappso/libodsstream/structure/ManifestXml.java b/src/fr/inra/pappso/libodsstream/structure/ManifestXml.java
deleted file mode 100644
index 0b06cd76a8f141a808005e84adec16a68574a5a9..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/structure/ManifestXml.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package fr.inra.pappso.libodsstream.structure;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-public class ManifestXml {
-	
-	XMLStreamWriter writer;
-	static String namespaceURI = new String ("urn:oasis:names:tc:opendocument:xmlns:manifest:1.0");
-
-	public ManifestXml(ZipOutputStream zipOutputStream) throws IOException, XMLStreamException {
-		//META-INF/
-		/* manifest.xml
-		 * <?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2" >
- 
-</manifest:manifest>
-		 */
-		ZipEntry entry = new ZipEntry("META-INF/manifest.xml");
-		zipOutputStream.putNextEntry(entry);
-		
-	
-		XMLOutputFactory factory = XMLOutputFactory.newInstance();
-		OutputStreamWriter noIndentOutput = new OutputStreamWriter(zipOutputStream,
-				"UTF8");
-		//XMLStreamWriter noIndentWriter = factory.createXMLStreamWriter(noIndentOutput);
-		//writer = new IndentingXMLStreamWriter(noIndentWriter);
-		writer = factory.createXMLStreamWriter(noIndentOutput);
-		
-		this.WriteHeader();
-		/*
-		 * <manifest:file-entry manifest:full-path="/" manifest:media-type="application/vnd.oasis.opendocument.spreadsheet"/>
- <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
- <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/>
- <manifest:file-entry manifest:full-path="settings.xml" manifest:media-type="text/xml"/>
- <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
-		 */
-		writer.writeStartElement("manifest", "file-entry", namespaceURI);
-		writer.writeAttribute("manifest", namespaceURI, "full-path", "/");
-		writer.writeAttribute("manifest", namespaceURI, "media-type", "application/vnd.oasis.opendocument.spreadsheet");
-		writer.writeEndElement();
-
-		writer.writeStartElement("manifest", "file-entry", namespaceURI);
-		writer.writeAttribute("manifest", namespaceURI, "full-path", "styles.xml");
-		writer.writeAttribute("manifest", namespaceURI, "media-type", "text/xml");
-		writer.writeEndElement();
-
-		writer.writeStartElement("manifest", "file-entry", namespaceURI);
-		writer.writeAttribute("manifest", namespaceURI, "full-path", "content.xml");
-		writer.writeAttribute("manifest", namespaceURI, "media-type", "text/xml");
-		writer.writeEndElement();
-
-		writer.writeStartElement("manifest", "file-entry", namespaceURI);
-		writer.writeAttribute("manifest", namespaceURI, "full-path", "meta.xml");
-		writer.writeAttribute("manifest", namespaceURI, "media-type", "text/xml");
-		writer.writeEndElement();
-
-		//<manifest:file-entry manifest:full-path="mimetype"
-		//manifest:media-type="text/plain" />
-		writer.writeStartElement("manifest", "file-entry", namespaceURI);
-		writer.writeAttribute("manifest", namespaceURI, "full-path", "mimetype");
-		writer.writeAttribute("manifest", namespaceURI, "media-type", "text/plain");
-		writer.writeEndElement();
-	
-		//<manifest:file-entry manifest:full-path="META-INF/manifest.xml"
-		//		manifest:media-type="text/xml" />
-		writer.writeStartElement("manifest", "file-entry", namespaceURI);
-		writer.writeAttribute("manifest", namespaceURI, "full-path", "META-INF/manifest.xml");
-		writer.writeAttribute("manifest", namespaceURI, "media-type", "text/xml");
-		writer.writeEndElement();
-	
-		
-		/*
-		writer.writeStartElement("manifest", "file-entry", namespaceURI);
-		writer.writeAttribute("manifest", namespaceURI, "full-path", "settings.xml");
-		writer.writeAttribute("manifest", namespaceURI, "media-type", "text/xml");
-		writer.writeEndElement();
-*/
-
-		this.close();
-	}
-
-	private void WriteHeader() throws XMLStreamException {
-		writer.writeStartDocument("UTF-8", "1.0");
-		//<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2" >
-		writer.writeStartElement("manifest", "manifest", namespaceURI);
-		//writer.setPrefix("manifest", namespaceURI);
-		//writer.setDefaultNamespace(namespaceURI);
-		//writer.writeStartElement("mzXML");
-		writer.writeNamespace("manifest", namespaceURI);
-		//writer.writeDefaultNamespace(namespaceURI);
-
-		//writer.writeAttribute(xmlnsxsi, "schemaLocation", xsischemaLocation);
-		
-		
-		//not compatible with MS office 2010 :
-		//writer.writeAttribute("manifest", namespaceURI, "version", "1.2");
-		
-	}
-
-	private void close() throws XMLStreamException {
-		writer.writeEndDocument();
-
-		writer.flush();
-		writer.close();
-		
-	}
-
-}
diff --git a/src/fr/inra/pappso/libodsstream/structure/MetaXml.java b/src/fr/inra/pappso/libodsstream/structure/MetaXml.java
deleted file mode 100644
index 7e1c4aafa96b6aab087d5bac712d33d5b273a35f..0000000000000000000000000000000000000000
--- a/src/fr/inra/pappso/libodsstream/structure/MetaXml.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package fr.inra.pappso.libodsstream.structure;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-
-public class MetaXml {
-
-	XMLStreamWriter writer;
-	// static String namespaceURI = new String
-	// ("urn:oasis:names:tc:opendocument:xmlns:manifest:1.0");
-	public static HashMap<String, String> hashNamespaceURI;
-
-	static {
-		hashNamespaceURI = new HashMap<String, String>();
-		hashNamespaceURI.put("anim", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:animation:1.0"));
-		hashNamespaceURI.put("chart", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:chart:1.0"));
-		hashNamespaceURI.put("config", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:config:1.0"));
-		hashNamespaceURI.put("db", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:database:1.0"));
-		hashNamespaceURI.put("dc", new String(
-				"http://purl.org/dc/elements/1.1/"));
-		hashNamespaceURI.put("dr3d", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"));
-		hashNamespaceURI.put("draw", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"));
-		hashNamespaceURI.put("fo", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"));
-		hashNamespaceURI.put("form", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:form:1.0"));
-		hashNamespaceURI.put("grddl", new String(
-				"http://www.w3.org/2003/g/data-view#"));
-		hashNamespaceURI.put("math", new String(
-				"http://www.w3.org/1998/Math/MathML"));
-		hashNamespaceURI.put("meta", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:meta:1.0"));
-		hashNamespaceURI.put("number", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"));
-		hashNamespaceURI.put("of", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:of:1.2"));
-		hashNamespaceURI.put("office", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:office:1.0"));
-		hashNamespaceURI.put("ooo", new String(
-				"http://openoffice.org/2004/office"));
-		hashNamespaceURI.put("presentation", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"));
-		hashNamespaceURI.put("script", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:script:1.0"));
-		hashNamespaceURI.put("smil", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"));
-		hashNamespaceURI.put("style", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:style:1.0"));
-		hashNamespaceURI.put("svg", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"));
-		hashNamespaceURI.put("table", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:table:1.0"));
-		hashNamespaceURI.put("text", new String(
-				"urn:oasis:names:tc:opendocument:xmlns:text:1.0"));
-		hashNamespaceURI.put("xforms", new String(
-				"http://www.w3.org/2002/xforms"));
-		hashNamespaceURI.put("xhtml",
-				new String("http://www.w3.org/1999/xhtml"));
-		hashNamespaceURI.put("xlink",
-				new String("http://www.w3.org/1999/xlink"));
-	}
-
-	public MetaXml(ZipOutputStream zipOutputStream) throws IOException,
-			XMLStreamException {
-		// META-INF/
-		/*
-		 * manifest.xml <?xml version="1.0" encoding="UTF-8"?>
-		 * <manifest:manifest
-		 * xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
-		 * manifest:version="1.2" >
-		 * 
-		 * </manifest:manifest>
-		 */
-		ZipEntry entry = new ZipEntry("meta.xml");
-		zipOutputStream.putNextEntry(entry);
-
-		XMLOutputFactory factory = XMLOutputFactory.newInstance();
-		OutputStreamWriter noIndentOutput = new OutputStreamWriter(
-				zipOutputStream, "UTF8");
-		// XMLStreamWriter noIndentWriter =
-		// factory.createXMLStreamWriter(noIndentOutput);
-
-		// writer = new IndentingXMLStreamWriter(noIndentWriter);
-		writer = factory.createXMLStreamWriter(noIndentOutput);
-
-		this.WriteHeader();
-		/*
-		 * <office:meta><meta:generator>ODFDOM/0.8.7</meta:generator>
-		 * <meta:creation-date>2011-04-29T16:12:27</meta:creation-date>
-		 * <dc:date>2011-04-29T16:12:28</dc:date>
-		 * <meta:editing-cycles>1</meta:editing-cycles>
-		 * <meta:editing-duration>PT0.602S</meta:editing-duration></office:meta>
-		 */
-		writer.writeStartElement("office", "meta",
-				MetaXml.hashNamespaceURI.get("office"));
-
-		/*
-		 * see RFC2616, or 3.1.1 in the oasis doc : meta:generator
-		 */
-		writer.writeStartElement("meta", "generator",
-				MetaXml.hashNamespaceURI.get("meta"));
-		writer.writeCharacters("LibOdsStream/0.0.1");
-		writer.writeEndElement();
-
-		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-		String strdate = dateFormat.format(new Date());
-
-		writer.writeStartElement("meta", "creation-date",
-				MetaXml.hashNamespaceURI.get("meta"));
-		writer.writeCharacters(strdate);
-		writer.writeEndElement();
-
-		writer.writeStartElement("dc", "date",
-				MetaXml.hashNamespaceURI.get("dc"));
-		writer.writeCharacters(strdate);
-		writer.writeEndElement();
-
-		writer.writeStartElement("meta", "editing-cycles",
-				MetaXml.hashNamespaceURI.get("meta"));
-		writer.writeCharacters("1");
-		writer.writeEndElement();
-
-		writer.writeStartElement("meta", "editing-duration",
-				MetaXml.hashNamespaceURI.get("meta"));
-		writer.writeCharacters("PT0.602S");
-		writer.writeEndElement();
-
-		this.close();
-	}
-
-	private void WriteHeader() throws XMLStreamException {
-		writer.writeStartDocument("UTF-8", "1.0");
-		// <manifest:manifest
-		// xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
-		// manifest:version="1.2" >
-		writer.writeStartElement("office", "document-meta",
-				MetaXml.hashNamespaceURI.get("office"));
-		writer.writeAttribute("office", MetaXml.hashNamespaceURI.get("office"),
-				"version", "1.2");
-		// writer.setPrefix("manifest", namespaceURI);
-		// writer.setDefaultNamespace(namespaceURI);
-		// writer.writeStartElement("mzXML");
-		Iterator<String> it = MetaXml.hashNamespaceURI.keySet().iterator();
-		while (it.hasNext()) {
-			String key = it.next();
-			writer.writeNamespace(key, MetaXml.hashNamespaceURI.get(key));
-
-		}
-
-	}
-
-	private void close() throws XMLStreamException {
-		writer.writeEndDocument();
-
-		writer.flush();
-		writer.close();
-
-	}
-
-}
diff --git a/src/odsstream/calcwriterinterface.h b/src/odsstream/calcwriterinterface.h
new file mode 100644
index 0000000000000000000000000000000000000000..904012fdb2978fa4fef5d43128aa5291ba845d8c
--- /dev/null
+++ b/src/odsstream/calcwriterinterface.h
@@ -0,0 +1,136 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef CALCWRITERINTERFACE_H
+#define CALCWRITERINTERFACE_H
+
+
+#include "odstablecellstyle.h"
+#include "odstablecellstyleref.h"
+
+class CalcWriterInterface
+{
+public:
+    virtual ~CalcWriterInterface() {};
+    virtual void close ()= 0;
+
+    /**
+     * \brief open a new sheet
+     *
+     * \param sheetName the sheet name
+     */
+    virtual void writeSheet(const QString & sheetName)= 0;
+
+    /**
+     * \brief open a new line
+     */
+    virtual void writeLine()= 0;
+    /** 
+     * \brief write a text cell
+     * \param cell_text cell text
+     */
+    virtual void writeCell(const char * cell_text)= 0;
+    /** 
+     * \brief write a text cell
+     * \param cell_text cell text
+     */
+    virtual void writeCell(const QString & cell_text)= 0;
+    /** 
+     * \brief write an empty cell
+     */
+    virtual void writeEmptyCell()= 0;
+    /** 
+     * \brief write an integer in a cell
+     * \param number integer to write
+     */
+    virtual void writeCell(int number)= 0;
+    /** 
+     * \brief write a positive integer in a cell
+     * \param number integer to write
+     */
+    virtual void writeCell(unsigned int posInteger) {
+        writeCell((int) posInteger);
+    };
+    /** 
+     * \brief write a float in a cell
+     * \param number float to write
+     */
+    virtual void writeCell(float number)= 0;
+    /** 
+     * \brief write a double in a cell
+     * \param number double to write
+     */
+    virtual void writeCell(double number)= 0;
+    /** 
+     * \brief write a boolean in a cell
+     * \param true_or_false boolean to write
+     */
+    virtual void writeCell(bool true_or_false)= 0;
+    /** 
+     * \brief write a date in a cell
+     * \param date date to write
+     */
+    virtual void writeCell(const QDate & date)= 0;
+    /** 
+     * \brief write a timestamp in a cell
+     * \param datetime timestamp to write
+     */
+    virtual void writeCell(const QDateTime & datetime)= 0;
+    /** 
+     * \brief write a text cell with an URL link
+     * \param url_link URL link
+     * \param text text to write
+     */
+    virtual void writeCell(const QUrl & url_link, const QString & text)= 0;
+
+
+    /**
+     * build table cell style reference with a style definition
+     *
+     * \param style OdsTableCellStyle
+     * \return OdsTableCellStyleRef pointer on a style reference
+     */
+    virtual OdsTableCellStyleRef getTableCellStyleRef(const OdsTableCellStyle & style) {
+        return nullptr;
+    };
+    /**
+     * set the cell table style. This is applied to in the stream to following cells.
+     * This ends by using an other style reference or by using setTableCellStyleRef function
+     *
+     * \param style_ref OdsTableCellStyleRef
+     */
+    virtual void setTableCellStyleRef(OdsTableCellStyleRef style_ref) {};
+
+    /**
+     * clear cell style definition in the stream. the default style will be applied.
+     *
+     */
+    void clearTableCellStyleRef() {
+        setTableCellStyleRef(nullptr);
+    };
+    
+    /** 
+     * \brief set annotation to write in the next cell
+     * \param annotation any comment on this cell
+     */
+    virtual void setCellAnnotation(const QString & annotation) = 0 ;
+
+};
+
+#endif // CALCWRITERINTERFACE_H
diff --git a/src/odsstream/odsdochandlerinterface.h b/src/odsstream/odsdochandlerinterface.h
new file mode 100644
index 0000000000000000000000000000000000000000..cacb380766b5787ec6b5b46b00b954dcd1195f90
--- /dev/null
+++ b/src/odsstream/odsdochandlerinterface.h
@@ -0,0 +1,68 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2015  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef ODSDOCHANDLERINTERFACE_H
+#define ODSDOCHANDLERINTERFACE_H
+
+#include <QString>
+#include "reader/odscell.h"
+
+class OdsDocHandlerInterface
+{
+public:
+    /**
+     * callback that indicates the begining of a data sheet. Override it in
+     * order to retrieve information about the current data sheet.
+     *
+     */
+    virtual void startSheet(const QString & sheet_name) = 0 ;
+
+    /**
+    * callback that indicates the end of the current data sheet. Override it if
+    * needed
+    */
+    virtual void endSheet()  = 0 ;
+
+    /**
+     * callback that indicates a new line start. Override it if needed.
+     */
+
+    virtual void startLine()  = 0 ;
+
+    /**
+     * callback that indicates a line ending. Override it if needed.
+     */
+
+    virtual void endLine()  = 0 ;
+
+    /**
+     * callback that report the content of the current cell in a dedicated Cell
+     * object. Override it if you need to retrieve cell content.
+     */
+    virtual void setCell(const OdsCell &)  = 0 ;
+
+    /**
+     * callback that report the end of the ODS document. Override it if you need
+     * to know that reading is finished.
+     */
+    virtual void endDocument() = 0 ;
+
+};
+
+#endif // ODSDOCHANDLERINTERFACE_H
diff --git a/src/odsstream/odsdocreader.cpp b/src/odsstream/odsdocreader.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..31c468c834493558a33c450625e8046971592e9a
--- /dev/null
+++ b/src/odsstream/odsdocreader.cpp
@@ -0,0 +1,115 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "odsdocreader.h"
+#include "odsexception.h"
+#include <QDebug>
+#include "./saxreader/saxhandlercontentxml.h"
+#include <quazip/quazipfile.h>
+
+OdsDocReader::OdsDocReader(OdsDocHandlerInterface & handler): _handler(handler)
+{
+}
+
+OdsDocReader::~OdsDocReader()
+{
+    if (_p_quaZip!= 0) {
+        if (_p_quaZip->isOpen()) {
+            _p_quaZip->close();
+            delete _p_quaZip;
+            _p_quaZip = 0;
+        }
+    }
+}
+
+
+
+void OdsDocReader::parse(QFile & odsFile) {
+    odsFile.open(QIODevice::ReadOnly);
+    parse(&odsFile);
+    odsFile.close();
+}
+
+void OdsDocReader::parse(QIODevice * p_inputstream) {
+    _p_quaZip = new QuaZip(p_inputstream);
+    _p_quaZip->open(QuaZip::mdUnzip);
+
+    qDebug() << "OdsDocReader::OdsDocReader(QIODevice * device) begin";
+    for(bool more=_p_quaZip->goToFirstFile(); more; more=_p_quaZip->goToNextFile()) {
+        qDebug() << _p_quaZip->getCurrentFileName();
+
+        if (_p_quaZip->getCurrentFileName() == "content.xml") {
+
+            SaxHandlerContentXml parser(*this);
+
+            QXmlSimpleReader reader;
+            reader.setContentHandler(&parser);
+            reader.setErrorHandler(&parser);
+
+            qDebug() << "Parsing XML input file '" << _p_quaZip->getCurrentFileName()
+                     << "'" << endl;
+
+            QuaZipFile zip_file(_p_quaZip);
+
+            QXmlInputSource xmlInputSource(&zip_file);
+
+            if (reader.parse(xmlInputSource))
+            {
+            }
+            else
+            {
+                qDebug() << "error "
+                         << parser.errorString();
+                throw OdsException(QObject::tr("error reading masschroqML input file :\n").append(parser.errorString()));
+            }
+            qDebug() << "contentXml : DONE on file '"
+                     << _p_quaZip->getCurrentFileName()
+                     << "'" << endl;
+        }
+    }
+    if (_p_quaZip!= 0) {
+        if (_p_quaZip->isOpen()) {
+            _p_quaZip->close();
+            delete _p_quaZip;
+            _p_quaZip = 0;
+        }
+    }
+    this->endDocument();
+
+}
+
+void OdsDocReader::startInsideLine() {
+    _column_number= 0;
+    startLine();
+}
+
+void OdsDocReader::setInsideCell(const OdsCell & cell) {
+    _column_number++;
+    qDebug() << "OdsDocReader::setCell " << cell.getOfficeValueType()<< " "  << cell.toString();
+    if (cell.isDate()) {
+        qDebug() << "OdsDocReader::setCell date " << cell.getDateTimeValue().toString(Qt::ISODate) << "  " << cell.getDateTimeValue().date().day()<< "  " << cell.getDateTimeValue().date().month();
+    }
+    else if (cell.isString()) {
+        qDebug() << "OdsDocReader::setCell string " << cell.getStringValue();
+    }
+    else if (cell.isDouble()) {
+        qDebug() << "OdsDocReader::setCell double " << cell.getDoubleValue();
+    }
+    setCell(cell);
+}
diff --git a/src/odsstream/odsdocreader.h b/src/odsstream/odsdocreader.h
new file mode 100644
index 0000000000000000000000000000000000000000..107435efa6e9f1fb081a2a655a3beb0e332ed214
--- /dev/null
+++ b/src/odsstream/odsdocreader.h
@@ -0,0 +1,71 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef ODSDOCREADER_H
+#define ODSDOCREADER_H
+
+#include <quazip/quazip.h>
+
+#include "reader/odscell.h"
+#include "odsdochandlerinterface.h"
+
+class SaxHandlerContentXml;
+
+class OdsDocReader
+{
+    friend SaxHandlerContentXml;
+public:
+    /**
+     * creates an ODS reader with a reader handler
+     *
+     * @Param OdsDocHandlerInterface & the interface to implement to read ODS files
+     */
+
+    OdsDocReader(OdsDocHandlerInterface & handler);
+    virtual ~OdsDocReader();
+
+
+    void parse(QFile & odsFile);
+    void parse(QIODevice * p_inputstream);
+
+
+private:
+    void setInsideCell(const OdsCell & cell);
+    void startInsideLine();
+
+    void startSheet(const QString & sheet_name) {_handler.startSheet(sheet_name);};
+
+    void endSheet() {_handler.endSheet();};
+
+    void startLine()  {_handler.startLine();};
+
+    void endLine()  {_handler.endLine();};
+
+    void setCell(const OdsCell & cell)   {_handler.setCell(cell);};
+    void endDocument() {_handler.endDocument();};
+
+
+    QuaZip * _p_quaZip;
+
+    uint _column_number;
+
+    OdsDocHandlerInterface & _handler;
+};
+
+#endif // ODSDOCREADER_H
diff --git a/src/odsstream/odsdocwriter.cpp b/src/odsstream/odsdocwriter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f4fe1bae3bcc5204813e6497393a3d219d1d34e4
--- /dev/null
+++ b/src/odsstream/odsdocwriter.cpp
@@ -0,0 +1,307 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "odsdocwriter.h"
+#include "odsexception.h"
+#include "structure/manifestxml.h"
+#include "structure/metaxml.h"
+#include "structure/stylesxml.h"
+
+#include <quazip/quazipfile.h>
+#include <quazip/quacrc32.h>
+#include <QDebug>
+#include <QFileInfo>
+
+OdsDocWriter::OdsDocWriter(const QString & filename) {
+    _p_device_delete = true;
+    QFile * p_file = new QFile(filename);
+    try {
+        openDevice(p_file);
+    }
+    catch (OdsException ods_error) {
+        throw OdsException(QObject::tr("error opening ODS file. check file permission for %1").arg(QFileInfo(filename).absoluteFilePath()));
+    }
+}
+
+OdsDocWriter::OdsDocWriter(QIODevice * device) {
+    openDevice(device);
+}
+
+void OdsDocWriter::openDevice(QIODevice * device) {
+    //_p_device_delete = false;
+    _p_device = device;
+    _p_quaZip = new QuaZip(device);
+    bool open_ok = _p_quaZip->open(QuaZip::mdCreate);
+
+    if (open_ok == false) {
+        throw OdsException(QObject::tr("error opening ODS file."));
+    }
+    //QuaZipFile::open(): file open mode 2 incompatible with ZIP open mode 0
+    //QuaZip::close(): ZIP is not open
+
+
+    //_p_quaZip->setComment("application/vnd.oasis.opendocument.spreadsheet");
+    QByteArray* messageIn = new QByteArray();
+    *messageIn = "application/vnd.oasis.opendocument.spreadsheet";
+
+    QuaZipFile outFile(_p_quaZip);
+    QuaCrc32 crc32;
+    quint32  crc(crc32.calculate( *messageIn));
+    QuaZipNewInfo info("mimetype");
+    info.uncompressedSize = messageIn->length();
+    outFile.open(QIODevice::WriteOnly,info,NULL,crc,0,0,true);
+    outFile.write(*messageIn);
+    outFile.close();
+
+    delete (messageIn);
+
+    ManifestXml manifest(_p_quaZip);
+    MetaXml metaxml(_p_quaZip);
+    _p_content = new ContentXml(_p_quaZip);
+
+}
+
+
+OdsDocWriter::~OdsDocWriter()
+{
+    //this->close();
+    if (_p_content != nullptr) {
+        this->close();
+    }
+}
+
+/**
+* ends the document creation. It is required to obtain a correct output
+*
+*/
+void OdsDocWriter::close() {
+    qDebug() << "OdsDocWriter::close";
+    _p_content->close();
+    delete _p_content;
+    StylesXml stylesXml(_p_quaZip);
+    _p_quaZip->close();
+    delete _p_quaZip;
+
+    if (_p_device != nullptr) {
+        //_p_device->flush();
+        _p_device->close();
+    }
+    _p_content = nullptr;
+    _p_quaZip = nullptr;
+    //zipOutputStream = null;
+
+    if (_p_device != nullptr) {
+        if (_p_device_delete) {
+            qDebug() << "_p_device_delete";
+            delete _p_device;
+        }
+    }
+}
+
+
+/**
+ * adds a new datasheet to the document
+ *
+ * @param sheetName
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeSheet(const QString & sheetName) {
+    _p_content->writeSheet(sheetName);
+}
+
+/**
+ * adds a new line to the document
+ *
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeLine() {
+    _p_content->writeLine();
+}
+
+
+void OdsDocWriter::clearAnnotation() {
+    _next_annotation = "";
+}
+/**
+ * adds a new text cell to the document
+ *
+ * @param text
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeCell(const QString & text) {
+    _p_content->writeCell(text, _next_annotation);
+    clearAnnotation();
+//     if (text == null) {
+//         this.writeEmptyCell();
+//         return;
+//     }
+//     this.content.writeCell(text);
+}
+
+void OdsDocWriter::writeCell(const char * text) {
+    QString textQt(text);
+    _p_content->writeCell(textQt, _next_annotation);
+    clearAnnotation();
+//     if (text == null) {
+//         this.writeEmptyCell();
+//         return;
+//     }
+//     this.content.writeCell(text);
+}
+
+/**
+ * writes an empty cell
+ *
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeEmptyCell() {
+    _p_content->writeEmptyCell(_next_annotation);
+    clearAnnotation();
+    // this.content.writeCell("");
+}
+
+/**
+ * adds a new cell containing an integer
+ *
+ * @param value
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeCell(int value) {
+    _p_content->writeCell(value, _next_annotation);
+    clearAnnotation();
+    // this.content.writeCell(value);
+}
+
+/**
+ * adds a new cell containing a float
+ *
+ * @param value
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeCell(float value) {
+    _p_content->writeCell(value, _next_annotation);
+    clearAnnotation();
+    // this.content.writeCell(value);
+}
+
+/**
+ * adds a new cell containing a double
+ *
+ * @param value
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeCell(double value) {
+    _p_content->writeCell(value, _next_annotation);
+    clearAnnotation();
+    // this.content.writeCell(value);
+}
+
+/**
+ * adds a new cell containing a boolean
+ *
+ * @param value
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeCell(bool value) {
+    _p_content->writeCell(value, _next_annotation);
+    clearAnnotation();
+    //this.content.writeCell(value);
+}
+
+/**
+ * adds a new cell containing a date
+ *
+ * @param date
+ * @throws XMLStreamException
+ * @throws DatatypeConfigurationException
+ */
+void OdsDocWriter::writeCell(const QDate & date)  {
+    _p_content->writeCell(date, _next_annotation);
+    clearAnnotation();
+//     if (date == null) {
+//         this.writeEmptyCell();
+//         return;
+//     }
+//     this.content.writeCell(date);
+}
+
+/**
+ * adds a new cell containing a timestamp
+ *
+ * @param date
+ * @throws XMLStreamException
+ * @throws DatatypeConfigurationException
+ */
+void OdsDocWriter::writeCell(const QDateTime & date) {
+    _p_content->writeCell(date, _next_annotation);
+    clearAnnotation();
+//     if (date == null) {
+//         this.writeEmptyCell();
+//         return;
+//     }
+//     this.content.writeCell(new Date(date.getTime()));
+}
+
+/**
+ * NOT WORKING, adds a new cell containing a duration
+ *
+ * @param duration
+ * @throws XMLStreamException
+ * @throws DatatypeConfigurationException
+ */
+// void OdsDocWriter::writeCell(Duration duration)  {
+//     if (duration == null) {
+//         this.writeEmptyCell();
+//         return;
+//     }
+//     this.content.writeCell(duration);
+// }
+
+/**
+ * adds a new cell containing a text inside an href link
+ *
+ * @param theUri
+ * @param text
+ * @throws XMLStreamException
+ */
+void OdsDocWriter::writeCell(const QUrl & theUri, const QString & text)  {
+    _p_content->writeCell(theUri, text, _next_annotation);
+    clearAnnotation();
+}
+
+
+/**
+ * get a table cell style reference with a style definition
+ *
+ * @param style OdsTableCellStyle
+ * @return OdsTableCellStyleRef pointer on a style reference
+ */
+OdsTableCellStyleRef OdsDocWriter::getTableCellStyleRef(const OdsTableCellStyle & style) {
+
+    return _p_content->getTableCellStyleRef(style);
+}
+
+void OdsDocWriter::setTableCellStyleRef(OdsTableCellStyleRef style_ref) {
+    _p_content->setTableCellStyleRef(style_ref);
+}
+
+
+void OdsDocWriter::setCellAnnotation(const QString & annotation) {
+    _next_annotation = annotation;
+}
diff --git a/src/odsstream/odsdocwriter.h b/src/odsstream/odsdocwriter.h
new file mode 100644
index 0000000000000000000000000000000000000000..83a2deae605afa6065242c11364b768bf2874c7b
--- /dev/null
+++ b/src/odsstream/odsdocwriter.h
@@ -0,0 +1,68 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef ODSDOCWRITER_H
+#define ODSDOCWRITER_H
+
+#include <QIODevice>
+#include <QString>
+#include <QUrl>
+
+#include <quazip/quazip.h>
+#include "structure/contentxml.h"
+#include "calcwriterinterface.h"
+
+class OdsDocWriter: public CalcWriterInterface
+{
+public:
+    OdsDocWriter(const QString & filename);
+    OdsDocWriter(QIODevice * device);
+    virtual ~OdsDocWriter();
+
+    void close() override;
+
+    void writeSheet(const QString & sheetName) override;
+    void writeLine() override;
+    void writeCell(const char *) override;
+    void writeCell(const QString &) override;
+    void writeEmptyCell() override;
+    void writeCell(int) override;
+    void writeCell(float) override;
+    void writeCell(double)override;
+    void writeCell(bool) override;
+    void writeCell(const QDate &) override;
+    void writeCell(const QDateTime &) override;
+    void writeCell(const QUrl &, const QString &) override;
+    OdsTableCellStyleRef getTableCellStyleRef(const OdsTableCellStyle & style) override;
+    void setTableCellStyleRef(OdsTableCellStyleRef style_ref) override;
+    void setCellAnnotation(const QString & annotation) override;
+
+private:
+    void openDevice(QIODevice* device);
+    void clearAnnotation();
+private:
+    ContentXml * _p_content;
+    QuaZip * _p_quaZip;
+    QIODevice * _p_device = nullptr;
+    bool _p_device_delete = false;
+    QString _next_annotation;
+
+};
+
+#endif // ODSDOCWRITER_H
diff --git a/src/odsstream/odsexception.h b/src/odsstream/odsexception.h
new file mode 100644
index 0000000000000000000000000000000000000000..eb9d7016f3a09f65b9e6964b47fa166cb87a9a47
--- /dev/null
+++ b/src/odsstream/odsexception.h
@@ -0,0 +1,53 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef ODSEXCEPTION_H
+#define ODSEXCEPTION_H
+
+#include <exception>
+#include <string>
+#include <QString>
+
+class OdsException: public std::exception {
+public:
+  OdsException(QString message) throw () {
+    _message = message;
+  }
+  
+  /*mcqError(std::string message = "") throw () :
+    _message(message.c_str()) {
+    }*/
+  
+    
+  virtual const char * what() const throw () override {
+    return _message.toStdString().c_str();
+  }
+  
+  virtual const QString & qwhat() const throw () {
+    return _message;
+  }
+  
+  virtual ~OdsException() throw () {
+  }
+  
+ private:
+  QString _message; //Description de l'erreur
+};
+
+#endif // ODSEXCEPTION_H
diff --git a/src/odsstream/odstablecellstyle.cpp b/src/odsstream/odstablecellstyle.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5bb53229b460f733442448039ced0486862dbf12
--- /dev/null
+++ b/src/odsstream/odstablecellstyle.cpp
@@ -0,0 +1,37 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "odstablecellstyle.h"
+
+OdsTableCellStyle::OdsTableCellStyle()
+{
+
+}
+
+OdsTableCellStyle::~OdsTableCellStyle()
+{
+
+}
+
+void OdsTableCellStyle::setBackgroundColor(const QColor & qcolor) {
+  _background_color = qcolor;
+}
+void OdsTableCellStyle::setTextColor(const QColor & qcolor) {
+  _text_color = qcolor;
+}
diff --git a/src/odsstream/odstablecellstyle.h b/src/odsstream/odstablecellstyle.h
new file mode 100644
index 0000000000000000000000000000000000000000..a011e918a5724f1211c4094cb06532565b6b98e5
--- /dev/null
+++ b/src/odsstream/odstablecellstyle.h
@@ -0,0 +1,40 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef ODSTABLECELLSTYLE_H
+#define ODSTABLECELLSTYLE_H
+
+#include <QColor>
+class ContentXml;
+
+class OdsTableCellStyle
+{
+  friend class ContentXml;
+public:
+    OdsTableCellStyle();
+    ~OdsTableCellStyle();
+    void setBackgroundColor(const QColor & qcolor);
+    void setTextColor(const QColor & qcolor);
+
+private:
+    QColor _background_color;
+    QColor _text_color;
+};
+
+#endif // ODSTABLECELLSTYLE_H
diff --git a/src/odsstream/odstablecellstyleref.cpp b/src/odsstream/odstablecellstyleref.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..36435259ccdb59cded0f7cf57d8f937b7ed0ee48
--- /dev/null
+++ b/src/odsstream/odstablecellstyleref.cpp
@@ -0,0 +1,25 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "odstablecellstyleref.h"
+
+OdsTableCellStyleRefInternal::OdsTableCellStyleRefInternal(unsigned int ref_num)
+{
+  _ref_str = QString("odsce%1").arg(ref_num);
+}
diff --git a/src/odsstream/odstablecellstyleref.h b/src/odsstream/odstablecellstyleref.h
new file mode 100644
index 0000000000000000000000000000000000000000..0fc4f685f7804d81d1ca9e045cd93770d3fa1e58
--- /dev/null
+++ b/src/odsstream/odstablecellstyleref.h
@@ -0,0 +1,41 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef ODSTABLECELLSTYLEREF_H
+#define ODSTABLECELLSTYLEREF_H
+
+#include <QString>
+
+class ContentXml;
+class OdsTableCellStyleRefInternal;
+
+typedef OdsTableCellStyleRefInternal * OdsTableCellStyleRef;
+
+
+class OdsTableCellStyleRefInternal
+{
+    friend class ContentXml;
+private:
+    OdsTableCellStyleRefInternal(unsigned int ref_num);
+
+
+    QString _ref_str;
+};
+
+#endif // ODSTABLECELLSTYLEREF_H
diff --git a/src/odsstream/reader/odscell.cpp b/src/odsstream/reader/odscell.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f566d97db56fdc691592b36c82e32943c44c6f9d
--- /dev/null
+++ b/src/odsstream/reader/odscell.cpp
@@ -0,0 +1,127 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <QDebug>
+#include "odscell.h"
+#include "../odsexception.h"
+
+OdsCell::OdsCell()
+{
+
+}
+
+OdsCell::~OdsCell()
+{
+
+}
+
+void OdsCell::setOfficeValueType(const QString & type) {
+    if (type.isEmpty()) {
+        _is_empty = true;
+        qDebug() << "empty cell";
+        _office_value_type = "";
+    }
+    else {
+        _is_empty = false;
+        _office_value_type = type;
+    }
+    _string_value = "";
+};
+void OdsCell::setDateValue(const QDateTime & date) {
+    //   qDebug() << "setDateValue date.fromString " << date.toString(Qt::ISODate);
+    _date_value = date;
+    _string_value = date.toString();
+};
+
+void OdsCell::setValueString(const QString & value) {
+    _string_value = value;
+};
+void OdsCell::setValueDouble(double value_num) {
+    _double_value = value_num;
+    _string_value.setNum(value_num);
+};
+void OdsCell::setValueBoolean(bool value_bool) {
+    _bool_value = value_bool;
+    _string_value.setNum(value_bool);
+};
+
+const QString & OdsCell::toString() const {
+    //if (isDate()) return QString (_date_value.toString());
+    //if (isDouble()) return QString(""+_double_value);
+    return _string_value;
+};
+
+const QString & OdsCell::getOfficeValueType() const {
+    return _office_value_type;
+};
+
+const QDateTime & OdsCell::getDateTimeValue() const {
+    if (isDate()) {
+        return _date_value;
+    }
+    else {
+        throw OdsException(QObject::tr("this cell is not a date :\n").append(toString()));
+    }
+};
+const QString & OdsCell::getStringValue() const {
+    if (isString()) {
+        return _string_value;
+    }
+    else {
+        throw OdsException(QObject::tr("this cell is not a string :\n").append(toString()));
+    }
+};
+double OdsCell::getDoubleValue() const {
+    if (isDouble()) {
+        return _double_value;
+    }
+    else {
+        throw OdsException(QObject::tr("this cell is not a double :\n").append(toString()));
+    }
+};
+bool OdsCell::getBooleanValue() const {
+    if (isBoolean()) {
+        return _bool_value;
+    }
+    else {
+        throw OdsException(QObject::tr("this cell is not a boolean :\n").append(toString()));
+    }
+};
+bool OdsCell::isEmpty () const {
+    return _is_empty;
+};
+bool OdsCell::isDate () const {
+    if (_office_value_type == "date") return true;
+    return false;
+};
+bool OdsCell::isDouble () const {
+    if (_office_value_type == "float") return true;
+    return false;
+};
+bool OdsCell::isString () const {
+    if (isDate()) return false;
+    if (isDouble()) return false;
+    if (isBoolean()) return false;
+    if (isEmpty()) return false;
+    return true;
+};
+bool OdsCell::isBoolean () const {
+    if (_office_value_type == "boolean") return true;
+    return false;
+};
diff --git a/src/odsstream/reader/odscell.h b/src/odsstream/reader/odscell.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf42942cd4a2ade376732ce514becf332840fc81
--- /dev/null
+++ b/src/odsstream/reader/odscell.h
@@ -0,0 +1,64 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef ODSCELL_H
+#define ODSCELL_H
+
+#include <QString>
+#include <QDateTime>
+//#include <QDebug>
+class SaxHandlerContentXml;
+
+class OdsCell
+{
+friend SaxHandlerContentXml;
+
+public:
+    OdsCell();
+    virtual ~OdsCell();
+
+    const QString & toString() const;
+    const QString & getOfficeValueType() const;
+    const QDateTime & getDateTimeValue()const;
+    const QString & getStringValue()const;
+    bool getBooleanValue() const;
+    double getDoubleValue()const;
+    bool isBoolean () const ;
+    bool isDate () const ;
+    bool isDouble () const;
+    bool isString () const ;
+    bool isEmpty () const ;
+protected :
+ 
+    void setOfficeValueType(const QString & type);
+    void setDateValue(const QDateTime & date);
+    void setValueString(const QString & value);
+    void setValueDouble(double value_num);
+    void setValueBoolean(bool value_bool);
+
+    QString _string_value ;
+    QString _office_value_type;
+    QDateTime _date_value;
+    double _double_value;
+    bool _bool_value;
+    bool _is_empty;
+
+};
+
+#endif // ODSCELL_H
diff --git a/src/odsstream/saxreader/saxhandlercontentxml.cpp b/src/odsstream/saxreader/saxhandlercontentxml.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d3ce01ad1927b12b6953b049f41b6a2ae81899c3
--- /dev/null
+++ b/src/odsstream/saxreader/saxhandlercontentxml.cpp
@@ -0,0 +1,237 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "saxhandlercontentxml.h"
+#include <QDebug>
+
+SaxHandlerContentXml::SaxHandlerContentXml(OdsDocReader & ods_reader) : _ods_reader(ods_reader)
+{
+    qDebug() << "SaxHandlerContentXml::SaxHandlerContentXml begin ";
+
+}
+
+SaxHandlerContentXml::~SaxHandlerContentXml()
+{
+
+}
+
+
+bool
+SaxHandlerContentXml::startElement(
+    const QString &namespaceURI,
+    const QString &localName,
+    const QString &qName,
+    const QXmlAttributes &attributes)
+{
+
+    qDebug() << "SaxHandlerContentXml::startElement "<< qName;
+    _tag_stack.push_back(qName);
+    bool is_ok = true;
+
+    //startElement_rawdata
+    if (qName == "table:table")
+    {
+        //  is_ok = startElement_rawdata(attributes);
+        is_ok = start_element_table(attributes);
+    } else if (qName == "table:table-row")
+    {
+        is_ok = start_element_table_row(attributes);
+    }
+    else if (qName == "table:table-cell")
+    {
+        is_ok = start_element_table_cell(attributes);
+    }
+
+    _currentText.clear();
+    return is_ok;
+}
+
+
+bool
+SaxHandlerContentXml::endElement(
+    const QString &namespaceURI,
+    const QString &localName,
+    const QString &qName)
+{
+    bool is_ok = true;
+    // endElement_peptide_list
+    if (qName == "table:table")
+    {
+        is_ok = end_element_table();
+    }
+    // endElement_isotope_label
+    else if (qName == "table:table-row")
+    {
+        is_ok = end_element_table_row();
+    }
+    else if (qName == "text:p")
+    {
+        is_ok = end_element_p();
+    } else if (qName == "table:table-cell")
+    {
+        is_ok = end_element_table_cell();
+    }
+
+    _currentText.clear();
+    _tag_stack.pop_back();
+
+    return is_ok;
+}
+
+
+bool SaxHandlerContentXml::start_element_table_row(const QXmlAttributes &attributes) const {
+
+    _ods_reader.startLine();
+    return true;
+}
+
+bool SaxHandlerContentXml::end_element_table_row() const {
+
+    _ods_reader.endLine();
+    return true;
+}
+
+
+bool SaxHandlerContentXml::start_element_table(const QXmlAttributes &attributes) const {
+    QString spread_sheet_name = attributes.value("table:name");
+    if (spread_sheet_name.isEmpty())
+    {
+        //_errorStr = QObject::tr("spread_sheet_name is empty.");
+        //return false;
+    }
+    _ods_reader.startSheet(spread_sheet_name);
+    return true;
+}
+
+
+bool
+SaxHandlerContentXml::start_element_p(const QXmlAttributes &attributes) {
+    _is_in_paragraph = true;
+}
+
+
+bool
+SaxHandlerContentXml::end_element_p() {
+    _current_cell.setValueString(_currentText);
+}
+
+bool SaxHandlerContentXml::end_element_table() const {
+
+    _ods_reader.endSheet();
+    return true;
+}
+
+
+bool SaxHandlerContentXml::start_element_table_cell(const QXmlAttributes &attributes) {
+    _is_in_paragraph = false;
+
+
+    _number_columns_repeated = 1;
+    _current_cell.setOfficeValueType(attributes.value("office:value-type"));
+
+
+    // table:number-columns-repeated="2"
+    // <table:table-cell table:number-columns-repeated="2"
+    // office:value-type="string"><text:p>N.A.</text:p></table:table-cell>
+
+    if (!attributes.value("table:number-columns-repeated").isEmpty()) {
+        _number_columns_repeated = attributes.value("table:number-columns-repeated").toUInt();
+        // System.out.println("coucou " + numberColumnsRepeated);
+    }
+
+    if (!_current_cell.getOfficeValueType().isEmpty()) {
+
+        QString dateStr = attributes.value("office:date-value");
+        if (!dateStr.isEmpty()) {
+            //qDebug() << "dateStr " << dateStr;
+            QDateTime date(QDateTime::fromString(dateStr,Qt::ISODate));
+            // date.fromString(dateStr,Qt::ISODate);
+            //qDebug() << " date.fromString " << date.toString(Qt::ISODate);
+            _current_cell.setDateValue(date);
+        }
+
+
+        if (_current_cell.getOfficeValueType()=="float") {
+            /*
+             * writer.writeAttribute("office",
+             * hashNamespaceURI.get("office"), "value-type",
+             * "float"); writer.writeAttribute("office",
+             * hashNamespaceURI.get("office"), "value", value);
+             */
+            QString valueStr = attributes.value("office:value");
+            if (valueStr.isEmpty()) {
+                _errorStr = QObject::tr("office:value is null");
+                return false;
+            }
+            _current_cell.setValueDouble(valueStr.toDouble());
+        }
+        else if (_current_cell.getOfficeValueType()=="boolean") {
+            //office:boolean-value="false" calcext:value-type="boolean" office:value-type="boolean"
+            QString valueStr = attributes.value("office:boolean-value");
+            _current_cell.setValueBoolean(false);
+            if (valueStr.isEmpty()) {
+                _current_cell.setValueBoolean(false);
+            }
+            else if (valueStr == "true") {
+                _current_cell.setValueBoolean(true);
+            }
+        }
+    }
+    return true;
+}
+
+
+bool SaxHandlerContentXml::end_element_table_cell() {
+
+    while (_number_columns_repeated > 0) {
+        _ods_reader.setInsideCell(_current_cell);
+        _number_columns_repeated--;
+    }
+    return true;
+}
+
+
+
+bool
+SaxHandlerContentXml::characters(const QString &str)
+{
+    _currentText += str;
+    return true;
+}
+
+bool
+SaxHandlerContentXml::fatalError(const QXmlParseException &exception)
+{
+    _errorStr =
+        QObject::tr("Parse error at line %1, column %2:\n"
+                    "%3") .arg(exception.lineNumber()).arg(exception.columnNumber()).arg(exception.message());
+    return false;
+}
+
+QString
+SaxHandlerContentXml::errorString() const
+{
+    return _errorStr;
+}
+
+bool
+SaxHandlerContentXml::endDocument()
+{
+    return true;
+}
diff --git a/src/odsstream/saxreader/saxhandlercontentxml.h b/src/odsstream/saxreader/saxhandlercontentxml.h
new file mode 100644
index 0000000000000000000000000000000000000000..c8499bf9fd6b5bfdcd5a9916f6a9eecda09331be
--- /dev/null
+++ b/src/odsstream/saxreader/saxhandlercontentxml.h
@@ -0,0 +1,75 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef SAXHANDLERCONTENTXML_H
+#define SAXHANDLERCONTENTXML_H
+
+#include <QXmlDefaultHandler>
+#include <QString>
+#include <vector>
+#include "../odsdocreader.h"
+
+class SaxHandlerContentXml : public QXmlDefaultHandler
+{
+
+public:
+    SaxHandlerContentXml(OdsDocReader &);
+    virtual ~SaxHandlerContentXml();
+
+    bool startElement(const QString &namespaceURI, const QString &localName,
+                      const QString &qName, const QXmlAttributes &attributes);
+
+    bool endElement(const QString &namespaceURI, const QString &localName,
+                    const QString &qName);
+
+    bool endDocument();
+
+    bool characters(const QString &str);
+
+    bool fatalError(const QXmlParseException &exception);
+
+    QString errorString() const;
+
+private:
+    bool start_element_table_row(const QXmlAttributes &attributes) const;
+    bool end_element_table_row() const;
+    bool start_element_table(const QXmlAttributes &attributes) const;
+    bool end_element_table() const;
+    bool start_element_table_cell(const QXmlAttributes &attributes);
+    bool end_element_table_cell() ;
+    bool start_element_p(const QXmlAttributes &attributes);
+    bool end_element_p();
+    /// the error description variable
+    QString _errorStr;
+
+    QString _currentText;
+
+    std::vector<QString> _tag_stack;
+
+    OdsDocReader & _ods_reader;
+
+    bool _is_in_paragraph;
+
+    uint _number_columns_repeated;
+
+    OdsCell _current_cell;
+
+};
+
+#endif // SAXHANDLERCONTENTXML_H
diff --git a/src/odsstream/structure/contentxml.cpp b/src/odsstream/structure/contentxml.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0005eb21a6eba3263cb496b753085a2abea84751
--- /dev/null
+++ b/src/odsstream/structure/contentxml.cpp
@@ -0,0 +1,669 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <algorithm>
+#include "contentxml.h"
+#include "metaxml.h"
+#include "../odsexception.h"
+
+QString ContentXml::_xsdNamespaceURI = "http://www.w3.org/2001/XMLSchema";
+QString ContentXml::_xsiNamespaceURI = "http://www.w3.org/2001/XMLSchema-instance";
+
+ContentXml::ContentXml(QuaZip * p_quaZip): _outFile(p_quaZip) {
+    QuaZipNewInfo info("content.xml");
+    _outFile.open(QIODevice::WriteOnly,info);
+    _p_writer = new QXmlStreamWriter(&_outFile);
+    _p_writer->setAutoFormatting(true);
+    this->WriteHeader();
+}
+
+ContentXml::~ContentXml() {
+
+}
+
+void ContentXml::WriteHeader() {
+    _tableRowStarted = false;
+    _tableStarted = false;
+    _p_writer->writeStartDocument("UTF-8", "1.0");
+    /*
+     * <office:document-content office:version="1.2"
+     * xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
+     * xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+     * xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+     * xmlns:db="urn:oasis:names:tc:opendocument:xmlns:database:1.0"
+     * xmlns:dc="http://purl.org/dc/elements/1.1/"
+     * xmlns:dom="http://www.w3.org/2001/xml-events"
+     * xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+     * xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+     * xmlns:fo
+     * ="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+     * xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+     * xmlns:grddl="http://www.w3.org/2003/g/data-view#"
+     * xmlns:math="http://www.w3.org/1998/Math/MathML"
+     * xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+     * xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+     * xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
+     * xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+     * xmlns:ooo="http://openoffice.org/2004/office"
+     * xmlns:oooc="http://openoffice.org/2004/calc"
+     * xmlns:ooow="http://openoffice.org/2004/writer" xmlns:presentation=
+     * "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+     * xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+     * xmlns:
+     * smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
+     * xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+     * xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+     * xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+     * xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+     * xmlns:xforms="http://www.w3.org/2002/xforms"
+     * xmlns:xhtml="http://www.w3.org/1999/xhtml"
+     * xmlns:xlink="http://www.w3.org/1999/xlink"
+     * xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+     */
+    MetaXml::getNamespaceURI("office");
+    QHash<QString, QString>::iterator i;
+    for (i = MetaXml::_p_hashNamespaceURI->begin(); i != MetaXml::_p_hashNamespaceURI->end(); ++i) {
+        _p_writer->writeNamespace(i.value(), i.key());
+    }
+    // xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    _p_writer->writeNamespace(_xsdNamespaceURI,"xsd" );
+
+    // xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    _p_writer->writeNamespace(_xsiNamespaceURI, "xsi");
+
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "document-content");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"), "version", "1.2");
+
+
+
+    // <office:scripts/>
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "scripts");
+    _p_writer->writeEndElement();
+
+    // <office:font-face-decls>
+    writeFontFaceDecls();
+
+}
+
+
+void ContentXml::writeFontFaceDecls() {
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "font-face-decls");
+    /**
+     * <style:font-face style:font-family-generic="swiss"
+     * style:font-pitch="variable" style:name="Arial"
+     * svg:font-family="Arial"/>
+     * */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "font-face");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"font-family-generic", "swiss");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"font-pitch", "variable");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name","Arial");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("svg"),"font-family", "Arial");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeEndElement();
+}
+
+
+void ContentXml::startSpreadsheet() {
+
+    if (_spreadsheet_started) return;
+    _spreadsheet_started = true;
+
+    // <office:body>
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "body");
+    // <office:spreadsheet>
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "spreadsheet");
+}
+
+void ContentXml::writeAutomaticStyles() {
+
+    if (_automatic_styles_writed) return;
+    _automatic_styles_writed = true;
+
+    /*
+     * <office:automatic-styles>
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     *
+     * </office:automatic-styles>
+     */
+    /*
+     *
+     * <office:automatic-styles>
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "automatic-styles");
+    /*
+     * <style:style style:name="ce1" style:family="table-cell"
+     * style:parent-style-name="Default" style:data-style-name="N0" />
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name","ce1");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "family","table-cell");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"parent-style-name", "Default");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"data-style-name", "N0");
+    _p_writer->writeEndElement();
+
+    /*
+     * <style:style style:name="ce2" style:family="table-cell"
+     * style:parent-style-name="Default" style:data-style-name="N36" />
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name","ce2");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "family","table-cell");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"parent-style-name", "Default");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"data-style-name", "N36");
+    _p_writer->writeEndElement();
+    // <style:style style:name="co1" style:family="table-column">
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name","co1");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "family","table-column");
+
+    /*
+     * <style:table-column-properties fo:break-before="auto"
+     * style:column-width="2.27541666666667cm" />
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "table-column-properties");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("fo"), "break-before","auto");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"column-width", "2.27541666666667cm");
+    _p_writer->writeEndElement();
+    // </style:style>
+    _p_writer->writeEndElement();
+
+    // <style:style style:name="co2" style:family="table-column">
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name","co2");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "family","table-column");
+    // <style:table-column-properties
+    // fo:break-before="auto" style:column-width="2.11666666666667cm" />
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "table-column-properties");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("fo"), "break-before","auto");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"column-width", "2.27541666666667cm");
+    _p_writer->writeEndElement();
+    // </style:style>
+    _p_writer->writeEndElement();
+    // <style:style style:name="ro1" style:family="table-row">
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name","ro1");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "family","table-row");
+
+    // <style:table-row-properties
+    // style:row-height="15pt" style:use-optimal-row-height="true"
+    // fo:break-before="auto" />
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "table-row-properties");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"row-height", "15pt");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"use-optimal-row-height", "true");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("fo"), "break-before","auto");
+    _p_writer->writeEndElement();
+    // </style:style>
+    _p_writer->writeEndElement();
+
+    // <style:style style:name="ta1" style:family="table"
+    // style:master-page-name="mp1">
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name","ta1");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "family","table");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"master-page-name", "mp1");
+    // <style:table-properties table:display="true"
+    // style:writing-mode="lr-tb" />
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "table-properties");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"display", "true");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"writing-mode", "lr-tb");
+    _p_writer->writeEndElement();
+
+    // </style:style>
+    _p_writer->writeEndElement();
+
+    /*
+     *
+    <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N0">
+    <style:table-cell-properties fo:background-color="#ffff00"/>
+    <style:text-properties fo:color="#800000"/>
+    </style:style>
+    */
+
+    for (unsigned int i=0; i < _style2write.size(); i++) {
+        _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "name",_style_ref_list[i]->_ref_str);
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"), "family","table-cell");
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"parent-style-name", "Default");
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("style"),"data-style-name", "N0");
+
+        if (_style2write[i]._background_color.isValid()) {
+            _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "table-cell-properties");
+            _p_writer->writeAttribute(MetaXml::getNamespaceURI("fo"), "background-color",_style2write[i]._background_color.name());
+            _p_writer->writeEndElement();
+        }
+        if (_style2write[i]._text_color.isValid()) {
+            _p_writer->writeStartElement(MetaXml::getNamespaceURI("style"), "text-properties");
+            _p_writer->writeAttribute(MetaXml::getNamespaceURI("fo"), "color",_style2write[i]._text_color.name());
+            _p_writer->writeEndElement();
+        }
+
+        _p_writer->writeEndElement();
+    }
+    _p_writer->writeEndElement();
+}
+
+void ContentXml::close() {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    _p_writer->writeEndDocument();
+
+    this->_outFile.close();
+
+    delete _p_writer;
+
+}
+
+void ContentXml::writeSheet(const QString & tableName) {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    if (_tableRowStarted) {
+        _p_writer->writeEndElement();
+    }
+    if (_tableStarted) {
+        _p_writer->writeEndElement();
+    }
+    _tableStarted = true;
+    _tableRowStarted = false;
+
+    /*
+     * <table:table table:name="Feuille1" table:style-name="ta1"
+     * table:print="false">
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"), "name", tableName);
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ta1");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"), "print","false");
+
+    /*
+     * <table:table-column table:style-name="co1"
+     * table:default-cell-style-name="ce1" />
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-column");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "co1");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"default-cell-style-name", "ce1");
+    _p_writer->writeEndElement();
+
+}
+
+void ContentXml::writeLine() {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    if (_tableStarted == false) {
+        writeSheet();
+    }
+    if (_tableRowStarted) {
+        _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-cell");
+        _p_writer->writeEndElement();
+        _p_writer->writeEndElement();
+    }
+    _tableRowStarted = true;
+    /*
+     * <table:table-row table:style-name="ro1">
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-row");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ro1");
+
+}
+
+void ContentXml::writeSheet() {
+    writeSheet("default");
+}
+
+void ContentXml::writeCell(double value, const QString & annotation) {
+    writeCellFloat(QString::number(value, 'e', 20), QString::number(value, 'g', 20), annotation);
+}
+
+void ContentXml::writeCell(int value, const QString & annotation) {
+    QString representation(QString::number(value));
+    writeCellFloat(representation, representation, annotation);
+}
+
+void ContentXml::writeCellFloat(const QString & value,const QString & representation, const QString & annotation) {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    if (_tableRowStarted == false) {
+        writeLine();
+    }
+    /*
+     * <table:table-cell office:value-type="float" office:value="45">
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-cell");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"value-type", "float");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"value", value);
+    // table:style-name="ce1"
+    if (_current_style_ref != nullptr) {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", _current_style_ref->_ref_str);
+    }
+    else {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ce1");
+    }
+    /*
+     * <text:p>45</text:p>
+     */
+    writeAnnotation (annotation);
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "p");
+    _p_writer->writeCharacters(representation);
+    _p_writer->writeEndElement();
+
+    /*
+     * </table:table-cell>
+     */
+    _p_writer->writeEndElement();
+    /*
+     * </table:table-row> </table:table> </office:spreadsheet>
+     * </office:body>
+     */
+}
+
+
+void ContentXml::writeEmptyCell(const QString & annotation) {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    if (_tableRowStarted == false) {
+        writeLine();
+    }
+    /*
+     * <table:table-cell office:value-type="string">
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-cell");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"value-type", "string");
+    // table:style-name="ce1"
+    if (_current_style_ref != nullptr) {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", _current_style_ref->_ref_str);
+    }
+    else {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ce1");
+    }
+    /*
+     * <text:p>45</text:p>
+     */
+    writeAnnotation (annotation);
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "p");
+    _p_writer->writeCharacters("");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeEndElement();
+
+}
+
+
+void ContentXml::writeAnnotation(const QString & annotation) {
+    //<office:annotation draw:style-name="gr1" draw:text-style-name="P2"
+    //svg:width="28.99mm" svg:height="10.69mm" svg:x="96.48mm" svg:y="0mm"
+//draw:caption-point-x="-6.1mm" draw:caption-point-y="10.68mm"><dc:date>2016-08-19T00:00:00</dc:date>
+//<text:p text:style-name="P1">Ceci est un commentaire</text:p>
+//</office:annotation>
+    if (!annotation.isEmpty()) {
+        _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "annotation");
+        _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "p");
+        _p_writer->writeCharacters(annotation);
+        _p_writer->writeEndElement();
+
+        _p_writer->writeEndElement();//annotation
+    }
+}
+
+void ContentXml::writeCell(const QString & value, const QString & annotation) {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    if (_tableRowStarted == false) {
+        writeLine();
+    }
+    /*
+     * <table:table-cell office:value-type="string">
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-cell");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"value-type", "string");
+    // table:style-name="ce1"
+
+
+    if (_current_style_ref != nullptr) {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", _current_style_ref->_ref_str);
+    }
+    else {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ce1");
+    }
+    /*
+     * <text:p>45</text:p>
+     */
+    writeAnnotation (annotation);
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "p");
+    _p_writer->writeCharacters(value);
+    _p_writer->writeEndElement();
+
+    _p_writer->writeEndElement();
+
+}
+
+void ContentXml::writeCell(const QDateTime & cal, const QString & annotation) {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+
+    if (_tableRowStarted == false) {
+        writeLine();
+    }
+    //cal..setTimezone(0);
+    /*
+     * <table:table-cell office:value-type="date"
+     * office:date-value="2011-07-16"
+     * ><text:p>16/07/11</text:p></table:table-cell>
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-cell");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"value-type", "date");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"date-value", cal.toString("yyyy-MM-dd'T'HH:mm:ss"));
+    // table:style-name="ce1"
+    if (_current_style_ref != nullptr) {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", _current_style_ref->_ref_str);
+    }
+    else {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ce2");
+    }
+    /*
+     * <text:p>45</text:p>
+     */
+    writeAnnotation (annotation);
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "p");
+    // writer.writeCharacters(cal.getDay()+"/"+cal.getMonth()+"/11");
+    _p_writer->writeCharacters(cal.toString("dd/MM/yyyy"));
+    _p_writer->writeEndElement();
+
+    /*
+     * </table:table-cell>
+     */
+    _p_writer->writeEndElement();
+    /*
+     * </table:table-row> </table:table> </office:spreadsheet>
+     * </office:body>
+     */
+
+}
+
+void ContentXml::writeCell(const QDate & date, const QString & annotation) {
+
+    QDateTime dateTime(date);
+
+    writeCell(dateTime, annotation);
+
+}
+
+void ContentXml::writeCell(bool value, const QString & annotation) {
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    if (_tableRowStarted == false) {
+        writeLine();
+    }
+    /*
+     * <table:table-cell office:value-type="date"
+     * office:date-value="2011-07-16"
+     * ><text:p>16/07/11</text:p></table:table-cell>
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-cell");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"value-type", "boolean");
+    if (_current_style_ref != nullptr) {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", _current_style_ref->_ref_str);
+    }
+    else {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ce1");
+    }
+
+    QString bvalue = "false";
+    if (value) {
+        bvalue = "true";
+    }
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"boolean-value", bvalue);
+    writeAnnotation(annotation);
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "p");
+    _p_writer->writeCharacters(bvalue);
+    _p_writer->writeEndElement();
+
+    /*
+     * </table:table-cell>
+     */
+    _p_writer->writeEndElement();
+}
+
+// public void writeCell(Duration duration) throws XMLStreamException {
+//     if (duration == null) {
+//         this.writeCell("");
+//     } else {
+//         if (this.tableRowStarted == false) {
+//             this.writeLine();
+//         }
+//         /*
+//          * <table:table-cell office:value-type="date"
+//          * office:date-value="2011-07-16"
+//          * ><text:p>16/07/11</text:p></table:table-cell>
+//          */
+//         writer.writeStartElement("table", "table-cell",
+//         hashNamespaceURI.get("table"));
+//         writer.writeAttribute("office", hashNamespaceURI.get("office"),
+//         "value-type", "time");
+//         writer.writeAttribute("office", hashNamespaceURI.get("office"),
+//         "time-value", duration.toString());
+//         writer.writeAttribute("table", hashNamespaceURI.get("table"),
+//         "style-name", "ce2");
+//         /*
+//          * <text:p>12:00:00</text:p>
+//          */
+//         writer.writeStartElement("text", "p", hashNamespaceURI.get("text"));
+//         writer.writeCharacters(duration.getHours() + ":"
+//         + duration.getMinutes() + ":" + duration.getSeconds());
+//         writer.writeEndElement();
+//
+//         /*
+//          * </table:table-cell>
+//          */
+//         writer.writeEndElement();
+//         /*
+//          * </table:table-row> </table:table> </office:spreadsheet>
+//          * </office:body>
+//          */
+//     }
+// }
+
+void ContentXml::writeCell(const QUrl & theUri, const QString & description, const QString & annotation) {
+    // <table:table-cell office:value-type="string"><text:p><text:a
+    // xlink:href="http://linuxfr.org/">linuxfr</text:a></text:p></table:table-cell>
+
+    writeAutomaticStyles();
+    startSpreadsheet();
+
+    if (_tableRowStarted == false) {
+        writeLine();
+    }
+    /*
+     * <table:table-cell office:value-type="string">
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("table"), "table-cell");
+    if (_current_style_ref != nullptr) {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", _current_style_ref->_ref_str);
+    }
+    else {
+        _p_writer->writeAttribute(MetaXml::getNamespaceURI("table"),"style-name", "ce1");
+    }
+
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"value-type", "string");
+    
+    writeAnnotation(annotation);
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "p");
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("text"), "a");
+    // xlink:href="http://linuxfr.org/"
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("xlink"), "href",theUri.toString());
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("xlink"), "type","simple");
+    _p_writer->writeCharacters(description);
+    _p_writer->writeEndElement();
+    _p_writer->writeEndElement();
+
+    _p_writer->writeEndElement();
+
+
+
+}
+
+OdsTableCellStyleRef ContentXml::getTableCellStyleRef(const OdsTableCellStyle & style) {
+    if (_automatic_styles_writed) {
+        throw OdsException(QObject::tr("unable to get style reference : styles already written"));
+    }
+
+    _style2write.push_back(style);
+
+    OdsTableCellStyleRef _p_ref = new OdsTableCellStyleRefInternal(_style2write.size());
+    _style_ref_list.push_back(_p_ref);
+    return _p_ref;
+}
+
+
+void ContentXml::setTableCellStyleRef(OdsTableCellStyleRef style_ref) {
+    if (style_ref != nullptr) {
+        auto it = find (_style_ref_list.begin(), _style_ref_list.end(), style_ref);
+        if (it == _style_ref_list.end()) {
+            throw OdsException(QObject::tr("this style reference was not registered in this document"));
+        }
+    }
+
+    _current_style_ref = style_ref;
+}
diff --git a/src/odsstream/structure/contentxml.h b/src/odsstream/structure/contentxml.h
new file mode 100644
index 0000000000000000000000000000000000000000..c16b9097d76a2ad378e599efcea5a333f943aebe
--- /dev/null
+++ b/src/odsstream/structure/contentxml.h
@@ -0,0 +1,85 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef CONTENTXML_H
+#define CONTENTXML_H
+
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
+#include <QXmlStreamWriter>
+#include <QUrl>
+#include <QDate>
+#include <QDateTime>
+#include "../odstablecellstyle.h"
+#include "../odstablecellstyleref.h"
+
+
+
+
+class ContentXml
+{
+public :
+    ContentXml(QuaZip * p_quaZip);
+    virtual ~ContentXml();
+    void writeSheet(const QString & sheetName);
+    void writeCell(double value, const QString & annotation);
+    void writeCell(int value, const QString & annotation);
+    void writeCell(const QString & value, const QString & annotation);
+    void writeCell(const QDate &, const QString & annotation);
+    void writeCell(const QDateTime &, const QString & annotation);
+    void writeCell(const QUrl &, const QString &, const QString & annotation);
+    void writeCell(bool value, const QString & annotation);
+    void writeEmptyCell(const QString & annotation);
+    void writeLine();
+    void close();
+    
+    OdsTableCellStyleRef getTableCellStyleRef(const OdsTableCellStyle & style);
+    void setTableCellStyleRef(OdsTableCellStyleRef style_ref);
+private:
+    void writeCellFloat(const QString & value, const QString & representation, const QString & annotation);
+    void writeSheet();
+
+    void WriteHeader();
+    void writeFontFaceDecls();
+    void writeAutomaticStyles();
+    void startSpreadsheet();
+    void writeAnnotation(const QString & annotation);
+
+    QuaZipFile _outFile;
+
+    static QString _xsdNamespaceURI;
+    static QString _xsiNamespaceURI;
+
+
+    QuaZip * _p_quaZip;
+    QXmlStreamWriter * _p_writer;
+
+    bool _tableStarted;
+
+    bool _tableRowStarted;
+    bool _automatic_styles_writed = false;
+    bool _spreadsheet_started =false;
+    std::vector< OdsTableCellStyle > _style2write;
+    std::vector< OdsTableCellStyleRef > _style_ref_list;
+    OdsTableCellStyleRefInternal * _current_style_ref=nullptr;
+
+
+};
+
+#endif // CONTENTXML_H
diff --git a/src/odsstream/structure/manifestxml.cpp b/src/odsstream/structure/manifestxml.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4156e4e7ccb3ba6dd6838c24925438b4358d5053
--- /dev/null
+++ b/src/odsstream/structure/manifestxml.cpp
@@ -0,0 +1,98 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "manifestxml.h"
+#include <QXmlStreamWriter>
+
+#include <quazip/quazipfile.h>
+
+QString ManifestXml::_namespaceURI = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
+
+ManifestXml::ManifestXml(QuaZip * p_quaZip): _p_quaZip(p_quaZip)
+{
+    QuaZipFile outFile(_p_quaZip);
+    QuaZipNewInfo info("META-INF/manifest.xml");
+    outFile.open(QIODevice::WriteOnly,info);
+    _p_writer = new QXmlStreamWriter(&outFile);
+    _p_writer->setAutoFormatting(true);
+
+    this->WriteHeader();
+
+    _p_writer->writeStartElement(_namespaceURI, "file-entry");
+    _p_writer->writeAttribute(_namespaceURI, "full-path", "/");
+    _p_writer->writeAttribute(_namespaceURI, "media-type", "application/vnd.oasis.opendocument.spreadsheet");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeStartElement(_namespaceURI, "file-entry");
+    _p_writer->writeAttribute(_namespaceURI, "full-path", "styles.xml");
+    _p_writer->writeAttribute(_namespaceURI, "media-type", "text/xml");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeStartElement(_namespaceURI, "file-entry");
+    _p_writer->writeAttribute(_namespaceURI, "full-path", "content.xml");
+    _p_writer->writeAttribute(_namespaceURI, "media-type", "text/xml");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeStartElement(_namespaceURI, "file-entry");
+    _p_writer->writeAttribute(_namespaceURI, "full-path", "meta.xml");
+    _p_writer->writeAttribute(_namespaceURI, "media-type", "text/xml");
+    _p_writer->writeEndElement();
+
+    //<manifest:file-entry manifest:full-path="mimetype"
+    //manifest:media-type="text/plain" />
+    _p_writer->writeStartElement(_namespaceURI, "file-entry");
+    _p_writer->writeAttribute(_namespaceURI, "full-path", "mimetype");
+    _p_writer->writeAttribute(_namespaceURI, "media-type", "text/plain");
+    _p_writer->writeEndElement();
+
+    //<manifest:file-entry manifest:full-path="META-INF/manifest.xml"
+    //		manifest:media-type="text/xml" />
+    _p_writer->writeStartElement(_namespaceURI,"file-entry");
+    _p_writer->writeAttribute(_namespaceURI, "full-path", "META-INF/manifest.xml");
+    _p_writer->writeAttribute(_namespaceURI, "media-type", "text/xml");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeEndDocument();
+    
+    delete _p_writer;
+    
+    outFile.close();
+}
+
+ManifestXml::~ManifestXml()
+{
+
+}
+
+void ManifestXml::WriteHeader()  {
+    _p_writer->writeStartDocument("UTF-8", "1.0");
+    //<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2" >
+    _p_writer->writeNamespace(_namespaceURI, "manifest");
+    _p_writer->writeStartElement(_namespaceURI, "manifest");
+    //_p_writer->setPrefix("manifest", namespaceURI);
+    //_p_writer->setDefaultNamespace(namespaceURI);
+    //_p_writer->writeStartElement("mzXML");
+
+    //_p_writer->writeAttribute(xmlnsxsi, "schemaLocation", xsischemaLocation);
+
+
+    //not compatible with MS office 2010 :
+    //_p_writer->writeAttribute("manifest", namespaceURI, "version", "1.2");
+
+}
diff --git a/src/odsstream/structure/manifestxml.h b/src/odsstream/structure/manifestxml.h
new file mode 100644
index 0000000000000000000000000000000000000000..ff3fd9b477a5cabf8fe36abeec41db59b4d1a027
--- /dev/null
+++ b/src/odsstream/structure/manifestxml.h
@@ -0,0 +1,41 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#ifndef MANIFESTXML_H
+#define MANIFESTXML_H
+
+#include <quazip/quazip.h>
+#include <QXmlStreamWriter>
+
+class ManifestXml
+{
+
+public:
+    ManifestXml(QuaZip * p_quaZip);
+    virtual ~ManifestXml();
+private:
+    static QString _namespaceURI;
+    void WriteHeader();
+
+    QuaZip * _p_quaZip;
+    QXmlStreamWriter * _p_writer;
+};
+
+#endif // MANIFESTXML_H
diff --git a/src/odsstream/structure/metaxml.cpp b/src/odsstream/structure/metaxml.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..13df78294e7db5e8cce4fd64a1d3336e6f37cbf9
--- /dev/null
+++ b/src/odsstream/structure/metaxml.cpp
@@ -0,0 +1,151 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "metaxml.h"
+#include <QDateTime>
+
+#include <quazip/quazipfile.h>
+QHash<QString, QString> * MetaXml::_p_hashNamespaceURI = new  QHash<QString, QString>();
+
+const QString & MetaXml::getNamespaceURI(const QString & xml_namespace) {
+    if (_p_hashNamespaceURI->size() == 0) {
+        _p_hashNamespaceURI->insert("anim","urn:oasis:names:tc:opendocument:xmlns:animation:1.0");
+        _p_hashNamespaceURI->insert("chart",
+                                    "urn:oasis:names:tc:opendocument:xmlns:chart:1.0");
+        _p_hashNamespaceURI->insert("config",
+                                    "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
+        _p_hashNamespaceURI->insert("db",
+                                    "urn:oasis:names:tc:opendocument:xmlns:database:1.0");
+        _p_hashNamespaceURI->insert("dc",
+                                    "http://purl.org/dc/elements/1.1/");
+        _p_hashNamespaceURI->insert("dr3d",
+                                    "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0");
+        _p_hashNamespaceURI->insert("draw",
+                                    "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
+        _p_hashNamespaceURI->insert("fo",
+                                    "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+        _p_hashNamespaceURI->insert("form",
+                                    "urn:oasis:names:tc:opendocument:xmlns:form:1.0");
+        _p_hashNamespaceURI->insert("grddl",
+                                    "http://www.w3.org/2003/g/data-view#");
+        _p_hashNamespaceURI->insert("math",
+                                    "http://www.w3.org/1998/Math/MathML");
+        _p_hashNamespaceURI->insert("meta",
+                                    "urn:oasis:names:tc:opendocument:xmlns:meta:1.0");
+        _p_hashNamespaceURI->insert("number",
+                                    "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0");
+        _p_hashNamespaceURI->insert("of",
+                                    "urn:oasis:names:tc:opendocument:xmlns:of:1.2");
+        _p_hashNamespaceURI->insert("office",
+                                    "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+        _p_hashNamespaceURI->insert("ooo",
+                                    "http://openoffice.org/2004/office");
+        _p_hashNamespaceURI->insert("presentation",
+                                    "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0");
+        _p_hashNamespaceURI->insert("script",
+                                    "urn:oasis:names:tc:opendocument:xmlns:script:1.0");
+        _p_hashNamespaceURI->insert("smil",
+                                    "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0");
+        _p_hashNamespaceURI->insert("style",
+                                    "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
+        _p_hashNamespaceURI->insert("svg",
+                                    "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+        _p_hashNamespaceURI->insert("table",
+                                    "urn:oasis:names:tc:opendocument:xmlns:table:1.0");
+        _p_hashNamespaceURI->insert("text",
+                                    "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+        _p_hashNamespaceURI->insert("xforms",
+                                    "http://www.w3.org/2002/xforms");
+        _p_hashNamespaceURI->insert("xhtml","http://www.w3.org/1999/xhtml");
+        _p_hashNamespaceURI->insert("xlink","http://www.w3.org/1999/xlink");
+
+    }
+    return _p_hashNamespaceURI->operator[](xml_namespace);
+}
+
+
+MetaXml::MetaXml(QuaZip * p_quaZip): _p_quaZip(p_quaZip)
+{
+    QuaZipFile outFile(_p_quaZip);
+    QuaZipNewInfo info("meta.xml");
+    outFile.open(QIODevice::WriteOnly,info);
+    _p_writer = new QXmlStreamWriter(&outFile);
+    _p_writer->setAutoFormatting(true);
+
+    this->WriteHeader();
+
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "meta");
+
+    /*
+     * see RFC2616, or 3.1.1 in the oasis doc : meta:generator
+     */
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("meta"), "generator");
+    _p_writer->writeCharacters("LibOdsStream/0.0.1");
+    _p_writer->writeEndElement();
+
+    QDateTime currentdate (QDateTime::currentDateTime());
+
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("meta"), "creation-date");
+    _p_writer->writeCharacters(currentdate.toString("yyyy-MM-dd'T'HH:mm:ss"));
+    _p_writer->writeEndElement();
+
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("dc"), "date");
+    _p_writer->writeCharacters(currentdate.toString("yyyy-MM-dd'T'HH:mm:ss"));
+    _p_writer->writeEndElement();
+
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("meta"), "editing-cycles");
+    _p_writer->writeCharacters("1");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("meta"), "editing-duration");
+    _p_writer->writeCharacters("PT0.602S");
+    _p_writer->writeEndElement();
+
+    _p_writer->writeEndDocument();
+
+    delete _p_writer;
+
+    outFile.close();
+}
+
+void MetaXml::WriteHeader() {
+    _p_writer->writeStartDocument("UTF-8", "1.0");
+    MetaXml::getNamespaceURI("office");
+    QHash<QString, QString>::iterator i;
+    for (i = MetaXml::_p_hashNamespaceURI->begin(); i != MetaXml::_p_hashNamespaceURI->end(); ++i) {
+        _p_writer->writeNamespace(i.value(), i.key());
+    }
+
+    // <manifest:manifest
+    // xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
+    // manifest:version="1.2" >
+    _p_writer->writeStartElement(MetaXml::getNamespaceURI("office"), "document-meta");
+    _p_writer->writeAttribute(MetaXml::getNamespaceURI("office"),"version", "1.2");
+    // writer.setPrefix("manifest", namespaceURI);
+    // writer.setDefaultNamespace(namespaceURI);
+    // writer.writeStartElement("mzXML");
+
+}
+
+
+MetaXml::~MetaXml()
+{
+
+}
+
diff --git a/src/odsstream/structure/metaxml.h b/src/odsstream/structure/metaxml.h
new file mode 100644
index 0000000000000000000000000000000000000000..81cda0cc928cf39ed704b94a00efcc8a9c71ed0b
--- /dev/null
+++ b/src/odsstream/structure/metaxml.h
@@ -0,0 +1,44 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef METAXML_H
+#define METAXML_H
+
+#include <QHash>
+#include <quazip/quazip.h>
+#include <QXmlStreamWriter>
+class MetaXml
+{
+
+public:
+    MetaXml(QuaZip * p_quaZip);
+    virtual ~MetaXml();
+
+    static const QString & getNamespaceURI(const QString & xml_namespace);
+    static QHash<QString, QString> * _p_hashNamespaceURI ;
+private:
+
+    void WriteHeader();
+
+    QuaZip * _p_quaZip;
+    QXmlStreamWriter * _p_writer;
+};
+
+#endif // METAXML_H
+
diff --git a/src/odsstream/structure/stylesxml.cpp b/src/odsstream/structure/stylesxml.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d1454b88b83a447a27a51b5c97cac2372f43b1d5
--- /dev/null
+++ b/src/odsstream/structure/stylesxml.cpp
@@ -0,0 +1,312 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "metaxml.h"
+#include "stylesxml.h"
+#include <quazip/quazipfile.h>
+
+QHash<QString, QString> * StylesXml::_p_hashNamespaceURI = new  QHash<QString, QString>();
+
+const QString & StylesXml::getNamespaceURI(const QString & xml_namespace) {
+    if (_p_hashNamespaceURI->size() == 0) {
+        _p_hashNamespaceURI->insert("chart", "urn:oasis:names:tc:opendocument:xmlns:chart:1.0");
+        _p_hashNamespaceURI->insert("dc", "http://purl.org/dc/elements/1.1/");
+        _p_hashNamespaceURI->insert("dr3d", "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0");
+        _p_hashNamespaceURI->insert("draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
+        _p_hashNamespaceURI->insert("fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+        _p_hashNamespaceURI->insert("form", "urn:oasis:names:tc:opendocument:xmlns:form:1.0");
+        _p_hashNamespaceURI->insert("grddl", "http://www.w3.org/2003/g/data-view#");
+        _p_hashNamespaceURI->insert("math", "http://www.w3.org/1998/Math/MathML");
+        _p_hashNamespaceURI->insert("meta","urn:oasis:names:tc:opendocument:xmlns:meta:1.0");
+        _p_hashNamespaceURI->insert("number", "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0");
+        _p_hashNamespaceURI->insert("of","urn:oasis:names:tc:opendocument:xmlns:of:1.2");
+        _p_hashNamespaceURI->insert("office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+        _p_hashNamespaceURI->insert("ooo", "http://openoffice.org/2004/office");
+        _p_hashNamespaceURI->insert("presentation", "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0");
+        _p_hashNamespaceURI->insert("script", "urn:oasis:names:tc:opendocument:xmlns:script:1.0");
+        _p_hashNamespaceURI->insert("style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
+        _p_hashNamespaceURI->insert("svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+        _p_hashNamespaceURI->insert("table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0");
+        _p_hashNamespaceURI->insert("text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+        _p_hashNamespaceURI->insert("xhtml","http://www.w3.org/1999/xhtml");
+        _p_hashNamespaceURI->insert("xlink","http://www.w3.org/1999/xlink");
+        // * xmlns:ooow="http://openoffice.org/2004/writer"
+        _p_hashNamespaceURI->insert("ooow", "http://openoffice.org/2004/writer");
+        // * xmlns:oooc="http://openoffice.org/2004/calc"
+        _p_hashNamespaceURI->insert("oooc", "http://openoffice.org/2004/calc");
+        // * xmlns:dom="http://www.w3.org/2001/xml-events"
+        _p_hashNamespaceURI->insert("dom", "http://www.w3.org/2001/xml-events");
+        // * xmlns:rpt="http://openoffice.org/2005/report"
+        _p_hashNamespaceURI->insert("rpt", "http://openoffice.org/2005/report");
+        // * xmlns:tableooo="http://openoffice.org/2009/table"
+        _p_hashNamespaceURI->insert("tableooo", "http://openoffice.org/2009/table");
+        // * xmlns:css3t="http://www.w3.org/TR/css3-text/"
+        _p_hashNamespaceURI->insert("css3t", "http://www.w3.org/TR/css3-text/");
+
+    }
+    return _p_hashNamespaceURI->operator[](xml_namespace);
+}
+
+StylesXml::StylesXml(QuaZip * p_quaZip)
+{
+    QuaZipFile outFile(p_quaZip);
+    QuaZipNewInfo info("styles.xml");
+    outFile.open(QIODevice::WriteOnly,info);
+    QXmlStreamWriter writer (&outFile);
+    writer.setAutoFormatting(true);
+
+    this->WriteHeader(writer);
+    this->WriteFontFaceDecls(writer);
+
+    // <office:styles>
+    this->WriteOfficeStyles(writer);
+
+    // <office:automatic-styles>
+    this->WriteAutomaticStyles(writer);
+
+    // <office:master-styles>
+    this->WriteMasterStyles(writer);
+    writer.writeEndDocument();
+    outFile.close();
+}
+
+StylesXml::~StylesXml()
+{
+
+}
+
+
+void StylesXml::WriteHeader(QXmlStreamWriter & writer) {
+    writer.writeStartDocument("UTF-8", "1.0");
+    /*
+     * <?xml version="1.0" encoding="UTF-8"?> <office:document-styles
+     * office:version="1.2" grddl
+     * :transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl"
+     * >
+     */
+
+    StylesXml::getNamespaceURI("office");
+    QHash<QString, QString>::iterator i;
+    for (i = StylesXml::_p_hashNamespaceURI->begin(); i != StylesXml::_p_hashNamespaceURI->end(); ++i) {
+        writer.writeNamespace(i.value(), i.key());
+    }
+    writer.writeStartElement(StylesXml::getNamespaceURI("office"), "document-styles");
+    writer.writeAttribute(StylesXml::getNamespaceURI("office"), "version", "1.2");
+    writer.writeAttribute(StylesXml::getNamespaceURI("grddl"), "transformation","http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl");
+
+
+}
+
+void StylesXml::WriteFontFaceDecls(QXmlStreamWriter & writer) {
+    /*
+     *
+     * <office:font-face-decls>
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("office"), "font-face-decls");
+    /*
+     * <style:font-face style:name="Arial" svg:font-family="Arial"
+     * style:font-family-generic="swiss" style:font-pitch="variable"/>
+     */
+    // Arial
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "font-face");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),
+                          "name", "Arial");
+    writer.writeAttribute(StylesXml::getNamespaceURI("svg"),
+                          "font-family", "Arial");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),
+                          "font-family-generic", "swiss");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),
+                          "font-pitch", "variable");
+    writer.writeEndElement();
+
+    /*
+     * </office:font-face-decls>
+     */
+    writer.writeEndElement();
+}
+
+void StylesXml::WriteOfficeStyles(QXmlStreamWriter & writer) {
+    // <office:styles>
+    writer.writeStartElement(MetaXml::getNamespaceURI("office"), "styles");
+
+    /*
+     * <number:number-style style:name="N0"><number:number
+     * number:min-integer-digits="1"/></number:number-style>
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "number-style");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),
+                          "name", "N0");
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "number");
+    writer.writeAttribute(StylesXml::getNamespaceURI("number"), "min-integer-digits", "1");
+    writer.writeEndElement();
+    writer.writeEndElement();
+
+    /*
+     * <number:date-style
+     * style:name="N36"><number:day/><number:text>/</number
+     * :text><number:month/><number:text>/</number:text> <number:year/>
+     * </number:date-style>
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "date-style");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"), "name", "N36");
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "day");
+    writer.writeEndElement();
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "text");
+    writer.writeCharacters("/");
+    writer.writeEndElement();
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "month");
+    writer.writeEndElement();
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "text");
+    writer.writeCharacters("/");
+    writer.writeEndElement();
+    writer.writeStartElement(MetaXml::getNamespaceURI("number"), "year");
+    writer.writeEndElement();
+    writer.writeEndElement();
+
+    /*
+     *
+     *
+     *
+     *
+     *
+     *
+     */
+    /*
+     * <style:style style:name="Default" style:family="table-cell"
+     * style:data-style-name="N0">
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "style");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"name", "Default");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"family", "table-cell");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"data-style-name", "N0");
+    /*
+     * <style:table-cell-properties style:vertical-align="automatic"
+     * fo:background-color="transparent" />
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "table-cell-properties");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"vertical-align", "automatic");
+    writer.writeAttribute(StylesXml::getNamespaceURI("fo"),"background-color", "transparent");
+    writer.writeEndElement();
+
+    /*
+     * <style:text-properties fo:color="#000000" style:font-name="Calibri"
+     * style:font-name-asian="Calibri" style:font-name-complex="Calibri"
+     * fo:font-size="11pt" style:font-size-asian="11pt"
+     * style:font-size-complex="11pt" />
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "text-properties");
+    writer.writeAttribute(StylesXml::getNamespaceURI("fo"),"color", "#000000");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"font-name", "Arial");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"font-name-asian", "Arial");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"font-name-complex", "Arial");
+    writer.writeAttribute(StylesXml::getNamespaceURI("fo"),"font-size", "11pt");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"font-size-asian", "11pt");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"font-size-complex", "11pt");
+    writer.writeEndElement();
+
+    // </style:style>
+    writer.writeEndElement();
+
+    // <style:default-style style:family="graphic">
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "default-style");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"family", "graphic");
+    /*
+     * <style:graphic-properties draw:fill="solid" draw:fill-color="#4f81bd"
+     * draw:opacity="100%" draw:stroke="solid" svg:stroke-width="0.02778in"
+     * svg:stroke-color="#385d8a" svg:stroke-opacity="100%" />
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "graphic-properties");
+    writer.writeAttribute(StylesXml::getNamespaceURI("draw"),"fill", "solid");
+    writer.writeAttribute(StylesXml::getNamespaceURI("draw"),"fill-color", "#4f81bd");
+    writer.writeAttribute(StylesXml::getNamespaceURI("draw"),"opacity", "100%");
+    writer.writeAttribute(StylesXml::getNamespaceURI("draw"),"stroke", "solid");
+    writer.writeAttribute(StylesXml::getNamespaceURI("svg"),"stroke-width", "0.02778in");
+    writer.writeAttribute(StylesXml::getNamespaceURI("svg"),"stroke-color", "#385d8a");
+    writer.writeAttribute(StylesXml::getNamespaceURI("svg"),"stroke-opacity", "100%");
+    writer.writeEndElement();
+
+    // </style:default-style>
+    writer.writeEndElement();
+
+    writer.writeEndElement();
+
+}
+
+void StylesXml::WriteAutomaticStyles(QXmlStreamWriter & writer)  {
+    /*
+     *
+     * <style:header-style> <style:header-footer-properties
+     * fo:min-height="0.45in" fo:margin-left="0.7in" fo:margin-right="0.7in"
+     * fo:margin-bottom="0in" /> </style:header-style> <style:footer-style>
+     * <style:header-footer-properties fo:min-height="0.45in"
+     * fo:margin-left="0.7in" fo:margin-right="0.7in" fo:margin-top="0in" />
+     * </style:footer-style> </style:page-layout> </office:automatic-styles>
+     */
+    /*
+     * <office:automatic-styles> <style:page-layout style:name="pm1">
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("office"), "automatic-styles");
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "master-page");
+    /*
+     * <style:page-layout-properties fo:margin-top="0.3in"
+     * fo:margin-bottom="0.3in" fo:margin-left="0.7in"
+     * fo:margin-right="0.7in" style:table-centering="none"
+     * style:print="objects charts drawings" />
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "page-layout-properties");
+    writer.writeAttribute(StylesXml::getNamespaceURI("fo"),"margin-top", "0.3in");
+    writer.writeAttribute(StylesXml::getNamespaceURI("fo"),"margin-bottom", "0.3in");
+    writer.writeAttribute(StylesXml::getNamespaceURI("fo"),"margin-left", "0.7in");
+    writer.writeAttribute(StylesXml::getNamespaceURI("fo"),"margin-right", "0.7in");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"table-centering", "none");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"print", "objects charts drawings");
+    writer.writeEndElement();
+
+    writer.writeEndElement();
+    writer.writeEndElement();
+
+}
+
+
+void StylesXml::WriteMasterStyles(QXmlStreamWriter & writer) {
+    /*
+     *
+     *
+     * <office:master-styles> <style:master-page style:name="mp1"
+     * style:page-layout-name="pm1"> <style:header /> <style:header-left
+     * style:display="false" /> <style:footer /> <style:footer-left
+     * style:display="false" /> </style:master-page> </office:master-styles>
+     */
+    writer.writeStartElement(MetaXml::getNamespaceURI("office"), "master-styles");
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "master-page");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"name", "mp1");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"page-layout-name", "pm1");
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"), "header");
+    writer.writeEndElement();
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"),"header-left");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"display", "false");
+    writer.writeEndElement();
+    writer.writeStartElement(MetaXml::getNamespaceURI("style"),"footer-left");
+    writer.writeAttribute(StylesXml::getNamespaceURI("style"),"display", "false");
+    writer.writeEndElement();
+    writer.writeEndElement();
+    writer.writeEndElement();
+}
+
+
diff --git a/src/odsstream/structure/stylesxml.h b/src/odsstream/structure/stylesxml.h
new file mode 100644
index 0000000000000000000000000000000000000000..9a2e2bb726e8672f01d707b102daf3f1947ae729
--- /dev/null
+++ b/src/odsstream/structure/stylesxml.h
@@ -0,0 +1,42 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef STYLESXML_H
+#define STYLESXML_H
+#include <quazip/quazip.h>
+#include <QXmlStreamWriter>
+#include <QHash>
+
+class StylesXml
+{
+
+public:
+    StylesXml(QuaZip * p_quaZip);
+    virtual ~StylesXml();
+    static const QString & getNamespaceURI(const QString & xml_namespace);
+private:
+    static QHash<QString, QString> * _p_hashNamespaceURI ;
+    void WriteHeader(QXmlStreamWriter & writer);
+    void WriteFontFaceDecls(QXmlStreamWriter & writer);
+    void WriteOfficeStyles(QXmlStreamWriter & writer);
+    void WriteAutomaticStyles(QXmlStreamWriter & writer);
+    void WriteMasterStyles(QXmlStreamWriter & writer);
+};
+
+#endif // STYLESXML_H
diff --git a/src/odsstream/tsvdirectorywriter.cpp b/src/odsstream/tsvdirectorywriter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..8676f1f9c117f0425f87d509ccfb01eaa14190ca
--- /dev/null
+++ b/src/odsstream/tsvdirectorywriter.cpp
@@ -0,0 +1,129 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <QFileInfo>
+#include <QDebug>
+#include "tsvdirectorywriter.h"
+#include "odsexception.h"
+
+
+TsvDirectoryWriter::TsvDirectoryWriter()
+{
+}
+
+TsvDirectoryWriter::TsvDirectoryWriter(const QDir & directory): _directory(directory)
+{
+    if (_directory.exists()) {
+    } else {
+        if (!_directory.mkdir(_directory.absolutePath())) {
+            throw OdsException(QString("unable to create output directory %1").arg(_directory.absolutePath()));
+        }
+    }
+}
+
+TsvDirectoryWriter::~TsvDirectoryWriter()
+{
+    close();
+}
+
+void TsvDirectoryWriter::close() {
+    if (_p_otxtstream != nullptr) {
+        _p_otxtstream->flush();
+	//_p_otxtstream->close();
+        delete (_p_otxtstream);
+        _p_otxtstream = nullptr;
+    }
+    if (_p_ofile != nullptr) {
+      _p_ofile->flush();
+        _p_ofile->close();
+        delete (_p_ofile);
+        _p_ofile = nullptr;
+    }
+}
+
+void TsvDirectoryWriter::writeSheet(const QString & sheetName) {
+    close();
+    // qDebug() << " TsvDirectoryWriter::writeSheet " <<  _directory.absolutePath();
+    _p_ofile = new QFile( QString(_directory.absolutePath()).append("/").append(sheetName).append(this->_file_extension) );
+    // qDebug() << " TsvDirectoryWriter::writeSheet " << QFileInfo(*_p_ofile).absoluteFilePath();
+    if (_p_ofile->open(QIODevice::WriteOnly) )
+    {
+        _p_otxtstream = new  QTextStream ( _p_ofile);
+    }
+    else {
+        throw OdsException(QString("unable to write into file %1").arg(QFileInfo(*_p_ofile).absoluteFilePath()));
+    }
+}
+
+
+void TsvDirectoryWriter::ensureSheet() {
+    if (_p_otxtstream == nullptr) {
+        writeSheet("default");
+    }
+}
+
+void TsvDirectoryWriter::writeLine() {
+    ensureSheet();
+    *_p_otxtstream << _end_of_line;
+    _tableRowStart = true;
+}
+void TsvDirectoryWriter::writeCell(const char * cstr) {
+    writeCell( QString(cstr));
+}
+void TsvDirectoryWriter::writeCell(const QString & text) {
+    ensureSheet();
+    if (!_tableRowStart) {
+        *_p_otxtstream << _separator;
+    }
+    _tableRowStart = false;
+    *_p_otxtstream << text;
+}
+void TsvDirectoryWriter::writeEmptyCell()  {
+    ensureSheet();
+    if (!_tableRowStart) {
+        *_p_otxtstream << _separator;
+    }
+    _tableRowStart = false;
+}
+void TsvDirectoryWriter::writeCell(int num)  {
+    writeCell( QString::number(num, 'g', 10));
+}
+void TsvDirectoryWriter::writeCell(float num) {
+    writeCell( QString::number(num, 'g', numFloatPrecision));
+}
+void TsvDirectoryWriter::writeCell(double num) {
+    writeCell( QString::number(num, 'g', numFloatPrecision));
+}
+void TsvDirectoryWriter::writeCell(bool isOk) {
+    if (isOk) {
+        writeCell( QString("T"));
+    }
+    else {
+        writeCell( QString("F"));
+    }
+}
+void TsvDirectoryWriter::writeCell(const QDate & date)  {
+    writeCell( date.toString("yyyy-MM-dd"));
+}
+void TsvDirectoryWriter::writeCell(const QDateTime & date)  {
+    writeCell( date.toString("yyyy-MM-ddThh:mm:ss"));
+}
+void TsvDirectoryWriter::writeCell(const QUrl & url, const QString & text) {
+    writeCell( text);
+}
diff --git a/src/odsstream/tsvdirectorywriter.h b/src/odsstream/tsvdirectorywriter.h
new file mode 100644
index 0000000000000000000000000000000000000000..c7c0a587b9f898486adff7451300061019794cbc
--- /dev/null
+++ b/src/odsstream/tsvdirectorywriter.h
@@ -0,0 +1,74 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef TSVDIRECTORYWRITER_H
+#define TSVDIRECTORYWRITER_H
+
+
+#include <QString>
+#include <QUrl>
+#include <QDate>
+#include <QDir>
+#include <QTextStream>
+#include <QFile>
+#include "calcwriterinterface.h"
+
+class TsvDirectoryWriter: public CalcWriterInterface
+{
+public:
+    TsvDirectoryWriter(const QDir & directory);
+    ~TsvDirectoryWriter();
+
+    void close() override;
+
+    void writeSheet(const QString & sheetName) override;
+    void writeLine() override;
+    void writeCell(const char *) override;
+    void writeCell(const QString &) override;
+    void writeEmptyCell() override;
+    void writeCell(int) override;
+    void writeCell(float) override;
+    void writeCell(double)override;
+    void writeCell(bool) override;
+    void writeCell(const QDate &) override;
+    void writeCell(const QDateTime &) override;
+    void writeCell(const QUrl &, const QString &) override;
+    void setCellAnnotation(const QString & annotation) override{};
+
+protected:
+    TsvDirectoryWriter();
+    QString _separator = "\t";
+    QString _end_of_line = "\n";
+    QTextStream * _p_otxtstream = nullptr;
+    unsigned int numFloatPrecision = 12;
+
+private:
+    const QDir _directory;
+
+    QString _file_extension = ".tsv";
+
+    bool _tableRowStart = true;
+
+    QFile * _p_ofile = nullptr;
+    void ensureSheet();
+
+
+};
+
+#endif // TSVDIRECTORYWRITER_H
diff --git a/src/odsstream/tsvoutputstream.cpp b/src/odsstream/tsvoutputstream.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..29abe237db047dde1d7ec177fff5033986477255
--- /dev/null
+++ b/src/odsstream/tsvoutputstream.cpp
@@ -0,0 +1,42 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "tsvoutputstream.h"
+
+TsvOutputStream::TsvOutputStream(QTextStream & otxtstream):TsvDirectoryWriter()
+{
+    _p_otxtstream = &otxtstream;
+}
+
+TsvOutputStream::~TsvOutputStream()
+{
+    //close();
+    _p_otxtstream = nullptr;
+}
+
+void TsvOutputStream::close() {
+    _p_otxtstream->flush();
+}
+
+
+void TsvOutputStream::writeSheet(const QString & sheetName) {
+
+    *_p_otxtstream << _end_of_line << _end_of_line << "**** " << sheetName << " ****"<< _end_of_line;
+
+}
diff --git a/src/odsstream/tsvoutputstream.h b/src/odsstream/tsvoutputstream.h
new file mode 100644
index 0000000000000000000000000000000000000000..6a23a7b0b45bc3f59f6e30d57ba8824fa7e61b53
--- /dev/null
+++ b/src/odsstream/tsvoutputstream.h
@@ -0,0 +1,36 @@
+/*
+    libodsstream is a library to read and write ODS documents as streams
+    Copyright (C) 2013  Olivier Langella <Olivier.Langella@moulon.inra.fr>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef TSVOUTPUTSTREAM_H
+#define TSVOUTPUTSTREAM_H
+
+#include "tsvdirectorywriter.h"
+
+class TsvOutputStream: public TsvDirectoryWriter
+{
+public:
+    TsvOutputStream(QTextStream & otxtstream);
+    ~TsvOutputStream();
+
+    void close() override;
+    void writeSheet(const QString & sheetName) override;
+
+};
+
+#endif // TSVOUTPUTSTREAM_H
diff --git a/src/test/TestReader.java b/src/test/TestReader.java
deleted file mode 100644
index eafdd01ba8ad1f341105b6eb0273579dd3763e34..0000000000000000000000000000000000000000
--- a/src/test/TestReader.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Olivier Langella <Olivier.Langella@moulon.inra.fr>.
- * 
- * This file is part of libOdsStream.
- * 
- *     libOdsStream is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     libOdsStream is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with libOdsStream.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     Olivier Langella <Olivier.Langella@moulon.inra.fr> - initial API and implementation
- ******************************************************************************/
-
-package test;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import fr.inra.pappso.libodsstream.OdsDocReader;
-import fr.inra.pappso.libodsstream.reader.OdsCell;
-import fr.inra.pappso.libodsstream.reader.OdsSheet;
-
-public class TestReader extends OdsDocReader {
-	public TestReader(String inputFilename) throws IOException {
-		super(inputFilename);
-	}
-
-	public TestReader(InputStream in) throws IOException {
-		super(in);
-	}
-
-	@Override
-	public void startSheet(OdsSheet sheet) throws Exception {
-		System.out
-				.println("****************** Start sheet *********************");
-		System.out.println("****************** " + sheet.getName()
-				+ " *********************");
-	}
-
-	@Override
-	public void endSheet() throws Exception {
-		System.out
-				.println("****************** End sheet *********************");
-	}
-
-	@Override
-	public void startLine() throws Exception {
-		System.out
-				.println("****************** Start Line *********************");
-	}
-
-	@Override
-	public void endLine() throws Exception {
-		System.out.println("****************** End Line *********************");
-	}
-
-	@Override
-	public void setCell(OdsCell cell) throws Exception {
-
-		try {
-			if (cell.isEmpty()) {
-				System.out
-						.println("****************** Cell is empty *********************");
-			} else {
-				if (cell.getStringValue() != null) {
-					System.out.println("******************  string : "
-							+ cell.getStringValue() + " *********************");
-				} else if (cell.getDateValue() != null) {
-					System.out.println("****************** date : "
-							+ cell.getDateValue().getTime()
-							+ " *********************");
-				} else if (cell.getDoubleValue() != null) {
-					System.out.println("****************** float : "
-							+ cell.getDoubleValue() + " *********************");
-				}
-			}
-			System.out.println("***************************************");
-		} catch (Exception e) {
-			throw new Exception("ERROR in setCell(OdsCell cell) : "
-					+ e.getMessage());
-		}
-	}
-}
diff --git a/src/test/odsstream/META-INF/manifest.xml b/src/test/odsstream/META-INF/manifest.xml
deleted file mode 100644
index 55860d7385b0f39582499e893510200a29bdb09a..0000000000000000000000000000000000000000
--- a/src/test/odsstream/META-INF/manifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
-	manifest:version="1.2">
-	<manifest:file-entry manifest:full-path="/"
-		manifest:media-type="application/vnd.oasis.opendocument.spreadsheet"></manifest:file-entry>
-	<manifest:file-entry manifest:full-path="styles.xml"
-		manifest:media-type="text/xml"></manifest:file-entry>
-	<manifest:file-entry manifest:full-path="content.xml"
-		manifest:media-type="text/xml"></manifest:file-entry>
-	<manifest:file-entry manifest:full-path="meta.xml"
-		manifest:media-type="text/xml"></manifest:file-entry>
-	<manifest:file-entry manifest:full-path="mimetype"
-		manifest:media-type="text/plain"></manifest:file-entry>
-	<manifest:file-entry manifest:full-path="META-INF/manifest.xml"
-		manifest:media-type="text/xml"></manifest:file-entry>
-</manifest:manifest>
\ No newline at end of file
diff --git a/src/test/odsstream/content.xml b/src/test/odsstream/content.xml
deleted file mode 100644
index 5ec3fc2feedbc654920dc4f9d302edb0fcfaa893..0000000000000000000000000000000000000000
--- a/src/test/odsstream/content.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content office:version="1.2"
-	xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-	xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
-	xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-	xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-	xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:db="urn:oasis:names:tc:opendocument:xmlns:database:1.0"
-	xmlns:ooo="http://openoffice.org/2004/office" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-	xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-	xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-	xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-	xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<office:scripts></office:scripts>
-	<office:font-face-decls>
-		<style:font-face style:font-family-generic="swiss"
-			style:font-pitch="variable" style:name="Arial" svg:font-family="Arial"></style:font-face>
-	</office:font-face-decls>
-	<office:automatic-styles>
-		<style:style style:name="ce1" style:family="table-cell"
-			style:parent-style-name="Default" style:data-style-name="N0"></style:style>
-		<style:style style:name="ce2" style:family="table-cell"
-			style:parent-style-name="Default" style:data-style-name="N36"></style:style>
-		<style:style style:name="co1" style:family="table-column">
-			<style:table-column-properties
-				fo:break-before="auto" style:column-width="2.27541666666667cm"></style:table-column-properties>
-		</style:style>
-		<style:style style:name="co2" style:family="table-column">
-			<style:table-column-properties
-				fo:break-before="auto" style:column-width="2.27541666666667cm"></style:table-column-properties>
-		</style:style>
-		<style:style style:name="ro1" style:family="table-row">
-			<style:table-row-properties
-				style:row-height="15pt" style:use-optimal-row-height="true"
-				fo:break-before="auto"></style:table-row-properties>
-		</style:style>
-		<style:style style:name="ta1" style:family="table"
-			style:master-page-name="mp1">
-			<style:table-properties table:display="true"
-				style:writing-mode="lr-tb"></style:table-properties>
-		</style:style>
-	</office:automatic-styles>
-	<office:body>
-		<office:spreadsheet>
-			<table:table table:name="new datasheet" table:style-name="ta1"
-				table:print="false">
-				<table:table-column table:style-name="co1"
-					table:default-cell-style-name="ce1"></table:table-column>
-				<table:table-row table:style-name="ro1">
-					<table:table-cell table:style-name="ce1"
-						office:value-type="string">
-						<text:p>
-							<text:a xlink:href="http://linuxfr.org/" xlink:type="simple">linux
-								fr</text:a>
-						</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="float"
-						office:value="43.0" table:style-name="ce1">
-						<text:p>43.0</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="date"
-						office:date-value="2011-09-19T15:45:33.196Z" table:style-name="ce2">
-						<text:p>19/9/2011</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="float"
-						office:value="45.15111111" table:style-name="ce1">
-						<text:p>45.15111111</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="boolean"
-						table:style-name="ce1" office:boolean-value="true">
-						<text:p></text:p>
-					</table:table-cell>
-				</table:table-row>
-			</table:table>
-			<table:table table:name="test2" table:style-name="ta1"
-				table:print="false">
-				<table:table-column table:style-name="co1"
-					table:default-cell-style-name="ce1"></table:table-column>
-				<table:table-row table:style-name="ro1">
-					<table:table-cell></table:table-cell>
-				</table:table-row>
-				<table:table-row table:style-name="ro1">
-					<table:table-cell office:value-type="string"
-						table:style-name="ce1">
-						<text:p>hello413453</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="string"
-						table:style-name="ce1">
-						<text:p>hello2</text:p>
-					</table:table-cell>
-				</table:table-row>
-			</table:table>
-		</office:spreadsheet>
-	</office:body>
-</office:document-content>
\ No newline at end of file
diff --git a/src/test/odsstream/meta.xml b/src/test/odsstream/meta.xml
deleted file mode 100644
index 9f5669646800fdcf280e88350366fc0b40641d87..0000000000000000000000000000000000000000
--- a/src/test/odsstream/meta.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-meta office:version="1.2"
-	xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-	xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
-	xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-	xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-	xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:db="urn:oasis:names:tc:opendocument:xmlns:database:1.0"
-	xmlns:ooo="http://openoffice.org/2004/office" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-	xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-	xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-	xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-	xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0">
-	<office:meta>
-		<meta:generator>LibOdsStream/0.0.1</meta:generator>
-		<meta:creation-date>2011-09-19T15:45:33</meta:creation-date>
-		<dc:date>2011-09-19T15:45:33</dc:date>
-		<meta:editing-cycles>1</meta:editing-cycles>
-		<meta:editing-duration>PT0.602S</meta:editing-duration>
-	</office:meta>
-</office:document-meta>
\ No newline at end of file
diff --git a/src/test/odsstream/mimetype b/src/test/odsstream/mimetype
deleted file mode 100644
index 78a49cc53504fc5f84a2d29658c3e3cbb7f13234..0000000000000000000000000000000000000000
--- a/src/test/odsstream/mimetype
+++ /dev/null
@@ -1 +0,0 @@
-application/vnd.oasis.opendocument.spreadsheet
\ No newline at end of file
diff --git a/src/test/odsstream/styles.xml b/src/test/odsstream/styles.xml
deleted file mode 100644
index e78d3dd99750fe3cbc23223a1d2909e5c3272c94..0000000000000000000000000000000000000000
--- a/src/test/odsstream/styles.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-styles office:version="1.2"
-	grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl"
-	xmlns:ooow="http://openoffice.org/2004/writer" xmlns:rpt="http://openoffice.org/2005/report"
-	xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xhtml="http://www.w3.org/1999/xhtml"
-	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-	xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-	xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ooo="http://openoffice.org/2004/office"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-	xmlns:tableooo="http://openoffice.org/2009/table" xmlns:css3t="http://www.w3.org/TR/css3-text/"
-	xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-	xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-	xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-	xmlns:oooc="http://openoffice.org/2004/calc">
-	<office:font-face-decls>
-		<style:font-face style:name="Arial" svg:font-family="Arial"
-			style:font-family-generic="swiss" style:font-pitch="variable"></style:font-face>
-	</office:font-face-decls>
-	<office:styles>
-		<number:number-style style:name="N0">
-			<number:number number:min-integer-digits="1"></number:number>
-		</number:number-style>
-		<number:date-style style:name="N36">
-			<number:day></number:day>
-			<number:text>/</number:text>
-			<number:month></number:month>
-			<number:text>/</number:text>
-			<number:year></number:year>
-		</number:date-style>
-		<style:style style:name="Default" style:family="table-cell"
-			style:data-style-name="N0">
-			<style:table-cell-properties
-				style:vertical-align="automatic" fo:background-color="transparent"></style:table-cell-properties>
-			<style:text-properties fo:color="#000000"
-				style:font-name="Arial" style:font-name-asian="Arial"
-				style:font-name-complex="Arial" fo:font-size="11pt"
-				style:font-size-asian="11pt" style:font-size-complex="11pt"></style:text-properties>
-		</style:style>
-		<style:default-style style:family="graphic">
-			<style:graphic-properties draw:fill="solid"
-				draw:fill-color="#4f81bd" draw:opacity="100%" draw:stroke="solid"
-				svg:stroke-width="0.02778in" svg:stroke-color="#385d8a"
-				svg:stroke-opacity="100%"></style:graphic-properties>
-		</style:default-style>
-	</office:styles>
-	<office:automatic-styles>
-		<style:master-page>
-			<style:page-layout-properties
-				fo:margin-top="0.3in" fo:margin-bottom="0.3in" fo:margin-left="0.7in"
-				fo:margin-right="0.7in" style:table-centering="none"
-				style:print="objects charts drawings"></style:page-layout-properties>
-		</style:master-page>
-	</office:automatic-styles>
-	<office:master-styles>
-		<style:master-page style:name="mp1"
-			style:page-layout-name="pm1">
-			<style:header></style:header>
-			<style:header-left style:display="false"></style:header-left>
-			<style:footer-left style:display="false"></style:footer-left>
-		</style:master-page>
-	</office:master-styles>
-</office:document-styles>
\ No newline at end of file
diff --git a/src/test/office_2010/META-INF/manifest.xml b/src/test/office_2010/META-INF/manifest.xml
deleted file mode 100644
index 2cb98c3ecde028dcb9e4085c0b5abdddbb1ec6e1..0000000000000000000000000000000000000000
--- a/src/test/office_2010/META-INF/manifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-	<manifest:file-entry manifest:full-path="/"
-		manifest:media-type="application/vnd.oasis.opendocument.spreadsheet" />
-	<manifest:file-entry manifest:full-path="styles.xml"
-		manifest:media-type="text/xml" />
-	<manifest:file-entry manifest:full-path="content.xml"
-		manifest:media-type="text/xml" />
-	<manifest:file-entry manifest:full-path="meta.xml"
-		manifest:media-type="text/xml" />
-	<manifest:file-entry manifest:full-path="mimetype"
-		manifest:media-type="text/plain" />
-	<manifest:file-entry manifest:full-path="META-INF/manifest.xml"
-		manifest:media-type="text/xml" />
-</manifest:manifest>
\ No newline at end of file
diff --git a/src/test/office_2010/content.xml b/src/test/office_2010/content.xml
deleted file mode 100644
index 79a7a2e1f8155438b10e97f9e919ba37851551ae..0000000000000000000000000000000000000000
--- a/src/test/office_2010/content.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<office:document-content
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-	xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-	xmlns:msoxl="http://schemas.microsoft.com/office/excel/formula">
-	<office:font-face-decls>
-		<style:font-face style:name="Calibri" svg:font-family="Calibri" />
-	</office:font-face-decls>
-
-	<office:automatic-styles>
-		<style:style style:name="ce1" style:family="table-cell"
-			style:parent-style-name="Default" style:data-style-name="N0" />
-		<style:style style:name="ce2" style:family="table-cell"
-			style:parent-style-name="Default" style:data-style-name="N36" />
-		<style:style style:name="ce3" style:family="table-cell"
-			style:parent-style-name="Default" style:data-style-name="N19" />
-		<style:style style:name="co1" style:family="table-column">
-			<style:table-column-properties
-				fo:break-before="auto" style:column-width="2.27541666666667cm" />
-		</style:style>
-		<style:style style:name="co2" style:family="table-column">
-			<style:table-column-properties
-				fo:break-before="auto" style:column-width="2.11666666666667cm" />
-		</style:style>
-		<style:style style:name="co3" style:family="table-column">
-			<style:table-column-properties
-				fo:break-before="auto" style:column-width="5.000625cm" />
-		</style:style>
-		<style:style style:name="ro1" style:family="table-row">
-			<style:table-row-properties
-				style:row-height="15pt" style:use-optimal-row-height="true"
-				fo:break-before="auto" />
-		</style:style>
-		<style:style style:name="ta1" style:family="table"
-			style:master-page-name="mp1">
-			<style:table-properties table:display="true"
-				style:writing-mode="lr-tb" />
-		</style:style>
-		<style:style style:name="ta2" style:family="table"
-			style:master-page-name="mp2">
-			<style:table-properties table:display="true"
-				style:writing-mode="lr-tb" />
-		</style:style>
-	</office:automatic-styles>
-
-	<office:body>
-		<office:spreadsheet>
-			<table:calculation-settings
-				table:case-sensitive="false"
-				table:search-criteria-must-apply-to-whole-cell="false" />
-			<table:table table:name="new_datasheet" table:style-name="ta1">
-				<table:table-column table:style-name="co1"
-					table:default-cell-style-name="ce1" />
-				<table:table-column table:style-name="co2"
-					table:default-cell-style-name="ce1" />
-				<table:table-column table:style-name="co3"
-					table:default-cell-style-name="ce1" />
-				<table:table-column table:style-name="co2"
-					table:number-columns-repeated="16381"
-					table:default-cell-style-name="ce1" />
-				<table:table-row table:style-name="ro1">
-					<table:table-cell office:value-type="string"
-						table:style-name="ce1">
-						<text:p>
-							<text:a xlink:href="http://linuxfr.org/">linux fr</text:a>
-						</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="float"
-						office:value="42" table:style-name="ce1">
-						<text:p>42</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="date"
-						office:date-value="2001-02-14T00:00:00" table:style-name="ce3">
-						<text:p>14/02/2001</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="float"
-						office:value="45.151111110000002" table:style-name="ce1">
-						<text:p>45,15111111</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="boolean"
-						office:boolean-value="true" table:style-name="ce1">
-						<text:p>VRAI</text:p>
-					</table:table-cell>
-					<table:table-cell table:number-columns-repeated="16379" />
-				</table:table-row>
-				<table:table-row table:number-rows-repeated="1048575"
-					table:style-name="ro1">
-					<table:table-cell table:number-columns-repeated="16384" />
-				</table:table-row>
-			</table:table>
-			<table:table table:name="test2" table:style-name="ta2">
-				<table:table-column table:style-name="co1"
-					table:default-cell-style-name="ce1" />
-				<table:table-column table:style-name="co2"
-					table:number-columns-repeated="16383"
-					table:default-cell-style-name="ce1" />
-				<table:table-row table:style-name="ro1">
-					<table:table-cell table:number-columns-repeated="16384" />
-				</table:table-row>
-				<table:table-row table:style-name="ro1">
-					<table:table-cell office:value-type="string"
-						table:style-name="ce1">
-						<text:p>hello413453</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="string"
-						table:style-name="ce1">
-						<text:p>hello2</text:p>
-					</table:table-cell>
-					<table:table-cell office:value-type="float"
-						office:value="0" table:formula="msoxl:=#N/A" table:style-name="ce2">
-						<text:p>#N/A</text:p>
-					</table:table-cell>
-					<table:table-cell table:number-columns-repeated="16381" />
-				</table:table-row>
-				<table:table-row table:number-rows-repeated="1048574"
-					table:style-name="ro1">
-					<table:table-cell table:number-columns-repeated="16384" />
-				</table:table-row>
-			</table:table>
-		</office:spreadsheet>
-	</office:body>
-</office:document-content>
diff --git a/src/test/office_2010/meta.xml b/src/test/office_2010/meta.xml
deleted file mode 100644
index a69a47582d51aaaefcf74be399b19fdb37975199..0000000000000000000000000000000000000000
--- a/src/test/office_2010/meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:xlink="http://www.w3.org/1999/xlink" office:version="1.1">
-	<office:meta>
-		<meta:generator>MicrosoftOffice/14.0
-			MicrosoftExcel/CalculationVersion-9302</meta:generator>
-		<meta:initial-creator>pappso</meta:initial-creator>
-		<dc:creator>pappso</dc:creator>
-		<meta:creation-date>2011-04-29T16:12:28Z</meta:creation-date>
-		<dc:date>2011-09-19T08:46:48Z</dc:date>
-		<meta:editing-cycles>1</meta:editing-cycles>
-		<meta:editing-duration>PT0S</meta:editing-duration>
-	</office:meta>
-</office:document-meta>
\ No newline at end of file
diff --git a/src/test/office_2010/mimetype b/src/test/office_2010/mimetype
deleted file mode 100644
index 78a49cc53504fc5f84a2d29658c3e3cbb7f13234..0000000000000000000000000000000000000000
--- a/src/test/office_2010/mimetype
+++ /dev/null
@@ -1 +0,0 @@
-application/vnd.oasis.opendocument.spreadsheet
\ No newline at end of file
diff --git a/src/test/office_2010/styles.xml b/src/test/office_2010/styles.xml
deleted file mode 100644
index 583fc280dde93079038e6f00ccd7da7810e7c6c5..0000000000000000000000000000000000000000
--- a/src/test/office_2010/styles.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<office:document-styles
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-	xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-	xmlns:msoxl="http://schemas.microsoft.com/office/excel/formula">
-	<office:font-face-decls>
-		<style:font-face style:name="Calibri" svg:font-family="Calibri" />
-	</office:font-face-decls>
-	<office:styles>
-		<number:number-style style:name="N0">
-			<number:number number:min-integer-digits="1" />
-		</number:number-style>
-		<number:date-style style:name="N19">
-			<number:day number:style="long" />
-			<number:text>/</number:text>
-			<number:month number:style="long" />
-			<number:text>/</number:text>
-			<number:year number:style="long" />
-		</number:date-style>
-		<number:date-style style:name="N36">
-			<number:day />
-			<number:text>/</number:text>
-			<number:month />
-			<number:text>/</number:text>
-			<number:year />
-		</number:date-style>
-		<style:style style:name="Default" style:family="table-cell"
-			style:data-style-name="N0">
-			<style:table-cell-properties
-				style:vertical-align="automatic" fo:background-color="transparent" />
-			<style:text-properties fo:color="#000000"
-				style:font-name="Calibri" style:font-name-asian="Calibri"
-				style:font-name-complex="Calibri" fo:font-size="11pt"
-				style:font-size-asian="11pt" style:font-size-complex="11pt" />
-		</style:style>
-		<style:default-style style:family="graphic">
-			<style:graphic-properties draw:fill="solid"
-				draw:fill-color="#4f81bd" draw:opacity="100%" draw:stroke="solid"
-				svg:stroke-width="0.02778in" svg:stroke-color="#385d8a"
-				svg:stroke-opacity="100%" />
-		</style:default-style>
-	</office:styles>
-	<office:automatic-styles>
-		<style:page-layout style:name="pm1">
-			<style:page-layout-properties
-				fo:margin-top="0.3in" fo:margin-bottom="0.3in" fo:margin-left="0.7in"
-				fo:margin-right="0.7in" style:print-orientation="portrait"
-				style:print-page-order="ttb" style:first-page-number="continue"
-				style:scale-to="100%" style:table-centering="none"
-				style:print="objects charts drawings" />
-			<style:header-style>
-				<style:header-footer-properties
-					fo:min-height="0.45in" fo:margin-left="0.7in" fo:margin-right="0.7in"
-					fo:margin-bottom="0in" />
-			</style:header-style>
-			<style:footer-style>
-				<style:header-footer-properties
-					fo:min-height="0.45in" fo:margin-left="0.7in" fo:margin-right="0.7in"
-					fo:margin-top="0in" />
-			</style:footer-style>
-		</style:page-layout>
-		<style:page-layout style:name="pm2">
-			<style:page-layout-properties
-				fo:margin-top="0.3in" fo:margin-bottom="0.3in" fo:margin-left="0.7in"
-				fo:margin-right="0.7in" style:table-centering="none"
-				style:print="objects charts drawings" />
-			<style:header-style>
-				<style:header-footer-properties
-					fo:min-height="0.45in" fo:margin-left="0.7in" fo:margin-right="0.7in"
-					fo:margin-bottom="0in" />
-			</style:header-style>
-			<style:footer-style>
-				<style:header-footer-properties
-					fo:min-height="0.45in" fo:margin-left="0.7in" fo:margin-right="0.7in"
-					fo:margin-top="0in" />
-			</style:footer-style>
-		</style:page-layout>
-	</office:automatic-styles>
-	<office:master-styles>
-		<style:master-page style:name="mp1"
-			style:page-layout-name="pm1">
-			<style:header />
-			<style:header-left style:display="false" />
-			<style:footer />
-			<style:footer-left style:display="false" />
-		</style:master-page>
-		<style:master-page style:name="mp2"
-			style:page-layout-name="pm2">
-			<style:header />
-			<style:header-left style:display="false" />
-			<style:footer />
-			<style:footer-left style:display="false" />
-		</style:master-page>
-	</office:master-styles>
-</office:document-styles>
\ No newline at end of file
diff --git a/src/test/readTestOds.java b/src/test/readTestOds.java
deleted file mode 100644
index 78b52f90f3e8ed80284d80a272766767a49864ff..0000000000000000000000000000000000000000
--- a/src/test/readTestOds.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package test;
-
-/*******************************************************************************
- * Copyright (c) 2011 Olivier Langella <Olivier.Langella@moulon.inra.fr>.
- * 
- * This file is part of libOdsStream.
- * 
- *     libOdsStream is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     libOdsStream is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with libOdsStream.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     Olivier Langella <Olivier.Langella@moulon.inra.fr> - initial API and implementation
- ******************************************************************************/
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Date;
-
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-
-//import main.java.fr.inra.moulon.svgspectrum.SvgIon;
-import fr.inra.pappso.libodsstream.OdsDocReader;
-import fr.inra.pappso.libodsstream.OdsDocWriter;
-//import fr.inra.pappso.libodsstream.buffer.OdsBuffer;
-
-
-/** libodsstream test class
- * 
- * this class shows how to use libodsstream in your software. 
- * It first create an ODS document with OdsDocWriter, save it in a file, the read this with OdsDocReader
- * 
- * @author Olivier Langella <Olivier.Langella@moulon.inra.fr>
- *
- */
-public class readTestOds {
-
-	public static void main(String[] args) throws IOException {
-
-		try {
-
-			/**
-			 * initialize an ODS reader.
-			 * OdsDocReader can read a file directly with the given filename, or use an InputStream
-			 */
-			OdsDocReader docRead = new TestReader("testReader.ods");
-			//OdsDocReader docRead = new OdsDocReader("/home/langella/protic-data/tests/biosources2ms_samples/PLANT RESPONSE TO DROUGHT.ods");
-			
-			/**
-			 * starts to read the document.
-			 * the default OdsDocReader only print on the standard output the cell contents of your document.
-			 * to do some specific work, you have to declare a new class extending OdsDocReader and overriding functions :
-			 * 
-			 * 	public void startSheet(OdsSheet sheet) throws Exception;
-			 * 	public void endSheet() throws Exception ;
-			 * 	public void startLine() throws Exception;
-			 * 	public void endLine() throws Exception;
-			 * 	public void setCell(OdsCell cell) throws Exception;
-			 */
-			docRead.readOds();
-
-			// OdsBuffer docBuffer = new OdsBuffer("test.ods");
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-}
diff --git a/src/test/testOds.java b/src/test/testOds.java
deleted file mode 100644
index c61ebfe16ea144cbc44168a2f9967db570c37f33..0000000000000000000000000000000000000000
--- a/src/test/testOds.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package test;
-
-/*******************************************************************************
- * Copyright (c) 2011 Olivier Langella <Olivier.Langella@moulon.inra.fr>.
- * 
- * This file is part of libOdsStream.
- * 
- *     libOdsStream is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     libOdsStream is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with libOdsStream.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     Olivier Langella <Olivier.Langella@moulon.inra.fr> - initial API and implementation
- ******************************************************************************/
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.Date;
-
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-
-//import main.java.fr.inra.moulon.svgspectrum.SvgIon;
-import fr.inra.pappso.libodsstream.OdsDocReader;
-import fr.inra.pappso.libodsstream.OdsDocWriter;
-//import fr.inra.pappso.libodsstream.buffer.OdsBuffer;
-
-
-/** libodsstream test class
- * 
- * this class shows how to use libodsstream in your software. 
- * It first create an ODS document with OdsDocWriter, save it in a file, the read this with OdsDocReader
- * 
- * @author Olivier Langella <Olivier.Langella@moulon.inra.fr>
- *
- */
-public class testOds {
-
-	public static void main(String[] args) throws IOException {
-
-		try {
-			//http://tools.services.openoffice.org/odfvalidator/
-			/**
-			 * initialize an ODS writer.
-			 * OdsDocWriter can write a file directly with the given filename, or use an OutputStream
-			 */
-			OdsDocWriter doc = new OdsDocWriter("test.ods");
-			/**
-			 * opens a new data sheet with the name "new datasheet"
-			 */
-			doc.writeSheet("new datasheet");
-			/**
-			 * starts an empty line
-			 */
-			doc.writeLine();
-			// doc.writeCell("hello");
-			//DatatypeFactory typeFactory = DatatypeFactory.newInstance();
-			//Duration duree = typeFactory.newDuration("P0Y0M0DT11H16M40.000S");
-			//doc.writeCell(duree);
-			/**
-			 * writes a cell with an href link
-			 */
-			doc.writeCell(new URI("http://linuxfr.org/"), "linux fr");
-			/**
-			 * writes a cell containing a number
-			 */
-			doc.writeCell(new Double(43));
-			/**
-			 * writes a cell with the current date
-			 */
-			doc.writeCell(new Date());
-
-			/**
-			 * writes a cell with a float
-			 */
-			doc.writeCell(45.15111111);
-
-			/**
-			 * writes a cell with a boolean value
-			 */
-			doc.writeCell(true);
-			/**
-			 * begin a new datasheet named "test2" : this will close the current line and datasheet
-			 */
-			doc.writeSheet("test2");
-			/**
-			 * start a new line
-			 */
-			doc.writeLine();
-			/**
-			 * ends the current line and start a new one : there will be an empty line
-			 */
-			doc.writeLine();
-			String text = null;
-			doc.writeCell(text);
-			Float number = null;
-			doc.writeCell(number);
-			/**
-			 * writes a cell with some text
-			 */
-			doc.writeCell("hello413453");
-			/**
-			 * writes a cell with some text
-			 */
-			doc.writeCell("hello2");
-			// doc.writeCell(new Double(45));
-
-			Date date = new Date();
-			/**
-			 * writes the current date
-			 */
-			//doc.writeCell(date);
-
-			/**
-			 * Closes your ODS document : it is required, don't forget it
-			 */
-
-			doc.close();
-
-			/**
-			 * initialize an ODS reader.
-			 * OdsDocReader can read a file directly with the given filename, or use an InputStream
-			 */
-			OdsDocReader docRead = new TestReader("test.ods");
-			//OdsDocReader docRead = new OdsDocReader("/home/langella/protic-data/tests/biosources2ms_samples/PLANT RESPONSE TO DROUGHT.ods");
-			
-			/**
-			 * starts to read the document.
-			 * the default OdsDocReader only print on the standard output the cell contents of your document.
-			 * to do some specific work, you have to declare a new class extending OdsDocReader and overriding functions :
-			 * 
-			 * 	public void startSheet(OdsSheet sheet) throws Exception;
-			 * 	public void endSheet() throws Exception ;
-			 * 	public void startLine() throws Exception;
-			 * 	public void endLine() throws Exception;
-			 * 	public void setCell(OdsCell cell) throws Exception;
-			 */
-			docRead.readOds();
-
-			// OdsBuffer docBuffer = new OdsBuffer("test.ods");
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9b5abd817a8fddee46b44822091a8fca5e411a81
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,84 @@
+# CMake script for PAPPSOms++ library
+# Author: Olivier Langella
+# Created: 03/03/2015 from the CMakeLists file of the Bio++ project
+
+#CTEST_OUTPUT_ON_FAILURE=TRUE make test
+#make test ARGS="-V"
+
+MACRO(TEST_FIND_LIBRARY OUTPUT_LIBS lib_name include_to_find)
+  #start:
+  FIND_PATH(${lib_name}_INCLUDE_DIR ${include_to_find})
+
+  SET(${lib_name}_NAMES ${lib_name} ${lib_name}.lib ${lib_name}.dll)
+  FIND_LIBRARY(${lib_name}_LIBRARY NAMES ${${lib_name}_NAMES})
+  IF(${lib_name}_LIBRARY)
+    MESSAGE("-- Library ${lib_name} found here:")
+    MESSAGE("   includes: ${${lib_name}_INCLUDE_DIR}")
+    MESSAGE("   dynamic libraries: ${${lib_name}_LIBRARY}")
+    MESSAGE(WARNING "Library ${lib_name} is already installed in the system tree. Test will be built against it. This may lead to unexpected results. You may want to do 'make install' before 'make test', or remove the installed version.")
+  ELSE()
+    MESSAGE("${lib_name}_LIBRARY -L../src -l${lib_name}")
+    MESSAGE("${lib_name}_INCLUDE_DIR ../src/")
+    MESSAGE("${LIBS}")
+    SET(${lib_name}_LIBRARY "-L../src -l${lib_name}")
+    SET(${lib_name}_INCLUDE_DIR "../src/")
+  ENDIF()
+  INCLUDE_DIRECTORIES(${${lib_name}_INCLUDE_DIR})
+  SET(${OUTPUT_LIBS} ${${OUTPUT_LIBS}} ${${lib_name}_LIBRARY})
+ENDMACRO(TEST_FIND_LIBRARY)
+
+
+# File list
+SET(CPP_TEST_FILES
+  
+  )
+  
+
+IF (USEQT5)
+  IF (USEQT4)
+     SET (USEQT5 0)
+     SET (USEQT4 1)
+  ENDIF(USEQT4)
+ENDIF(USEQT5)
+
+IF (USEQT5)
+  #Find the bpp-core library library:
+  TEST_FIND_LIBRARY(LIBS odsstream-qt5 odsstream/odsdocreader.h)
+
+  FIND_PACKAGE( Qt5Core REQUIRED )
+  FIND_PACKAGE( Qt5Xml REQUIRED )
+  FIND_PACKAGE( Qt5Gui REQUIRED )
+  INCLUDE_DIRECTORIES(${Qt5Core_INCLUDES} ${Qt5Xml_INCLUDES} ${Qt5Gui_INCLUDES})
+  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
+ 
+  set(QTLIBS ${Qt5Core_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Gui_LIBRARIES})
+ENDIF(USEQT5)
+
+IF (USEQT4)
+  #Find the bpp-core library library:
+  TEST_FIND_LIBRARY(LIBS odsstream-qt4 odsstream/odsdocreader.h)
+
+  FIND_PACKAGE( Qt4 COMPONENTS QTCORE QTXML QTGUI REQUIRED )
+  
+  INCLUDE( ${QT_USE_FILE} )
+  set(QTLIBS "${QT_LIBRARIES}")
+ENDIF(USEQT4)
+
+ADD_EXECUTABLE(test_ods test_ods.cpp)
+TARGET_LINK_LIBRARIES(test_ods ${LIBS} ${QTLIBS})
+ADD_TEST(test_ods "test_ods")
+
+
+ADD_EXECUTABLE(test_tsv test_tsv.cpp)
+TARGET_LINK_LIBRARIES(test_tsv ${LIBS} ${QTLIBS})
+ADD_TEST(test_tsv "test_tsv")
+
+
+IF(UNIX)
+  SET_PROPERTY(TEST test_ods test_tsv ${TEST_LIST} PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:../src")
+ENDIF()
+
+IF(WIN32)
+  SET(ENV{PATH} "$ENV{PATH};..\\src")
+ENDIF()
+
diff --git a/test/test_ods.cpp b/test/test_ods.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c591550c5c1682cace3c590fd78109d4a4044d2b
--- /dev/null
+++ b/test/test_ods.cpp
@@ -0,0 +1,118 @@
+#include <odsstream/odsdocreader.h>
+#include <odsstream/odsdocwriter.h>
+#include <odsstream/odstablecellstyle.h>
+#include <QDebug>
+
+using namespace std;
+
+class CustomHandler: public OdsDocHandlerInterface
+{
+public:
+    /**
+     * callback that indicates the begining of a data sheet. Override it in
+     * order to retrieve information about the current data sheet.
+     *
+     */
+    virtual void startSheet(const QString & sheet_name)  {} ;
+
+    /**
+    * callback that indicates the end of the current data sheet. Override it if
+    * needed
+    */
+    virtual void endSheet()  {
+        qDebug() << "endSheet";
+    } ;
+
+    /**
+     * callback that indicates a new line start. Override it if needed.
+     */
+
+    virtual void startLine() {} ;
+
+    /**
+     * callback that indicates a line ending. Override it if needed.
+     */
+
+    virtual void endLine()  {} ;
+
+    /**
+     * callback that report the content of the current cell in a dedicated Cell
+     * object. Override it if you need to retrieve cell content.
+     */
+    virtual void setCell(const OdsCell & cell)  {
+        qDebug() << "CustomHandler::setCell " << cell.toString();
+    } ;
+
+    /**
+     * callback that report the end of the ODS document. Override it if you need
+     * to know that reading is finished.
+     */
+    virtual void endDocument() {} ;
+
+};
+
+int main(int argc, char **argv) {
+
+    QFile file("test.ods");
+    //file.open(QIODevice::WriteOnly);
+    OdsDocWriter writer(&file);
+
+    QColor red("red");
+    OdsTableCellStyle style;
+    style.setBackgroundColor(QColor("yellow"));
+    style.setTextColor(red);
+
+    OdsTableCellStyleRef ref = writer.getTableCellStyleRef(style);
+
+    QString test("truc");
+
+    writer.writeSheet("classeur");
+
+    writer.writeCell(test);
+    //writer.clearTableCellStyleRef();
+    writer.setTableCellStyleRef(ref);
+    writer.writeLine();
+    writer.writeEmptyCell();
+    writer.setCellAnnotation("ceci est un commentaire n1");
+    writer.writeCell("coucou");
+    bool vf(0);
+    writer.writeCell(vf);
+
+    QDateTime currentdate (QDateTime::currentDateTime());
+
+    writer.setCellAnnotation("ceci est un commentaire sur une date");
+    writer.writeCell(currentdate);
+
+    writer.clearTableCellStyleRef();
+    writer.writeLine();
+    writer.writeEmptyCell();
+    writer.setCellAnnotation("ceci est un commentaire");
+    writer.writeCell("coucou");
+    writer.writeCell(vf);
+    writer.writeCell(currentdate);
+
+    writer.close();
+
+    file.close();
+
+    //qDebug() << "coucou";
+
+    //file.open();
+    CustomHandler handler;
+    OdsDocReader reader(handler);
+    reader.parse(&file);
+    file.close();
+
+    QFile file2("test2.ods");
+    OdsDocReader reader2(handler);
+    reader2.parse(&file2);
+
+    file2.close();
+
+    //SUCCESS
+
+    OdsDocWriter writerb("testbis.ods");
+    writerb.writeCell("coucou");
+
+    return 0;
+}
diff --git a/test/test_tsv.cpp b/test/test_tsv.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..85116fd43143d088b34d7331d6e940b119e1de7b
--- /dev/null
+++ b/test/test_tsv.cpp
@@ -0,0 +1,48 @@
+#include <odsstream/tsvdirectorywriter.h>
+#include <odsstream/tsvoutputstream.h>
+#include <QDebug>
+#include <iostream>
+
+using namespace std;
+
+int main(int argc, char **argv) {
+
+    //file.open(QIODevice::WriteOnly);
+    TsvDirectoryWriter writer(QDir("test"));
+
+    QString test("truc");
+
+    writer.writeSheet("classeur");
+    writer.writeCell(test);
+    writer.writeLine();
+    writer.writeEmptyCell();
+    writer.writeCell("coucou");
+    bool vf(0);
+    writer.writeCell(vf);
+
+    QDateTime currentdate (QDateTime::currentDateTime());
+
+    writer.writeCell(currentdate);
+
+    writer.close();
+
+    QTextStream terminalOut(stdout, QIODevice::WriteOnly);
+    TsvOutputStream writero(terminalOut);
+
+
+    writero.writeSheet("classeur");
+    writero.writeCell(test);
+    writero.writeLine();
+    writero.writeEmptyCell();
+    writero.setCellAnnotation("ne sera pas prise en compte en TSV");
+    writero.writeCell("coucou");
+    writero.writeCell(vf);
+
+
+    writero.writeCell(currentdate);
+
+    writero.close();
+
+    //SUCCESS
+    return 0;
+}
diff --git a/win64/Toolchain-mingw64.cmake b/win64/Toolchain-mingw64.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..16aad99310cc132240c0b3b8a7897adafe2dde63
--- /dev/null
+++ b/win64/Toolchain-mingw64.cmake
@@ -0,0 +1,139 @@
+#download Qt5 mingw64 environment from :
+#http://www.rpmfind.net//linux/RPM/fedora/21/x86_64/m/mingw64-qt5-qtbase-5.3.2-1.fc21.noarch.html
+#ftp://195.220.108.108/linux/sourceforge/p/ps/pspp4windows/used-repositories/2015-06-19/win64/src/mingw64-zlib-1.2.8-8.13.src.rpm
+#http://rpm.pbone.net/index.php3/stat/4/idpl/24061932/dir/opensuse_12.x/com/mingw64-quazip-0.4.4-2.39.noarch.rpm.html
+
+# cd buildwin64
+# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../win64/Toolchain-mingw64.cmake ..
+
+SET (QT_DEFINITIONS "QT_DLL")
+
+SET (MINGW 1)
+SET (USEQT4 1)
+SET (USEQT5 1)
+SET (BUILD_WITH_QT4 1)
+
+# this one is important
+SET(CMAKE_SYSTEM_NAME Windows)
+#this one not so much
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET (WINDAUBE_ENV_PATH /opt/win64)
+# it worked on 27 nov 2013 :
+# download and install from http://download.qt-project.org/archive/qt/4.8/4.8.2/ the mingw32 version
+
+#SET(QMAKE_PREFIX    /usr/bin/qmake-qt4 -spec win32-crossCompil-g++ CONFIG=release)
+#SET(QT_PREFIX    /usr/local/src/mingw32_f15/qt-4.7.1/i686-pc-mingw32/sys-root/mingw)
+#SET(QT_PREFIX    /usr/local/src/mingw_qt/usr/i686-pc-mingw32/sys-root/mingw)
+SET(QT_PREFIX    ${WINDAUBE_ENV_PATH}/Qt64-4.8.6)
+
+SET (ZLIB_PREFIX   ${WINDAUBE_ENV_PATH}/zlib-1.2.8)
+
+SET(QT5_PREFIX    ${WINDAUBE_ENV_PATH}/Qt64-5.3.2)
+
+set (QUAZIP_INCLUDE_DIR ${WINDAUBE_ENV_PATH}/quazip-0.7.1)
+set (QUAZIP_LIBRARIES 1)
+INCLUDE_DIRECTORIES(${QUAZIP_INCLUDE_DIR})
+
+set (QUAZIP_QT5_LIBRARIES ${WINDAUBE_ENV_PATH}/quazip-0.7.1/buildwin64/libquazip.dll.a)
+
+set (QUAZIP_QT4_LIBRARIES ${WINDAUBE_ENV_PATH}/quazip-0.7.1/buildwin64/libquazip.dll.a)
+
+
+
+SET (Qt5Core_DIR "/usr/lib/x86_64-linux-gnu/cmake/Qt5Core")
+SET (Qt5Concurrent_DIR "/usr/lib/x86_64-linux-gnu/cmake/Qt5Concurrent")
+SET (Qt5Gui_DIR "/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui")
+SET (Qt5Xml_DIR "/usr/lib/x86_64-linux-gnu/cmake/Qt5Xml")
+
+IF (USEQT5)
+SET (CMAKE_MODULE_PATH "${Qt5Core_DIR} ${Qt5Concurrent_DIR} ${Qt5Gui_DIR}")
+message( "CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}")
+  SET (CMAKE_FIND_LIBRARY_PREFIXES "${QT5_PREFIX}/lib")
+  SET (CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+  FIND_PACKAGE( Qt5Core REQUIRED )
+  FIND_PACKAGE( Qt5Concurrent REQUIRED )
+  FIND_PACKAGE( Qt5Gui REQUIRED )
+  FIND_PACKAGE( Qt5Xml REQUIRED )
+  
+   set(Qt5Core_LIBRARY_DIRS "${QT5_PREFIX}/lib") 
+  SET(Qt5Core_LIBRARY "Qt5Core.dll")
+  SET(Qt5Core_LIBRARIES ${Qt5Core_LIBRARY})
+  
+  
+  set(Qt5Core_HEADERS_DIR ${QT5_PREFIX}/include)
+  set(Qt5Core_LIBRARY_DIRS ${QT5_PREFIX}/lib)
+
+  set(Qt5Core_LIBRARY ${QT5_PREFIX}/lib/libQt5Core.dll.a)
+  set(Qt5Core_LIBRARY_RELEASE ${QT5_PREFIX}/lib/libQt5Core.dll.a)
+  set(Qt5Core_INCLUDE_DIR ${QT5_PREFIX}/include/QtCore)
+
+  SET(Qt5Core_FOUND 1)
+ENDIF(USEQT5)
+
+#SET(QT_MOC_EXECUTABLE      /usr/local/src/QtSDK/Desktop/Qt/4.8.1/gcc/bin/moc)
+#SET(QMAKE_UIC      /usr/local/src/QtSDK/Desktop/Qt/4.8.1/gcc/bin/uic)
+#SET(QMAKE_RCC      /usr/local/src/QtSDK/Desktop/Qt/4.8.1/gcc/bin/rcc)
+
+# specify the cross compiler
+#cc++
+SET(CMAKE_C_COMPILER   /usr/bin/x86_64-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
+SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
+
+# where is the target environment
+#http://qt.nokia.com/downloads/windows-cpp
+SET(CMAKE_FIND_ROOT_PATH  /usr/i586-mingw32msvc ${QT_PREFIX} )
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+
+set (CMAKE_CXX_FLAGS " -fexceptions -mthreads -fmessage-length=0 -fident ")
+
+set(ADD_MINGW_EXE_LINKER_FLAGS
+  " -static-libgcc -static-libstdc++ "
+  )
+#--enable-auto-import
+#set(CMAKE_EXE_LINKER_FLAGS
+#"${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import"
+#)
+# remove console
+#set(CMAKE_EXE_LINKER_FLAGS
+#"${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows"
+#)
+
+#set(
+#CMAKE_SHARED_LIBRARY_CXX_FLAGS
+#"${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -Wl,--enable-auto-import "
+#)
+set(
+CMAKE_SHARED_LIBRARY_CXX_FLAGS
+"${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -shared -Wl,--subsystem,windows -DDLL"
+)
+
+set(QT_HEADERS_DIR ${QT_PREFIX}/include)
+set(QT_LIBRARY_DIR ${QT_PREFIX}/lib)
+
+set(QT_QTCORE_LIBRARY ${QT_PREFIX}/lib/libQtCore4.dll.a)
+set(QT_QTCORE_LIBRARY_RELEASE ${QT_PREFIX}/lib/libQtCore4.dll.a)
+set(QT_QTCORE_INCLUDE_DIR ${QT_PREFIX}/include/QtCore)
+
+set(QT_QTXML_LIBRARY ${QT_PREFIX}/lib/libQtXml4.dll.a)
+set(QT_QTXML_LIBRARY_RELEASE ${QT_PREFIX}/lib/libQtXml4.dll.a)
+set(QT_QTXML_INCLUDE_DIR ${QT_PREFIX}/include/QtXml)
+
+
+#set(QT_BINARY_DIR   ${QT_PREFIX}/bin)
+#set(QT_LIBRARY_DIR  ${QT_PREFIX}/lib)
+#set(QT_QTCORE_LIBRARY   ${QT_PREFIX}/lib/libQtCore4.dll.a)
+#set(QT_QTCORE_INCLUDE_DIR ${QT_PREFIX}/include/QtCore)
+#set(QT_MOC_EXECUTABLE  ${QT_PREFIX}/moc)
+#set(QT_QMAKE_EXECUTABLE  ${QT_PREFIX}/qmake)
+#set(QT_UIC_EXECUTABLE  ${QT_PREFIX}/uic)
+
+SET (ZLIB_LIBRARY ${ZLIB_PREFIX}/lib/libz.dll.a)
+SET (ZLIB_INCLUDE_DIR ${ZLIB_PREFIX}/include)
\ No newline at end of file