Remove include xhmtl2odt library (refs #4178)

26 files changed, 0 insertions, 4644 deletions

diff --git a/xhtml2odt/LICENSE.txt b/xhtml2odt/LICENSE.txt
deleted file mode 100644
index 3394995ab..000000000
--- a/xhtml2odt/LICENSE.txt
+++ /dev/null
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE

-                       Version 2.1, February 1999

-

- Copyright (C) 1991, 1999 Free Software Foundation, Inc.

- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- Everyone is permitted to copy and distribute verbatim copies

- of this license document, but changing it is not allowed.

-

-[This is the first released version of the Lesser GPL.  It also counts

- as the successor of the GNU Library Public License, version 2, hence

- the version number 2.1.]

-

-                            Preamble

-

-  The licenses for most software are designed to take away your

-freedom to share and change it.  By contrast, the GNU General Public

-Licenses are intended to guarantee your freedom to share and change

-free software--to make sure the software is free for all its users.

-

-  This license, the Lesser General Public License, applies to some

-specially designated software packages--typically libraries--of the

-Free Software Foundation and other authors who decide to use it.  You

-can use it too, but we suggest you first think carefully about whether

-this license or the ordinary General Public License is the better

-strategy to use in any particular case, based on the explanations below.

-

-  When we speak of free software, we are referring to freedom of use,

-not price.  Our General Public Licenses are designed to make sure that

-you have the freedom to distribute copies of free software (and charge

-for this service if you wish); that you receive source code or can get

-it if you want it; that you can change the software and use pieces of

-it in new free programs; and that you are informed that you can do

-these things.

-

-  To protect your rights, we need to make restrictions that forbid

-distributors to deny you these rights or to ask you to surrender these

-rights.  These restrictions translate to certain responsibilities for

-you if you distribute copies of the library or if you modify it.

-

-  For example, if you distribute copies of the library, whether gratis

-or for a fee, you must give the recipients all the rights that we gave

-you.  You must make sure that they, too, receive or can get the source

-code.  If you link other code with the library, you must provide

-complete object files to the recipients, so that they can relink them

-with the library after making changes to the library and recompiling

-it.  And you must show them these terms so they know their rights.

-

-  We protect your rights with a two-step method: (1) we copyright the

-library, and (2) we offer you this license, which gives you legal

-permission to copy, distribute and/or modify the library.

-

-  To protect each distributor, we want to make it very clear that

-there is no warranty for the free library.  Also, if the library is

-modified by someone else and passed on, the recipients should know

-that what they have is not the original version, so that the original

-author's reputation will not be affected by problems that might be

-introduced by others.

-

-  Finally, software patents pose a constant threat to the existence of

-any free program.  We wish to make sure that a company cannot

-effectively restrict the users of a free program by obtaining a

-restrictive license from a patent holder.  Therefore, we insist that

-any patent license obtained for a version of the library must be

-consistent with the full freedom of use specified in this license.

-

-  Most GNU software, including some libraries, is covered by the

-ordinary GNU General Public License.  This license, the GNU Lesser

-General Public License, applies to certain designated libraries, and

-is quite different from the ordinary General Public License.  We use

-this license for certain libraries in order to permit linking those

-libraries into non-free programs.

-

-  When a program is linked with a library, whether statically or using

-a shared library, the combination of the two is legally speaking a

-combined work, a derivative of the original library.  The ordinary

-General Public License therefore permits such linking only if the

-entire combination fits its criteria of freedom.  The Lesser General

-Public License permits more lax criteria for linking other code with

-the library.

-

-  We call this license the "Lesser" General Public License because it

-does Less to protect the user's freedom than the ordinary General

-Public License.  It also provides other free software developers Less

-of an advantage over competing non-free programs.  These disadvantages

-are the reason we use the ordinary General Public License for many

-libraries.  However, the Lesser license provides advantages in certain

-special circumstances.

-

-  For example, on rare occasions, there may be a special need to

-encourage the widest possible use of a certain library, so that it becomes

-a de-facto standard.  To achieve this, non-free programs must be

-allowed to use the library.  A more frequent case is that a free

-library does the same job as widely used non-free libraries.  In this

-case, there is little to gain by limiting the free library to free

-software only, so we use the Lesser General Public License.

-

-  In other cases, permission to use a particular library in non-free

-programs enables a greater number of people to use a large body of

-free software.  For example, permission to use the GNU C Library in

-non-free programs enables many more people to use the whole GNU

-operating system, as well as its variant, the GNU/Linux operating

-system.

-

-  Although the Lesser General Public License is Less protective of the

-users' freedom, it does ensure that the user of a program that is

-linked with the Library has the freedom and the wherewithal to run

-that program using a modified version of the Library.

-

-  The precise terms and conditions for copying, distribution and

-modification follow.  Pay close attention to the difference between a

-"work based on the library" and a "work that uses the library".  The

-former contains code derived from the library, whereas the latter must

-be combined with the library in order to run.

-

-                  GNU LESSER GENERAL PUBLIC LICENSE

-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-

-  0. This License Agreement applies to any software library or other

-program which contains a notice placed by the copyright holder or

-other authorized party saying it may be distributed under the terms of

-this Lesser General Public License (also called "this License").

-Each licensee is addressed as "you".

-

-  A "library" means a collection of software functions and/or data

-prepared so as to be conveniently linked with application programs

-(which use some of those functions and data) to form executables.

-

-  The "Library", below, refers to any such software library or work

-which has been distributed under these terms.  A "work based on the

-Library" means either the Library or any derivative work under

-copyright law: that is to say, a work containing the Library or a

-portion of it, either verbatim or with modifications and/or translated

-straightforwardly into another language.  (Hereinafter, translation is

-included without limitation in the term "modification".)

-

-  "Source code" for a work means the preferred form of the work for

-making modifications to it.  For a library, complete source code means

-all the source code for all modules it contains, plus any associated

-interface definition files, plus the scripts used to control compilation

-and installation of the library.

-

-  Activities other than copying, distribution and modification are not

-covered by this License; they are outside its scope.  The act of

-running a program using the Library is not restricted, and output from

-such a program is covered only if its contents constitute a work based

-on the Library (independent of the use of the Library in a tool for

-writing it).  Whether that is true depends on what the Library does

-and what the program that uses the Library does.

-

-  1. You may copy and distribute verbatim copies of the Library's

-complete source code as you receive it, in any medium, provided that

-you conspicuously and appropriately publish on each copy an

-appropriate copyright notice and disclaimer of warranty; keep intact

-all the notices that refer to this License and to the absence of any

-warranty; and distribute a copy of this License along with the

-Library.

-

-  You may charge a fee for the physical act of transferring a copy,

-and you may at your option offer warranty protection in exchange for a

-fee.

-

-  2. You may modify your copy or copies of the Library or any portion

-of it, thus forming a work based on the Library, and copy and

-distribute such modifications or work under the terms of Section 1

-above, provided that you also meet all of these conditions:

-

-    a) The modified work must itself be a software library.

-

-    b) You must cause the files modified to carry prominent notices

-    stating that you changed the files and the date of any change.

-

-    c) You must cause the whole of the work to be licensed at no

-    charge to all third parties under the terms of this License.

-

-    d) If a facility in the modified Library refers to a function or a

-    table of data to be supplied by an application program that uses

-    the facility, other than as an argument passed when the facility

-    is invoked, then you must make a good faith effort to ensure that,

-    in the event an application does not supply such function or

-    table, the facility still operates, and performs whatever part of

-    its purpose remains meaningful.

-

-    (For example, a function in a library to compute square roots has

-    a purpose that is entirely well-defined independent of the

-    application.  Therefore, Subsection 2d requires that any

-    application-supplied function or table used by this function must

-    be optional: if the application does not supply it, the square

-    root function must still compute square roots.)

-

-These requirements apply to the modified work as a whole.  If

-identifiable sections of that work are not derived from the Library,

-and can be reasonably considered independent and separate works in

-themselves, then this License, and its terms, do not apply to those

-sections when you distribute them as separate works.  But when you

-distribute the same sections as part of a whole which is a work based

-on the Library, the distribution of the whole must be on the terms of

-this License, whose permissions for other licensees extend to the

-entire whole, and thus to each and every part regardless of who wrote

-it.

-

-Thus, it is not the intent of this section to claim rights or contest

-your rights to work written entirely by you; rather, the intent is to

-exercise the right to control the distribution of derivative or

-collective works based on the Library.

-

-In addition, mere aggregation of another work not based on the Library

-with the Library (or with a work based on the Library) on a volume of

-a storage or distribution medium does not bring the other work under

-the scope of this License.

-

-  3. You may opt to apply the terms of the ordinary GNU General Public

-License instead of this License to a given copy of the Library.  To do

-this, you must alter all the notices that refer to this License, so

-that they refer to the ordinary GNU General Public License, version 2,

-instead of to this License.  (If a newer version than version 2 of the

-ordinary GNU General Public License has appeared, then you can specify

-that version instead if you wish.)  Do not make any other change in

-these notices.

-

-  Once this change is made in a given copy, it is irreversible for

-that copy, so the ordinary GNU General Public License applies to all

-subsequent copies and derivative works made from that copy.

-

-  This option is useful when you wish to copy part of the code of

-the Library into a program that is not a library.

-

-  4. You may copy and distribute the Library (or a portion or

-derivative of it, under Section 2) in object code or executable form

-under the terms of Sections 1 and 2 above provided that you accompany

-it with the complete corresponding machine-readable source code, which

-must be distributed under the terms of Sections 1 and 2 above on a

-medium customarily used for software interchange.

-

-  If distribution of object code is made by offering access to copy

-from a designated place, then offering equivalent access to copy the

-source code from the same place satisfies the requirement to

-distribute the source code, even though third parties are not

-compelled to copy the source along with the object code.

-

-  5. A program that contains no derivative of any portion of the

-Library, but is designed to work with the Library by being compiled or

-linked with it, is called a "work that uses the Library".  Such a

-work, in isolation, is not a derivative work of the Library, and

-therefore falls outside the scope of this License.

-

-  However, linking a "work that uses the Library" with the Library

-creates an executable that is a derivative of the Library (because it

-contains portions of the Library), rather than a "work that uses the

-library".  The executable is therefore covered by this License.

-Section 6 states terms for distribution of such executables.

-

-  When a "work that uses the Library" uses material from a header file

-that is part of the Library, the object code for the work may be a

-derivative work of the Library even though the source code is not.

-Whether this is true is especially significant if the work can be

-linked without the Library, or if the work is itself a library.  The

-threshold for this to be true is not precisely defined by law.

-

-  If such an object file uses only numerical parameters, data

-structure layouts and accessors, and small macros and small inline

-functions (ten lines or less in length), then the use of the object

-file is unrestricted, regardless of whether it is legally a derivative

-work.  (Executables containing this object code plus portions of the

-Library will still fall under Section 6.)

-

-  Otherwise, if the work is a derivative of the Library, you may

-distribute the object code for the work under the terms of Section 6.

-Any executables containing that work also fall under Section 6,

-whether or not they are linked directly with the Library itself.

-

-  6. As an exception to the Sections above, you may also combine or

-link a "work that uses the Library" with the Library to produce a

-work containing portions of the Library, and distribute that work

-under terms of your choice, provided that the terms permit

-modification of the work for the customer's own use and reverse

-engineering for debugging such modifications.

-

-  You must give prominent notice with each copy of the work that the

-Library is used in it and that the Library and its use are covered by

-this License.  You must supply a copy of this License.  If the work

-during execution displays copyright notices, you must include the

-copyright notice for the Library among them, as well as a reference

-directing the user to the copy of this License.  Also, you must do one

-of these things:

-

-    a) Accompany the work with the complete corresponding

-    machine-readable source code for the Library including whatever

-    changes were used in the work (which must be distributed under

-    Sections 1 and 2 above); and, if the work is an executable linked

-    with the Library, with the complete machine-readable "work that

-    uses the Library", as object code and/or source code, so that the

-    user can modify the Library and then relink to produce a modified

-    executable containing the modified Library.  (It is understood

-    that the user who changes the contents of definitions files in the

-    Library will not necessarily be able to recompile the application

-    to use the modified definitions.)

-

-    b) Use a suitable shared library mechanism for linking with the

-    Library.  A suitable mechanism is one that (1) uses at run time a

-    copy of the library already present on the user's computer system,

-    rather than copying library functions into the executable, and (2)

-    will operate properly with a modified version of the library, if

-    the user installs one, as long as the modified version is

-    interface-compatible with the version that the work was made with.

-

-    c) Accompany the work with a written offer, valid for at

-    least three years, to give the same user the materials

-    specified in Subsection 6a, above, for a charge no more

-    than the cost of performing this distribution.

-

-    d) If distribution of the work is made by offering access to copy

-    from a designated place, offer equivalent access to copy the above

-    specified materials from the same place.

-

-    e) Verify that the user has already received a copy of these

-    materials or that you have already sent this user a copy.

-

-  For an executable, the required form of the "work that uses the

-Library" must include any data and utility programs needed for

-reproducing the executable from it.  However, as a special exception,

-the materials to be distributed need not include anything that is

-normally distributed (in either source or binary form) with the major

-components (compiler, kernel, and so on) of the operating system on

-which the executable runs, unless that component itself accompanies

-the executable.

-

-  It may happen that this requirement contradicts the license

-restrictions of other proprietary libraries that do not normally

-accompany the operating system.  Such a contradiction means you cannot

-use both them and the Library together in an executable that you

-distribute.

-

-  7. You may place library facilities that are a work based on the

-Library side-by-side in a single library together with other library

-facilities not covered by this License, and distribute such a combined

-library, provided that the separate distribution of the work based on

-the Library and of the other library facilities is otherwise

-permitted, and provided that you do these two things:

-

-    a) Accompany the combined library with a copy of the same work

-    based on the Library, uncombined with any other library

-    facilities.  This must be distributed under the terms of the

-    Sections above.

-

-    b) Give prominent notice with the combined library of the fact

-    that part of it is a work based on the Library, and explaining

-    where to find the accompanying uncombined form of the same work.

-

-  8. You may not copy, modify, sublicense, link with, or distribute

-the Library except as expressly provided under this License.  Any

-attempt otherwise to copy, modify, sublicense, link with, or

-distribute the Library is void, and will automatically terminate your

-rights under this License.  However, parties who have received copies,

-or rights, from you under this License will not have their licenses

-terminated so long as such parties remain in full compliance.

-

-  9. You are not required to accept this License, since you have not

-signed it.  However, nothing else grants you permission to modify or

-distribute the Library or its derivative works.  These actions are

-prohibited by law if you do not accept this License.  Therefore, by

-modifying or distributing the Library (or any work based on the

-Library), you indicate your acceptance of this License to do so, and

-all its terms and conditions for copying, distributing or modifying

-the Library or works based on it.

-

-  10. Each time you redistribute the Library (or any work based on the

-Library), the recipient automatically receives a license from the

-original licensor to copy, distribute, link with or modify the Library

-subject to these terms and conditions.  You may not impose any further

-restrictions on the recipients' exercise of the rights granted herein.

-You are not responsible for enforcing compliance by third parties with

-this License.

-

-  11. If, as a consequence of a court judgment or allegation of patent

-infringement or for any other reason (not limited to patent issues),

-conditions are imposed on you (whether by court order, agreement or

-otherwise) that contradict the conditions of this License, they do not

-excuse you from the conditions of this License.  If you cannot

-distribute so as to satisfy simultaneously your obligations under this

-License and any other pertinent obligations, then as a consequence you

-may not distribute the Library at all.  For example, if a patent

-license would not permit royalty-free redistribution of the Library by

-all those who receive copies directly or indirectly through you, then

-the only way you could satisfy both it and this License would be to

-refrain entirely from distribution of the Library.

-

-If any portion of this section is held invalid or unenforceable under any

-particular circumstance, the balance of the section is intended to apply,

-and the section as a whole is intended to apply in other circumstances.

-

-It is not the purpose of this section to induce you to infringe any

-patents or other property right claims or to contest validity of any

-such claims; this section has the sole purpose of protecting the

-integrity of the free software distribution system which is

-implemented by public license practices.  Many people have made

-generous contributions to the wide range of software distributed

-through that system in reliance on consistent application of that

-system; it is up to the author/donor to decide if he or she is willing

-to distribute software through any other system and a licensee cannot

-impose that choice.

-

-This section is intended to make thoroughly clear what is believed to

-be a consequence of the rest of this License.

-

-  12. If the distribution and/or use of the Library is restricted in

-certain countries either by patents or by copyrighted interfaces, the

-original copyright holder who places the Library under this License may add

-an explicit geographical distribution limitation excluding those countries,

-so that distribution is permitted only in or among countries not thus

-excluded.  In such case, this License incorporates the limitation as if

-written in the body of this License.

-

-  13. The Free Software Foundation may publish revised and/or new

-versions of the 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

-specifies a version number of this License which applies to it and

-"any later version", you have the option of following the terms and

-conditions either of that version or of any later version published by

-the Free Software Foundation.  If the Library does not specify a

-license version number, you may choose any version ever published by

-the Free Software Foundation.

-

-  14. If you wish to incorporate parts of the Library into other free

-programs whose distribution conditions are incompatible with these,

-write to the author to ask for permission.  For software which is

-copyrighted by the Free Software Foundation, write to the Free

-Software Foundation; we sometimes make exceptions for this.  Our

-decision will be guided by the two goals of preserving the free status

-of all derivatives of our free software and of promoting the sharing

-and reuse of software generally.

-

-                            NO WARRANTY

-

-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO

-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.

-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR

-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY

-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE

-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME

-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-

-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN

-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY

-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU

-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR

-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE

-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING

-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A

-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF

-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH

-DAMAGES.

-

-                     END OF TERMS AND CONDITIONS

-

-           How to Apply These Terms to Your New Libraries

-

-  If you develop a new library, and you want it to be of the greatest

-possible use to the public, we recommend making it free software that

-everyone can redistribute and change.  You can do so by permitting

-redistribution under these terms (or, alternatively, under the terms of the

-ordinary General Public License).

-

-  To apply these terms, attach the following notices to the library.  It is

-safest to attach them to the start of each source file to most effectively

-convey the exclusion of warranty; and each file should have at least the

-"copyright" line and a pointer to where the full notice is found.

-

-    <one line to give the library's name and a brief idea of what it does.>

-    Copyright (C) <year>  <name of author>

-

-    This library is free software; you can redistribute it and/or

-    modify it under the terms of the GNU Lesser General Public

-    License as published by the Free Software Foundation; either

-    version 2.1 of the License, or (at your option) any later version.

-

-    This library is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-    Lesser General Public License for more details.

-

-    You should have received a copy of the GNU Lesser General Public

-    License along with this library; if not, write to the Free Software

-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

-

-Also add information on how to contact you by electronic and paper mail.

-

-You should also get your employer (if you work as a programmer) or your

-school, if any, to sign a "copyright disclaimer" for the library, if

-necessary.  Here is a sample; alter the names:

-

-  Yoyodyne, Inc., hereby disclaims all copyright interest in the

-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

-

-  <signature of Ty Coon>, 1 April 1990

-  Ty Coon, President of Vice

-

-That's all there is to it!

diff --git a/xhtml2odt/__init__.py b/xhtml2odt/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/xhtml2odt/__init__.py
+++ /dev/null
diff --git a/xhtml2odt/xhtml2odt.py b/xhtml2odt/xhtml2odt.py
deleted file mode 100755
index 0923c1d05..000000000
--- a/xhtml2odt/xhtml2odt.py
+++ /dev/null
@@ -1,715 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-u"""
-xhtml2odt - XHTML to ODT XML transformation
-===========================================
-
-Copyright (C) 2009-2010 Aurelien Bompard
-Copyright (C) 2015 Étienne Loks
-
-This script can convert a wiki page to the OpenDocument Text (ODT) format,
-standardized as ISO/IEC 26300:2006, and the native format of office suites such
-as OpenOffice.org, KOffice, and others.
-
-It uses a template ODT file which will be filled with the converted content of
-the XHTML page.
-
-Website: http://xhtml2odt.org
-
-Inspired by the work on docbook2odt_, by Roman Fordinal
-
-.. _docbook2odt: http://open.comsultia.com/docbook2odf/
-
-
-Usage
------
-
-Call the script with the :option:`--help` option to see all the available
-options.  The main options are:
-
-.. cmdoption:: -i <file>, --input <file>
-
-   The HTML file to read from.
-
-.. cmdoption:: -o <file>, --output <file>
-
-   The ODT file to export to (will be overwritten if already present).
-
-.. cmdoption:: -t <file>, --template <file>
-
-   The ODT file to use as a template (must be readable).
-
-.. cmdoption:: -v
-
-   Be verbose (enables logging)
-
-
-The full help message is::
-
-    Usage: xhtml2odt.py [options] -i input -o output -t template.odt
-
-    Options:
-      -h, --help            show this help message and exit
-      -i FILE, --input=FILE
-                            Read the html from this file
-      -o FILE, --output=FILE
-                            Location of the output ODT file
-      -t FILE, --template=FILE
-                            Location of the template ODT file
-      -u URL, --url=URL     Use this URL for relative links
-      -v, --verbose         Show what's going on
-      --html-id=ID          Only export from the element with this ID
-      --replace=KEYWORD     Keyword to replace in the ODT template (default is
-                            ODT-INSERT)
-      --cut-start=KEYWORD   Keyword to start cutting text from the ODT template
-                            (default is ODT-CUT-START)
-      --cut-stop=KEYWORD    Keyword to stop cutting text from the ODT template
-                            (default is ODT-CUT-STOP)
-      --top-header-level=LEVEL
-                            Level of highest header in the HTML (default is 1)
-      --img-default-width=WIDTH
-                            Default image width (default is 8cm)
-      --img-default-height=HEIGHT
-                            Default image height (default is 6cm)
-      --dpi=DPI             Screen resolution in Dots Per Inch (default is 96)
-      --no-network          Do not download remote images
-
-
-License
--------
-
-GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl-2.1.html
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-Code
-----
-"""
-
-import tempfile
-import shutil
-import re
-import os
-import sys
-import zipfile
-import urllib2
-import urlparse
-import hashlib
-import mimetypes
-from StringIO import StringIO
-from optparse import OptionParser
-
-try:
-    import tidy
-except:
-    from tidylib import tidy_document as tidy
-
-from lxml import etree
-from PIL import Image
-
-#pylint#: disable-msg=C0301,C0111
-
-INSTALL_PATH = os.path.dirname(__file__)
-
-INCH_TO_CM = 2.54
-CHARSET = "utf-8"
-
-__version__ = 0.1
-
-class ODTExportError(Exception):
-    """Base exception for ODT conversion errors"""
-    pass
-
-class HTMLFile(object):
-    """
-    This class contains the HTML document to convert to ODT. The HTML code
-    will be run through Tidy to ensure that is is valid and well-formed
-    XHTML.
-
-    :ivar options: An OptionParser-result object containing the options for
-        processing.
-    :type options: OptionsParser-result object
-    :ivar html: The HTML code.
-    :type html: ``str``
-    """
-
-    def __init__(self, options):
-        self.options = options
-        self.html = ""
-
-    def read(self):
-        """
-        Read the HTML file from :attr:`options`.input, run it through Tidy, and
-        filter using the selected ID (if applicable).
-        """
-        in_file = open(self.options.input)
-        self.html = in_file.read()
-        in_file.close()
-        self.cleanup()
-        if self.options.htmlid:
-            self.select_id()
-
-    def cleanup(self):
-        """
-        Run the HTML code from the :attr:`html` instance variable through Tidy.
-        """
-        tidy_options = dict(output_xhtml=1, add_xml_decl=1, indent=1,
-                            tidy_mark=0, #input_encoding=str(self.charset),
-                            output_encoding='utf8', doctype='auto',
-                            wrap=0, char_encoding='utf8')
-        self.html = str(tidy.parseString(self.html, **tidy_options))
-        if not self.html:
-            raise ODTExportError(
-                        "Tidy could not clean up the document, aborting.")
-        # Replace nbsp with entity
-        # http://www.mail-archive.com/analog-help@lists.meer.net/msg03670.html
-        self.html = self.html.replace("&nbsp;", "&#160;")
-        # Tidy creates newlines after <pre> (by indenting)
-        self.html = re.sub('<pre([^>]*)>\n', '<pre\\1>', self.html)
-
-    def select_id(self):
-        """
-        Replace the HTML content by an element in the content. The element
-        is selected by its HTML ID.
-        """
-        try:
-            html_tree = etree.fromstring(self.html)
-        except etree.XMLSyntaxError:
-            if self.options.verbose:
-                raise
-            else:
-                raise ODTExportError("The XHTML is still not valid after "
-                                     "Tidy's work, I can't convert it.")
-        selected = html_tree.xpath("//*[@id='%s']" % self.options.htmlid)
-        if selected:
-            self.html = etree.tostring(selected[0], method="html")
-        else:
-            print >> sys.stderr, "Can't find the selected HTML id: %s, " \
-                                 % self.options.htmlid \
-                                +"converting everything."
-
-
-class ODTFile(object):
-    """Handles the conversion and production of an ODT file"""
-
-    def __init__(self, options):
-        self.options = options
-        self.xml = {
-            "content": "",
-            "styles": "",
-        }
-        self.tmpdir = tempfile.mkdtemp(prefix="xhtml2odt-")
-        self.zfile = None
-        self._added_images = []
-
-    def open(self):
-        """
-        Uncompress the template ODT file, and read the content.xml and
-        styles.xml files into memory.
-        """
-        self.zfile = zipfile.ZipFile(self.options.template, "r")
-        for name in self.zfile.namelist():
-            fname = os.path.join(self.tmpdir, name)
-            if not os.path.exists(os.path.dirname(fname)):
-                os.makedirs(os.path.dirname(fname))
-            if name[-1] == "/":
-                if not os.path.exists(fname):
-                    os.mkdir(fname)
-                continue
-            fname_h = open(fname, "w")
-            fname_h.write(self.zfile.read(name))
-            fname_h.close()
-        for xmlfile in self.xml:
-            self.xml[xmlfile] = self.zfile.read("%s.xml" % xmlfile)
-
-    def import_xhtml(self, xhtml):
-        """
-        Main function to run the conversion process:
-
-        * XHTML import
-        * conversion to ODT XML
-        * insertion into the ODT template
-        * adding of the missing styles
-
-        The next logical step is to use the :meth:`save` method.
-
-        :param xhtml: the XHTML content to import
-        :type  xhtml: str
-        """
-        odt = self.xhtml_to_odt(xhtml)
-        self.insert_content(odt)
-        self.add_styles()
-
-    def xhtml_to_odt(self, xhtml):
-        """
-        Converts the XHTML content into ODT.
-
-        :param xhtml: the XHTML content to import
-        :type  xhtml: str
-        :returns: the ODT XML from the conversion
-        :rtype: str
-        """
-        xsl_dir = os.path.join(INSTALL_PATH, 'xsl')
-        tmpdirxsl = os.path.join(tempfile.mkdtemp(prefix="xhtml2odt-"), 'xsl')
-        shutil.copytree(xsl_dir, tmpdirxsl)
-
-        xslt_doc = etree.parse(os.path.join(tmpdirxsl, "xhtml2odt.xsl"))
-        transform = etree.XSLT(xslt_doc)
-        xhtml = self.handle_images(xhtml)
-        xhtml = self.handle_links(xhtml)
-        try:
-            xhtml = etree.fromstring(xhtml) # must be valid xml at this point
-        except etree.XMLSyntaxError:
-            if self.options.verbose:
-                raise
-            else:
-                raise ODTExportError("The XHTML is still not valid after "
-                                     "Tidy's work, I can't convert it.")
-        params = {
-            "url": "/",
-            "heading_minus_level": str(self.options.top_header_level - 1),
-        }
-        if self.options.verbose:
-            params["debug"] = "1"
-        if self.options.img_width:
-            if hasattr(etree.XSLT, "strparam"):
-                params["img_default_width"] = etree.XSLT.strparam(
-                                                self.options.img_width)
-            else: # lxml < 2.2
-                params["img_default_width"] = "'%s'" % self.options.img_width
-        if self.options.img_height:
-            if hasattr(etree.XSLT, "strparam"):
-                params["img_default_height"] = etree.XSLT.strparam(
-                                                self.options.img_height)
-            else: # lxml < 2.2
-                params["img_default_height"] = "'%s'" % self.options.img_height
-        odt = transform(xhtml, **params)
-        # DEBUG
-        #print str(odt)
-        return str(odt).replace('<?xml version="1.0" encoding="utf-8"?>','')
-
-    def handle_images(self, xhtml):
-        """
-        Handling of image tags in the XHTML. Local and remote images are
-        handled differently: see the :meth:`handle_local_img` and
-        :meth:`handle_remote_img` methods for details.
-
-        :param xhtml: the XHTML content to import
-        :type  xhtml: str
-        :returns: XHTML with normalized ``img`` tags
-        :rtype: str
-        """
-        # Handle local images
-        xhtml = re.sub('<img [^>]*src="([^"]+)"[^>]*>',
-                      self.handle_local_img, xhtml)
-        # Handle remote images
-        if self.options.with_network:
-            xhtml = re.sub('<img [^>]*src="(https?://[^"]+)"[^>]*>',
-                          self.handle_remote_img, xhtml)
-        #print xhtml
-        return xhtml
-
-    def handle_local_img(self, img_mo):
-        """
-        Handling of local images. This method should be called as a callback on
-        each ``img`` tag.
-
-        Find the real path of the image file and use the :meth:`handle_img`
-        method to flag it for inclusion in the ODT file.
-
-        This implementation downloads the files that come from the same domain
-        as the XHTML document cames from, but server-based export plugins can
-        just retrieve it from the local disk, using either the
-        ``DOCUMENT_ROOT`` or any appropriate method (depending on the web
-        application you're writing an export plugin for).
-
-        :param img_mo: the match object from the `re.sub` callback
-        """
-        log("handling local image: %s" % img_mo.group(1), self.options.verbose)
-        src = img_mo.group(1)
-        if src.count("://") and not src.startswith("file://"):
-            # This is an absolute link, don't touch it
-            return img_mo.group()
-        if src.startswith("file://"):
-            filename = src[7:]
-        elif src.startswith("/"):
-            filename = src
-        else: # relative link
-            filename = os.path.join(os.path.dirname(self.options.input), src)
-        if os.path.exists(filename):
-            return self.handle_img(img_mo.group(), src, filename)
-        if src.startswith("file://") or not self.options.url:
-            # There's nothing we can do here
-            return img_mo.group()
-        newsrc = urlparse.urljoin(self.options.url, os.path.normpath(src))
-        if not self.options.with_network:
-            # Don't download it, just update the URL
-            return img_mo.group().replace(src, newsrc)
-        try:
-            tmpfile = self.download_img(newsrc)
-        except (urllib2.HTTPError, urllib2.URLError):
-            log("Failed getting %s" % newsrc, self.options.verbose)
-            return img_mo.group()
-        ret = self.handle_img(img_mo.group(), src, tmpfile)
-        os.remove(tmpfile)
-        return ret
-
-    def handle_remote_img(self, img_mo):
-        """
-        Downloads remote images to a temporary file and flags them for
-        inclusion using the :meth:`handle_img` method.
-
-        :param img_mo: the match object from the `re.sub` callback
-        """
-        log('handling remote image: %s' % img_mo.group(), self.options.verbose)
-        src = img_mo.group(1)
-        try:
-            tmpfile = self.download_img(src)
-        except (urllib2.HTTPError, urllib2.URLError):
-            return img_mo.group()
-        ret = self.handle_img(img_mo.group(), src, tmpfile)
-        os.remove(tmpfile)
-        return ret
-
-    def download_img(self, src):
-        """
-        Downloads the given image to a temporary location.
-
-        :param src: the URL to download
-        :type  src: str
-        """
-        log('Downloading image: %s' % src, self.options.verbose)
-        # TODO: proxy support
-        remoteimg = urllib2.urlopen(src)
-        tmpimg_fd, tmpfile = tempfile.mkstemp()
-        tmpimg = os.fdopen(tmpimg_fd, 'w')
-        tmpimg.write(remoteimg.read())
-        tmpimg.close()
-        remoteimg.close()
-        return tmpfile
-
-    def handle_img(self, full_tag, src, filename):
-        """
-        Imports an image into the ODT file.
-
-        :param full_tag: the full ``img`` tag in the original XHTML document
-        :type  full_tag: str
-        :param src: the ``src`` attribute of the ``img`` tag
-        :type  src: str
-        :param filename: the path to the image file on the local disk
-        :type  filename: str
-        """
-        log('Importing image: %s' % filename, self.options.verbose)
-        if not os.path.exists(filename):
-            raise ODTExportError('Image "%s" is not readable or does not exist'
-                                 % filename)
-        # TODO: generate a filename (with tempfile.mkstemp) to avoid weird
-        # filenames. Maybe use img.format for the extension
-        if not os.path.exists(os.path.join(self.tmpdir, "Pictures")):
-            os.mkdir(os.path.join(self.tmpdir, "Pictures"))
-        newname = ( hashlib.md5(filename).hexdigest()
-                    + os.path.splitext(filename)[1] )
-        shutil.copy(filename, os.path.join(self.tmpdir, "Pictures", newname))
-        self._added_images.append(os.path.join("Pictures", newname))
-        full_tag = full_tag.replace('src="%s"' % src,
-                                    'src="Pictures/%s"' % newname)
-        try:
-            img = Image.open(filename)
-        except IOError:
-            log('Failed to identify image: %s' % filename,
-                self.options.verbose)
-        else:
-            width, height = img.size
-            log('Detected size: %spx x %spx' % (width, height),
-                self.options.verbose)
-            width_mo = re.search('width="([0-9]+)(?:px)?"', full_tag)
-            height_mo = re.search('height="([0-9]+)(?:px)?"', full_tag)
-            if width_mo and height_mo:
-                log('Forced size: %spx x %spx.' % (width_mo.group(),
-                        height_mo.group()), self.options.verbose)
-                width = float(width_mo.group(1)) / self.options.img_dpi \
-                            * INCH_TO_CM
-                height = float(height_mo.group(1)) / self.options.img_dpi \
-                            * INCH_TO_CM
-                full_tag = full_tag.replace(width_mo.group(), "")\
-                                   .replace(height_mo.group(), "")
-            elif width_mo and not height_mo:
-                newwidth = float(width_mo.group(1)) / \
-                           float(self.options.img_dpi) * INCH_TO_CM
-                height = height * newwidth / width
-                width = newwidth
-                log('Forced width: %spx. Size will be: %scm x %scm' %
-                    (width_mo.group(1), width, height), self.options.verbose)
-                full_tag = full_tag.replace(width_mo.group(), "")
-            elif not width_mo and height_mo:
-                newheight = float(height_mo.group(1)) / \
-                            float(self.options.img_dpi) * INCH_TO_CM
-                width = width * newheight / height
-                height = newheight
-                log('Forced height: %spx. Size will be: %scm x %scm' %
-                    (height_mo.group(1), height, width), self.options.verbose)
-                full_tag = full_tag.replace(height_mo.group(), "")
-            elif hasattr(self.options, 'img_dpi'):
-                width = width / float(self.options.img_dpi) * INCH_TO_CM
-                height = height / float(self.options.img_dpi) * INCH_TO_CM
-                log('Size converted to: %scm x %scm' % (height, width),
-                        self.options.verbose)
-            elif hasattr(self.options, 'img_width'):
-                ratio = float(height) / float(width)
-                width = float(self.options.img_width.replace('cm', ''))
-                height = ratio * width
-                log('Size converted to: %scm x %scm' % (height, width),
-                        self.options.verbose)
-            else:
-                return full_tag
-            full_tag = full_tag.replace('<img',
-                    '<img width="%scm" height="%scm"' % (width, height))
-        return full_tag
-
-    def handle_links(self, xhtml):
-        """
-        Turn relative links into absolute links using the :meth:`handle_links`
-        method.
-        """
-        # Handle local images
-        xhtml = re.sub('<a [^>]*href="([^"]+)"',
-                      self.handle_relative_links, xhtml)
-        return xhtml
-
-    def handle_relative_links(self, link_mo):
-        """
-        Do the actual conversion of links from relative to absolute. This
-        method is used as a callback by the :meth:`handle_links` method.
-        """
-        href = link_mo.group(1)
-        if href.startswith("file://") or not self.options.url:
-            # There's nothing we can do here
-            return link_mo.group()
-        if href.count("://"):
-            # This is an absolute link, don't touch it
-            return link_mo.group()
-        log("handling relative link: %s" % href, self.options.verbose)
-        newhref = urlparse.urljoin(self.options.url, os.path.normpath(href))
-        return link_mo.group().replace(href, newhref)
-
-    def insert_content(self, content):
-        """
-        Insert ODT XML content into the ``content.xml`` file, replacing the
-        keywords if needed.
-
-        :param content: ODT XML content to insert
-        :type  content: str
-        """
-        if self.options.replace_keyword and \
-            self.xml["content"].count(self.options.replace_keyword) > 0:
-            self.xml["content"] = re.sub(
-                    "<text:p[^>]*>" +
-                    re.escape(self.options.replace_keyword)
-                    +"</text:p>", content, self.xml["content"])
-        else:
-            self.xml["content"] = self.xml["content"].replace(
-                '</office:text>',
-                content + '</office:text>')
-        # Cut unwanted text
-        if self.options.cut_start \
-                and self.xml["content"].count(self.options.cut_start) > 0 \
-                and self.options.cut_stop \
-                and self.xml["content"].count(self.options.cut_stop) > 0:
-            self.xml["content"] = re.sub(
-                    re.escape(self.options.cut_start)
-                    + ".*" +
-                    re.escape(self.options.cut_stop),
-                    "", self.xml["content"])
-
-    def add_styles(self):
-        """
-        Scans the ODT XML for used styles that would not be already included in
-        the ODT template, and adds those missing styles.
-        """
-        xsl_dir = os.path.join(INSTALL_PATH, 'xsl')
-        xslt_doc = etree.parse(os.path.join(xsl_dir, "styles.xsl"))
-        transform = etree.XSLT(xslt_doc)
-        contentxml = etree.fromstring(self.xml["content"])
-        stylesxml = etree.fromstring(self.xml["styles"])
-        params = {}
-        if self.options.verbose:
-            params["debug"] = "1"
-        self.xml["content"] = str(transform(contentxml, **params))
-        self.xml["styles"] = str(transform(stylesxml, **params))
-
-    def update_manifest(self):
-        manifest_path = os.path.join(self.tmpdir, "META-INF", "manifest.xml")
-        if not os.path.exists(manifest_path):
-            return
-        manifest = etree.parse(manifest_path)
-        manifest_root = manifest.getroot()
-        manifest_ns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
-        for img in self._added_images:
-            mime_type = mimetypes.guess_type(img, strict=False)[0]
-            if mime_type is None:
-                continue
-            img_el = etree.SubElement(
-                        manifest_root,
-                        "{%s}file-entry" % manifest_ns,
-                        {"{%s}media-type" % manifest_ns: mime_type,
-                         "{%s}full-path" % manifest_ns: img,
-                        })
-        manifest.write(manifest_path)
-
-    def compile(self):
-        """
-        Writes the in-memory ODT XML content and styles to the disk
-        """
-        # Store the new content
-        for xmlfile in self.xml:
-            xmlf = open(os.path.join(self.tmpdir, "%s.xml" % xmlfile), "w")
-            xmlf.write(self.xml[xmlfile])
-            xmlf.close()
-        self.update_manifest()
-
-    def _build_zip(self, document):
-        """
-        Zips the working directory into a :class:`zipfile.ZipFile` object
-
-        :param document: where the :class:`ZipFile` will be stored
-        :type  document: str or file-like object
-        """
-        newzf = zipfile.ZipFile(document, "w", zipfile.ZIP_DEFLATED)
-        for root, dirs, files in os.walk(self.tmpdir):
-            for cur_file in files:
-                realpath = os.path.join(root, cur_file)
-                to_skip = len(self.tmpdir) + 1
-                internalpath = os.path.join(root[to_skip:], cur_file)
-                newzf.write(realpath, internalpath)
-        newzf.close()
-
-    def save(self, output=None):
-        """
-        General method to save the in-memory content to an ODT file on the disk.
-
-        If :attr:`output` is ``None``, the document is returned.
-
-        :param output: where the document should be saved, see the :option:`-o`
-            option.
-        :type  output: str or file-like object or ``None``
-        :returns: if output is None: the ODT document ; or else ``None``.
-        """
-        self.compile()
-        if output:
-            document = output
-        else:
-            document = StringIO()
-        self._build_zip(document)
-        shutil.rmtree(self.tmpdir)
-        if not output:
-            return document.getvalue()
-
-
-def log(msg, verbose=False):
-    """
-    Simple method to log if we're in verbose mode (with the :option:`-v`
-    option).
-    """
-    if verbose:
-        sys.stderr.write(msg+"\n")
-
-def get_options():
-    """
-    Parses the command-line options.
-    """
-    usage = "usage: %prog [options] -i input -o output -t template.odt"
-    parser = OptionParser(usage=usage)
-    parser.add_option("--version", dest="version", action="store_true",
-                      help="Show the version and exit")
-    parser.add_option("-i", "--input", dest="input", metavar="FILE",
-                      help="Read the html from this file")
-    parser.add_option("-o", "--output", dest="output", metavar="FILE",
-                      help="Location of the output ODT file")
-    parser.add_option("-t", "--template", dest="template", metavar="FILE",
-                      help="Location of the template ODT file")
-    parser.add_option("-u", "--url", dest="url",
-                      help="Use this URL for relative links")
-    parser.add_option("-v", "--verbose", dest="verbose",
-                      action="store_true", default=False,
-                      help="Show what's going on")
-    parser.add_option("--html-id", dest="htmlid", metavar="ID",
-                      help="Only export from the element with this ID")
-    parser.add_option("--replace", dest="replace_keyword",
-                      default="ODT-INSERT", metavar="KEYWORD",
-                      help="Keyword to replace in the ODT template "
-                      "(default is %default)")
-    parser.add_option("--cut-start", dest="cut_start",
-                      default="ODT-CUT-START", metavar="KEYWORD",
-                      help="Keyword to start cutting text from the ODT "
-                      "template (default is %default)")
-    parser.add_option("--cut-stop", dest="cut_stop",
-                      default="ODT-CUT-STOP", metavar="KEYWORD",
-                      help="Keyword to stop cutting text from the ODT "
-                      "template (default is %default)")
-    parser.add_option("--top-header-level", dest="top_header_level",
-                      type="int", default="1", metavar="LEVEL",
-                      help="Level of highest header in the HTML "
-                      "(default is %default)")
-    parser.add_option("--img-default-width", dest="img_width",
-                      metavar="WIDTH", default="8cm",
-                      help="Default image width (default is %default)")
-    parser.add_option("--img-default-height", dest="img_height",
-                      metavar="HEIGHT", default="6cm",
-                      help="Default image height (default is %default)")
-    parser.add_option("--dpi", dest="img_dpi", type="int",
-                      default=96, metavar="DPI", help="Screen resolution "
-                      "in Dots Per Inch (default is %default)")
-    parser.add_option("--no-network", dest="with_network",
-                      action="store_false", default=True,
-                      help="Do not download remote images")
-    options, args = parser.parse_args()
-    if options.version:
-        print "xhtml2odt %s" % __version__
-        sys.exit(0)
-    if len(args) > 0:
-        parser.error("illegal arguments: %s"% ", ".join(args))
-    if not options.input:
-        parser.error("No input provided")
-    if not options.output:
-        parser.error("No output provided")
-    if not options.template:
-        default_template = os.path.join(INSTALL_PATH, "template.odt")
-        if os.path.exists(default_template):
-            options.template = default_template
-        else:
-            parser.error("No ODT template provided")
-    if not os.path.exists(options.input):
-        parser.error("Can't find input file: %s" % options.input)
-    if not os.path.exists(options.template):
-        parser.error("Can't find template file: %s" % options.template)
-    return options
-
-def main():
-    """
-    Main function, called when the script is invoked on the command line.
-    """
-    options = get_options()
-    try:
-        htmlfile = HTMLFile(options)
-        htmlfile.read()
-        odtfile = ODTFile(options)
-        odtfile.open()
-        odtfile.import_xhtml(htmlfile.html)
-        odtfile.save(options.output)
-    except ODTExportError, ex:
-        print >> sys.stderr, ex
-        print >> sys.stderr, "Conversion failed."
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()
-
diff --git a/xhtml2odt/xsl/document-content.xsl b/xhtml2odt/xsl/document-content.xsl
deleted file mode 100644
index 9063b714e..000000000
--- a/xhtml2odt/xsl/document-content.xsl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<xsl:include href="document-content/paragraph.xsl"/>
-<xsl:include href="document-content/block.xsl"/>
-<xsl:include href="document-content/inline.xsl"/>
-<xsl:include href="document-content/link.xsl"/>
-<xsl:include href="document-content/lists.xsl"/>
-<xsl:include href="document-content/section.xsl"/>
-<xsl:include href="document-content/media.xsl"/>
-<xsl:include href="document-content/tables.xsl"/>
-<xsl:include href="document-content/ignore.xsl"/>
-<xsl:include href="document-content/html5.xsl"/>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/block.xsl b/xhtml2odt/xsl/document-content/block.xsl
deleted file mode 100644
index cac6873e5..000000000
--- a/xhtml2odt/xsl/document-content/block.xsl
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-
-<xsl:template match="h:blockquote">
-    <!-- special formatting is defined in paragraph -->
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:hr">
-    <text:p text:style-name="Horizontal_20_Line"/>
-</xsl:template>
-<xsl:template match="h:hr" mode="inparagraph"/>
-
-<!--
-    Preformatted paragraphs management
--->
-<xsl:template match="h:pre">
-    <text:p text:style-name="Preformatted_20_Text">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:p>
-    <!-- The Preformatted_20_Text style has a margin-bottom of 0, so we add an
-         empty line here -->
-    <text:p text:style-name="Text_20_body"/>
-</xsl:template>
-<xsl:template match="h:pre" mode="inparagraph"/>
-
-<xsl:template match="h:pre//text()" mode="inparagraph">
-    <!-- Don't generate the last line break before the </pre> -->
-    <xsl:variable name="content">
-        <xsl:choose>
-            <xsl:when test="contains(., '&#10;')
-                            and position() = last()
-                            and substring(., string-length(.)) = '&#10;'">
-                <xsl:value-of select="substring(., 1, string-length(.)-1)"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="."/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
-    <!-- Now call the main template, which will handle the line-breaking -->
-    <xsl:call-template name="pre.line">
-        <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-</xsl:template>
-
-<!--
-    this template splits newline-separated pararagraphs into multiple
-    paragraphs
--->
-<xsl:template name="pre.line">
-    <xsl:param name="content"/>
-    <xsl:choose>
-        <!-- This line-breaking manipulation is classical, e.g.:
-             http://skew.org/xml/stylesheets/linefeed2br/
-        -->
-        <xsl:when test="contains($content, '&#10;')">
-            <!-- split in two -->
-            <xsl:call-template name="pre.line">
-                <xsl:with-param name="content" select="substring-before($content, '&#10;')"/>
-            </xsl:call-template>
-            <text:line-break/>
-            <xsl:call-template name="pre.line">
-                <xsl:with-param name="content" select="substring-after($content, '&#10;')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <!-- here we're on a single line, call pre.line.single to preserve
-                 spaces -->
-            <xsl:call-template name="pre.line.single">
-                <xsl:with-param name="content" select="string($content)"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- This template escapes adjacent spaces -->
-<xsl:template name="pre.line.single">
-    <xsl:param name="content"/>
-    <xsl:choose>
-        <xsl:when test="contains($content, '  ')">
-            <xsl:call-template name="pre.line.single">
-                <xsl:with-param name="content" select="substring-before($content, '  ')"/>
-            </xsl:call-template>
-            <text:s text:c="2"/>
-            <xsl:call-template name="pre.line.single">
-                <xsl:with-param name="content" select="substring-after($content, '  ')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="contains($content, '&#9;')">
-            <xsl:call-template name="pre.line.single">
-                <xsl:with-param name="content" select="substring-before($content, '&#9;')"/>
-            </xsl:call-template>
-            <text:tab/>
-            <xsl:call-template name="pre.line.single">
-                <xsl:with-param name="content" select="substring-after($content, '&#9;')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="string($content)"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="h:address">
-    <!-- special formatting is defined in paragraph -->
-    <xsl:call-template name="paragraph"/>
-</xsl:template>
-<xsl:template match="h:address" mode="inparagraph"/>
-
-<xsl:template match="h:center">
-    <!-- special formatting is defined in paragraph -->
-    <xsl:call-template name="paragraph"/>
-</xsl:template>
-<xsl:template match="h:center" mode="inparagraph"/>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/html5.xsl b/xhtml2odt/xsl/document-content/html5.xsl
deleted file mode 100644
index aff901af7..000000000
--- a/xhtml2odt/xsl/document-content/html5.xsl
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:section">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:header">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:footer">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:summary">
-    <!-- TODO: Add space on the left and right of the text -->
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:article">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:nav"/> <!-- only keep the content -->
-
-<xsl:template match="h:aside">
-    <text:p text:style-name="Text_20_body">
-        <draw:frame draw:style-name="Marginalia"
-                    text:anchor-type="paragraph"
-                    svg:width="8.5cm" style:rel-width="50%">
-            <draw:text-box fo:min-height="0.5cm">
-                <xsl:apply-templates/>
-            </draw:text-box>
-        </draw:frame>
-    </text:p>
-</xsl:template>
-
-<xsl:template match="h:hgroup">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:time" mode="inparagraph">
-    <xsl:apply-templates mode="inparagraph"/>
-</xsl:template>
-<xsl:template match="h:time"/>
-
-<xsl:template match="h:mark" mode="inparagraph">
-    <!-- TODO: make the text background color yellow -->
-    <xsl:apply-templates mode="inparagraph"/>
-</xsl:template>
-
-<xsl:template match="h:canvas"/>
-
-<!-- TODO: include the source ? -->
-<xsl:template match="h:audio"/>
-<xsl:template match="h:video"/>
-<xsl:template match="h:source"/>
-
-<!-- form elements -->
-<xsl:template match="h:command|h:datalist|h:details|h:meter|h:output|h:progress|h:keygen"/>
-
-<!-- TODO: make a frame around it -->
-<xsl:template match="h:figure"/>
-<xsl:template match="h:figcaption"/>
-
-<xsl:template match="h:ruby|h:rt|h:rp" mode="inparagraph">
-    <xsl:apply-templates mode="inparagraph"/>
-</xsl:template>
-<xsl:template match="h:ruby|h:rt|h:rp"/>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/ignore.xsl b/xhtml2odt/xsl/document-content/ignore.xsl
deleted file mode 100644
index d9c95bc00..000000000
--- a/xhtml2odt/xsl/document-content/ignore.xsl
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<xsl:template match="h:div">
-    <xsl:apply-templates/>
-</xsl:template>
-<xsl:template match="h:div" mode="inparagraph">
-    <xsl:apply-templates mode="inparagraph"/>
-</xsl:template>
-
-<xsl:template match="h:html">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:head"/>
-
-<xsl:template match="h:body">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:span"/>
-<xsl:template match="h:span" mode="inparagraph">
-    <xsl:choose>
-        <xsl:when test="translate(@style,' ','') != ''">
-            <!-- leave the style handling to xsl/styles.xsl -->
-            <xsl:copy>
-                <xsl:copy-of select="@*"/>
-                <xsl:apply-templates mode="inparagraph"/>
-            </xsl:copy>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:apply-templates mode="inparagraph"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template match="h:script"/>
-<xsl:template match="h:noscript"/>
-
-<xsl:template match="h:object"/>
-
-<xsl:template match="h:form"/>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/inline.xsl b/xhtml2odt/xsl/document-content/inline.xsl
deleted file mode 100644
index 54701b7ce..000000000
--- a/xhtml2odt/xsl/document-content/inline.xsl
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:em|h:i"/>
-<xsl:template match="h:em|h:i" mode="inparagraph">
-    <text:span text:style-name="emphasis">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:strong|h:b"/>
-<xsl:template match="h:strong|h:b" mode="inparagraph">
-    <text:span text:style-name="strong">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:sup"/>
-<xsl:template match="h:sup" mode="inparagraph">
-    <text:span text:style-name="sup">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:sub"/>
-<xsl:template match="h:sub" mode="inparagraph">
-    <text:span text:style-name="sub">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:code|h:tt|h:samp|h:kbd"/>
-<xsl:template match="h:code|h:tt|h:samp|h:kbd" mode="inparagraph">
-    <text:span text:style-name="Teletype">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:br">
-    <text:line-break/>
-</xsl:template>
-<xsl:template match="h:br" mode="inparagraph">
-    <text:line-break/>
-</xsl:template>
-
-<xsl:template match="h:del"/>
-<xsl:template match="h:del" mode="inparagraph">
-    <text:span text:style-name="strike">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:abbr|h:acronym"/>
-<xsl:template match="h:abbr|h:acronym" mode="inparagraph">
-    <xsl:apply-templates mode="inparagraph"/>
-    <xsl:variable name="footnotenum"
-                  select="count(preceding::h:abbr) + count(preceding::h:acronym) + 1"/>
-    <text:note text:note-class="footnote">
-        <xsl:attribute name="text:id">
-            <xsl:text>ftn</xsl:text>
-            <xsl:value-of select="$footnotenum"/>
-        </xsl:attribute>
-        <text:note-citation>
-            <xsl:value-of select="$footnotenum"/>
-        </text:note-citation>
-        <text:note-body>
-            <text:p text:style-name="Footnote">
-                <xsl:value-of select="@title"/>
-            </text:p>
-        </text:note-body>
-    </text:note>
-</xsl:template>
-
-<xsl:template match="h:big"/>
-<xsl:template match="h:big" mode="inparagraph">
-    <text:span text:style-name="big">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:small"/>
-<xsl:template match="h:small" mode="inparagraph">
-    <text:span text:style-name="small">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:cite|h:dfn|h:var"/>
-<xsl:template match="h:cite|h:dfn|h:var" mode="inparagraph">
-    <text:span text:style-name="Citation">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:q"/>
-<xsl:template match="h:q" mode="inparagraph">
-    <xsl:text>"</xsl:text>
-    <xsl:apply-templates mode="inparagraph"/>
-    <xsl:text>"</xsl:text>
-</xsl:template>
-
-<xsl:template match="h:ins"/>
-<xsl:template match="h:ins" mode="inparagraph">
-    <text:span text:style-name="underline">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-<xsl:template match="h:u"/>
-<xsl:template match="h:u" mode="inparagraph">
-    <text:span text:style-name="underline">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/link.xsl b/xhtml2odt/xsl/document-content/link.xsl
deleted file mode 100644
index aa3c58266..000000000
--- a/xhtml2odt/xsl/document-content/link.xsl
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:a">
-    <xsl:call-template name="link">
-        <xsl:with-param name="mode" select="''"/>
-    </xsl:call-template>
-</xsl:template>
-<xsl:template match="h:a" mode="inparagraph">
-    <xsl:call-template name="link">
-        <xsl:with-param name="mode" select="'inparagraph'"/>
-    </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="link">
-    <xsl:param name="mode"/>
-    <xsl:choose>
-        <xsl:when test="h:img">
-            <draw:a>
-                <xsl:call-template name="link-content">
-                    <xsl:with-param name="mode" select="$mode"/>
-                </xsl:call-template>
-            </draw:a>
-        </xsl:when>
-        <xsl:otherwise>
-            <text:a>
-                <xsl:call-template name="link-content">
-                    <xsl:with-param name="mode" select="$mode"/>
-                </xsl:call-template>
-            </text:a>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="link-content">
-    <xsl:param name="mode"/>
-    <xsl:attribute name="xlink:type"><xsl:text>simple</xsl:text></xsl:attribute>
-    <xsl:attribute name="xlink:href">
-        <xsl:choose>
-            <xsl:when test="contains(@href, '#') and substring-before(@href,'#') = $url">
-                <xsl:text>#</xsl:text><xsl:value-of select="substring-after(@href,'#')"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="@href"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:attribute>
-    <xsl:choose>
-        <xsl:when test="@id">
-            <text:bookmark-start>
-                <xsl:attribute name="text:name">
-                    <xsl:value-of select="@id"/>
-                </xsl:attribute>
-            </text:bookmark-start>
-        </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-        <xsl:when test="$mode = 'inparagraph'">
-            <xsl:apply-templates mode="inparagraph"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:apply-templates/>
-        </xsl:otherwise>
-    </xsl:choose>
-    <xsl:choose>
-        <xsl:when test="@id">
-            <text:bookmark-end>
-                <xsl:attribute name="text:name">
-                    <xsl:value-of select="@id"/>
-                </xsl:attribute>
-            </text:bookmark-end>
-        </xsl:when>
-    </xsl:choose>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/lists.xsl b/xhtml2odt/xsl/document-content/lists.xsl
deleted file mode 100644
index aa0d8eb05..000000000
--- a/xhtml2odt/xsl/document-content/lists.xsl
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:ul" mode="inparagraph"/>
-<xsl:template match="h:ul">
-    <xsl:param name="nolists" select="false()"/>
-    <!-- No lists inside lists (handled separately, see below) -->
-    <xsl:if test="not($nolists)">
-        <text:list text:style-name="List_20_1">
-            <xsl:apply-templates select="h:li"/>
-        </text:list>
-    </xsl:if>
-</xsl:template>
-
-
-<xsl:template match="h:ol" mode="inparagraph"/>
-<xsl:template match="h:ol">
-    <xsl:param name="nolists" select="false()"/>
-    <!-- No lists inside lists (handled separately, see below) -->
-    <xsl:if test="not($nolists)">
-        <text:list text:style-name="Numbering_20_1">
-            <xsl:apply-templates select="h:li" />
-        </text:list>
-    </xsl:if>
-</xsl:template>
-
-<!-- li -->
-
-<xsl:template match="h:li" mode="inparagraph"/>
-<xsl:template match="h:li">
-    <text:list-item>
-        <text:p>
-            <xsl:attribute name="text:style-name">
-                <xsl:text>list-item</xsl:text>
-                <xsl:choose>
-                    <xsl:when test="parent::h:ul"><xsl:text>-bullet</xsl:text></xsl:when>
-                    <xsl:when test="parent::h:ol"><xsl:text>-number</xsl:text></xsl:when>
-                    <xsl:otherwise></xsl:otherwise>
-                </xsl:choose>
-            </xsl:attribute>
-            <xsl:apply-templates select="child::node()" mode="inparagraph">
-                <!-- sublists must be after the </text:p> -->
-                <xsl:with-param name="nolists" select="true()"/>
-            </xsl:apply-templates>
-        </text:p>
-        <xsl:apply-templates select="h:ul|h:ol|h:pre|h:blockquote"/>
-    </text:list-item>
-</xsl:template>
-
-
-<!-- Definition lists -->
-<xsl:template match="h:dl" mode="inparagraph"/>
-<xsl:template match="h:dl">
-    <!--<xsl:apply-templates select="h:dt"/>-->
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:dt" mode="inparagraph"/>
-<xsl:template match="h:dt">
-    <xsl:call-template name="paragraph"/>
-    <!--
-    <text:p text:style-name="Definition_20_Term">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:p>
-    <xsl:apply-templates select="following-sibling::h:dd[position()=1]"/>
-    -->
-</xsl:template>
-
-<xsl:template match="h:dd" mode="inparagraph"/>
-<xsl:template match="h:dd">
-    <xsl:call-template name="paragraph"/>
-    <!--
-    <text:p text:style-name="Definition_20_Description">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:p>
-    -->
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/media.xsl b/xhtml2odt/xsl/document-content/media.xsl
deleted file mode 100644
index 5397a06df..000000000
--- a/xhtml2odt/xsl/document-content/media.xsl
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:img">
-    <text:p text:style-name="Text_20_body">
-        <xsl:call-template name="image"/>
-    </text:p>
-</xsl:template>
-<xsl:template match="h:img" mode="inparagraph">
-    <xsl:call-template name="image"/>
-</xsl:template>
-
-<xsl:template name="image">
-
-    <!-- @align                                                  -->
-    <!-- @contentwidth                                           -->
-    <!-- @contentheight                                          -->
-    <!-- @fileref                                                -->
-    <!-- @format                                                 -->
-    <!-- @scale                                                  -->
-    <!-- @scalefit                                               -->
-    <!-- @valign                                                 -->
-    <!-- @width                                                  -->
-    <!-- @depth                                                  -->
-
-    <xsl:element name="draw:frame">
-
-        <xsl:choose>
-            <xsl:when test="substring-before(@width,'cm') &lt; $img_inline_threshold
-                            and substring-before(@height,'cm') &lt; $img_inline_threshold">
-                <xsl:attribute name="text:anchor-type">as-char</xsl:attribute>
-                <xsl:attribute name="draw:style-name">image-inline</xsl:attribute>
-            </xsl:when>
-            <xsl:when test="contains(@style,'float:') and contains(@style,'left')">
-                <xsl:attribute name="text:anchor-type">paragraph</xsl:attribute>
-                <xsl:attribute name="draw:style-name">image-left</xsl:attribute>
-            </xsl:when>
-            <xsl:when test="contains(@style,'float:') and contains(@style,'right')">
-                <xsl:attribute name="text:anchor-type">paragraph</xsl:attribute>
-                <xsl:attribute name="draw:style-name">image-right</xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:attribute name="text:anchor-type">paragraph</xsl:attribute>
-                <xsl:attribute name="draw:style-name">image-center</xsl:attribute>
-            </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:attribute name="draw:name">imageobject-<xsl:value-of select="generate-id()"/></xsl:attribute>
-
-        <xsl:choose>
-            <xsl:when test="@width and @height">
-                <xsl:attribute name="svg:width"><xsl:value-of select="@width"/></xsl:attribute>
-                <xsl:attribute name="svg:height"><xsl:value-of select="@height"/></xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-                <!-- In OpenDocument svg:width and height must be defined. Use defaults here -->
-                <xsl:attribute name="svg:width"><xsl:value-of select="$img_default_width"/></xsl:attribute>
-                <xsl:attribute name="svg:height"><xsl:value-of select="$img_default_height"/></xsl:attribute>
-            </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:attribute name="svg:y">0.20cm</xsl:attribute>
-
-        <xsl:attribute name="draw:z-index">1</xsl:attribute>
-        <xsl:element name="draw:image">
-            <xsl:attribute name="xlink:href"><xsl:value-of select="@src"/></xsl:attribute>
-            <xsl:attribute name="xlink:type">simple</xsl:attribute>
-            <xsl:attribute name="xlink:show">embed</xsl:attribute>
-            <xsl:attribute name="xlink:actuate">onLoad</xsl:attribute>
-        </xsl:element>
-
-        <xsl:element name="svg:title"><xsl:value-of select="@alt"/></xsl:element>
-
-    </xsl:element>
-
-</xsl:template>
-
-
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/paragraph.xsl b/xhtml2odt/xsl/document-content/paragraph.xsl
deleted file mode 100644
index b9ffbec55..000000000
--- a/xhtml2odt/xsl/document-content/paragraph.xsl
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:p">
-    <xsl:call-template name="paragraph"/>
-</xsl:template>
-<xsl:template match="h:p" mode="inparagraph">
-    <xsl:apply-templates mode="inparagraph"/>
-</xsl:template>
-
-<xsl:template name="paragraph">
-    <xsl:choose>
-        <xsl:when test="
-            child::h:ul|
-            child::h:ol|
-            child::h:blockquote|
-            child::h:pre |
-            child::h:dl |
-            child::h:div
-            ">
-            <xsl:for-each select="
-                    child::h:ul |
-                    child::h:ol |
-                    child::h:blockquote |
-                    child::h:pre |
-                    child::h:dl |
-                    child::h:div
-                    ">
-                <!-- Paragraph with the text before -->
-                <xsl:if test="preceding-sibling::node()">
-                    <xsl:call-template name="paragraph-content">
-                        <xsl:with-param name="subject" select="preceding-sibling::node()"/>
-                    </xsl:call-template>
-                </xsl:if>
-                <!-- Create the block-type element -->
-                <xsl:apply-templates select="."/>
-                <!-- Paragraph with the text after -->
-                    <xsl:if test="following-sibling::node()">
-                    <xsl:call-template name="paragraph-content">
-                        <xsl:with-param name="subject" select="following-sibling::node()"/>
-                    </xsl:call-template>
-                </xsl:if>
-            </xsl:for-each>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="paragraph-content">
-                <xsl:with-param name="subject" select="node()"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-
-<xsl:template name="paragraph-content">
-
-    <xsl:param name="subject"/>
-
-    <text:p>
-
-        <xsl:attribute name="text:style-name">
-            <xsl:choose>
-                <!-- those two seem unnecessary, it's handled in lists.xsl -->
-                <xsl:when test="$subject/parent::h:ul">
-                    <xsl:text>list-item-bullet</xsl:text>
-                </xsl:when>
-                <xsl:when test="$subject/parent::h:ol">
-                    <xsl:text>list-item-number</xsl:text>
-                </xsl:when>
-                <xsl:when test="$subject/../parent::h:blockquote">Quotations</xsl:when>
-                <xsl:when test="contains(@style,'text-align:') and contains(@style,'left')">left</xsl:when>
-                <xsl:when test="contains(@style,'text-align:') and contains(@style,'center')">center</xsl:when>
-                <xsl:when test="contains(@style,'text-align:') and contains(@style,'right')">right</xsl:when>
-                <xsl:when test="contains(@style,'text-align:') and contains(@style,'justify')">justify</xsl:when>
-                <xsl:when test="$subject/self::h:address or (name($subject) = '' and $subject/parent::h:address)">Sender</xsl:when>
-                <xsl:when test="$subject/self::h:center or (name($subject) = '' and $subject/parent::h:center)">center</xsl:when>
-                <xsl:when test="$subject/self::h:th or (name($subject) = '' and $subject/parent::h:th)">Table_20_Heading</xsl:when>
-                <xsl:when test="$subject/self::h:td or (name($subject) = '' and $subject/parent::h:td)">Table_20_Contents</xsl:when>
-                <xsl:when test="$subject/self::h:dt or (name($subject) = '' and $subject/parent::h:dt)">Definition_20_Term</xsl:when>
-                <xsl:when test="$subject/self::h:dd or (name($subject) = '' and $subject/parent::h:dd)">Definition_20_Description</xsl:when>
-                <xsl:otherwise>Text_20_body</xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-
-        <xsl:for-each select="$subject">
-            <xsl:choose>
-                <xsl:when test="name() = ''">
-                    <!-- text node -->
-                    <xsl:value-of select="string()"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="inparagraph"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-
-    </text:p>
-
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/section.xsl b/xhtml2odt/xsl/document-content/section.xsl
deleted file mode 100644
index 72f1479f2..000000000
--- a/xhtml2odt/xsl/document-content/section.xsl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template name="section" match="h:h1|h:h2|h:h3|h:h4|h:h5|h:h6">
-
-    <!-- compute level of section -->
-    <xsl:variable name="level">
-        <xsl:value-of select="substring-after(local-name(.),'h') - $heading_minus_level"/>
-    </xsl:variable>
-
-    <xsl:comment>
-        <xsl:text>section level </xsl:text><xsl:value-of select="$level"/>
-    </xsl:comment>
-
-    <text:h>
-        <xsl:attribute name="text:style-name"><xsl:text>Heading_20_</xsl:text>
-            <xsl:value-of select="$level"/>
-        </xsl:attribute>
-        <xsl:attribute name="text:outline-level">
-            <xsl:value-of select="$level"/>
-        </xsl:attribute>
-
-        <xsl:apply-templates mode="inparagraph"/>
-
-    </text:h>
-
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/document-content/tables.xsl b/xhtml2odt/xsl/document-content/tables.xsl
deleted file mode 100644
index f17354455..000000000
--- a/xhtml2odt/xsl/document-content/tables.xsl
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template name="table.number">
-    <!-- compute number of section -->
-    <xsl:value-of select="count(preceding::h:table)+1"/>
-</xsl:template>
-
-<xsl:template match="h:table">
-    <xsl:if test="h:caption">
-        <xsl:variable name="number">
-            <xsl:call-template name="table.number"/>
-        </xsl:variable>
-        <text:p text:style-name="Caption">
-            <xsl:text>Table </xsl:text>
-            <text:sequence text:ref-name="refTable0" text:name="Table"
-                           text:formula="ooow:Table+1" style:num-format="1">
-                <xsl:value-of select="$number"/>
-            </text:sequence>
-            <xsl:text>: </xsl:text><xsl:value-of select="h:caption"/>
-        </text:p>
-    </xsl:if>
-    <table:table table:style-name="table-default">
-        <table:table-column>
-            <xsl:attribute name="table:number-columns-repeated">
-                <xsl:value-of select="count(descendant::h:tr[1]/h:th|descendant::h:tr[1]/h:td)"/>
-            </xsl:attribute>
-        </table:table-column>
-        <!--<xsl:attribute name="table:name"></xsl:attribute>-->
-        <xsl:apply-templates/>
-        <xsl:apply-templates select="h:tfoot/*"/>
-    </table:table>
-</xsl:template>
-
-<xsl:template match="h:table/h:caption"/>
-
-<xsl:template match="h:thead">
-    <!-- <table:table-header-rows> handled in <th> -->
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:tfoot">
-    <!-- handled above in h:table -->
-</xsl:template>
-
-<xsl:template match="h:tbody">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="h:tr">
-    <xsl:choose>
-        <!-- this is header -->
-        <xsl:when test="h:th">
-            <table:table-header-rows>
-                <xsl:call-template name="make-table-row"/>
-            </table:table-header-rows>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="make-table-row"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make-table-row">
-    <table:table-row>
-        <!-- fill covered-table-cells for rowspans on the first column -->
-        <xsl:for-each select="preceding-sibling::h:tr/*[position() = 1 and @rowspan != 1]">
-            <xsl:call-template name="make-rowspan-covered-table-cell">
-                <xsl:with-param name="vertical-position">
-                    <xsl:value-of select="count(preceding-sibling::h:tr) + 1"/>
-                </xsl:with-param>
-            </xsl:call-template>
-        </xsl:for-each>
-        <!-- do the cell handling now -->
-        <xsl:apply-templates/>
-    </table:table-row>
-</xsl:template>
-
-<xsl:template match="h:th">
-    <xsl:call-template name="table-cell">
-        <xsl:with-param name="horizontal-position" select="count(preceding-sibling::*) + 1"/>
-        <xsl:with-param name="horizontal-count" select="count(../*)"/>
-        <xsl:with-param name="vertical-position" select="count(../preceding-sibling::h:tr) + 1"/>
-        <xsl:with-param name="vertical-count" select="count(ancestor::h:table[1]/descendant::h:tr)"/>
-    </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="h:td">
-    <xsl:call-template name="table-cell">
-        <xsl:with-param name="horizontal-position" select="count(preceding-sibling::*) + 1"/>
-        <xsl:with-param name="horizontal-count" select="count(../*)"/>
-        <xsl:with-param name="vertical-position" select="count(../preceding-sibling::h:tr)
-                                                       + count(ancestor::h:table[1]/descendant::h:thead/h:tr)
-                                                       + 1"/>
-        <xsl:with-param name="vertical-count" select="count(ancestor::h:table[1]/descendant::h:tr)"/>
-    </xsl:call-template>
-</xsl:template>
-
-
-<!-- table cell -->
-
-<xsl:template name="table-cell">
-
-    <xsl:param name="horizontal-position" />
-    <xsl:param name="horizontal-count" />
-    <xsl:param name="vertical-position" />
-    <xsl:param name="vertical-count" />
-
-    <xsl:comment>horizontal-position=<xsl:value-of select="$horizontal-position"/></xsl:comment>
-    <xsl:comment>horizontal-count=<xsl:value-of select="$horizontal-count"/></xsl:comment>
-    <xsl:comment>vertical-position=<xsl:value-of select="$vertical-position"/></xsl:comment>
-    <xsl:comment>vertical-count=<xsl:value-of select="$vertical-count"/></xsl:comment>
-
-    <table:table-cell office:value-type="string">
-
-        <xsl:attribute name="table:style-name">
-            <xsl:text>table-default.cell-</xsl:text>
-            <!-- prefix -->
-            <xsl:if test="self::h:th and $vertical-position = 1">
-                <xsl:text>H-</xsl:text>
-            </xsl:if>
-            <xsl:if test="parent::h:tr/parent::h:tfoot">
-                <xsl:text>F-</xsl:text>
-            </xsl:if>
-            <!-- postfix defined by cell position -->
-            <!--
-                __________
-                |A1|B1|C1|
-                |A2|B2|C2|
-                |A3|B3|C3|
-                ^^^^^^^^^^
-                __________
-                |A4|B4|C4|
-                ^^^^^^^^^^
-                ____
-                |C1|
-                |C2|
-                |C3|
-                ^^^^
-            -->
-            <xsl:choose>
-
-                <!-- single -->
-                <xsl:when test="$horizontal-count = 1 and $vertical-count = 1">
-                    <xsl:text>single</xsl:text>
-                </xsl:when>
-
-                <!-- A4 -->
-                <xsl:when test="$horizontal-position = 1 and $vertical-count = 1">
-                    <xsl:text>A4</xsl:text>
-                </xsl:when>
-                <!-- C4 -->
-                <xsl:when test="$horizontal-position = $horizontal-count and $vertical-count = 1">
-                    <xsl:text>C4</xsl:text>
-                </xsl:when>
-                <!-- B4 -->
-                <xsl:when test="$vertical-count = 1">
-                    <xsl:text>B4</xsl:text>
-                </xsl:when>
-
-                <!-- tfoot A -->
-                <xsl:when test="ancestor::h:tfoot and $horizontal-position = 1">
-                    <xsl:text>A3</xsl:text>
-                </xsl:when>
-                <!-- tfoot B -->
-                <xsl:when test="ancestor::h:tfoot and $horizontal-position = $horizontal-count">
-                    <xsl:text>C3</xsl:text>
-                </xsl:when>
-                <!-- tfoot C -->
-                <xsl:when test="ancestor::h:tfoot">
-                    <xsl:text>B3</xsl:text>
-                </xsl:when>
-
-                <!-- A3 -->
-                <xsl:when test="$horizontal-position = 1 and $horizontal-count != 1 and $vertical-position = $vertical-count">
-                    <xsl:text>A3</xsl:text>
-                </xsl:when>
-                <!-- C3 -->
-                <xsl:when test="$horizontal-position = $horizontal-count and $vertical-position = $vertical-count">
-                    <xsl:text>C3</xsl:text>
-                </xsl:when>
-                <!-- B3 -->
-                <xsl:when test="$vertical-position = $vertical-count">
-                    <xsl:text>B3</xsl:text>
-                </xsl:when>
-
-                <!-- A1 -->
-                <xsl:when test="$horizontal-position = 1 and $horizontal-position != $horizontal-count and $vertical-position = 1">
-                    <xsl:text>A1</xsl:text>
-                </xsl:when>
-                <!-- C1 -->
-                <xsl:when test="$horizontal-position = $horizontal-count and $vertical-position = 1">
-                    <xsl:text>C1</xsl:text>
-                </xsl:when>
-                <!-- B1 -->
-                <xsl:when test="$vertical-position = 1">
-                    <xsl:text>B1</xsl:text>
-                </xsl:when>
-
-                <!-- A2 -->
-                <xsl:when test="$horizontal-position = 1 and $horizontal-position != $horizontal-count">
-                    <xsl:text>A2</xsl:text>
-                </xsl:when>
-                <!-- C2 -->
-                <xsl:when test="$horizontal-position = $horizontal-count">
-                    <xsl:text>C2</xsl:text>
-                </xsl:when>
-
-                <!-- all other cells -->
-                <xsl:otherwise>
-                    <xsl:text>B2</xsl:text>
-                </xsl:otherwise>
-
-            </xsl:choose>
-
-        </xsl:attribute>
-
-        <xsl:if test="@colspan and @colspan != 1">
-            <xsl:attribute name="table:number-columns-spanned">
-                <xsl:value-of select="@colspan"/>
-            </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="@rowspan and @rowspan != 1">
-            <xsl:attribute name="table:number-rows-spanned">
-                <xsl:value-of select="@rowspan"/>
-            </xsl:attribute>
-        </xsl:if>
-
-        <!-- Content -->
-        <xsl:choose>
-            <xsl:when test="h:table"> <!-- nested tables -->
-                <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:call-template name="paragraph"/>
-            </xsl:otherwise>
-        </xsl:choose>
-
-    </table:table-cell>
-
-    <!-- fill covered-table-cells for colspans -->
-    <xsl:if test="@colspan and @colspan != 1">
-        <xsl:call-template name="make-covered-table-cell">
-            <xsl:with-param name="num">
-                <xsl:value-of select="@colspan"/>
-            </xsl:with-param>
-        </xsl:call-template>
-    </xsl:if>
-
-    <!-- fill covered-table-cells for rowspans -->
-    <xsl:for-each select="../preceding-sibling::h:tr/*[position() = $horizontal-position + 1 and @rowspan != 1]">
-        <xsl:call-template name="make-rowspan-covered-table-cell">
-            <xsl:with-param name="vertical-position">
-                <xsl:value-of select="$vertical-position"/>
-            </xsl:with-param>
-        </xsl:call-template>
-    </xsl:for-each>
-
-</xsl:template>
-
-
-<xsl:template name="make-covered-table-cell">
-    <xsl:param name="num"/>
-    <xsl:if test="$num > 1">
-        <table:covered-table-cell/>
-        <xsl:call-template name="make-covered-table-cell">
-            <xsl:with-param name="num">
-                <xsl:value-of select="$num - 1"/>
-            </xsl:with-param>
-        </xsl:call-template>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template name="make-rowspan-covered-table-cell">
-    <xsl:param name="vertical-position"/>
-    <xsl:variable name="spanned-vertical-position" select="count(../preceding-sibling::h:tr) + 1"/>
-    <xsl:if test="$spanned-vertical-position + @rowspan - 1 >= $vertical-position">
-        <table:covered-table-cell/>
-    </xsl:if>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/param.xsl b/xhtml2odt/xsl/param.xsl
deleted file mode 100644
index 5117d59fa..000000000
--- a/xhtml2odt/xsl/param.xsl
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-    <xsl:param name="debug"></xsl:param>
-
-    <!-- URL of the converted page -->
-    <xsl:param name="url">http://localhost</xsl:param>
-
-    <!-- in the text to convert, heading tags start below this level
-         (0 for h1, 1 for h2, etc.) -->
-    <xsl:param name="heading_minus_level">0</xsl:param>
-
-    <!-- default image size -->
-    <xsl:param name="img_default_width">8cm</xsl:param>
-    <xsl:param name="img_default_height">6cm</xsl:param>
-
-    <!-- images smaller that this will be placed inline (e.g. smileys) -->
-    <xsl:param name="img_inline_threshold">2</xsl:param>
-
-</xsl:stylesheet>
-
diff --git a/xhtml2odt/xsl/specific.xsl b/xhtml2odt/xsl/specific.xsl
deleted file mode 100644
index bba06f2a4..000000000
--- a/xhtml2odt/xsl/specific.xsl
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<xsl:include href="specific/trac.xsl"/>
-<xsl:include href="specific/pygments.xsl"/>
-<xsl:include href="specific/geshi.xsl"/>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/specific/geshi.xsl b/xhtml2odt/xsl/specific/geshi.xsl
deleted file mode 100644
index a0795f473..000000000
--- a/xhtml2odt/xsl/specific/geshi.xsl
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:pre[@class]">
-    <xsl:choose>
-        <xsl:when test="not(child::h:ol)">
-            <text:p text:style-name="Preformatted_20_Text">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:p>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:apply-templates mode="inparagraph"/>
-        </xsl:otherwise>
-    </xsl:choose>
-    <!-- The Preformatted_20_Text style has a margin-bottom of 0, so we add an
-         empty line here -->
-    <text:p text:style-name="Text_20_body"/>
-</xsl:template>
-
-<xsl:template match="h:pre/h:ol" mode="inparagraph">
-    <text:list text:style-name="Numbering_20_1">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:list>
-</xsl:template>
-
-<xsl:template match="h:pre/h:ol/h:li" mode="inparagraph">
-    <text:list-item>
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:list-item>
-</xsl:template>
-
-<xsl:template match="h:pre/h:ol/h:li/h:div" mode="inparagraph">
-    <text:p text:style-name="Source_20_Code_20_Numbered"> 
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:p>
-</xsl:template>
-
-<xsl:template match="h:pre/h:ol/h:li/h:div//text()" mode="inparagraph">
-    <xsl:call-template name="pre.line.single">
-        <xsl:with-param name="content" select="."/>
-     </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/specific/pygments.xsl b/xhtml2odt/xsl/specific/pygments.xsl
deleted file mode 100644
index 0d46a36b0..000000000
--- a/xhtml2odt/xsl/specific/pygments.xsl
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:div[@class='code']/h:pre">
-    <text:p text:style-name="Source_20_Code">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:p>
-    <!-- The Preformatted_20_Text style has a margin-bottom of 0, so we add an
-         empty line here -->
-    <text:p text:style-name="Text_20_body"/>
-</xsl:template>
-
-<!--
-     Code highlighting
-     This is incomplete, see http://pygments.org/docs/tokens/
--->
-
-<xsl:template match="h:div[@class='code']/h:pre/h:span[@class]" mode="inparagraph">
-    <xsl:choose>
-        <!-- Keyword and Keyword.* -->
-        <xsl:when test="substring(@class,1,1) = 'k'">
-            <text:span text:style-name="strong">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Class -->
-        <xsl:when test="@class = 'nc'">
-            <text:span text:style-name="syntax-highlight.class">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Function -->
-        <xsl:when test="@class = 'nf'">
-            <text:span text:style-name="syntax-highlight.function">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Tag -->
-        <xsl:when test="@class = 'nt'">
-            <text:span text:style-name="syntax-highlight.tag">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Attribute -->
-        <xsl:when test="@class = 'na'">
-            <text:span text:style-name="syntax-highlight.attr">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Builtin -->
-        <xsl:when test="@class = 'nb'">
-            <text:span text:style-name="syntax-highlight.builtin">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Namespace -->
-        <xsl:when test="@class = 'nn'">
-            <text:span text:style-name="syntax-highlight.namespace">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Exception -->
-        <xsl:when test="@class = 'ne'">
-            <text:span text:style-name="syntax-highlight.exception">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Variable -->
-        <xsl:when test="@class = 'nv'">
-            <text:span text:style-name="syntax-highlight.var">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Name.Builtin.Pseudo -->
-        <xsl:when test="@class = 'bp'">
-            <text:span text:style-name="syntax-highlight.builtin.pseudo">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- String and String.* -->
-        <xsl:when test="substring(@class,1,1) = 's'">
-            <text:span text:style-name="syntax-highlight.string">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Number and Number.* -->
-        <xsl:when test="substring(@class,1,1) = 'm'">
-            <text:span text:style-name="syntax-highlight.number">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Operator and Operator.Word -->
-        <xsl:when test="substring(@class,1,1) = 'o'">
-            <text:span text:style-name="strong">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Punctuation -->
-        <xsl:when test="@class = 'p'">
-            <xsl:apply-templates mode="inparagraph"/>
-        </xsl:when>
-        <!-- Comment and Comment.* -->
-        <xsl:when test="substring(@class,1,1) = 'c'">
-            <text:span text:style-name="syntax-highlight.comment">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <!-- Generic.Error -->
-        <xsl:when test="@class = 'err'">
-            <text:span text:style-name="syntax-highlight.error">
-                <xsl:apply-templates mode="inparagraph"/>
-            </text:span>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:apply-templates mode="inparagraph"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/specific/trac.xsl b/xhtml2odt/xsl/specific/trac.xsl
deleted file mode 100644
index 859bd3c83..000000000
--- a/xhtml2odt/xsl/specific/trac.xsl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-
-<xsl:template match="h:span[@class='underline']"/>
-<xsl:template match="h:span[@class='underline']" mode="inparagraph">
-    <text:span text:style-name="underline">
-        <xsl:apply-templates mode="inparagraph"/>
-    </text:span>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/styles.xsl b/xhtml2odt/xsl/styles.xsl
deleted file mode 100644
index 44c5bca64..000000000
--- a/xhtml2odt/xsl/styles.xsl
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    exclude-result-prefixes="office xsl dc text style table draw fo xlink meta number svg chart dr3d math form script dom xforms xsd xsi presentation h"
-    version="1.0">
-
-<!-- SETTINGS -->
-<xsl:decimal-format name="staff" digit="D" />
-<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="utf-8"/>
-<!--<xsl:strip-space elements="*"/>-->
-<!--<xsl:preserve-space elements=""/>-->
-
-
-<xsl:include href="param.xsl"/>
-<xsl:include href="styles/automatic-styles.xsl"/>
-<xsl:include href="styles/main-styles.xsl"/>
-<xsl:include href="styles/fonts.xsl"/>
-<xsl:include href="styles/highlight.xsl"/>
-<xsl:include href="styles/inline.xsl"/>
-
-
-<xsl:template match="/">
-    <xsl:apply-templates/>
-</xsl:template>
-
-
-<!-- process automatic styles -->
-<xsl:template match="office:automatic-styles">
-    <office:automatic-styles>
-        <!-- copy the existing styles -->
-        <xsl:for-each select="child::*">
-            <xsl:copy>
-                <xsl:copy-of select="@*"/>
-                <xsl:apply-templates/>
-            </xsl:copy>
-        </xsl:for-each>
-        <!-- add missing styles -->
-        <xsl:call-template name="autostyles"/>
-        <!-- add missing syntax highlighting styles -->
-        <xsl:call-template name="highlight"/>
-        <!-- add missing inline styles -->
-        <xsl:call-template name="inline"/>
-    </office:automatic-styles>
-</xsl:template>
-
-<!-- process main styles -->
-<xsl:template match="office:styles">
-    <office:styles>
-        <!-- copy the existing styles -->
-        <xsl:for-each select="child::*">
-            <xsl:copy>
-                <xsl:copy-of select="@*"/>
-                <xsl:apply-templates/>
-            </xsl:copy>
-        </xsl:for-each>
-        <!-- add missing styles -->
-        <xsl:call-template name="mainstyles"/>
-    </office:styles>
-</xsl:template>
-
-<!-- process font declarations -->
-<xsl:template match="office:font-face-decls">
-    <office:font-face-decls>
-        <!-- copy the existing fonts -->
-        <xsl:for-each select="child::*">
-            <xsl:copy>
-                <xsl:copy-of select="@*"/>
-                <xsl:apply-templates/>
-            </xsl:copy>
-        </xsl:for-each>
-        <!-- add missing fonts -->
-        <xsl:call-template name="fonts"/>
-    </office:font-face-decls>
-</xsl:template>
-
-<!-- Convert the <span> tags which have inline CSS properties in the style
-     attribute. See the styles/inline.xsl stylesheet for details -->
-<xsl:template match="h:span[@style]">
-    <text:span>
-        <xsl:attribute name="text:style-name">
-            <xsl:text>inline-style.</xsl:text>
-            <xsl:value-of select="generate-id(.)"/>
-        </xsl:attribute>
-        <xsl:apply-templates/>
-    </text:span>
-</xsl:template>
-
-<!-- Leave alone unknown tags -->
-<xsl:template match="*">
-    <xsl:copy>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates/>
-    </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/styles/automatic-styles.xsl b/xhtml2odt/xsl/styles/automatic-styles.xsl
deleted file mode 100644
index 6c079be9d..000000000
--- a/xhtml2odt/xsl/styles/automatic-styles.xsl
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<xsl:template name="autostyles">
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'big']) = 0">
-        <style:style style:name="big" style:family="text">
-            <style:text-properties fo:font-size="120%"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'left']) = 0">
-        <style:style style:name="left" style:family="paragraph"
-                     style:parent-style-name="Text_20_body">
-            <style:paragraph-properties fo:text-align="left"
-                                        style:justify-single-word="false"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'center']) = 0">
-        <style:style style:name="center" style:family="paragraph"
-                     style:parent-style-name="Text_20_body">
-            <style:paragraph-properties fo:text-align="center"
-                                        style:justify-single-word="false"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'right']) = 0">
-        <style:style style:name="right" style:family="paragraph"
-                     style:parent-style-name="Text_20_body">
-            <style:paragraph-properties fo:text-align="right"
-                                        style:justify-single-word="false"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'justify']) = 0">
-        <style:style style:name="justify" style:family="paragraph"
-                     style:parent-style-name="Text_20_body">
-            <style:paragraph-properties fo:text-align="justify"
-                                        style:justify-single-word="false"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'emphasis']) = 0">
-        <style:style style:name="emphasis" style:family="text">
-            <style:text-properties fo:font-style="italic"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'image-center']) = 0">
-    <style:style style:name="image-center" style:family="graphic"
-                 style:parent-style-name="Graphics">
-        <style:graphic-properties style:wrap="none"
-                                  style:horizontal-pos="center"
-                                  style:horizontal-rel="paragraph"/>
-    </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'image-inline']) = 0">
-        <style:style style:name="image-inline" style:family="graphic"
-                     style:parent-style-name="Graphics">
-            <style:graphic-properties style:vertical-pos="middle"
-                                      style:vertical-rel="text"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'image-left']) = 0">
-        <style:style style:name="image-left" style:family="graphic"
-                     style:parent-style-name="Graphics">
-            <style:graphic-properties style:wrap="right" style:vertical-pos="top"
-                                      style:vertical-rel="paragraph-content"
-                                      style:horizontal-pos="left"
-                                      style:horizontal-rel="paragraph"
-                                      style:flow-with-text="true"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'image-right']) = 0">
-        <style:style style:name="image-right" style:family="graphic"
-                     style:parent-style-name="Graphics">
-            <style:graphic-properties style:wrap="left" style:vertical-pos="top"
-                                      style:vertical-rel="paragraph-content"
-                                      style:horizontal-pos="right"
-                                      style:horizontal-rel="paragraph"
-                                      style:flow-with-text="true"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'list-item-bullet']) = 0">
-        <style:style style:name="list-item-bullet" style:family="paragraph"
-                     style:parent-style-name="Text_20_body"
-                     style:list-style-name="List_20_1"/>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'list-item-number']) = 0">
-        <style:style style:name="list-item-number" style:family="paragraph"
-                     style:parent-style-name="Text_20_body"
-                     style:list-style-name="Numbering_20_1"/>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'small']) = 0">
-        <style:style style:name="small" style:family="text">
-            <style:text-properties fo:font-size="80%"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'strike']) = 0">
-        <style:style style:name="strike" style:family="text">
-            <style:text-properties style:text-line-through-style="solid"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'strong']) = 0">
-        <style:style style:name="strong" style:family="text">
-            <style:text-properties fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'sub']) = 0">
-        <style:style style:name="sub" style:family="text">
-             <style:text-properties style:text-position="sub 58%"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'sup']) = 0">
-        <style:style style:name="sup" style:family="text">
-             <style:text-properties style:text-position="super 58%"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-A1']) = 0">
-        <style:style style:name="table-default.cell-A1" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.03cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.01cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-A2']) = 0">
-        <style:style style:name="table-default.cell-A2" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.03cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="none"
-                                         fo:border-bottom="0.01cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-A3']) = 0">
-        <style:style style:name="table-default.cell-A3" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.03cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="none"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-A4']) = 0">
-        <style:style style:name="table-default.cell-A4" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.03cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-B1']) = 0">
-        <style:style style:name="table-default.cell-B1" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.01cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-B2']) = 0">
-        <style:style style:name="table-default.cell-B2" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="none"
-                                         fo:border-bottom="0.01cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-B3']) = 0">
-        <style:style style:name="table-default.cell-B3" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="none"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-B4']) = 0">
-        <style:style style:name="table-default.cell-B4" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-C1']) = 0">
-        <style:style style:name="table-default.cell-C1" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="0.03cm solid #000000"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.01cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-C2']) = 0">
-        <style:style style:name="table-default.cell-C2" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="0.03cm solid #000000"
-                                         fo:border-top="none"
-                                         fo:border-bottom="0.01cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-C3']) = 0">
-        <style:style style:name="table-default.cell-C3" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="0.03cm solid #000000"
-                                         fo:border-top="none"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-C4']) = 0">
-        <style:style style:name="table-default.cell-C4" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="0.03cm solid #000000"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-F-A3']) = 0">
-        <style:style style:name="table-default.cell-F-A3" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.03cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-F-B3']) = 0">
-        <style:style style:name="table-default.cell-F-B3" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-F-C3']) = 0">
-        <style:style style:name="table-default.cell-F-C3" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="0.03cm solid #000000"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-H-A1']) = 0">
-        <style:style style:name="table-default.cell-H-A1" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.03cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-H-B1']) = 0">
-        <style:style style:name="table-default.cell-H-B1" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="none"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-H-C1']) = 0">
-        <style:style style:name="table-default.cell-H-C1" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.01cm solid #000000"
-                                         fo:border-right="0.03cm solid #000000"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default.cell-single']) = 0">
-        <style:style style:name="table-default.cell-single" style:family="table-cell">
-            <style:table-cell-properties fo:padding="0.05cm"
-                                         fo:border-left="0.03cm solid #000000"
-                                         fo:border-right="0.03cm solid #000000"
-                                         fo:border-top="0.03cm solid #000000"
-                                         fo:border-bottom="0.03cm solid #000000"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'table-default']) = 0">
-        <style:style style:name="table-default" style:family="table">
-            <style:table-properties style:width="100%" table:align="margins"/>
-        </style:style>
-    </xsl:if>
-
-
-<!-- Specific -->
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'underline']) = 0">
-        <style:style style:name="underline" style:family="text">
-            <style:text-properties style:text-underline-style="solid"
-                                   style:text-underline-width="auto"
-                                   style:text-underline-color="font-color"/>
-        </style:style>
-    </xsl:if>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/styles/fonts.xsl b/xhtml2odt/xsl/styles/fonts.xsl
deleted file mode 100644
index 31bd2ea96..000000000
--- a/xhtml2odt/xsl/styles/fonts.xsl
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<xsl:template name="fonts">
-
-    <xsl:if test="count(//office:font-face-decls/style:font-face[@style:name = 'DejaVu Sans Mono']) = 0">
-        <style:font-face style:name="DejaVu Sans Mono"
-                         svg:font-family="&apos;DejaVu Sans Mono&apos;"
-                         style:font-family-generic="modern" style:font-pitch="fixed"/>
-    </xsl:if>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/styles/highlight.xsl b/xhtml2odt/xsl/styles/highlight.xsl
deleted file mode 100644
index 46e4d2627..000000000
--- a/xhtml2odt/xsl/styles/highlight.xsl
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<xsl:template name="highlight">
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.class']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.class']) > 0">
-        <style:style style:name="syntax-highlight.class" style:family="text">
-            <style:text-properties fo:color="#445588"
-                                   fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.function']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.function']) > 0">
-        <style:style style:name="syntax-highlight.function" style:family="text">
-            <style:text-properties fo:color="#990000"
-                                   fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.tag']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.tag']) > 0">
-        <style:style style:name="syntax-highlight.tag" style:family="text">
-            <style:text-properties fo:color="#000080"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.attr']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.attr']) > 0">
-        <style:style style:name="syntax-highlight.attr" style:family="text">
-            <style:text-properties fo:color="#008080"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.builtin']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.builtin']) > 0">
-        <style:style style:name="syntax-highlight.builtin" style:family="text">
-            <style:text-properties fo:color="#999999"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.namespace']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.namespace']) > 0">
-        <style:style style:name="syntax-highlight.namespace" style:family="text">
-            <style:text-properties fo:color="#555555"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.exception']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.exception']) > 0">
-        <style:style style:name="syntax-highlight.exception" style:family="text">
-            <style:text-properties fo:color="#990000"
-                                   fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.var']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.var']) > 0">
-        <style:style style:name="syntax-highlight.var" style:family="text">
-            <style:text-properties fo:color="#009999"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.builtin.pseudo']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.builtin.pseudo']) > 0">
-        <style:style style:name="syntax-highlight.builtin.pseudo" style:family="text">
-            <style:text-properties fo:color="#999999"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.string']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.string']) > 0">
-        <style:style style:name="syntax-highlight.string" style:family="text">
-            <style:text-properties fo:color="#bb8844"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.number']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.number']) > 0">
-        <style:style style:name="syntax-highlight.number" style:family="text">
-            <style:text-properties fo:color="#009999"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.comment']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.comment']) > 0">
-        <style:style style:name="syntax-highlight.comment" style:family="text">
-            <style:text-properties fo:color="#999988"
-                                   fo:font-style="italic"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:automatic-styles/style:style[@style:name = 'syntax-highlight.error']) = 0
-                  and count(//*[@text:style-name='syntax-highlight.error']) > 0">
-        <style:style style:name="syntax-highlight.error" style:family="text">
-            <style:text-properties fo:color="#a61717"
-                                   fo:background-color="#e3d2d2"/>
-        </style:style>
-    </xsl:if>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/styles/inline.xsl b/xhtml2odt/xsl/styles/inline.xsl
deleted file mode 100644
index c000259e1..000000000
--- a/xhtml2odt/xsl/styles/inline.xsl
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<!--
-     Create a specific automatic-style for each <span> tag with a style
-     attribute.
-     Parse the CSS values in the style attribute and convert them verbatim to
-     ODT XML. Luckily, the propreties are very often identical in name and
-     syntax. If not, they will be silently ignored by the application, so it's
-     not a big deal.
--->
-
-<xsl:template name="inline">
-
-    <xsl:for-each select="//h:span[@style]">
-        <style:style style:family="text">
-            <xsl:attribute name="style:name">
-                <xsl:value-of select="concat('inline-style.', generate-id(.))"/>
-            </xsl:attribute>
-            <style:text-properties>
-                <xsl:call-template name="css.style.multi">
-                    <xsl:with-param name="style" select="@style"/>
-                </xsl:call-template>
-            </style:text-properties>
-        </style:style>
-    </xsl:for-each>
-
-</xsl:template>
-
-<!-- pass the content of the style attribute to this template, it will split
-     the CSS properties -->
-<xsl:template name="css.style.multi">
-    <xsl:param name="style"/>
-    <xsl:choose>
-        <xsl:when test="contains($style, ';')">
-            <xsl:call-template name="css.style.multi">
-                <xsl:with-param name="style" select="substring-before($style, ';')"/>
-            </xsl:call-template>
-            <xsl:call-template name="css.style.multi">
-                <xsl:with-param name="style" select="substring-after($style, ';')"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:call-template name="css.style.single">
-                <xsl:with-param name="name" select="substring-before($style, ':')"/>
-                <xsl:with-param name="value" select="substring-after($style, ':')"/>
-            </xsl:call-template>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- pass the individual CSS properties to this template, it will create the
-     ODT XML style attributes -->
-<xsl:template name="css.style.single">
-    <xsl:param name="name"/>
-    <xsl:param name="value"/>
-    <xsl:if test="translate($name,' ','') != '' and
-                  translate($value,' ','') != ''">
-        <xsl:attribute name="{concat('fo:',translate($name,' ',''))}">
-            <xsl:value-of select="translate($value,' ','')"/>
-        </xsl:attribute>
-    </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/styles/main-styles.xsl b/xhtml2odt/xsl/styles/main-styles.xsl
deleted file mode 100644
index 7ebd3c9c4..000000000
--- a/xhtml2odt/xsl/styles/main-styles.xsl
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    version="1.0">
-
-<xsl:template name="mainstyles">
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Caption']) = 0">
-        <style:style style:name="Caption" style:display-name="Caption" style:class="extra"
-                     style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:margin-top="0.2cm" fo:margin-bottom="0.2cm"
-                                        text:number-lines="false" text:line-number="0"/>
-            <style:text-properties fo:font-size="95%" fo:font-style="italic"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Citation']) = 0">
-        <style:style style:name="Citation" style:display-name="Citation" style:family="text">
-            <style:text-properties fo:font-style="italic"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Footnote']) = 0">
-        <style:style style:name="Footnote" style:display-name="Footnote"
-                     style:family="paragraph" style:class="extra"
-                     style:parent-style-name="Standard">
-            <style:paragraph-properties fo:margin-left="0.5cm" fo:margin-right="0cm"
-                   fo:text-indent="-0.5cm" style:auto-text-indent="false"
-                   text:number-lines="false" text:line-number="0"/>
-            <style:text-properties fo:font-size="10pt"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Heading_20_1']) = 0">
-        <style:style style:name="Heading_20_1" style:display-name="Heading 1"
-                      style:family="paragraph" style:parent-style-name="Heading"
-                      style:next-style-name="Text_20_body" style:class="text"
-                      style:default-outline-level="1">
-            <style:text-properties fo:font-size="115%" fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Heading_20_2']) = 0">
-        <style:style style:name="Heading_20_2" style:display-name="Heading 2"
-                      style:family="paragraph" style:parent-style-name="Heading"
-                      style:next-style-name="Text_20_body" style:class="text"
-                      style:default-outline-level="2">
-            <style:text-properties fo:font-size="110%" fo:font-weight="bold"
-                                   fo:font-style="italic"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Heading_20_3']) = 0">
-        <style:style style:name="Heading_20_3" style:display-name="Heading 3"
-                      style:family="paragraph" style:parent-style-name="Heading"
-                      style:next-style-name="Text_20_body" style:class="text"
-                      style:default-outline-level="3">
-            <style:text-properties fo:font-size="105%" fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Heading_20_4']) = 0">
-        <style:style style:name="Heading_20_4" style:display-name="Heading 4"
-                      style:family="paragraph" style:parent-style-name="Heading"
-                      style:next-style-name="Text_20_body" style:class="text"
-                      style:default-outline-level="4">
-            <style:text-properties fo:font-size="100%" fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Heading_20_5']) = 0">
-        <style:style style:name="Heading_20_5" style:display-name="Heading 5"
-                      style:family="paragraph" style:parent-style-name="Heading"
-                      style:next-style-name="Text_20_body" style:class="text"
-                      style:default-outline-level="5">
-            <style:text-properties fo:font-size="100%" fo:font-style="italic"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Heading_20_6']) = 0">
-        <style:style style:name="Heading_20_6" style:display-name="Heading 6"
-                      style:family="paragraph" style:parent-style-name="Heading"
-                      style:next-style-name="Text_20_body" style:class="text"
-                      style:default-outline-level="6">
-            <style:text-properties fo:font-size="90%" fo:font-weight="bold"
-                                   style:text-underline-style="solid"
-                                   style:text-underline-width="auto"
-                                   style:text-underline-color="font-color"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Horizontal_20_Line']) = 0">
-        <style:style style:name="Horizontal_20_Line" style:display-name="Horizontal Line"
-                     style:family="paragraph" style:parent-style-name="Standard"
-                     style:next-style-name="Text_20_body" style:class="html">
-            <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.5cm"
-                         style:border-line-width-bottom="0.002cm 0.035cm 0.002cm"
-                         fo:padding="0cm" fo:border-left="none" fo:border-right="none"
-                         fo:border-top="none" fo:border-bottom="0.04cm double #808080"
-                         text:number-lines="false" text:line-number="0"
-                         style:join-border="false"/>
-            <style:text-properties fo:font-size="6pt"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'List_20_1']) = 0">
-        <text:list-style style:name="List_20_1" style:display-name="List 1">
-            <text:list-level-style-bullet text:level="1"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="•">
-                <style:list-level-properties
-                    text:space-before="0.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="2"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="◦">
-                <style:list-level-properties
-                    text:space-before="1cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="3"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="▪">
-                <style:list-level-properties
-                    text:space-before="1.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="4"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="•">
-                <style:list-level-properties
-                    text:space-before="2cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="5"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="◦">
-                <style:list-level-properties
-                    text:space-before="2.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="6"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="▪">
-                <style:list-level-properties
-                    text:space-before="3cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="7"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="•">
-                <style:list-level-properties
-                    text:space-before="3.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="8"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="◦">
-                <style:list-level-properties
-                    text:space-before="4cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="9"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="▪">
-                <style:list-level-properties
-                    text:space-before="4.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-            <text:list-level-style-bullet text:level="10"
-                    text:style-name="Bullet_20_Symbols"
-                    text:bullet-char="•">
-                <style:list-level-properties
-                    text:space-before="5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-bullet>
-        </text:list-style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Numbering_20_1']) = 0">
-        <text:list-style style:name="Numbering_20_1" style:display-name="Numbering 1">
-            <text:list-level-style-number text:level="1"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="0.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="2"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="1cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="3"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="1.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="4"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="2cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="5"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="2.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="6"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="3cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="7"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="3.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="8"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="4cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="9"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="4.5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-            <text:list-level-style-number text:level="10"
-                    text:style-name="Numbering_20_Symbols"
-                    style:num-suffix="."
-                    style:num-format="1">
-                <style:list-level-properties
-                    text:space-before="5cm"
-                    text:min-label-width="0.5cm"/>
-            </text:list-level-style-number>
-        </text:list-style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Definition_20_Term']) = 0">
-        <style:style style:name="Definition_20_Term"
-                     style:display-name="Definition Term" style:family="paragraph"
-                     style:parent-style-name="Text_20_body" style:class="html">
-            <style:text-properties fo:font-weight="bold"/>
-            <style:paragraph-properties fo:margin-bottom="0cm"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Definition_20_Description']) = 0">
-        <style:style style:name="Definition_20_Description"
-                     style:display-name="Definition Description" style:family="paragraph"
-                     style:parent-style-name="Text_20_body" style:class="html">
-            <style:paragraph-properties fo:margin-top="0cm" fo:margin-left="1cm"
-                                        fo:margin-bottom="0.2cm"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Preformatted_20_Text']) = 0">
-        <style:style style:name="Preformatted_20_Text"
-                     style:display-name="Preformatted Text" style:family="paragraph"
-                     style:parent-style-name="Standard" style:class="html">
-            <style:paragraph-properties fo:margin-left="1cm" fo:margin-right="1cm"
-                                        fo:margin-top="0cm" fo:margin-bottom="0cm"/>
-            <style:text-properties style:font-name="DejaVu Sans Mono"
-                                   fo:font-size="9pt"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Source_20_Code']) = 0">
-        <style:style style:name="Source_20_Code"
-                     style:display-name="Source Code" style:family="paragraph"
-                     style:parent-style-name="Preformatted_20_Text">
-            <style:paragraph-properties fo:padding="0.05cm" style:shadow="none"
-                                        fo:border="0.002cm solid #c0c0c0"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Source_20_Code_20_Numbered']) = 0">
-        <style:style style:name="Source_20_Code_20_Numbered"
-                     style:display-name="Source Code Numbered" style:family="paragraph"
-                     style:list-style-name="Numbering_20_1"
-                     style:parent-style-name="Source_20_Code">
-            <style:paragraph-properties text:number-lines="true" text:line-number="1"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Quotations']) = 0">
-        <style:style style:name="Quotations" style:family="paragraph"
-                     style:display-name="Quotations"
-                     style:parent-style-name="Standard" style:class="html">
-            <style:paragraph-properties fo:margin-left="1cm" fo:margin-right="1cm"
-                                        fo:margin-top="0cm" fo:margin-bottom="0.5cm"
-                                        fo:text-indent="0cm" style:auto-text-indent="false"
-                                        fo:padding="0.2cm"
-                                        fo:border-left="0.088cm solid #999999"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Sender']) = 0">
-        <style:style style:name="Sender" style:display-name="Sender" style:class="extra"
-                     style:family="paragraph" style:parent-style-name="Standard">
-            <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.100cm"
-                                        text:number-lines="false" text:line-number="0"/>
-            <style:text-properties fo:font-style="italic"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Table_20_Contents']) = 0">
-        <style:style style:name="Table_20_Contents" style:display-name="Table Contents"
-                     style:family="paragraph" style:parent-style-name="Standard"
-                     style:class="extra">
-            <style:paragraph-properties text:number-lines="false" text:line-number="0"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Table_20_Heading']) = 0">
-        <style:style style:name="Table_20_Heading" style:display-name="Table Heading"
-                     style:family="paragraph" style:parent-style-name="Table_20_Contents"
-                     style:class="extra">
-            <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"
-                                        text:number-lines="false" text:line-number="0"/>
-            <style:text-properties fo:font-weight="bold"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Teletype']) = 0">
-        <style:style style:name="Teletype" style:display-name="Teletype"
-                     style:family="text">
-            <style:text-properties style:font-name="DejaVu Sans Mono"
-                                   fo:font-size="9pt"/>
-        </style:style>
-    </xsl:if>
-
-    <xsl:if test="count(//office:styles/style:style[@style:name = 'Marginalia']) = 0">
-        <style:style style:name="Marginalia" style:display-name="Marginalia"
-                     style:family="graphic">
-            <style:graphic-properties svg:width="8.5cm" style:rel-width="50%"
-                                      fo:min-height="0.5cm"
-                                      text:anchor-type="paragraph"
-                                      svg:x="0cm" svg:y="0cm"
-                                      fo:margin-left="0.2cm"
-                                      fo:margin-right="0cm"
-                                      fo:margin-top="0.1cm"
-                                      fo:margin-bottom="0.1cm"
-                                      style:wrap="parallel"
-                                      style:number-wrapped-paragraphs="no-limit"
-                                      style:wrap-contour="false"
-                                      style:vertical-pos="top"
-                                      style:vertical-rel="paragraph"
-                                      style:horizontal-pos="right"
-                                      style:horizontal-rel="paragraph"
-                                      fo:background-color="transparent"
-                                      style:background-transparency="100%"
-                                      fo:padding="0.15cm"
-                                      fo:border="0.002cm solid #000000"
-                                      style:shadow="none">
-            </style:graphic-properties>
-        </style:style>
-    </xsl:if>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/xhtml2odt/xsl/xhtml2odt.xsl b/xhtml2odt/xsl/xhtml2odt.xsl
deleted file mode 100644
index 62f24326f..000000000
--- a/xhtml2odt/xsl/xhtml2odt.xsl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    xhtml2odt - XHTML to ODT XML transformation.
-    Copyright (C) 2009 Aurelien Bompard
-    Inspired by the work on docbook2odt, by Roman Fordinal
-    http://open.comsultia.com/docbook2odf/
-
-    License: LGPL v2.1 or later <http://www.gnu.org/licenses/lgpl-2.1.html>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA  02110-1301  USA
-
--->
-<xsl:stylesheet
-    xmlns:h="http://www.w3.org/1999/xhtml"
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table: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:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    exclude-result-prefixes="office xsl dc text style table draw fo xlink meta number svg chart dr3d math form script dom xforms xsd xsi presentation h"
-    version="1.0">
-
-<!-- SETTINGS -->
-<xsl:decimal-format name="staff" digit="D" />
-<xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="utf-8"/>
-<!--<xsl:strip-space elements="*"/>-->
-<!--<xsl:preserve-space elements=""/>-->
-
-
-<xsl:include href="param.xsl"/>
-<xsl:include href="document-content.xsl"/>
-<xsl:include href="specific.xsl"/>
-
-
-<xsl:template match="/">
-    <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ignore ODT paragraph inside ODT paragraphs -->
-<xsl:template match="text:p">
-    <xsl:choose>
-        <xsl:when test="
-            descendant::h:p|
-            child::h:h1|
-            child::h:h2|
-            child::h:h3|
-            child::h:h4|
-            child::h:h5|
-            child::h:h6
-            ">
-            <!-- continue without text:p creation to child element -->
-
-            <!-- when in this block is some text, display it in paragraph -->
-            <!-- this is not functional
-            <text:p>
-                <xsl:value-of select="string(.)"/>
-            </text:p>
-            -->
-            <!-- call template for each found element -->
-            <xsl:for-each select="*">
-                <xsl:apply-templates select="."/>
-            </xsl:for-each>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:copy>
-                <xsl:copy-of select="@*"/>
-                <xsl:apply-templates/>
-            </xsl:copy>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- Leave alone unknown tags -->
-<xsl:template match="*">
-    <xsl:if test="$debug">
-        <xsl:comment>Unknown tag : <xsl:value-of select="name(.)"/><xsl:value-of select="."/></xsl:comment>
-    </xsl:if>
-    <xsl:copy>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates/>
-    </xsl:copy>
-</xsl:template>
-
-
-</xsl:stylesheet>