[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-457-ge752e66
Michael Tautschnig
mt at debian.org
Tue Mar 24 19:45:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1939e8460e01d73d80e7bcda6d62e51d1e31fc53
Author: Michael Tautschnig <mt at debian.org>
Date: Tue Mar 24 20:21:54 2009 +0100
Merged changes from tarball
- Some contrib/ subdirectories have been removed
- Final version
- Updated daily.cvd
Signed-off-by: Michael Tautschnig <mt at debian.org>
diff --git a/configure b/configure
index 7bb8fa6..c936212 100755
--- a/configure
+++ b/configure
@@ -2989,7 +2989,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
-VERSION="0.95rc2"
+VERSION="0.95"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
diff --git a/configure.in b/configure.in
index aa5c91c..c29b654 100644
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ dnl the date in the version
AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
dnl change this on a release
-VERSION="0.95rc2"
+VERSION="0.95"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=6
diff --git a/contrib/entitynorm/AUTHORS b/contrib/entitynorm/AUTHORS
deleted file mode 100644
index 08811f2..0000000
--- a/contrib/entitynorm/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-edwin at clamav.net
\ No newline at end of file
diff --git a/contrib/entitynorm/COPYING b/contrib/entitynorm/COPYING
deleted file mode 100644
index 623b625..0000000
--- a/contrib/entitynorm/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 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.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/contrib/entitynorm/ChangeLog b/contrib/entitynorm/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/entitynorm/Makefile b/contrib/entitynorm/Makefile
deleted file mode 100644
index f4e619f..0000000
--- a/contrib/entitynorm/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-PERL=perl
-CC=cc
-
-all: entitylist.h encoding_aliases.h gentbl encname_chars.h generate_hash
-
-entities_parsed: entities entities/* entity_decl_parse.pl
- $(PERL) entity_decl_parse.pl $</* | sort -u >$@
-
-generate_entitylist: generate_entitylist.c ../../libclamav/hashtab.h ../../libclamav/hashtab.c ../../libclamav/others.c
- $(CC) -I. -DHAVE_CONFIG_H -DCLI_MEMFUNSONLY -DPROFILE_HASHTABLE $< ../../libclamav/hashtab.c ../../libclamav/others.c -o $@
-
-generate_hash: generate_hash.c ../../libclamav/hashtab.h ../../libclamav/hashtab.c ../../libclamav/others.c
- $(CC) -I. -DHAVE_CONFIG_H -DCLI_MEMFUNSONLY -DPROFILE_HASHTABLE $< ../../libclamav/hashtab.c ../../libclamav/others.c -o $@
-
-generate_encoding_aliases: generate_encoding_aliases.c ../../libclamav/hashtab.c ../../libclamav/others.c ../../libclamav/htmlnorm.h ../../libclamav/entconv.h ../../libclamav/cltypes.h ../../libclamav/hashtab.h ../../libclamav/hashtab.h
- $(CC) -I. -DHAVE_CONFIG_H -DCLI_MEMFUNSONLY -DPROFILE_HASHTABLE $< ../../libclamav/hashtab.c ../../libclamav/others.c -o $@
-
-entitylist.h: generate_entitylist entities_parsed
- ./$< <entities_parsed >$@
-
-encoding_aliases.h: generate_encoding_aliases
- ./$< >$@
-
-gentbl: gentbl.c
- $(CC) $< -o $@
-encname_chars.h: gentbl
- ./gentbl encname_chars 0-9 a-z A-Z _ . / \( \) - : >$@
-
-clean:
- rm -f entitylist.h encoding_aliases.h entities_parsed generate_entitylist generate_encoding_aliases gentbl encname_chars.h
diff --git a/contrib/entitynorm/NEWS b/contrib/entitynorm/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/entitynorm/README b/contrib/entitynorm/README
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/entitynorm/clamav-config.h b/contrib/entitynorm/clamav-config.h
deleted file mode 100644
index 54f9429..0000000
--- a/contrib/entitynorm/clamav-config.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/* clamav-config.h. Generated from clamav-config.h.in by configure. */
-/* clamav-config.h.in. Generated from configure.in by autoheader. */
-
-/* enable bind8 compatibility */
-/* #undef BIND_8_COMPAT */
-
-/* Define if your snprintf is busted */
-/* #undef BROKEN_SNPRINTF */
-
-/* "build clamd" */
-/* #undef BUILD_CLAMD */
-
-/* name of the clamav group */
-#define CLAMAVGROUP "clamav"
-
-/* name of the clamav user */
-#define CLAMAVUSER "clamav"
-
-/* enable clamuko */
-/* #undef CLAMUKO */
-
-/* enable debugging */
-/* #undef CL_DEBUG */
-
-/* enable experimental code */
-/* #undef CL_EXPERIMENTAL */
-
-/* thread safe */
-/* #undef CL_THREAD_SAFE */
-
-/* where to look for the config file */
-#define CONFDIR "/usr/local/etc"
-
-/* os is aix */
-/* #undef C_AIX */
-
-/* os is beos */
-/* #undef C_BEOS */
-
-/* Increase thread stack size. */
-/* #undef C_BIGSTACK */
-
-/* os is bsd flavor */
-/* #undef C_BSD */
-
-/* os is cygwin */
-/* #undef C_CYGWIN */
-
-/* os is darwin */
-/* #undef C_DARWIN */
-
-/* target is gnu-hurd */
-/* #undef C_GNU_HURD */
-
-/* os is hpux */
-/* #undef C_HPUX */
-
-/* os is interix */
-/* #undef C_INTERIX */
-
-/* os is irix */
-/* #undef C_IRIX */
-
-/* target is kfreebsd-gnu */
-/* #undef C_KFREEBSD_GNU */
-
-/* target is linux */
-/* #define C_LINUX 1 */
-
-/* os is OS/2 */
-/* #undef C_OS2 */
-
-/* os is osf/tru64 */
-/* #undef C_OSF */
-
-/* os is QNX 6.x.x */
-/* #undef C_QNX6 */
-
-/* os is solaris */
-/* #undef C_SOLARIS */
-
-/* Path to virus database directory. */
-#define DATADIR "/usr/local/share/clamav"
-
-/* "default FD_SETSIZE value" */
-#define DEFAULT_FD_SETSIZE 1024
-
-/* "build unrar code" */
-/* #undef ENABLE_UNRAR */
-
-/* file i/o buffer size */
-#define FILEBUFF 8192
-
-/* FPU byte ordering is little endian */
-#define FPU_WORDS_BIGENDIAN 0
-
-/* enable workaround for broken DNS servers */
-/* #undef FRESHCLAM_DNS_FIX */
-
-/* use "Cache-Control: no-cache" in freshclam */
-/* #undef FRESHCLAM_NO_CACHE */
-
-/* access rights in msghdr */
-/* #undef HAVE_ACCRIGHTS_IN_MSGHDR */
-
-/* attrib aligned */
-#define HAVE_ATTRIB_ALIGNED 1
-
-/* attrib packed */
-#define HAVE_ATTRIB_PACKED 1
-
-/* have bzip2 */
-/* #define HAVE_BZLIB_H 1 */
-
-/* ancillary data style fd pass */
-/* #define HAVE_CONTROL_IN_MSGHDR 1 */
-
-/* Define to 1 if you have the `ctime_r' function. */
-/* #define HAVE_CTIME_R 1 */
-
-/* ctime_r takes 2 arguments */
-/* #define HAVE_CTIME_R_2 1 */
-
-/* ctime_r takes 3 arguments */
-/* #undef HAVE_CTIME_R_3 */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #define HAVE_DLFCN_H 1 */
-
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#define HAVE_FSEEKO 1
-
-/* gethostbyname_r takes 3 arguments */
-/* #undef HAVE_GETHOSTBYNAME_R_3 */
-
-/* gethostbyname_r takes 5 arguments */
-/* #undef HAVE_GETHOSTBYNAME_R_5 */
-
-/* gethostbyname_r takes 6 arguments */
-/* #undef HAVE_GETHOSTBYNAME_R_6 */
-
-/* Define to 1 if you have the `getpagesize' function. */
-/* #define HAVE_GETPAGESIZE 1 */
-
-/* have gmp installed */
-/* #undef HAVE_GMP */
-
-/* Define to 1 if you have the <grp.h> header file. */
- #define HAVE_GRP_H 1
-
-/* Define to 1 if you have the <iconv.h> header file. */
-/* #define HAVE_ICONV_H 1 */
-
-/* Define to 1 if you have the `inet_ntop' function. */
-/* #define HAVE_INET_NTOP 1 */
-
-/* Define to 1 if you have the `initgroups' function. */
-/* #define HAVE_INITGROUPS 1 */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #define HAVE_INTTYPES_H 1 */
-
-/* in_addr_t is defined */
-/* #define HAVE_IN_ADDR_T 1 */
-
-/* in_port_t is defined */
-/* #define HAVE_IN_PORT_T 1 */
-
-/* Define to 1 if you have the <libmilter/mfapi.h> header file. */
-/* #undef HAVE_LIBMILTER_MFAPI_H */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-/* #define HAVE_MALLOC_H 1 */
-
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-/* #define HAVE_MEMORY_H 1 */
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the <ndir.h> header file. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the `poll' function. */
-/* #define HAVE_POLL 1 */
-
-/* Define to 1 if you have the <poll.h> header file. */
-/* #define HAVE_POLL_H 1 */
-
-/* "pragma pack" */
-/* #undef HAVE_PRAGMA_PACK */
-
-/* "pragma pack hppa/hp-ux style" */
-/* #undef HAVE_PRAGMA_PACK_HPPA */
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* readdir_r takes 2 arguments */
-/* #undef HAVE_READDIR_R_2 */
-
-/* readdir_r takes 3 arguments */
-/* #undef HAVE_READDIR_R_3 */
-
-/* Define to 1 if you have the `recvmsg' function. */
-/* #define HAVE_RECVMSG 1 */
-
-/* have resolv.h */
-/* #undef HAVE_RESOLV_H */
-
-/* Define signed right shift implementation */
-#define HAVE_SAR 1
-
-/* Define to 1 if you have the `sendmsg' function. */
-/* #define HAVE_SENDMSG 1 */
-
-/* Define to 1 if you have the `setgroups' function. */
-/* #define HAVE_SETGROUPS 1 */
-
-/* Define to 1 if you have the `setsid' function. */
-/* #define HAVE_SETSID 1 */
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-/* #define HAVE_STRERROR_R 1 */
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #define HAVE_STRINGS_H 1 */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strlcat' function. */
-/* #undef HAVE_STRLCAT */
-
-/* Define to 1 if you have the `strlcpy' function. */
-/* #undef HAVE_STRLCPY */
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/inttypes.h> header file. */
-/* #undef HAVE_SYS_INTTYPES_H */
-
-/* Define to 1 if you have the <sys/int_types.h> header file. */
-/* #undef HAVE_SYS_INT_TYPES_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* "have <sys/select.h>" */
-/* #undef HAVE_SYS_SELECT_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-/* #define HAVE_SYS_UIO_H 1 */
-
-/* Define to 1 if you have the <tcpd.h> header file. */
-/* #undef HAVE_TCPD_H */
-
-/* Define to 1 if you have the <termios.h> header file. */
-/* #define HAVE_TERMIOS_H 1 */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* zlib installed */
-#define HAVE_ZLIB_H 1
-
-/* Early Linux doesn't set cmsg fields */
-/* #undef INCOMPLETE_CMSG */
-
-/* bzip funtions do not have bz2 prefix */
-/* #undef NOBZ2PREFIX */
-
-/* "no fd_set" */
-/* #undef NO_FD_SET */
-
-/* Name of package */
-#define PACKAGE "clamav"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* scan buffer size */
-#define SCANBUFF 131072
-
-/* location of Sendmail binary */
-/* #undef SENDMAIL_BIN */
-
-/* major version of Sendmail */
-/* #undef SENDMAIL_VERSION_A */
-
-/* minor version of Sendmail */
-/* #undef SENDMAIL_VERSION_B */
-
-/* subversion of Sendmail */
-/* #undef SENDMAIL_VERSION_C */
-
-/* Define to 1 if the `setpgrp' function takes no argument. */
-#define SETPGRP_VOID 1
-
-#if 0
-/* lets assume system has proper stdint that defines uintX_t. */
-/* The number of bytes in type int */
-/* #define SIZEOF_INT 4 */
-
-/* The number of bytes in type long */
-#define SIZEOF_LONG 8
-
-/* The number of bytes in type long long */
-#define SIZEOF_LONG_LONG 8
-
-/* The number of bytes in type short */
-#define SIZEOF_SHORT 2
-#endif
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* use syslog */
-/* #define USE_SYSLOG 1 */
-
-/* Version number of package */
-#define VERSION "devel-20071218"
-
-/* tcpwrappers support */
-/* #undef WITH_TCPWRAP */
-
-/* endianess */
-/* #define WORDS_BIGENDIAN 0 */
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-/* #undef _LARGEFILE_SOURCE */
-
-/* POSIX compatibility */
-/* #undef _POSIX_PII_SOCKET */
-
-/* thread safe */
-/* #undef _REENTRANT */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to "int" if <sys/socket.h> does not define. */
-/* #undef socklen_t */
diff --git a/contrib/entitynorm/entities/isoamsa.ent b/contrib/entitynorm/entities/isoamsa.ent
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/entitynorm/entities/isoamsb.ent b/contrib/entitynorm/entities/isoamsb.ent
deleted file mode 100644
index 39ce606..0000000
--- a/contrib/entitynorm/entities/isoamsb.ent
+++ /dev/null
@@ -1,83 +0,0 @@
-
-<!--
- File isoamsb.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isoamsb.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isoamsb.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isoamsb PUBLIC
- "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isoamsb.ent"
- >
- %isoamsb;
-
--->
-
-<!ENTITY amalg "⨿" ><!--AMALGAMATION OR COPRODUCT -->
-<!ENTITY Barwed "⌆" ><!--PERSPECTIVE -->
-<!ENTITY barwed "⌅" ><!--PROJECTIVE -->
-<!ENTITY Cap "⋒" ><!--DOUBLE INTERSECTION -->
-<!ENTITY coprod "∐" ><!--N-ARY COPRODUCT -->
-<!ENTITY Cup "⋓" ><!--DOUBLE UNION -->
-<!ENTITY cuvee "⋎" ><!--CURLY LOGICAL OR -->
-<!ENTITY cuwed "⋏" ><!--CURLY LOGICAL AND -->
-<!ENTITY diam "⋄" ><!--DIAMOND OPERATOR -->
-<!ENTITY divonx "⋇" ><!--DIVISION TIMES -->
-<!ENTITY intcal "⊺" ><!--INTERCALATE -->
-<!ENTITY lthree "⋋" ><!--LEFT SEMIDIRECT PRODUCT -->
-<!ENTITY ltimes "⋉" ><!--LEFT NORMAL FACTOR SEMIDIRECT PRODUCT -->
-<!ENTITY minusb "⊟" ><!--SQUARED MINUS -->
-<!ENTITY oast "⊛" ><!--CIRCLED ASTERISK OPERATOR -->
-<!ENTITY ocir "⊚" ><!--CIRCLED RING OPERATOR -->
-<!ENTITY odash "⊝" ><!--CIRCLED DASH -->
-<!ENTITY odot "⊙" ><!--CIRCLED DOT OPERATOR -->
-<!ENTITY ominus "⊖" ><!--CIRCLED MINUS -->
-<!ENTITY oplus "⊕" ><!--CIRCLED PLUS -->
-<!ENTITY osol "⊘" ><!--CIRCLED DIVISION SLASH -->
-<!ENTITY otimes "⊗" ><!--CIRCLED TIMES -->
-<!ENTITY plusb "⊞" ><!--SQUARED PLUS -->
-<!ENTITY plusdo "∔" ><!--DOT PLUS -->
-<!ENTITY prod "∏" ><!--N-ARY PRODUCT -->
-<!ENTITY rthree "⋌" ><!--RIGHT SEMIDIRECT PRODUCT -->
-<!ENTITY rtimes "⋊" ><!--RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT -->
-<!ENTITY sdot "⋅" ><!--DOT OPERATOR -->
-<!ENTITY sdotb "⊡" ><!--SQUARED DOT OPERATOR -->
-<!ENTITY setmn "∖" ><!--SET MINUS -->
-<!ENTITY sqcap "⊓" ><!--SQUARE CAP -->
-<!ENTITY sqcup "⊔" ><!--SQUARE CUP -->
-<!ENTITY ssetmn "∖" ><!--SET MINUS -->
-<!ENTITY sstarf "⋆" ><!--STAR OPERATOR -->
-<!ENTITY sum "∑" ><!--N-ARY SUMMATION -->
-<!ENTITY timesb "⊠" ><!--SQUARED TIMES -->
-<!ENTITY top "⊤" ><!--DOWN TACK -->
-<!ENTITY uplus "⊎" ><!--MULTISET UNION -->
-<!ENTITY wreath "≀" ><!--WREATH PRODUCT -->
-<!ENTITY xcirc "◯" ><!--LARGE CIRCLE -->
-<!ENTITY xdtri "▽" ><!--WHITE DOWN-POINTING TRIANGLE -->
-<!ENTITY xutri "△" ><!--WHITE UP-POINTING TRIANGLE -->
diff --git a/contrib/entitynorm/entities/isoamsc.ent b/contrib/entitynorm/entities/isoamsc.ent
deleted file mode 100644
index f74c051..0000000
--- a/contrib/entitynorm/entities/isoamsc.ent
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<!--
- File isoamsc.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isoamsc.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isoamsc.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isoamsc PUBLIC
- "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isoamsc.ent"
- >
- %isoamsc;
-
--->
-
-<!ENTITY dlcorn "⌞" ><!--BOTTOM LEFT CORNER -->
-<!ENTITY drcorn "⌟" ><!--BOTTOM RIGHT CORNER -->
-<!ENTITY lceil "⌈" ><!--LEFT CEILING -->
-<!ENTITY lfloor "⌊" ><!--LEFT FLOOR -->
-<!ENTITY lpargt "⦠" ><!--SPHERICAL ANGLE OPENING LEFT -->
-<!ENTITY rceil "⌉" ><!--RIGHT CEILING -->
-<!ENTITY rfloor "⌋" ><!--RIGHT FLOOR -->
-<!ENTITY rpargt "⦔" ><!--RIGHT ARC GREATER-THAN BRACKET -->
-<!ENTITY ulcorn "⌜" ><!--TOP LEFT CORNER -->
-<!ENTITY urcorn "⌝" ><!--TOP RIGHT CORNER -->
diff --git a/contrib/entitynorm/entities/isoamso.ent b/contrib/entitynorm/entities/isoamso.ent
deleted file mode 100644
index 8869859..0000000
--- a/contrib/entitynorm/entities/isoamso.ent
+++ /dev/null
@@ -1,59 +0,0 @@
-
-<!--
- File isoamso.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isoamso.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isoamso.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isoamso PUBLIC
- "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isoamso.ent"
- >
- %isoamso;
-
--->
-
-<!ENTITY ang "∠" ><!--ANGLE -->
-<!ENTITY angmsd "∡" ><!--MEASURED ANGLE -->
-<!ENTITY beth "ℶ" ><!--BET SYMBOL -->
-<!ENTITY bprime "‵" ><!--REVERSED PRIME -->
-<!ENTITY comp "∁" ><!--COMPLEMENT -->
-<!ENTITY daleth "ℸ" ><!--DALET SYMBOL -->
-<!ENTITY ell "ℓ" ><!--SCRIPT SMALL L -->
-<!ENTITY empty "∅" ><!--EMPTY SET -->
-<!ENTITY gimel "ℷ" ><!--GIMEL SYMBOL -->
-<!ENTITY inodot "ı" ><!--LATIN SMALL LETTER DOTLESS I -->
-<!ENTITY jnodot "j" ><!--LATIN SMALL LETTER J -->
-<!ENTITY nexist "∄" ><!--THERE DOES NOT EXIST -->
-<!ENTITY oS "Ⓢ" ><!--CIRCLED LATIN CAPITAL LETTER S -->
-<!ENTITY planck "ℏ" ><!--PLANCK CONSTANT OVER TWO PI -->
-<!ENTITY real "ℜ" ><!--BLACK-LETTER CAPITAL R -->
-<!ENTITY sbsol "﹨" ><!--SMALL REVERSE SOLIDUS -->
-<!ENTITY vprime "′" ><!--PRIME -->
-<!ENTITY weierp "℘" ><!--SCRIPT CAPITAL P -->
diff --git a/contrib/entitynorm/entities/isoamsr.ent b/contrib/entitynorm/entities/isoamsr.ent
deleted file mode 100644
index e087b0f..0000000
--- a/contrib/entitynorm/entities/isoamsr.ent
+++ /dev/null
@@ -1,125 +0,0 @@
-
-<!--
- File isoamsr.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isoamsr.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isoamsr.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isoamsr PUBLIC
- "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isoamsr.ent"
- >
- %isoamsr;
-
--->
-
-<!ENTITY ape "≊" ><!--ALMOST EQUAL OR EQUAL TO -->
-<!ENTITY asymp "≈" ><!--ALMOST EQUAL TO -->
-<!ENTITY bcong "≌" ><!--ALL EQUAL TO -->
-<!ENTITY bepsi "϶" ><!--GREEK REVERSED LUNATE EPSILON SYMBOL -->
-<!ENTITY bowtie "⋈" ><!--BOWTIE -->
-<!ENTITY bsim "∽" ><!--REVERSED TILDE -->
-<!ENTITY bsime "⋍" ><!--REVERSED TILDE EQUALS -->
-<!ENTITY bump "≎" ><!--GEOMETRICALLY EQUIVALENT TO -->
-<!ENTITY bumpe "≏" ><!--DIFFERENCE BETWEEN -->
-<!ENTITY cire "≗" ><!--RING EQUAL TO -->
-<!ENTITY colone "≔" ><!--COLON EQUALS -->
-<!ENTITY cuepr "⋞" ><!--EQUAL TO OR PRECEDES -->
-<!ENTITY cuesc "⋟" ><!--EQUAL TO OR SUCCEEDS -->
-<!ENTITY cupre "≼" ><!--PRECEDES OR EQUAL TO -->
-<!ENTITY dashv "⊣" ><!--LEFT TACK -->
-<!ENTITY ecir "≖" ><!--RING IN EQUAL TO -->
-<!ENTITY ecolon "≕" ><!--EQUALS COLON -->
-<!ENTITY eDot "≑" ><!--GEOMETRICALLY EQUAL TO -->
-<!ENTITY efDot "≒" ><!--APPROXIMATELY EQUAL TO OR THE IMAGE OF -->
-<!ENTITY egs "⪖" ><!--SLANTED EQUAL TO OR GREATER-THAN -->
-<!ENTITY els "⪕" ><!--SLANTED EQUAL TO OR LESS-THAN -->
-<!ENTITY erDot "≓" ><!--IMAGE OF OR APPROXIMATELY EQUAL TO -->
-<!ENTITY esdot "≐" ><!--APPROACHES THE LIMIT -->
-<!ENTITY fork "⋔" ><!--PITCHFORK -->
-<!ENTITY frown "⌢" ><!--FROWN -->
-<!ENTITY gap "⪆" ><!--GREATER-THAN OR APPROXIMATE -->
-<!ENTITY gE "≧" ><!--GREATER-THAN OVER EQUAL TO -->
-<!ENTITY gEl "⪌" ><!--GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN -->
-<!ENTITY gel "⋛" ><!--GREATER-THAN EQUAL TO OR LESS-THAN -->
-<!ENTITY ges "⩾" ><!--GREATER-THAN OR SLANTED EQUAL TO -->
-<!ENTITY Gg "⋙" ><!--VERY MUCH GREATER-THAN -->
-<!ENTITY gl "≷" ><!--GREATER-THAN OR LESS-THAN -->
-<!ENTITY gsdot "⋗" ><!--GREATER-THAN WITH DOT -->
-<!ENTITY gsim "≳" ><!--GREATER-THAN OR EQUIVALENT TO -->
-<!ENTITY Gt "≫" ><!--MUCH GREATER-THAN -->
-<!ENTITY lap "⪅" ><!--LESS-THAN OR APPROXIMATE -->
-<!ENTITY ldot "⋖" ><!--LESS-THAN WITH DOT -->
-<!ENTITY lE "≦" ><!--LESS-THAN OVER EQUAL TO -->
-<!ENTITY lEg "⪋" ><!--LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN -->
-<!ENTITY leg "⋚" ><!--LESS-THAN EQUAL TO OR GREATER-THAN -->
-<!ENTITY les "⩽" ><!--LESS-THAN OR SLANTED EQUAL TO -->
-<!ENTITY lg "≶" ><!--LESS-THAN OR GREATER-THAN -->
-<!ENTITY Ll "⋘" ><!--VERY MUCH LESS-THAN -->
-<!ENTITY lsim "≲" ><!--LESS-THAN OR EQUIVALENT TO -->
-<!ENTITY Lt "≪" ><!--MUCH LESS-THAN -->
-<!ENTITY ltrie "⊴" ><!--NORMAL SUBGROUP OF OR EQUAL TO -->
-<!ENTITY mid "∣" ><!--DIVIDES -->
-<!ENTITY models "⊧" ><!--MODELS -->
-<!ENTITY pr "≺" ><!--PRECEDES -->
-<!ENTITY prap "⪷" ><!--PRECEDES ABOVE ALMOST EQUAL TO -->
-<!ENTITY pre "⪯" ><!--PRECEDES ABOVE SINGLE-LINE EQUALS SIGN -->
-<!ENTITY prsim "≾" ><!--PRECEDES OR EQUIVALENT TO -->
-<!ENTITY rtrie "⊵" ><!--CONTAINS AS NORMAL SUBGROUP OR EQUAL TO -->
-<!ENTITY samalg "∐" ><!--N-ARY COPRODUCT -->
-<!ENTITY sc "≻" ><!--SUCCEEDS -->
-<!ENTITY scap "⪸" ><!--SUCCEEDS ABOVE ALMOST EQUAL TO -->
-<!ENTITY sccue "≽" ><!--SUCCEEDS OR EQUAL TO -->
-<!ENTITY sce "⪰" ><!--SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN -->
-<!ENTITY scsim "≿" ><!--SUCCEEDS OR EQUIVALENT TO -->
-<!ENTITY sfrown "⌢" ><!--FROWN -->
-<!ENTITY smid "∣" ><!--DIVIDES -->
-<!ENTITY smile "⌣" ><!--SMILE -->
-<!ENTITY spar "∥" ><!--PARALLEL TO -->
-<!ENTITY sqsub "⊏" ><!--SQUARE IMAGE OF -->
-<!ENTITY sqsube "⊑" ><!--SQUARE IMAGE OF OR EQUAL TO -->
-<!ENTITY sqsup "⊐" ><!--SQUARE ORIGINAL OF -->
-<!ENTITY sqsupe "⊒" ><!--SQUARE ORIGINAL OF OR EQUAL TO -->
-<!ENTITY ssmile "⌣" ><!--SMILE -->
-<!ENTITY Sub "⋐" ><!--DOUBLE SUBSET -->
-<!ENTITY subE "⫅" ><!--SUBSET OF ABOVE EQUALS SIGN -->
-<!ENTITY Sup "⋑" ><!--DOUBLE SUPERSET -->
-<!ENTITY supE "⫆" ><!--SUPERSET OF ABOVE EQUALS SIGN -->
-<!ENTITY thkap "≈" ><!--ALMOST EQUAL TO -->
-<!ENTITY thksim "∼" ><!--TILDE OPERATOR -->
-<!ENTITY trie "≜" ><!--DELTA EQUAL TO -->
-<!ENTITY twixt "≬" ><!--BETWEEN -->
-<!ENTITY Vdash "⊩" ><!--FORCES -->
-<!ENTITY vDash "⊨" ><!--TRUE -->
-<!ENTITY vdash "⊢" ><!--RIGHT TACK -->
-<!ENTITY veebar "⊻" ><!--XOR -->
-<!ENTITY vltri "⊲" ><!--NORMAL SUBGROUP OF -->
-<!ENTITY vprop "∝" ><!--PROPORTIONAL TO -->
-<!ENTITY vrtri "⊳" ><!--CONTAINS AS NORMAL SUBGROUP -->
-<!ENTITY Vvdash "⊪" ><!--TRIPLE VERTICAL BAR RIGHT TURNSTILE -->
diff --git a/contrib/entitynorm/entities/isobox.ent b/contrib/entitynorm/entities/isobox.ent
deleted file mode 100644
index 7731223..0000000
--- a/contrib/entitynorm/entities/isobox.ent
+++ /dev/null
@@ -1,81 +0,0 @@
-
-<!--
- File isobox.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isobox.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isobox.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isobox PUBLIC
- "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isobox.ent"
- >
- %isobox;
-
--->
-
-<!ENTITY boxDL "╗" ><!--BOX DRAWINGS DOUBLE DOWN AND LEFT -->
-<!ENTITY boxDl "╖" ><!--BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE -->
-<!ENTITY boxdL "╕" ><!--BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE -->
-<!ENTITY boxdl "┐" ><!--BOX DRAWINGS LIGHT DOWN AND LEFT -->
-<!ENTITY boxDR "╔" ><!--BOX DRAWINGS DOUBLE DOWN AND RIGHT -->
-<!ENTITY boxDr "╓" ><!--BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE -->
-<!ENTITY boxdR "╒" ><!--BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE -->
-<!ENTITY boxdr "┌" ><!--BOX DRAWINGS LIGHT DOWN AND RIGHT -->
-<!ENTITY boxH "═" ><!--BOX DRAWINGS DOUBLE HORIZONTAL -->
-<!ENTITY boxh "─" ><!--BOX DRAWINGS LIGHT HORIZONTAL -->
-<!ENTITY boxHD "╦" ><!--BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL -->
-<!ENTITY boxHd "╤" ><!--BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE -->
-<!ENTITY boxhD "╥" ><!--BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE -->
-<!ENTITY boxhd "┬" ><!--BOX DRAWINGS LIGHT DOWN AND HORIZONTAL -->
-<!ENTITY boxHU "╩" ><!--BOX DRAWINGS DOUBLE UP AND HORIZONTAL -->
-<!ENTITY boxHu "╧" ><!--BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE -->
-<!ENTITY boxhU "╨" ><!--BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE -->
-<!ENTITY boxhu "┴" ><!--BOX DRAWINGS LIGHT UP AND HORIZONTAL -->
-<!ENTITY boxUL "╝" ><!--BOX DRAWINGS DOUBLE UP AND LEFT -->
-<!ENTITY boxUl "╜" ><!--BOX DRAWINGS UP DOUBLE AND LEFT SINGLE -->
-<!ENTITY boxuL "╛" ><!--BOX DRAWINGS UP SINGLE AND LEFT DOUBLE -->
-<!ENTITY boxul "┘" ><!--BOX DRAWINGS LIGHT UP AND LEFT -->
-<!ENTITY boxUR "╚" ><!--BOX DRAWINGS DOUBLE UP AND RIGHT -->
-<!ENTITY boxUr "╙" ><!--BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE -->
-<!ENTITY boxuR "╘" ><!--BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE -->
-<!ENTITY boxur "└" ><!--BOX DRAWINGS LIGHT UP AND RIGHT -->
-<!ENTITY boxV "║" ><!--BOX DRAWINGS DOUBLE VERTICAL -->
-<!ENTITY boxv "│" ><!--BOX DRAWINGS LIGHT VERTICAL -->
-<!ENTITY boxVH "╬" ><!--BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL -->
-<!ENTITY boxVh "╫" ><!--BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE -->
-<!ENTITY boxvH "╪" ><!--BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE -->
-<!ENTITY boxvh "┼" ><!--BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL -->
-<!ENTITY boxVL "╣" ><!--BOX DRAWINGS DOUBLE VERTICAL AND LEFT -->
-<!ENTITY boxVl "╢" ><!--BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE -->
-<!ENTITY boxvL "╡" ><!--BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE -->
-<!ENTITY boxvl "┤" ><!--BOX DRAWINGS LIGHT VERTICAL AND LEFT -->
-<!ENTITY boxVR "╠" ><!--BOX DRAWINGS DOUBLE VERTICAL AND RIGHT -->
-<!ENTITY boxVr "╟" ><!--BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE -->
-<!ENTITY boxvR "╞" ><!--BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE -->
-<!ENTITY boxvr "├" ><!--BOX DRAWINGS LIGHT VERTICAL AND RIGHT -->
diff --git a/contrib/entitynorm/entities/isocyr1.ent b/contrib/entitynorm/entities/isocyr1.ent
deleted file mode 100644
index 2e5c784..0000000
--- a/contrib/entitynorm/entities/isocyr1.ent
+++ /dev/null
@@ -1,108 +0,0 @@
-
-<!--
- File isocyr1.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isocyr1.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isocyr1.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isocyr1 PUBLIC
- "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isocyr1.ent"
- >
- %isocyr1;
-
--->
-
-<!ENTITY Acy "А" ><!--CYRILLIC CAPITAL LETTER A -->
-<!ENTITY acy "а" ><!--CYRILLIC SMALL LETTER A -->
-<!ENTITY Bcy "Б" ><!--CYRILLIC CAPITAL LETTER BE -->
-<!ENTITY bcy "б" ><!--CYRILLIC SMALL LETTER BE -->
-<!ENTITY CHcy "Ч" ><!--CYRILLIC CAPITAL LETTER CHE -->
-<!ENTITY chcy "ч" ><!--CYRILLIC SMALL LETTER CHE -->
-<!ENTITY Dcy "Д" ><!--CYRILLIC CAPITAL LETTER DE -->
-<!ENTITY dcy "д" ><!--CYRILLIC SMALL LETTER DE -->
-<!ENTITY Ecy "Э" ><!--CYRILLIC CAPITAL LETTER E -->
-<!ENTITY ecy "э" ><!--CYRILLIC SMALL LETTER E -->
-<!ENTITY Fcy "Ф" ><!--CYRILLIC CAPITAL LETTER EF -->
-<!ENTITY fcy "ф" ><!--CYRILLIC SMALL LETTER EF -->
-<!ENTITY Gcy "Г" ><!--CYRILLIC CAPITAL LETTER GHE -->
-<!ENTITY gcy "г" ><!--CYRILLIC SMALL LETTER GHE -->
-<!ENTITY HARDcy "Ъ" ><!--CYRILLIC CAPITAL LETTER HARD SIGN -->
-<!ENTITY hardcy "ъ" ><!--CYRILLIC SMALL LETTER HARD SIGN -->
-<!ENTITY Icy "И" ><!--CYRILLIC CAPITAL LETTER I -->
-<!ENTITY icy "и" ><!--CYRILLIC SMALL LETTER I -->
-<!ENTITY IEcy "Е" ><!--CYRILLIC CAPITAL LETTER IE -->
-<!ENTITY iecy "е" ><!--CYRILLIC SMALL LETTER IE -->
-<!ENTITY IOcy "Ё" ><!--CYRILLIC CAPITAL LETTER IO -->
-<!ENTITY iocy "ё" ><!--CYRILLIC SMALL LETTER IO -->
-<!ENTITY Jcy "Й" ><!--CYRILLIC CAPITAL LETTER SHORT I -->
-<!ENTITY jcy "й" ><!--CYRILLIC SMALL LETTER SHORT I -->
-<!ENTITY Kcy "К" ><!--CYRILLIC CAPITAL LETTER KA -->
-<!ENTITY kcy "к" ><!--CYRILLIC SMALL LETTER KA -->
-<!ENTITY KHcy "Х" ><!--CYRILLIC CAPITAL LETTER HA -->
-<!ENTITY khcy "х" ><!--CYRILLIC SMALL LETTER HA -->
-<!ENTITY Lcy "Л" ><!--CYRILLIC CAPITAL LETTER EL -->
-<!ENTITY lcy "л" ><!--CYRILLIC SMALL LETTER EL -->
-<!ENTITY Mcy "М" ><!--CYRILLIC CAPITAL LETTER EM -->
-<!ENTITY mcy "м" ><!--CYRILLIC SMALL LETTER EM -->
-<!ENTITY Ncy "Н" ><!--CYRILLIC CAPITAL LETTER EN -->
-<!ENTITY ncy "н" ><!--CYRILLIC SMALL LETTER EN -->
-<!ENTITY numero "№" ><!--NUMERO SIGN -->
-<!ENTITY Ocy "О" ><!--CYRILLIC CAPITAL LETTER O -->
-<!ENTITY ocy "о" ><!--CYRILLIC SMALL LETTER O -->
-<!ENTITY Pcy "П" ><!--CYRILLIC CAPITAL LETTER PE -->
-<!ENTITY pcy "п" ><!--CYRILLIC SMALL LETTER PE -->
-<!ENTITY Rcy "Р" ><!--CYRILLIC CAPITAL LETTER ER -->
-<!ENTITY rcy "р" ><!--CYRILLIC SMALL LETTER ER -->
-<!ENTITY Scy "С" ><!--CYRILLIC CAPITAL LETTER ES -->
-<!ENTITY scy "с" ><!--CYRILLIC SMALL LETTER ES -->
-<!ENTITY SHCHcy "Щ" ><!--CYRILLIC CAPITAL LETTER SHCHA -->
-<!ENTITY shchcy "щ" ><!--CYRILLIC SMALL LETTER SHCHA -->
-<!ENTITY SHcy "Ш" ><!--CYRILLIC CAPITAL LETTER SHA -->
-<!ENTITY shcy "ш" ><!--CYRILLIC SMALL LETTER SHA -->
-<!ENTITY SOFTcy "Ь" ><!--CYRILLIC CAPITAL LETTER SOFT SIGN -->
-<!ENTITY softcy "ь" ><!--CYRILLIC SMALL LETTER SOFT SIGN -->
-<!ENTITY Tcy "Т" ><!--CYRILLIC CAPITAL LETTER TE -->
-<!ENTITY tcy "т" ><!--CYRILLIC SMALL LETTER TE -->
-<!ENTITY TScy "Ц" ><!--CYRILLIC CAPITAL LETTER TSE -->
-<!ENTITY tscy "ц" ><!--CYRILLIC SMALL LETTER TSE -->
-<!ENTITY Ucy "У" ><!--CYRILLIC CAPITAL LETTER U -->
-<!ENTITY ucy "у" ><!--CYRILLIC SMALL LETTER U -->
-<!ENTITY Vcy "В" ><!--CYRILLIC CAPITAL LETTER VE -->
-<!ENTITY vcy "в" ><!--CYRILLIC SMALL LETTER VE -->
-<!ENTITY YAcy "Я" ><!--CYRILLIC CAPITAL LETTER YA -->
-<!ENTITY yacy "я" ><!--CYRILLIC SMALL LETTER YA -->
-<!ENTITY Ycy "Ы" ><!--CYRILLIC CAPITAL LETTER YERU -->
-<!ENTITY ycy "ы" ><!--CYRILLIC SMALL LETTER YERU -->
-<!ENTITY YUcy "Ю" ><!--CYRILLIC CAPITAL LETTER YU -->
-<!ENTITY yucy "ю" ><!--CYRILLIC SMALL LETTER YU -->
-<!ENTITY Zcy "З" ><!--CYRILLIC CAPITAL LETTER ZE -->
-<!ENTITY zcy "з" ><!--CYRILLIC SMALL LETTER ZE -->
-<!ENTITY ZHcy "Ж" ><!--CYRILLIC CAPITAL LETTER ZHE -->
-<!ENTITY zhcy "ж" ><!--CYRILLIC SMALL LETTER ZHE -->
diff --git a/contrib/entitynorm/entities/isocyr2.ent b/contrib/entitynorm/entities/isocyr2.ent
deleted file mode 100644
index 3676caf..0000000
--- a/contrib/entitynorm/entities/isocyr2.ent
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<!--
- File isocyr2.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isocyr2.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isocyr2.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isocyr2 PUBLIC
- "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isocyr2.ent"
- >
- %isocyr2;
-
--->
-
-<!ENTITY DJcy "Ђ" ><!--CYRILLIC CAPITAL LETTER DJE -->
-<!ENTITY djcy "ђ" ><!--CYRILLIC SMALL LETTER DJE -->
-<!ENTITY DScy "Ѕ" ><!--CYRILLIC CAPITAL LETTER DZE -->
-<!ENTITY dscy "ѕ" ><!--CYRILLIC SMALL LETTER DZE -->
-<!ENTITY DZcy "Џ" ><!--CYRILLIC CAPITAL LETTER DZHE -->
-<!ENTITY dzcy "џ" ><!--CYRILLIC SMALL LETTER DZHE -->
-<!ENTITY GJcy "Ѓ" ><!--CYRILLIC CAPITAL LETTER GJE -->
-<!ENTITY gjcy "ѓ" ><!--CYRILLIC SMALL LETTER GJE -->
-<!ENTITY Iukcy "І" ><!--CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I -->
-<!ENTITY iukcy "і" ><!--CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
-<!ENTITY Jsercy "Ј" ><!--CYRILLIC CAPITAL LETTER JE -->
-<!ENTITY jsercy "ј" ><!--CYRILLIC SMALL LETTER JE -->
-<!ENTITY Jukcy "Є" ><!--CYRILLIC CAPITAL LETTER UKRAINIAN IE -->
-<!ENTITY jukcy "є" ><!--CYRILLIC SMALL LETTER UKRAINIAN IE -->
-<!ENTITY KJcy "Ќ" ><!--CYRILLIC CAPITAL LETTER KJE -->
-<!ENTITY kjcy "ќ" ><!--CYRILLIC SMALL LETTER KJE -->
-<!ENTITY LJcy "Љ" ><!--CYRILLIC CAPITAL LETTER LJE -->
-<!ENTITY ljcy "љ" ><!--CYRILLIC SMALL LETTER LJE -->
-<!ENTITY NJcy "Њ" ><!--CYRILLIC CAPITAL LETTER NJE -->
-<!ENTITY njcy "њ" ><!--CYRILLIC SMALL LETTER NJE -->
-<!ENTITY TSHcy "Ћ" ><!--CYRILLIC CAPITAL LETTER TSHE -->
-<!ENTITY tshcy "ћ" ><!--CYRILLIC SMALL LETTER TSHE -->
-<!ENTITY Ubrcy "Ў" ><!--CYRILLIC CAPITAL LETTER SHORT U -->
-<!ENTITY ubrcy "ў" ><!--CYRILLIC SMALL LETTER SHORT U -->
-<!ENTITY YIcy "Ї" ><!--CYRILLIC CAPITAL LETTER YI -->
-<!ENTITY yicy "ї" ><!--CYRILLIC SMALL LETTER YI -->
diff --git a/contrib/entitynorm/entities/isodia.ent b/contrib/entitynorm/entities/isodia.ent
deleted file mode 100644
index 7e9a9c6..0000000
--- a/contrib/entitynorm/entities/isodia.ent
+++ /dev/null
@@ -1,55 +0,0 @@
-
-<!--
- File isodia.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isodia.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isodia.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isodia PUBLIC
- "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isodia.ent"
- >
- %isodia;
-
--->
-
-<!ENTITY acute "´" ><!--ACUTE ACCENT -->
-<!ENTITY breve "˘" ><!--BREVE -->
-<!ENTITY caron "ˇ" ><!--CARON -->
-<!ENTITY cedil "¸" ><!--CEDILLA -->
-<!ENTITY circ "ˆ" ><!--MODIFIER LETTER CIRCUMFLEX ACCENT -->
-<!ENTITY dblac "˝" ><!--DOUBLE ACUTE ACCENT -->
-<!ENTITY die "¨" ><!--DIAERESIS -->
-<!ENTITY dot "˙" ><!--DOT ABOVE -->
-<!ENTITY grave "`" ><!--GRAVE ACCENT -->
-<!ENTITY macr "¯" ><!--MACRON -->
-<!ENTITY ogon "˛" ><!--OGONEK -->
-<!ENTITY ring "˚" ><!--RING ABOVE -->
-<!ENTITY tilde "˜" ><!--SMALL TILDE -->
-<!ENTITY uml "¨" ><!--DIAERESIS -->
diff --git a/contrib/entitynorm/entities/isogrk1.ent b/contrib/entitynorm/entities/isogrk1.ent
deleted file mode 100644
index 4755910..0000000
--- a/contrib/entitynorm/entities/isogrk1.ent
+++ /dev/null
@@ -1,90 +0,0 @@
-
-<!--
- File isogrk1.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isogrk1.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Greek Letters//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isogrk1.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isogrk1 PUBLIC
- "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isogrk1.ent"
- >
- %isogrk1;
-
--->
-
-<!ENTITY Agr "Α" ><!--GREEK CAPITAL LETTER ALPHA -->
-<!ENTITY agr "α" ><!--GREEK SMALL LETTER ALPHA -->
-<!ENTITY Bgr "Β" ><!--GREEK CAPITAL LETTER BETA -->
-<!ENTITY bgr "β" ><!--GREEK SMALL LETTER BETA -->
-<!ENTITY Dgr "Δ" ><!--GREEK CAPITAL LETTER DELTA -->
-<!ENTITY dgr "δ" ><!--GREEK SMALL LETTER DELTA -->
-<!ENTITY EEgr "Η" ><!--GREEK CAPITAL LETTER ETA -->
-<!ENTITY eegr "η" ><!--GREEK SMALL LETTER ETA -->
-<!ENTITY Egr "Ε" ><!--GREEK CAPITAL LETTER EPSILON -->
-<!ENTITY egr "ε" ><!--GREEK SMALL LETTER EPSILON -->
-<!ENTITY Ggr "Γ" ><!--GREEK CAPITAL LETTER GAMMA -->
-<!ENTITY ggr "γ" ><!--GREEK SMALL LETTER GAMMA -->
-<!ENTITY Igr "Ι" ><!--GREEK CAPITAL LETTER IOTA -->
-<!ENTITY igr "ι" ><!--GREEK SMALL LETTER IOTA -->
-<!ENTITY Kgr "Κ" ><!--GREEK CAPITAL LETTER KAPPA -->
-<!ENTITY kgr "κ" ><!--GREEK SMALL LETTER KAPPA -->
-<!ENTITY KHgr "Χ" ><!--GREEK CAPITAL LETTER CHI -->
-<!ENTITY khgr "χ" ><!--GREEK SMALL LETTER CHI -->
-<!ENTITY Lgr "Λ" ><!--GREEK CAPITAL LETTER LAMDA -->
-<!ENTITY lgr "λ" ><!--GREEK SMALL LETTER LAMDA -->
-<!ENTITY Mgr "Μ" ><!--GREEK CAPITAL LETTER MU -->
-<!ENTITY mgr "μ" ><!--GREEK SMALL LETTER MU -->
-<!ENTITY Ngr "Ν" ><!--GREEK CAPITAL LETTER NU -->
-<!ENTITY ngr "ν" ><!--GREEK SMALL LETTER NU -->
-<!ENTITY Ogr "Ο" ><!--GREEK CAPITAL LETTER OMICRON -->
-<!ENTITY ogr "ο" ><!--GREEK SMALL LETTER OMICRON -->
-<!ENTITY OHgr "Ω" ><!--GREEK CAPITAL LETTER OMEGA -->
-<!ENTITY ohgr "ω" ><!--GREEK SMALL LETTER OMEGA -->
-<!ENTITY Pgr "Π" ><!--GREEK CAPITAL LETTER PI -->
-<!ENTITY pgr "π" ><!--GREEK SMALL LETTER PI -->
-<!ENTITY PHgr "Φ" ><!--GREEK CAPITAL LETTER PHI -->
-<!ENTITY phgr "φ" ><!--GREEK SMALL LETTER PHI -->
-<!ENTITY PSgr "Ψ" ><!--GREEK CAPITAL LETTER PSI -->
-<!ENTITY psgr "ψ" ><!--GREEK SMALL LETTER PSI -->
-<!ENTITY Rgr "Ρ" ><!--GREEK CAPITAL LETTER RHO -->
-<!ENTITY rgr "ρ" ><!--GREEK SMALL LETTER RHO -->
-<!ENTITY sfgr "ς" ><!--GREEK SMALL LETTER FINAL SIGMA -->
-<!ENTITY Sgr "Σ" ><!--GREEK CAPITAL LETTER SIGMA -->
-<!ENTITY sgr "σ" ><!--GREEK SMALL LETTER SIGMA -->
-<!ENTITY Tgr "Τ" ><!--GREEK CAPITAL LETTER TAU -->
-<!ENTITY tgr "τ" ><!--GREEK SMALL LETTER TAU -->
-<!ENTITY THgr "Θ" ><!--GREEK CAPITAL LETTER THETA -->
-<!ENTITY thgr "θ" ><!--GREEK SMALL LETTER THETA -->
-<!ENTITY Ugr "Υ" ><!--GREEK CAPITAL LETTER UPSILON -->
-<!ENTITY ugr "υ" ><!--GREEK SMALL LETTER UPSILON -->
-<!ENTITY Xgr "Ξ" ><!--GREEK CAPITAL LETTER XI -->
-<!ENTITY xgr "ξ" ><!--GREEK SMALL LETTER XI -->
-<!ENTITY Zgr "Ζ" ><!--GREEK CAPITAL LETTER ZETA -->
-<!ENTITY zgr "ζ" ><!--GREEK SMALL LETTER ZETA -->
diff --git a/contrib/entitynorm/entities/isogrk2.ent b/contrib/entitynorm/entities/isogrk2.ent
deleted file mode 100644
index f922d83..0000000
--- a/contrib/entitynorm/entities/isogrk2.ent
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<!--
- File isogrk2.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isogrk2.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isogrk2.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isogrk2 PUBLIC
- "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isogrk2.ent"
- >
- %isogrk2;
-
--->
-
-<!ENTITY Aacgr "Ά" ><!--GREEK CAPITAL LETTER ALPHA WITH TONOS -->
-<!ENTITY aacgr "ά" ><!--GREEK SMALL LETTER ALPHA WITH TONOS -->
-<!ENTITY Eacgr "Έ" ><!--GREEK CAPITAL LETTER EPSILON WITH TONOS -->
-<!ENTITY eacgr "έ" ><!--GREEK SMALL LETTER EPSILON WITH TONOS -->
-<!ENTITY EEacgr "Ή" ><!--GREEK CAPITAL LETTER ETA WITH TONOS -->
-<!ENTITY eeacgr "ή" ><!--GREEK SMALL LETTER ETA WITH TONOS -->
-<!ENTITY Iacgr "Ί" ><!--GREEK CAPITAL LETTER IOTA WITH TONOS -->
-<!ENTITY iacgr "ί" ><!--GREEK SMALL LETTER IOTA WITH TONOS -->
-<!ENTITY idiagr "ΐ" ><!--GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS -->
-<!ENTITY Idigr "Ϊ" ><!--GREEK CAPITAL LETTER IOTA WITH DIALYTIKA -->
-<!ENTITY idigr "ϊ" ><!--GREEK SMALL LETTER IOTA WITH DIALYTIKA -->
-<!ENTITY Oacgr "Ό" ><!--GREEK CAPITAL LETTER OMICRON WITH TONOS -->
-<!ENTITY oacgr "ό" ><!--GREEK SMALL LETTER OMICRON WITH TONOS -->
-<!ENTITY OHacgr "Ώ" ><!--GREEK CAPITAL LETTER OMEGA WITH TONOS -->
-<!ENTITY ohacgr "ώ" ><!--GREEK SMALL LETTER OMEGA WITH TONOS -->
-<!ENTITY Uacgr "Ύ" ><!--GREEK CAPITAL LETTER UPSILON WITH TONOS -->
-<!ENTITY uacgr "ύ" ><!--GREEK SMALL LETTER UPSILON WITH TONOS -->
-<!ENTITY udiagr "ΰ" ><!--GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS -->
-<!ENTITY Udigr "Ϋ" ><!--GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA -->
-<!ENTITY udigr "ϋ" ><!--GREEK SMALL LETTER UPSILON WITH DIALYTIKA -->
diff --git a/contrib/entitynorm/entities/isogrk3.ent b/contrib/entitynorm/entities/isogrk3.ent
deleted file mode 100644
index caebefb..0000000
--- a/contrib/entitynorm/entities/isogrk3.ent
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<!--
- File isogrk3.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isogrk3.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Greek Symbols//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isogrk3.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isogrk3 PUBLIC
- "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isogrk3.ent"
- >
- %isogrk3;
-
--->
-
-<!ENTITY alpha "α" ><!--GREEK SMALL LETTER ALPHA -->
-<!ENTITY beta "β" ><!--GREEK SMALL LETTER BETA -->
-<!ENTITY chi "χ" ><!--GREEK SMALL LETTER CHI -->
-<!ENTITY Delta "Δ" ><!--GREEK CAPITAL LETTER DELTA -->
-<!ENTITY delta "δ" ><!--GREEK SMALL LETTER DELTA -->
-<!ENTITY epsi "ϵ" ><!--GREEK LUNATE EPSILON SYMBOL -->
-<!ENTITY epsis "ϵ" ><!--GREEK LUNATE EPSILON SYMBOL -->
-<!ENTITY epsiv "ε" ><!--GREEK SMALL LETTER EPSILON -->
-<!ENTITY eta "η" ><!--GREEK SMALL LETTER ETA -->
-<!ENTITY Gamma "Γ" ><!--GREEK CAPITAL LETTER GAMMA -->
-<!ENTITY gamma "γ" ><!--GREEK SMALL LETTER GAMMA -->
-<!ENTITY gammad "ϝ" ><!--GREEK SMALL LETTER DIGAMMA -->
-<!ENTITY iota "ι" ><!--GREEK SMALL LETTER IOTA -->
-<!ENTITY kappa "κ" ><!--GREEK SMALL LETTER KAPPA -->
-<!ENTITY kappav "ϰ" ><!--GREEK KAPPA SYMBOL -->
-<!ENTITY Lambda "Λ" ><!--GREEK CAPITAL LETTER LAMDA -->
-<!ENTITY lambda "λ" ><!--GREEK SMALL LETTER LAMDA -->
-<!ENTITY mu "μ" ><!--GREEK SMALL LETTER MU -->
-<!ENTITY nu "ν" ><!--GREEK SMALL LETTER NU -->
-<!ENTITY Omega "Ω" ><!--GREEK CAPITAL LETTER OMEGA -->
-<!ENTITY omega "ω" ><!--GREEK SMALL LETTER OMEGA -->
-<!ENTITY Phi "Φ" ><!--GREEK CAPITAL LETTER PHI -->
-<!ENTITY phis "ϕ" ><!--GREEK PHI SYMBOL -->
-<!ENTITY phiv "φ" ><!--GREEK SMALL LETTER PHI -->
-<!ENTITY Pi "Π" ><!--GREEK CAPITAL LETTER PI -->
-<!ENTITY pi "π" ><!--GREEK SMALL LETTER PI -->
-<!ENTITY piv "ϖ" ><!--GREEK PI SYMBOL -->
-<!ENTITY Psi "Ψ" ><!--GREEK CAPITAL LETTER PSI -->
-<!ENTITY psi "ψ" ><!--GREEK SMALL LETTER PSI -->
-<!ENTITY rho "ρ" ><!--GREEK SMALL LETTER RHO -->
-<!ENTITY rhov "ϱ" ><!--GREEK RHO SYMBOL -->
-<!ENTITY Sigma "Σ" ><!--GREEK CAPITAL LETTER SIGMA -->
-<!ENTITY sigma "σ" ><!--GREEK SMALL LETTER SIGMA -->
-<!ENTITY sigmav "ς" ><!--GREEK SMALL LETTER FINAL SIGMA -->
-<!ENTITY tau "τ" ><!--GREEK SMALL LETTER TAU -->
-<!ENTITY Theta "Θ" ><!--GREEK CAPITAL LETTER THETA -->
-<!ENTITY thetas "θ" ><!--GREEK SMALL LETTER THETA -->
-<!ENTITY thetav "ϑ" ><!--GREEK THETA SYMBOL -->
-<!ENTITY Upsi "ϒ" ><!--GREEK UPSILON WITH HOOK SYMBOL -->
-<!ENTITY upsi "υ" ><!--GREEK SMALL LETTER UPSILON -->
-<!ENTITY Xi "Ξ" ><!--GREEK CAPITAL LETTER XI -->
-<!ENTITY xi "ξ" ><!--GREEK SMALL LETTER XI -->
-<!ENTITY zeta "ζ" ><!--GREEK SMALL LETTER ZETA -->
diff --git a/contrib/entitynorm/entities/isolat1.ent b/contrib/entitynorm/entities/isolat1.ent
deleted file mode 100644
index d4a4e86..0000000
--- a/contrib/entitynorm/entities/isolat1.ent
+++ /dev/null
@@ -1,103 +0,0 @@
-
-<!--
- File isolat1.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isolat1.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Added Latin 1//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isolat1.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isolat1 PUBLIC
- "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isolat1.ent"
- >
- %isolat1;
-
--->
-
-<!ENTITY Aacute "Á" ><!--LATIN CAPITAL LETTER A WITH ACUTE -->
-<!ENTITY aacute "á" ><!--LATIN SMALL LETTER A WITH ACUTE -->
-<!ENTITY Acirc "Â" ><!--LATIN CAPITAL LETTER A WITH CIRCUMFLEX -->
-<!ENTITY acirc "â" ><!--LATIN SMALL LETTER A WITH CIRCUMFLEX -->
-<!ENTITY AElig "Æ" ><!--LATIN CAPITAL LETTER AE -->
-<!ENTITY aelig "æ" ><!--LATIN SMALL LETTER AE -->
-<!ENTITY Agrave "À" ><!--LATIN CAPITAL LETTER A WITH GRAVE -->
-<!ENTITY agrave "à" ><!--LATIN SMALL LETTER A WITH GRAVE -->
-<!ENTITY Aring "Å" ><!--LATIN CAPITAL LETTER A WITH RING ABOVE -->
-<!ENTITY aring "å" ><!--LATIN SMALL LETTER A WITH RING ABOVE -->
-<!ENTITY Atilde "Ã" ><!--LATIN CAPITAL LETTER A WITH TILDE -->
-<!ENTITY atilde "ã" ><!--LATIN SMALL LETTER A WITH TILDE -->
-<!ENTITY Auml "Ä" ><!--LATIN CAPITAL LETTER A WITH DIAERESIS -->
-<!ENTITY auml "ä" ><!--LATIN SMALL LETTER A WITH DIAERESIS -->
-<!ENTITY Ccedil "Ç" ><!--LATIN CAPITAL LETTER C WITH CEDILLA -->
-<!ENTITY ccedil "ç" ><!--LATIN SMALL LETTER C WITH CEDILLA -->
-<!ENTITY Eacute "É" ><!--LATIN CAPITAL LETTER E WITH ACUTE -->
-<!ENTITY eacute "é" ><!--LATIN SMALL LETTER E WITH ACUTE -->
-<!ENTITY Ecirc "Ê" ><!--LATIN CAPITAL LETTER E WITH CIRCUMFLEX -->
-<!ENTITY ecirc "ê" ><!--LATIN SMALL LETTER E WITH CIRCUMFLEX -->
-<!ENTITY Egrave "È" ><!--LATIN CAPITAL LETTER E WITH GRAVE -->
-<!ENTITY egrave "è" ><!--LATIN SMALL LETTER E WITH GRAVE -->
-<!ENTITY ETH "Ð" ><!--LATIN CAPITAL LETTER ETH -->
-<!ENTITY eth "ð" ><!--LATIN SMALL LETTER ETH -->
-<!ENTITY Euml "Ë" ><!--LATIN CAPITAL LETTER E WITH DIAERESIS -->
-<!ENTITY euml "ë" ><!--LATIN SMALL LETTER E WITH DIAERESIS -->
-<!ENTITY Iacute "Í" ><!--LATIN CAPITAL LETTER I WITH ACUTE -->
-<!ENTITY iacute "í" ><!--LATIN SMALL LETTER I WITH ACUTE -->
-<!ENTITY Icirc "Î" ><!--LATIN CAPITAL LETTER I WITH CIRCUMFLEX -->
-<!ENTITY icirc "î" ><!--LATIN SMALL LETTER I WITH CIRCUMFLEX -->
-<!ENTITY Igrave "Ì" ><!--LATIN CAPITAL LETTER I WITH GRAVE -->
-<!ENTITY igrave "ì" ><!--LATIN SMALL LETTER I WITH GRAVE -->
-<!ENTITY Iuml "Ï" ><!--LATIN CAPITAL LETTER I WITH DIAERESIS -->
-<!ENTITY iuml "ï" ><!--LATIN SMALL LETTER I WITH DIAERESIS -->
-<!ENTITY Ntilde "Ñ" ><!--LATIN CAPITAL LETTER N WITH TILDE -->
-<!ENTITY ntilde "ñ" ><!--LATIN SMALL LETTER N WITH TILDE -->
-<!ENTITY Oacute "Ó" ><!--LATIN CAPITAL LETTER O WITH ACUTE -->
-<!ENTITY oacute "ó" ><!--LATIN SMALL LETTER O WITH ACUTE -->
-<!ENTITY Ocirc "Ô" ><!--LATIN CAPITAL LETTER O WITH CIRCUMFLEX -->
-<!ENTITY ocirc "ô" ><!--LATIN SMALL LETTER O WITH CIRCUMFLEX -->
-<!ENTITY Ograve "Ò" ><!--LATIN CAPITAL LETTER O WITH GRAVE -->
-<!ENTITY ograve "ò" ><!--LATIN SMALL LETTER O WITH GRAVE -->
-<!ENTITY Oslash "Ø" ><!--LATIN CAPITAL LETTER O WITH STROKE -->
-<!ENTITY oslash "ø" ><!--LATIN SMALL LETTER O WITH STROKE -->
-<!ENTITY Otilde "Õ" ><!--LATIN CAPITAL LETTER O WITH TILDE -->
-<!ENTITY otilde "õ" ><!--LATIN SMALL LETTER O WITH TILDE -->
-<!ENTITY Ouml "Ö" ><!--LATIN CAPITAL LETTER O WITH DIAERESIS -->
-<!ENTITY ouml "ö" ><!--LATIN SMALL LETTER O WITH DIAERESIS -->
-<!ENTITY szlig "ß" ><!--LATIN SMALL LETTER SHARP S -->
-<!ENTITY THORN "Þ" ><!--LATIN CAPITAL LETTER THORN -->
-<!ENTITY thorn "þ" ><!--LATIN SMALL LETTER THORN -->
-<!ENTITY Uacute "Ú" ><!--LATIN CAPITAL LETTER U WITH ACUTE -->
-<!ENTITY uacute "ú" ><!--LATIN SMALL LETTER U WITH ACUTE -->
-<!ENTITY Ucirc "Û" ><!--LATIN CAPITAL LETTER U WITH CIRCUMFLEX -->
-<!ENTITY ucirc "û" ><!--LATIN SMALL LETTER U WITH CIRCUMFLEX -->
-<!ENTITY Ugrave "Ù" ><!--LATIN CAPITAL LETTER U WITH GRAVE -->
-<!ENTITY ugrave "ù" ><!--LATIN SMALL LETTER U WITH GRAVE -->
-<!ENTITY Uuml "Ü" ><!--LATIN CAPITAL LETTER U WITH DIAERESIS -->
-<!ENTITY uuml "ü" ><!--LATIN SMALL LETTER U WITH DIAERESIS -->
-<!ENTITY Yacute "Ý" ><!--LATIN CAPITAL LETTER Y WITH ACUTE -->
-<!ENTITY yacute "ý" ><!--LATIN SMALL LETTER Y WITH ACUTE -->
-<!ENTITY yuml "ÿ" ><!--LATIN SMALL LETTER Y WITH DIAERESIS -->
diff --git a/contrib/entitynorm/entities/isonum.ent b/contrib/entitynorm/entities/isonum.ent
deleted file mode 100644
index f20e9c7..0000000
--- a/contrib/entitynorm/entities/isonum.ent
+++ /dev/null
@@ -1,117 +0,0 @@
-
-<!--
- File isonum.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isonum.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isonum.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isonum PUBLIC
- "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isonum.ent"
- >
- %isonum;
-
--->
-
-<!ENTITY amp "&#38;" ><!--AMPERSAND -->
-<!ENTITY apos "'" ><!--APOSTROPHE -->
-<!ENTITY ast "*" ><!--ASTERISK -->
-<!ENTITY brvbar "¦" ><!--BROKEN BAR -->
-<!ENTITY bsol "\" ><!--REVERSE SOLIDUS -->
-<!ENTITY cent "¢" ><!--CENT SIGN -->
-<!ENTITY colon ":" ><!--COLON -->
-<!ENTITY comma "," ><!--COMMA -->
-<!ENTITY commat "@" ><!--COMMERCIAL AT -->
-<!ENTITY copy "©" ><!--COPYRIGHT SIGN -->
-<!ENTITY curren "¤" ><!--CURRENCY SIGN -->
-<!ENTITY darr "↓" ><!--DOWNWARDS ARROW -->
-<!ENTITY deg "°" ><!--DEGREE SIGN -->
-<!ENTITY divide "÷" ><!--DIVISION SIGN -->
-<!ENTITY dollar "$" ><!--DOLLAR SIGN -->
-<!ENTITY equals "=" ><!--EQUALS SIGN -->
-<!ENTITY excl "!" ><!--EXCLAMATION MARK -->
-<!ENTITY frac12 "½" ><!--VULGAR FRACTION ONE HALF -->
-<!ENTITY frac14 "¼" ><!--VULGAR FRACTION ONE QUARTER -->
-<!ENTITY frac18 "⅛" ><!--VULGAR FRACTION ONE EIGHTH -->
-<!ENTITY frac34 "¾" ><!--VULGAR FRACTION THREE QUARTERS -->
-<!ENTITY frac38 "⅜" ><!--VULGAR FRACTION THREE EIGHTHS -->
-<!ENTITY frac58 "⅝" ><!--VULGAR FRACTION FIVE EIGHTHS -->
-<!ENTITY frac78 "⅞" ><!--VULGAR FRACTION SEVEN EIGHTHS -->
-<!ENTITY gt ">" ><!--GREATER-THAN SIGN -->
-<!ENTITY half "½" ><!--VULGAR FRACTION ONE HALF -->
-<!ENTITY horbar "―" ><!--HORIZONTAL BAR -->
-<!ENTITY hyphen "‐" ><!--HYPHEN -->
-<!ENTITY iexcl "¡" ><!--INVERTED EXCLAMATION MARK -->
-<!ENTITY iquest "¿" ><!--INVERTED QUESTION MARK -->
-<!ENTITY laquo "«" ><!--LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-<!ENTITY larr "←" ><!--LEFTWARDS ARROW -->
-<!ENTITY lcub "{" ><!--LEFT CURLY BRACKET -->
-<!ENTITY ldquo "“" ><!--LEFT DOUBLE QUOTATION MARK -->
-<!ENTITY lowbar "_" ><!--LOW LINE -->
-<!ENTITY lpar "(" ><!--LEFT PARENTHESIS -->
-<!ENTITY lsqb "[" ><!--LEFT SQUARE BRACKET -->
-<!ENTITY lsquo "‘" ><!--LEFT SINGLE QUOTATION MARK -->
-<!ENTITY lt "&#60;" ><!--LESS-THAN SIGN -->
-<!ENTITY micro "µ" ><!--MICRO SIGN -->
-<!ENTITY middot "·" ><!--MIDDLE DOT -->
-<!ENTITY nbsp " " ><!--NO-BREAK SPACE -->
-<!ENTITY not "¬" ><!--NOT SIGN -->
-<!ENTITY num "#" ><!--NUMBER SIGN -->
-<!ENTITY ohm "Ω" ><!--OHM SIGN -->
-<!ENTITY ordf "ª" ><!--FEMININE ORDINAL INDICATOR -->
-<!ENTITY ordm "º" ><!--MASCULINE ORDINAL INDICATOR -->
-<!ENTITY para "¶" ><!--PILCROW SIGN -->
-<!ENTITY percnt "%" ><!--PERCENT SIGN -->
-<!ENTITY period "." ><!--FULL STOP -->
-<!ENTITY plus "+" ><!--PLUS SIGN -->
-<!ENTITY plusmn "±" ><!--PLUS-MINUS SIGN -->
-<!ENTITY pound "£" ><!--POUND SIGN -->
-<!ENTITY quest "?" ><!--QUESTION MARK -->
-<!ENTITY quot """ ><!--QUOTATION MARK -->
-<!ENTITY raquo "»" ><!--RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
-<!ENTITY rarr "→" ><!--RIGHTWARDS ARROW -->
-<!ENTITY rcub "}" ><!--RIGHT CURLY BRACKET -->
-<!ENTITY rdquo "”" ><!--RIGHT DOUBLE QUOTATION MARK -->
-<!ENTITY reg "®" ><!--REGISTERED SIGN -->
-<!ENTITY rpar ")" ><!--RIGHT PARENTHESIS -->
-<!ENTITY rsqb "]" ><!--RIGHT SQUARE BRACKET -->
-<!ENTITY rsquo "’" ><!--RIGHT SINGLE QUOTATION MARK -->
-<!ENTITY sect "§" ><!--SECTION SIGN -->
-<!ENTITY semi ";" ><!--SEMICOLON -->
-<!ENTITY shy "­" ><!--SOFT HYPHEN -->
-<!ENTITY sol "/" ><!--SOLIDUS -->
-<!ENTITY sung "♪" ><!--EIGHTH NOTE -->
-<!ENTITY sup1 "¹" ><!--SUPERSCRIPT ONE -->
-<!ENTITY sup2 "²" ><!--SUPERSCRIPT TWO -->
-<!ENTITY sup3 "³" ><!--SUPERSCRIPT THREE -->
-<!ENTITY times "×" ><!--MULTIPLICATION SIGN -->
-<!ENTITY trade "™" ><!--TRADE MARK SIGN -->
-<!ENTITY uarr "↑" ><!--UPWARDS ARROW -->
-<!ENTITY verbar "|" ><!--VERTICAL LINE -->
-<!ENTITY yen "¥" ><!--YEN SIGN -->
diff --git a/contrib/entitynorm/entities/isopub.ent b/contrib/entitynorm/entities/isopub.ent
deleted file mode 100644
index 10ad9d5..0000000
--- a/contrib/entitynorm/entities/isopub.ent
+++ /dev/null
@@ -1,125 +0,0 @@
-
-<!--
- File isopub.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isopub.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES Publishing//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isopub.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isopub PUBLIC
- "ISO 8879:1986//ENTITIES Publishing//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isopub.ent"
- >
- %isopub;
-
--->
-
-<!ENTITY blank "␣" ><!--OPEN BOX -->
-<!ENTITY blk12 "▒" ><!--MEDIUM SHADE -->
-<!ENTITY blk14 "░" ><!--LIGHT SHADE -->
-<!ENTITY blk34 "▓" ><!--DARK SHADE -->
-<!ENTITY block "█" ><!--FULL BLOCK -->
-<!ENTITY bull "•" ><!--BULLET -->
-<!ENTITY caret "⁁" ><!--CARET INSERTION POINT -->
-<!ENTITY check "✓" ><!--CHECK MARK -->
-<!ENTITY cir "○" ><!--WHITE CIRCLE -->
-<!ENTITY clubs "♣" ><!--BLACK CLUB SUIT -->
-<!ENTITY copysr "℗" ><!--SOUND RECORDING COPYRIGHT -->
-<!ENTITY cross "✗" ><!--BALLOT X -->
-<!ENTITY Dagger "‡" ><!--DOUBLE DAGGER -->
-<!ENTITY dagger "†" ><!--DAGGER -->
-<!ENTITY dash "‐" ><!--HYPHEN -->
-<!ENTITY diams "♦" ><!--BLACK DIAMOND SUIT -->
-<!ENTITY dlcrop "⌍" ><!--BOTTOM LEFT CROP -->
-<!ENTITY drcrop "⌌" ><!--BOTTOM RIGHT CROP -->
-<!ENTITY dtri "▿" ><!--WHITE DOWN-POINTING SMALL TRIANGLE -->
-<!ENTITY dtrif "▾" ><!--BLACK DOWN-POINTING SMALL TRIANGLE -->
-<!ENTITY emsp " " ><!--EM SPACE -->
-<!ENTITY emsp13 " " ><!--THREE-PER-EM SPACE -->
-<!ENTITY emsp14 " " ><!--FOUR-PER-EM SPACE -->
-<!ENTITY ensp " " ><!--EN SPACE -->
-<!ENTITY female "♀" ><!--FEMALE SIGN -->
-<!ENTITY ffilig "ffi" ><!--LATIN SMALL LIGATURE FFI -->
-<!ENTITY fflig "ff" ><!--LATIN SMALL LIGATURE FF -->
-<!ENTITY ffllig "ffl" ><!--LATIN SMALL LIGATURE FFL -->
-<!ENTITY filig "fi" ><!--LATIN SMALL LIGATURE FI -->
-<!ENTITY flat "♭" ><!--MUSIC FLAT SIGN -->
-<!ENTITY fllig "fl" ><!--LATIN SMALL LIGATURE FL -->
-<!ENTITY frac13 "⅓" ><!--VULGAR FRACTION ONE THIRD -->
-<!ENTITY frac15 "⅕" ><!--VULGAR FRACTION ONE FIFTH -->
-<!ENTITY frac16 "⅙" ><!--VULGAR FRACTION ONE SIXTH -->
-<!ENTITY frac23 "⅔" ><!--VULGAR FRACTION TWO THIRDS -->
-<!ENTITY frac25 "⅖" ><!--VULGAR FRACTION TWO FIFTHS -->
-<!ENTITY frac35 "⅗" ><!--VULGAR FRACTION THREE FIFTHS -->
-<!ENTITY frac45 "⅘" ><!--VULGAR FRACTION FOUR FIFTHS -->
-<!ENTITY frac56 "⅚" ><!--VULGAR FRACTION FIVE SIXTHS -->
-<!ENTITY hairsp " " ><!--HAIR SPACE -->
-<!ENTITY hearts "♥" ><!--BLACK HEART SUIT -->
-<!ENTITY hellip "…" ><!--HORIZONTAL ELLIPSIS -->
-<!ENTITY hybull "⁃" ><!--HYPHEN BULLET -->
-<!ENTITY incare "℅" ><!--CARE OF -->
-<!ENTITY ldquor "„" ><!--DOUBLE LOW-9 QUOTATION MARK -->
-<!ENTITY lhblk "▄" ><!--LOWER HALF BLOCK -->
-<!ENTITY loz "◊" ><!--LOZENGE -->
-<!ENTITY lozf "⧫" ><!--BLACK LOZENGE -->
-<!ENTITY lsquor "‚" ><!--SINGLE LOW-9 QUOTATION MARK -->
-<!ENTITY ltri "◃" ><!--WHITE LEFT-POINTING SMALL TRIANGLE -->
-<!ENTITY ltrif "◂" ><!--BLACK LEFT-POINTING SMALL TRIANGLE -->
-<!ENTITY male "♂" ><!--MALE SIGN -->
-<!ENTITY malt "✠" ><!--MALTESE CROSS -->
-<!ENTITY marker "▮" ><!--BLACK VERTICAL RECTANGLE -->
-<!ENTITY mdash "—" ><!--EM DASH -->
-<!ENTITY mldr "…" ><!--HORIZONTAL ELLIPSIS -->
-<!ENTITY natur "♮" ><!--MUSIC NATURAL SIGN -->
-<!ENTITY ndash "–" ><!--EN DASH -->
-<!ENTITY nldr "‥" ><!--TWO DOT LEADER -->
-<!ENTITY numsp " " ><!--FIGURE SPACE -->
-<!ENTITY phone "☎" ><!--BLACK TELEPHONE -->
-<!ENTITY puncsp " " ><!--PUNCTUATION SPACE -->
-<!ENTITY rdquor "”" ><!--RIGHT DOUBLE QUOTATION MARK -->
-<!ENTITY rect "▭" ><!--WHITE RECTANGLE -->
-<!ENTITY rsquor "’" ><!--RIGHT SINGLE QUOTATION MARK -->
-<!ENTITY rtri "▹" ><!--WHITE RIGHT-POINTING SMALL TRIANGLE -->
-<!ENTITY rtrif "▸" ><!--BLACK RIGHT-POINTING SMALL TRIANGLE -->
-<!ENTITY rx "℞" ><!--PRESCRIPTION TAKE -->
-<!ENTITY sext "✶" ><!--SIX POINTED BLACK STAR -->
-<!ENTITY sharp "♯" ><!--MUSIC SHARP SIGN -->
-<!ENTITY spades "♠" ><!--BLACK SPADE SUIT -->
-<!ENTITY squ "□" ><!--WHITE SQUARE -->
-<!ENTITY squf "▪" ><!--BLACK SMALL SQUARE -->
-<!ENTITY star "☆" ><!--WHITE STAR -->
-<!ENTITY starf "★" ><!--BLACK STAR -->
-<!ENTITY target "⌖" ><!--POSITION INDICATOR -->
-<!ENTITY telrec "⌕" ><!--TELEPHONE RECORDER -->
-<!ENTITY thinsp " " ><!--THIN SPACE -->
-<!ENTITY uhblk "▀" ><!--UPPER HALF BLOCK -->
-<!ENTITY ulcrop "⌏" ><!--TOP LEFT CROP -->
-<!ENTITY urcrop "⌎" ><!--TOP RIGHT CROP -->
-<!ENTITY utri "▵" ><!--WHITE UP-POINTING SMALL TRIANGLE -->
-<!ENTITY utrif "▴" ><!--BLACK UP-POINTING SMALL TRIANGLE -->
-<!ENTITY vellip "⋮" ><!--VERTICAL ELLIPSIS -->
diff --git a/contrib/entitynorm/entities/isotech.ent b/contrib/entitynorm/entities/isotech.ent
deleted file mode 100644
index 3184553..0000000
--- a/contrib/entitynorm/entities/isotech.ent
+++ /dev/null
@@ -1,103 +0,0 @@
-
-<!--
- File isotech.ent produced by the XSL script entities.xsl
- from input data in unicode.xml.
-
- Please report any errors to David Carlisle
- via the public W3C list www-math at w3.org.
-
- The numeric character values assigned to each entity
- (should) match the Unicode assignments in Unicode 4.0.
-
- Entity names in this file are derived from files carrying the
- following notice:
-
- (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
-
--->
-
-
-<!--
- Version: $Id: isotech.ent,v 1.1 2006/12/26 16:17:01 tkojm Exp $
-
- Public identifier: ISO 8879:1986//ENTITIES General Technical//EN//XML
- System identifier: http://www.w3.org/2003/entities/iso8879/isotech.ent
-
- The public identifier should always be used verbatim.
- The system identifier may be changed to suit local requirements.
-
- Typical invocation:
-
- <!ENTITY % isotech PUBLIC
- "ISO 8879:1986//ENTITIES General Technical//EN//XML"
- "http://www.w3.org/2003/entities/iso8879/isotech.ent"
- >
- %isotech;
-
--->
-
-<!ENTITY aleph "ℵ" ><!--ALEF SYMBOL -->
-<!ENTITY and "∧" ><!--LOGICAL AND -->
-<!ENTITY ang90 "∟" ><!--RIGHT ANGLE -->
-<!ENTITY angsph "∢" ><!--SPHERICAL ANGLE -->
-<!ENTITY angst "Å" ><!--ANGSTROM SIGN -->
-<!ENTITY ap "≈" ><!--ALMOST EQUAL TO -->
-<!ENTITY becaus "∵" ><!--BECAUSE -->
-<!ENTITY bernou "ℬ" ><!--SCRIPT CAPITAL B -->
-<!ENTITY bottom "⊥" ><!--UP TACK -->
-<!ENTITY cap "∩" ><!--INTERSECTION -->
-<!ENTITY compfn "∘" ><!--RING OPERATOR -->
-<!ENTITY cong "≅" ><!--APPROXIMATELY EQUAL TO -->
-<!ENTITY conint "∮" ><!--CONTOUR INTEGRAL -->
-<!ENTITY cup "∪" ><!--UNION -->
-<!ENTITY Dot "¨" ><!--DIAERESIS -->
-<!ENTITY DotDot " ⃜" ><!--COMBINING FOUR DOTS ABOVE -->
-<!ENTITY equiv "≡" ><!--IDENTICAL TO -->
-<!ENTITY exist "∃" ><!--THERE EXISTS -->
-<!ENTITY fnof "ƒ" ><!--LATIN SMALL LETTER F WITH HOOK -->
-<!ENTITY forall "∀" ><!--FOR ALL -->
-<!ENTITY ge "≥" ><!--GREATER-THAN OR EQUAL TO -->
-<!ENTITY hamilt "ℋ" ><!--SCRIPT CAPITAL H -->
-<!ENTITY iff "⇔" ><!--LEFT RIGHT DOUBLE ARROW -->
-<!ENTITY infin "∞" ><!--INFINITY -->
-<!ENTITY int "∫" ><!--INTEGRAL -->
-<!ENTITY isin "∈" ><!--ELEMENT OF -->
-<!ENTITY lagran "ℒ" ><!--SCRIPT CAPITAL L -->
-<!ENTITY lang "〈" ><!--LEFT-POINTING ANGLE BRACKET -->
-<!ENTITY lArr "⇐" ><!--LEFTWARDS DOUBLE ARROW -->
-<!ENTITY le "≤" ><!--LESS-THAN OR EQUAL TO -->
-<!ENTITY lowast "∗" ><!--ASTERISK OPERATOR -->
-<!ENTITY minus "−" ><!--MINUS SIGN -->
-<!ENTITY mnplus "∓" ><!--MINUS-OR-PLUS SIGN -->
-<!ENTITY nabla "∇" ><!--NABLA -->
-<!ENTITY ne "≠" ><!--NOT EQUAL TO -->
-<!ENTITY ni "∋" ><!--CONTAINS AS MEMBER -->
-<!ENTITY notin "∉" ><!--NOT AN ELEMENT OF -->
-<!ENTITY or "∨" ><!--LOGICAL OR -->
-<!ENTITY order "ℴ" ><!--SCRIPT SMALL O -->
-<!ENTITY par "∥" ><!--PARALLEL TO -->
-<!ENTITY part "∂" ><!--PARTIAL DIFFERENTIAL -->
-<!ENTITY permil "‰" ><!--PER MILLE SIGN -->
-<!ENTITY perp "⊥" ><!--UP TACK -->
-<!ENTITY phmmat "ℳ" ><!--SCRIPT CAPITAL M -->
-<!ENTITY Prime "″" ><!--DOUBLE PRIME -->
-<!ENTITY prime "′" ><!--PRIME -->
-<!ENTITY prop "∝" ><!--PROPORTIONAL TO -->
-<!ENTITY radic "√" ><!--SQUARE ROOT -->
-<!ENTITY rang "〉" ><!--RIGHT-POINTING ANGLE BRACKET -->
-<!ENTITY rArr "⇒" ><!--RIGHTWARDS DOUBLE ARROW -->
-<!ENTITY sim "∼" ><!--TILDE OPERATOR -->
-<!ENTITY sime "≃" ><!--ASYMPTOTICALLY EQUAL TO -->
-<!ENTITY square "□" ><!--WHITE SQUARE -->
-<!ENTITY sub "⊂" ><!--SUBSET OF -->
-<!ENTITY sube "⊆" ><!--SUBSET OF OR EQUAL TO -->
-<!ENTITY sup "⊃" ><!--SUPERSET OF -->
-<!ENTITY supe "⊇" ><!--SUPERSET OF OR EQUAL TO -->
-<!ENTITY tdot " ⃛" ><!--COMBINING THREE DOTS ABOVE -->
-<!ENTITY there4 "∴" ><!--THEREFORE -->
-<!ENTITY tprime "‴" ><!--TRIPLE PRIME -->
-<!ENTITY Verbar "‖" ><!--DOUBLE VERTICAL LINE -->
-<!ENTITY wedgeq "≙" ><!--ESTIMATES -->
diff --git a/contrib/entitynorm/entities/xhtml-lat1.ent b/contrib/entitynorm/entities/xhtml-lat1.ent
deleted file mode 100644
index aaae738..0000000
--- a/contrib/entitynorm/entities/xhtml-lat1.ent
+++ /dev/null
@@ -1,196 +0,0 @@
-<!-- Portions (C) International Organization for Standardization 1986
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
- <!ENTITY % HTMLlat1 PUBLIC
- "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
- %HTMLlat1;
--->
-
-<!ENTITY nbsp " "> <!-- no-break space = non-breaking space,
- U+00A0 ISOnum -->
-<!ENTITY iexcl "¡"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent "¢"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound "£"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "¤"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen "¥"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "¦"> <!-- broken bar = broken vertical bar,
- U+00A6 ISOnum -->
-<!ENTITY sect "§"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml "¨"> <!-- diaeresis = spacing diaeresis,
- U+00A8 ISOdia -->
-<!ENTITY copy "©"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf "ª"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo "«"> <!-- left-pointing double angle quotation mark
- = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not "¬"> <!-- not sign = discretionary hyphen,
- U+00AC ISOnum -->
-<!ENTITY shy "­"> <!-- soft hyphen = discretionary hyphen,
- U+00AD ISOnum -->
-<!ENTITY reg "®"> <!-- registered sign = registered trade mark sign,
- U+00AE ISOnum -->
-<!ENTITY macr "¯"> <!-- macron = spacing macron = overline
- = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg "°"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "±"> <!-- plus-minus sign = plus-or-minus sign,
- U+00B1 ISOnum -->
-<!ENTITY sup2 "²"> <!-- superscript two = superscript digit two
- = squared, U+00B2 ISOnum -->
-<!ENTITY sup3 "³"> <!-- superscript three = superscript digit three
- = cubed, U+00B3 ISOnum -->
-<!ENTITY acute "´"> <!-- acute accent = spacing acute,
- U+00B4 ISOdia -->
-<!ENTITY micro "µ"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para "¶"> <!-- pilcrow sign = paragraph sign,
- U+00B6 ISOnum -->
-<!ENTITY middot "·"> <!-- middle dot = Georgian comma
- = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil "¸"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1 "¹"> <!-- superscript one = superscript digit one,
- U+00B9 ISOnum -->
-<!ENTITY ordm "º"> <!-- masculine ordinal indicator,
- U+00BA ISOnum -->
-<!ENTITY raquo "»"> <!-- right-pointing double angle quotation mark
- = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "¼"> <!-- vulgar fraction one quarter
- = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "½"> <!-- vulgar fraction one half
- = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "¾"> <!-- vulgar fraction three quarters
- = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "¿"> <!-- inverted question mark
- = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "À"> <!-- latin capital letter A with grave
- = latin capital letter A grave,
- U+00C0 ISOlat1 -->
-<!ENTITY Aacute "Á"> <!-- latin capital letter A with acute,
- U+00C1 ISOlat1 -->
-<!ENTITY Acirc "Â"> <!-- latin capital letter A with circumflex,
- U+00C2 ISOlat1 -->
-<!ENTITY Atilde "Ã"> <!-- latin capital letter A with tilde,
- U+00C3 ISOlat1 -->
-<!ENTITY Auml "Ä"> <!-- latin capital letter A with diaeresis,
- U+00C4 ISOlat1 -->
-<!ENTITY Aring "Å"> <!-- latin capital letter A with ring above
- = latin capital letter A ring,
- U+00C5 ISOlat1 -->
-<!ENTITY AElig "Æ"> <!-- latin capital letter AE
- = latin capital ligature AE,
- U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "Ç"> <!-- latin capital letter C with cedilla,
- U+00C7 ISOlat1 -->
-<!ENTITY Egrave "È"> <!-- latin capital letter E with grave,
- U+00C8 ISOlat1 -->
-<!ENTITY Eacute "É"> <!-- latin capital letter E with acute,
- U+00C9 ISOlat1 -->
-<!ENTITY Ecirc "Ê"> <!-- latin capital letter E with circumflex,
- U+00CA ISOlat1 -->
-<!ENTITY Euml "Ë"> <!-- latin capital letter E with diaeresis,
- U+00CB ISOlat1 -->
-<!ENTITY Igrave "Ì"> <!-- latin capital letter I with grave,
- U+00CC ISOlat1 -->
-<!ENTITY Iacute "Í"> <!-- latin capital letter I with acute,
- U+00CD ISOlat1 -->
-<!ENTITY Icirc "Î"> <!-- latin capital letter I with circumflex,
- U+00CE ISOlat1 -->
-<!ENTITY Iuml "Ï"> <!-- latin capital letter I with diaeresis,
- U+00CF ISOlat1 -->
-<!ENTITY ETH "Ð"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "Ñ"> <!-- latin capital letter N with tilde,
- U+00D1 ISOlat1 -->
-<!ENTITY Ograve "Ò"> <!-- latin capital letter O with grave,
- U+00D2 ISOlat1 -->
-<!ENTITY Oacute "Ó"> <!-- latin capital letter O with acute,
- U+00D3 ISOlat1 -->
-<!ENTITY Ocirc "Ô"> <!-- latin capital letter O with circumflex,
- U+00D4 ISOlat1 -->
-<!ENTITY Otilde "Õ"> <!-- latin capital letter O with tilde,
- U+00D5 ISOlat1 -->
-<!ENTITY Ouml "Ö"> <!-- latin capital letter O with diaeresis,
- U+00D6 ISOlat1 -->
-<!ENTITY times "×"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "Ø"> <!-- latin capital letter O with stroke
- = latin capital letter O slash,
- U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "Ù"> <!-- latin capital letter U with grave,
- U+00D9 ISOlat1 -->
-<!ENTITY Uacute "Ú"> <!-- latin capital letter U with acute,
- U+00DA ISOlat1 -->
-<!ENTITY Ucirc "Û"> <!-- latin capital letter U with circumflex,
- U+00DB ISOlat1 -->
-<!ENTITY Uuml "Ü"> <!-- latin capital letter U with diaeresis,
- U+00DC ISOlat1 -->
-<!ENTITY Yacute "Ý"> <!-- latin capital letter Y with acute,
- U+00DD ISOlat1 -->
-<!ENTITY THORN "Þ"> <!-- latin capital letter THORN,
- U+00DE ISOlat1 -->
-<!ENTITY szlig "ß"> <!-- latin small letter sharp s = ess-zed,
- U+00DF ISOlat1 -->
-<!ENTITY agrave "à"> <!-- latin small letter a with grave
- = latin small letter a grave,
- U+00E0 ISOlat1 -->
-<!ENTITY aacute "á"> <!-- latin small letter a with acute,
- U+00E1 ISOlat1 -->
-<!ENTITY acirc "â"> <!-- latin small letter a with circumflex,
- U+00E2 ISOlat1 -->
-<!ENTITY atilde "ã"> <!-- latin small letter a with tilde,
- U+00E3 ISOlat1 -->
-<!ENTITY auml "ä"> <!-- latin small letter a with diaeresis,
- U+00E4 ISOlat1 -->
-<!ENTITY aring "å"> <!-- latin small letter a with ring above
- = latin small letter a ring,
- U+00E5 ISOlat1 -->
-<!ENTITY aelig "æ"> <!-- latin small letter ae
- = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "ç"> <!-- latin small letter c with cedilla,
- U+00E7 ISOlat1 -->
-<!ENTITY egrave "è"> <!-- latin small letter e with grave,
- U+00E8 ISOlat1 -->
-<!ENTITY eacute "é"> <!-- latin small letter e with acute,
- U+00E9 ISOlat1 -->
-<!ENTITY ecirc "ê"> <!-- latin small letter e with circumflex,
- U+00EA ISOlat1 -->
-<!ENTITY euml "ë"> <!-- latin small letter e with diaeresis,
- U+00EB ISOlat1 -->
-<!ENTITY igrave "ì"> <!-- latin small letter i with grave,
- U+00EC ISOlat1 -->
-<!ENTITY iacute "í"> <!-- latin small letter i with acute,
- U+00ED ISOlat1 -->
-<!ENTITY icirc "î"> <!-- latin small letter i with circumflex,
- U+00EE ISOlat1 -->
-<!ENTITY iuml "ï"> <!-- latin small letter i with diaeresis,
- U+00EF ISOlat1 -->
-<!ENTITY eth "ð"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "ñ"> <!-- latin small letter n with tilde,
- U+00F1 ISOlat1 -->
-<!ENTITY ograve "ò"> <!-- latin small letter o with grave,
- U+00F2 ISOlat1 -->
-<!ENTITY oacute "ó"> <!-- latin small letter o with acute,
- U+00F3 ISOlat1 -->
-<!ENTITY ocirc "ô"> <!-- latin small letter o with circumflex,
- U+00F4 ISOlat1 -->
-<!ENTITY otilde "õ"> <!-- latin small letter o with tilde,
- U+00F5 ISOlat1 -->
-<!ENTITY ouml "ö"> <!-- latin small letter o with diaeresis,
- U+00F6 ISOlat1 -->
-<!ENTITY divide "÷"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "ø"> <!-- latin small letter o with stroke,
- = latin small letter o slash,
- U+00F8 ISOlat1 -->
-<!ENTITY ugrave "ù"> <!-- latin small letter u with grave,
- U+00F9 ISOlat1 -->
-<!ENTITY uacute "ú"> <!-- latin small letter u with acute,
- U+00FA ISOlat1 -->
-<!ENTITY ucirc "û"> <!-- latin small letter u with circumflex,
- U+00FB ISOlat1 -->
-<!ENTITY uuml "ü"> <!-- latin small letter u with diaeresis,
- U+00FC ISOlat1 -->
-<!ENTITY yacute "ý"> <!-- latin small letter y with acute,
- U+00FD ISOlat1 -->
-<!ENTITY thorn "þ"> <!-- latin small letter thorn with,
- U+00FE ISOlat1 -->
-<!ENTITY yuml "ÿ"> <!-- latin small letter y with diaeresis,
- U+00FF ISOlat1 -->
diff --git a/contrib/entitynorm/entities/xhtml-special.ent b/contrib/entitynorm/entities/xhtml-special.ent
deleted file mode 100644
index cf709d1..0000000
--- a/contrib/entitynorm/entities/xhtml-special.ent
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
- <!ENTITY % HTMLspecial PUBLIC
- "-//W3C//ENTITIES Special for XHTML//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
- %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
- New names (i.e., not in ISO 8879 list) do not clash with any
- existing ISO 8879 entity names. ISO 10646 character numbers
- are given for each character, in hex. values are decimal
- conversions of the ISO 10646 values and refer to the document
- character set. Names are Unicode names.
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot """> <!-- quotation mark = APL quote,
- U+0022 ISOnum -->
-<!ENTITY amp "&#38;"> <!-- ampersand, U+0026 ISOnum -->
-<!ENTITY lt "&#60;"> <!-- less-than sign, U+003C ISOnum -->
-<!ENTITY gt ">"> <!-- greater-than sign, U+003E ISOnum -->
-<!ENTITY apos "'"> <!-- apostrophe mark, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig "Œ"> <!-- latin capital ligature OE,
- U+0152 ISOlat2 -->
-<!ENTITY oelig "œ"> <!-- latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron "Š"> <!-- latin capital letter S with caron,
- U+0160 ISOlat2 -->
-<!ENTITY scaron "š"> <!-- latin small letter s with caron,
- U+0161 ISOlat2 -->
-<!ENTITY Yuml "Ÿ"> <!-- latin capital letter Y with diaeresis,
- U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ "ˆ"> <!-- modifier letter circumflex accent,
- U+02C6 ISOpub -->
-<!ENTITY tilde "˜"> <!-- small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp " "> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp " "> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp " "> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj "‌"> <!-- zero width non-joiner,
- U+200C NEW RFC 2070 -->
-<!ENTITY zwj "‍"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm "‎"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm "‏"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash "–"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash "—"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo "‘"> <!-- left single quotation mark,
- U+2018 ISOnum -->
-<!ENTITY rsquo "’"> <!-- right single quotation mark,
- U+2019 ISOnum -->
-<!ENTITY sbquo "‚"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo "“"> <!-- left double quotation mark,
- U+201C ISOnum -->
-<!ENTITY rdquo "”"> <!-- right double quotation mark,
- U+201D ISOnum -->
-<!ENTITY bdquo "„"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger "†"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger "‡"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil "‰"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo "‹"> <!-- single left-pointing angle quotation mark,
- U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo "›"> <!-- single right-pointing angle quotation mark,
- U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
diff --git a/contrib/entitynorm/entities/xhtml-symbol.ent b/contrib/entitynorm/entities/xhtml-symbol.ent
deleted file mode 100644
index 16f876b..0000000
--- a/contrib/entitynorm/entities/xhtml-symbol.ent
+++ /dev/null
@@ -1,242 +0,0 @@
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
- <!ENTITY % HTMLsymbol PUBLIC
- "-//W3C//ENTITIES Symbols for XHTML//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
- %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
- Permission to copy in any form is granted for use with
- conforming SGML systems and applications as defined in
- ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
- New names (i.e., not in ISO 8879 list) do not clash with any
- existing ISO 8879 entity names. ISO 10646 character numbers
- are given for each character, in hex. values are decimal
- conversions of the ISO 10646 values and refer to the document
- character set. Names are Unicode names.
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof "ƒ"> <!-- latin small f with hook = function
- = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha "Α"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta "Β"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma "Γ"> <!-- greek capital letter gamma,
- U+0393 ISOgrk3 -->
-<!ENTITY Delta "Δ"> <!-- greek capital letter delta,
- U+0394 ISOgrk3 -->
-<!ENTITY Epsilon "Ε"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta "Ζ"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta "Η"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta "Θ"> <!-- greek capital letter theta,
- U+0398 ISOgrk3 -->
-<!ENTITY Iota "Ι"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa "Κ"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda "Λ"> <!-- greek capital letter lambda,
- U+039B ISOgrk3 -->
-<!ENTITY Mu "Μ"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu "Ν"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi "Ξ"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron "Ο"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi "Π"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho "Ρ"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma "Σ"> <!-- greek capital letter sigma,
- U+03A3 ISOgrk3 -->
-<!ENTITY Tau "Τ"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon "Υ"> <!-- greek capital letter upsilon,
- U+03A5 ISOgrk3 -->
-<!ENTITY Phi "Φ"> <!-- greek capital letter phi,
- U+03A6 ISOgrk3 -->
-<!ENTITY Chi "Χ"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi "Ψ"> <!-- greek capital letter psi,
- U+03A8 ISOgrk3 -->
-<!ENTITY Omega "Ω"> <!-- greek capital letter omega,
- U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha "α"> <!-- greek small letter alpha,
- U+03B1 ISOgrk3 -->
-<!ENTITY beta "β"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma "γ"> <!-- greek small letter gamma,
- U+03B3 ISOgrk3 -->
-<!ENTITY delta "δ"> <!-- greek small letter delta,
- U+03B4 ISOgrk3 -->
-<!ENTITY epsilon "ε"> <!-- greek small letter epsilon,
- U+03B5 ISOgrk3 -->
-<!ENTITY zeta "ζ"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta "η"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta "θ"> <!-- greek small letter theta,
- U+03B8 ISOgrk3 -->
-<!ENTITY iota "ι"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa "κ"> <!-- greek small letter kappa,
- U+03BA ISOgrk3 -->
-<!ENTITY lambda "λ"> <!-- greek small letter lambda,
- U+03BB ISOgrk3 -->
-<!ENTITY mu "μ"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu "ν"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi "ξ"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron "ο"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi "π"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho "ρ"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf "ς"> <!-- greek small letter final sigma,
- U+03C2 ISOgrk3 -->
-<!ENTITY sigma "σ"> <!-- greek small letter sigma,
- U+03C3 ISOgrk3 -->
-<!ENTITY tau "τ"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon "υ"> <!-- greek small letter upsilon,
- U+03C5 ISOgrk3 -->
-<!ENTITY phi "φ"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi "χ"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi "ψ"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega "ω"> <!-- greek small letter omega,
- U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "ϑ"> <!-- greek small letter theta symbol,
- U+03D1 NEW -->
-<!ENTITY upsih "ϒ"> <!-- greek upsilon with hook symbol,
- U+03D2 NEW -->
-<!ENTITY piv "ϖ"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull "•"> <!-- bullet = black small circle,
- U+2022 ISOpub -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip "…"> <!-- horizontal ellipsis = three dot leader,
- U+2026 ISOpub -->
-<!ENTITY prime "′"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime "″"> <!-- double prime = seconds = inches,
- U+2033 ISOtech -->
-<!ENTITY oline "‾"> <!-- overline = spacing overscore,
- U+203E NEW -->
-<!ENTITY frasl "⁄"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp "℘"> <!-- script capital P = power set
- = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image "ℑ"> <!-- blackletter capital I = imaginary part,
- U+2111 ISOamso -->
-<!ENTITY real "ℜ"> <!-- blackletter capital R = real part symbol,
- U+211C ISOamso -->
-<!ENTITY trade "™"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym "ℵ"> <!-- alef symbol = first transfinite cardinal,
- U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
- U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr "←"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr "↑"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr "→"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr "↓"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr "↔"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr "↵"> <!-- downwards arrow with corner leftwards
- = carriage return, U+21B5 NEW -->
-<!ENTITY lArr "⇐"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
- but also does not have any other character for that function. So ? lArr can
- be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr "⇑"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr "⇒"> <!-- rightwards double arrow,
- U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have
- another character with this function so ?
- rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr "⇓"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr "⇔"> <!-- left right double arrow,
- U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall "∀"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part "∂"> <!-- partial differential, U+2202 ISOtech -->
-<!ENTITY exist "∃"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty "∅"> <!-- empty set = null set = diameter,
- U+2205 ISOamso -->
-<!ENTITY nabla "∇"> <!-- nabla = backward difference,
- U+2207 ISOtech -->
-<!ENTITY isin "∈"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin "∉"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni "∋"> <!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod "∏"> <!-- n-ary product = product sign,
- U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
- the same glyph might be used for both -->
-<!ENTITY sum "∑"> <!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
- though the same glyph might be used for both -->
-<!ENTITY minus "−"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast "∗"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic "√"> <!-- square root = radical sign,
- U+221A ISOtech -->
-<!ENTITY prop "∝"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin "∞"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang "∠"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and "∧"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or "∨"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap "∩"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup "∪"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int "∫"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4 "∴"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim "∼"> <!-- tilde operator = varies with = similar to,
- U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
- although the same glyph might be used to represent both -->
-<!ENTITY cong "≅"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp "≈"> <!-- almost equal to = asymptotic to,
- U+2248 ISOamsr -->
-<!ENTITY ne "≠"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv "≡"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le "≤"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge "≥"> <!-- greater-than or equal to,
- U+2265 ISOtech -->
-<!ENTITY sub "⊂"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup "⊃"> <!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
- font encoding and is not included. Should it be, for symmetry?
- It is in ISOamsn -->
-<!ENTITY nsub "⊄"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube "⊆"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe "⊇"> <!-- superset of or equal to,
- U+2287 ISOtech -->
-<!ENTITY oplus "⊕"> <!-- circled plus = direct sum,
- U+2295 ISOamsb -->
-<!ENTITY otimes "⊗"> <!-- circled times = vector product,
- U+2297 ISOamsb -->
-<!ENTITY perp "⊥"> <!-- up tack = orthogonal to = perpendicular,
- U+22A5 ISOtech -->
-<!ENTITY sdot "⋅"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil "⌈"> <!-- left ceiling = apl upstile,
- U+2308 ISOamsc -->
-<!ENTITY rceil "⌉"> <!-- right ceiling, U+2309 ISOamsc -->
-<!ENTITY lfloor "⌊"> <!-- left floor = apl downstile,
- U+230A ISOamsc -->
-<!ENTITY rfloor "⌋"> <!-- right floor, U+230B ISOamsc -->
-<!ENTITY lang "〈"> <!-- left-pointing angle bracket = bra,
- U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than'
- or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang "〉"> <!-- right-pointing angle bracket = ket,
- U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than'
- or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz "◊"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades "♠"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs "♣"> <!-- black club suit = shamrock,
- U+2663 ISOpub -->
-<!ENTITY hearts "♥"> <!-- black heart suit = valentine,
- U+2665 ISOpub -->
-<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/contrib/entitynorm/entity_decl_parse.pl b/contrib/entitynorm/entity_decl_parse.pl
deleted file mode 100644
index c69b929..0000000
--- a/contrib/entitynorm/entity_decl_parse.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/perl
-# (C) 2008 Török Edwin <edwin at clamav.net>
-# parse <!ENTITY declarations and output them in the format
-# used by generate_entitylist.c
-# Format is EntityName,EntityValue.
-# Only accepts entity values 0 < V < 0xffff, and doesn't accept entities that have multiple values assigned.
-while(<>) {
- chomp;
- if(/<!ENTITY +([^ \t]+)[ \t]+\" *([^ \"]+) *\" *>/) {
- $name = $1;
- $v = $2;
- if($v =~ /^&(#38;)?#([^;]+);$/) {
- $valx = $2;
- my $value;
- if($valx =~ /^x([0-9a-fA-F]+)$/) {
- $value = hex($valx);
- if($value > 0xffff) {
- printf STDERR "TOOBIG $_\n"
- } else {
- printf "$name,%d\n", $value
- }
- } elsif($valx =~ /^[0-9]+$/) {
- if($valx > 0xffff) {
- print STDERR "TOOBIG $_\n";
- } else {
- printf "$name,%d\n", $valx
- }
- } else {
- print "unknown1: $_\n";
- }
- } elsif($v =~ /^(&#x[0-9a-fA-F]+;)+$/) {
- print STDERR "MULTIPLECHARS $name $1\n";
- } else {
- print "unknown2: $_\n";
- }
- } elsif(/.*<!ENTITY.*/) {
- if($_ !~ /.*(PUBLIC|SYSTEM).*/) {
- print "unknown3: $_\n";
- }
- }
-}
diff --git a/contrib/entitynorm/fix_dbs.sh b/contrib/entitynorm/fix_dbs.sh
deleted file mode 100644
index 284a9ec..0000000
--- a/contrib/entitynorm/fix_dbs.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-export DBLOCATION=/usr/local/share/clamav
-export OUTDIR=db_temp
-
-mkdir -p /tmp/$OUTDIR
-(
- cd /tmp/$OUTDIR
- sigtool --unpack $DBLOCATION/main.cvd 2>/tmp/$OUTDIR/errlog
- sigtool --unpack $DBLOCATIOn/daily.cvd 2>>/tmp/$OUTDIR/errlog
- cp $DBLOCATION/daily.inc/* . 2>>/tmp/$OUTDIR/errlog
- cp $DBLOCATION/main.inc/* . 2>>/tmp/$OUTDIR/errlog
-)
-
-./fixdb </tmp/$OUTDIR/main.ndb >/tmp/$OUTDIR/fixed_db 2>/tmp/$OUTDIR/errlog
-./fixdb </tmp/$OUTDIR/daily.ndb >>/tmp/$OUTDIR/fixed_db 2>>/tmp/$OUTDIR/errlog
-cat /tmp/$OUTDIR/fixed_db |./postprocessdb 1 > /tmp/$OUTDIR/fixed_db_p
-cat /tmp/$OUTDIR/fixed_db_p|./postprocessdb nocolor >/tmp/$OUTDIR/fixed.ndb
-
-echo /tmp/$OUTDIR/fixed.ndb "created"
diff --git a/contrib/entitynorm/fixdb.c b/contrib/entitynorm/fixdb.c
deleted file mode 100644
index 6641c52..0000000
--- a/contrib/entitynorm/fixdb.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * Copyright (C) 2006 Török Edvin <edwin at clamav.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-#include <clamav-config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <clamav.h>
-#include <str.h>
-#include <ctype.h>
-#include <string.h>
-#include <others.h>
-#include <htmlnorm.h>
-
-static int dehex(int c)
-{
- int l;
-
- if(!isascii(c))
- return -1;
-
- if(isdigit(c))
- return c - '0';
-
- l = tolower(c);
- if((l >= 'a') && (l <= 'f'))
- return l + 10 - 'a';
-
- cli_errmsg("hex2int() translation problem (%d)\n", l);
- return -1;
-}
-
-static const char* red = "\033[1;31m";
-static const char* blue = "\033[1;34m";
-static const char* green = "\033[1;32m";
-static const char* magenta = "\033[1;35m";
-static const char* yellow = "\033[1;33m";
-static const char* color_off = "\033[0;0m";
-
-/* TODO: for each uppercase letter add a lowercase alternative */
-static const unsigned char* normalize_sig(unsigned char* sig,size_t len)
-{
- const unsigned char* ret = NULL;
- const unsigned char* dir = cli_gentempdir("/tmp");
- unsigned char* filenam;
- FILE* f;
-
- html_normalise_mem(sig, len, dir , NULL);
-
- filenam = cli_malloc(strlen(dir)+20);
- strcpy(filenam, dir);
- strcat(filenam,"/");
- strcat(filenam,"comment.html");
-
- f = fopen(filenam,"rb");
- if(f) {
- long siz;
- unsigned char* buff;
- size_t iread;
-
- fseek(f,0,SEEK_END);
- siz = ftell(f);
- buff = cli_malloc(siz);
-
- fseek(f,0, SEEK_SET);
-
- iread = fread(buff, 1, siz, f);
-
- if(ferror(f))
- perror("Error while reading file!");
- fclose(f);
-
- ret = cli_str2hex(buff,iread);
- free(buff);
-
- }
- else
- cli_dbgmsg("Unable to open:%s",filenam);
-
- free(filenam);
- cli_rmdirs(dir);
-
- return ret;
-}
-
-
-static int cleanup_sig(const char* newsig, const char* sig)
-{
- int up = 0;
- size_t i,j;
- cli_chomp(newsig);
- cli_chomp(sig);
- for(i=0, j=0;j < strlen(sig);) {
- int new_val;
- int old_val;
- if(!isxdigit(newsig[i]) && !isxdigit(sig[j]) && newsig[i] == sig[j]) {
- switch(sig[j]) {
- case '{':
- while (sig[j] != '}') {
- putc(sig[j++],stdout);
- i++;
- }
- putc(sig[j++],stdout);
- i++;
- break;
- case '(':
- while(sig[j] != ')') {
- putc(sig[j++],stdout);
- i++;
- }
- putc(sig[j++],stdout);
- i++;
- break;
- default:
- putc(sig[j++],stdout);
- i++;
- break;
- }
- continue;
- }
-
- if(isxdigit(newsig[i]) && isxdigit(newsig[i+1]) && !isxdigit(sig[j])) {
- printf("%s%c%c%s",blue,newsig[i],newsig[i+1],color_off);
- up = 1;
- i += 2;
- continue;
- }
-
- if(isxdigit(sig[j]) && isxdigit(sig[j+1]) && !isxdigit(newsig[i])) {
- if( (sig[j] == '2' && sig[j+1] == '0') || (sig[j]=='2' && sig[j+1] == '6'))
- printf("%c%c",sig[j],sig[j+1]);/* space, and ampersand is normal to be stripped before {,(... */
- else {
- printf("%s{-1}%s",red,color_off);
- up = 1;
- }
- j += 2;
- continue;
- }
-
- new_val= (dehex(newsig[i])<<4) + dehex(newsig[i+1]);
- old_val = (dehex(sig[j])<<4) + dehex(sig[j+1]);
-
- if(old_val != new_val || old_val==0x26 ) {/* 0x26 needs resync always*/
- int resync_needed = 0;
-
- if(new_val - old_val == 'a'-'A') {
- printf("%s(%02x|%02x)%s",green,old_val,new_val,color_off);
- up = 1;
- i += 2;
- j += 2;
- continue;
- }
-
- switch(old_val) {
- case 0x09:
- case 0x0a:
- case 0x0d:
- printf("%s{-1}%s",blue,color_off);
- /* TODO: check why this got stripped */
- j += 2;
- up = 1;
- break;
- case 0x20:
- /*strip extra space*/
- j += 2;
- break;
- case 0x26:
- resync_needed = 1;
- break;
- default:
- switch(new_val) {
- case 0x20:
- printf("%s{-1}%s",blue,color_off);
- i += 2;
- /*TODO:implement*/
- up = 1;
- break;
- default:
- resync_needed = 1;
- }
- }/*switch old_val */
-
- if(resync_needed) {
- if(old_val >= 0x80 && new_val == 0x26) {
- int cnt = 2;
- i += 2;
- up = 1;
- j += 2;
-
- if(i < strlen(newsig)) {
- old_val = (dehex(sig[j])<<4) + dehex(sig[j+1]);
- new_val = (dehex(newsig[i])<<4) + dehex(newsig[i+1]);
- if(old_val >=0x80) old_val = 0x26;
- while(i < strlen(newsig) && new_val != 0x3b ) {
- i += 2;
- cnt++;
- if(i<strlen(newsig))
- new_val = (dehex(newsig[i])<<4) + dehex(newsig[i+1]);
- }
- i += 2;
- printf("%s{1-%d}%s",red, cnt, color_off);
- }
- }
- else if(old_val == '&' && new_val == '&') {
- int cnt=0;
- printf("26");
- i += 2;
- j += 2;
- while(i < strlen(newsig) && j < strlen(sig) && old_val != ';' && new_val != ';') {
- old_val = (dehex(sig[j])<<4) + dehex(sig[j+1]);
- new_val = (dehex(newsig[i])<<4) + dehex(newsig[i+1]);
- if(old_val == new_val) {
- printf("%02x",old_val);
- }
- else {
- printf("%s(%02x|%02x)%s",red,old_val,new_val,color_off);
- up = 1;
- }
- i += 2;
- j += 2;
-
- }
- while(old_val != 0x3b && j < strlen(sig)) {
- old_val = (dehex(sig[j])<<4) + dehex(sig[j+1]);
- j += 2;
- cnt++;
- }
- if(cnt) {
- printf("%s{0-%d}%s",red,cnt,color_off);
- up = 1;
- }
- else {
- while(new_val != 0x3b && i < strlen(newsig)) {
- new_val = (dehex(newsig[i])<<4)+ dehex(newsig[i+1]);
- i += 2;
- cnt++;
- }
- if(cnt) {
- printf("%s{0-%d}%s",red,cnt+1,color_off);
- up = 1;
- }
-/* else if(old_val == new_val) {
- * no operation needed
- }*/
- }
- }
- else if(old_val == '&') {
- const size_t sig_len = strlen(sig);
- int cnt = 2;
- /*printf("%s(%02x|%02x)%s", red, old_val, new_val, color_off);
- i += 2;*/
- up = 1;
- j += 2;
- while(j < sig_len && old_val != 0x3b ) {
- j += 2;
- if(j < sig_len)
- old_val = (dehex(sig[j])<<4) + dehex(sig[j+1]);
- cnt++;
- }
- j += 2;
- printf("%s{-%d}%s",red,cnt,color_off);
- }
- else if (new_val == '&') {
- const size_t sig_len = strlen(sig);
- int cnt = 2;
- i += 2;
- up = 1;
- j += 2;
- while(j < sig_len && old_val != 0x3b ) {
- j += 2;
- if(j < sig_len)
- old_val = (dehex(sig[j])<<4) + dehex(sig[j+1]);
- cnt++;
- }
- j += 2;
- printf("%s{1-%d}%s",red,cnt,color_off);
- }
- else if(new_val - old_val == 'a' - 'A') {
- printf("%s(%02x|%02x)%s",green,old_val,new_val,color_off);
- i += 2;
- up = 1;
- j += 2;
- }
- else {
- printf("%s(%02x|%02x)%s",red, old_val,new_val,color_off);
- i += 2;
- up = 1;
- j += 2;
- }
- }
- }
- else {
- printf("%02x",old_val);
- i += 2;
- j += 2;
- }
- }
- if(newsig[i]) {
- printf("%s",red);
- while(newsig[i]) {
- putc(newsig[i++],stdout);
- up = 1;
- }
- printf("%s\n",color_off);
- }
- return up;
-}
-
-int main(int argc,char* argv[])
-{
- char* line=NULL;
- size_t n;
- size_t i;
- cl_debug();
- while(getline(&line,&n,stdin)!=-1) {
-
- const char* signame = cli_strtok(line, 0, ":");
- const char* sigtype = cli_strtok(line,1,":");
- const char* x = cli_strtok(line,2,":");
- const char* sig = cli_strtok(line,3,":");
- if(sigtype[0] == '3') {
- const size_t len = strlen(sig);
- size_t real_len = 0;
- size_t up_len = 0;
- unsigned char* outbuff = cli_malloc(len);
- unsigned char* upgraded_sig = cli_malloc(20*len);
-
- cli_dbgmsg("Verifying signature:%s\n",signame);
-
- for(i=0; i < len ; i++) {
- if(isxdigit(sig[i])) {
- unsigned char val = (dehex(sig[i])<<4) + dehex(sig[i+1]);
- i++;
- outbuff[real_len++] = val;
- }
- else {
- const unsigned char* up = normalize_sig(outbuff, real_len);
- strncpy(upgraded_sig+up_len, up, strlen(up));
- up_len += strlen(up);
- real_len = 0;
-
- if(sig[i] == '{') {
- while(sig[i] != '}') {
- upgraded_sig[up_len++] = sig[i++];
- }
- upgraded_sig[up_len++] = sig[i];
- }
- else
- upgraded_sig[up_len++] = sig[i];
- }
- }
-
- if(real_len) {
- const unsigned char* up = normalize_sig(outbuff, real_len);
- strncpy(upgraded_sig+up_len, up, strlen(up));
- up_len += strlen(up);
- real_len = 0;
- }
-
- upgraded_sig[up_len] = '\0';
- printf("%s:%s:%s:",signame, sigtype, x);
- if(cleanup_sig(upgraded_sig, sig)) {
- printf("\n");
- printf("%s%s:%s:%s:%s%s\n",magenta, signame, sigtype, x, sig, color_off);
- printf("%s%s:%s:%s:%s%s\n",yellow, signame, sigtype, x, upgraded_sig, color_off);
- }
- else
- printf("\n");
- printf("\n");
-#if 0
- start =0 ;
- for(i=0, j=0;j < strlen(sig);j++) {
- if(!isxdigit(upgraded_sig[i]) && !isxdigit(sig[j])) {
- i++;
- continue;
- }
-/* cli_dbgmsg("%c%c==%c%c(%d,%d)\n",upgraded_sig[i],upgraded_sig[i+1],sig[j],sig[j+1],i,j);*/
- if(upgraded_sig[i] != sig[j] || (isxdigit(upgraded_sig[i+1]) && isxdigit(sig[j+1]) && upgraded_sig[i+1] != sig[j+1])) {
- if(((sig[j]=='2' && sig[j+1]=='0') || (sig[j] == '0' && sig[j+1] == 'a') || (sig[j] == '0' && sig[j+1]=='d') || (sig[j]=='0' && sig[j+1]=='9')||
- ((!isxdigit(upgraded_sig[i]) && (sig[j]=='2' && sig[j+1]=='6')))))
- j++;
- else if(upgraded_sig[i]=='2' && upgraded_sig[i+1]=='0') {
- i+=2;
- j--;
- }
- else {
- cli_dbgmsg("Upgrade is needed for this signature, difference at:%ld: %c%c!=%c%c\n",i,upgraded_sig[i],upgraded_sig[i+1],sig[j],sig[j+1]);
-/* printf("%s:%s:%s:%s",signame, sigtype, x, sig);*/
-
- printf("%s:%s:%s:%s",signame, sigtype, x, cleanup_sig(upgraded_sig,sig) );
- break;
- }
- start = 0;
- }
- else {
- if(isxdigit(upgraded_sig[i+1]) && isxdigit(sig[j+1]))
- i++,j++;
- i++;
- }
-
- }
-#endif
- free(upgraded_sig);
- }
- free(signame);
- free(sig);
- free(x);
- free(line);
- line=NULL;
- }
- return 0;
-}
diff --git a/contrib/entitynorm/generate_encoding_aliases.c b/contrib/entitynorm/generate_encoding_aliases.c
deleted file mode 100644
index f7df968..0000000
--- a/contrib/entitynorm/generate_encoding_aliases.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2006 Török Edvin <edwin at clamav.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "../../libclamav/htmlnorm.h"
-#include "../../libclamav/entconv.h"
-#include "../../libclamav/hashtab.h"
-#include <string.h>
-
-static const struct {
- const char* alias;
- int encoding;
-} aliases [] = {
- {"UTF8",E_UTF8},
- {"UTF-8",E_UTF8},
- {"ISO-10646/UTF8",E_UTF8},
- {"ISO-10646/UTF-8",E_UTF8},
- {"ISO-10646",E_UCS4},
- {"10646-1:1993",E_UCS4},
- {"UCS4",E_UCS4},
- {"UCS-4",E_UCS4},
- {"UCS-4BE",E_UCS4_4321},
- {"UCS-4LE",E_UCS4_1234},
- {"ISO-10646/UCS4",E_UCS4},
- {"10646-1:1993/UCS4",E_UCS4},
- {"UCS2",E_UTF16},
- {"ISO-10646/UCS2",E_UTF16},
- {"UTF-16",E_UTF16},
- {"UTF-16BE",E_UTF16_BE},
- {"UTF-16LE",E_UTF16_LE},
- {"UTF16BE",E_UTF16_BE},
- {"UTF16LE",E_UTF16_LE},
- {"UTF32",E_UCS4},
- {"UTF32BE",E_UCS4_4321},
- {"UTF32LE",E_UCS4_1234},
- {"UTF-32",E_UCS4},
- {"UTF-32BE",E_UCS4_4321},
- {"UTF-32LE",E_UCS4_1234}
-};
-
-static const size_t aliases_cnt = sizeof(aliases)/sizeof(aliases[0]);
-extern short cli_debug_flag;
-
-int main(int argc, char* argv[])
-{
- struct hashtable ht;
- size_t i;
-
- cli_debug_flag=1;
- hashtab_init(&ht,aliases_cnt);
-
- for(i=0;i < aliases_cnt;i++) {
- hashtab_insert(&ht,(const unsigned char*)aliases[i].alias,strlen(aliases[i].alias),aliases[i].encoding);
- }
-
- hashtab_generate_c(&ht,"aliases_htable");
- return 0;
-}
diff --git a/contrib/entitynorm/generate_entitylist.c b/contrib/entitynorm/generate_entitylist.c
deleted file mode 100644
index e720ae3..0000000
--- a/contrib/entitynorm/generate_entitylist.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2006 Török Edvin <edwin at clamav.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include "../../libclamav/hashtab.h"
-#include <sys/types.h>
-#include <dirent.h>
-
-#define MAX_LINE 1024
-/* ------------ generating entity tables from .ent files ---------------- */
-static uint16_t* map_data = NULL;
-static size_t map_data_n = 0;
-
-static void loadEntities(struct hashtable* s)
-{
- char line[MAX_LINE];
-
- while( fgets(line, MAX_LINE, stdin)) {
- const char* name = line;
- char* mapto;
- size_t val;
- struct element* elem;
- uint16_t converted;
- int found=0, i;
-
- mapto = strchr(line,',');
- if(!mapto) {
- fprintf(stderr,"Invalid line:%s\n",line);
- abort();
- }
- *mapto++ = '\0';
-
- mapto[strlen(mapto)-1] = '\0';
- if(elem = hashtab_find(s,name,strlen(name))) {
- if(strlen(elem->key) == strlen(name)) {
- fprintf(stderr, "Duplicate entity:%s\n", name);
- }
- continue;
- }
- converted = atoi(mapto);
- hashtab_insert(s,name,strlen(name), converted);
- }
-}
-extern short cli_debug_flag;
-
-int main(int argc, char* argv[])
-{
- struct hashtable ht;
- int i;
- cli_debug_flag=1;
- hashtab_init(&ht,2048);
-
- loadEntities(&ht);
- hashtab_generate_c(&ht,"entities_htable");
- return 0;
-}
-
diff --git a/contrib/entitynorm/gentbl.c b/contrib/entitynorm/gentbl.c
deleted file mode 100644
index 007863d..0000000
--- a/contrib/entitynorm/gentbl.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-int main(int argc, char* argv[])
-{
- int i;
- uint8_t tbl[256];
- if(argc < 3) {
- fprintf(stderr, "Usage: %s <variable-name> <character-range|single-char> ...\n", argv[0]);
- return 1;
- }
- memset(tbl, 0, sizeof(tbl));
- for(i=2;i<argc;i++) {
- const char* v = argv[i];
- tbl[*v] = 1;
- if(v[1] == '-') {
- int j;
- for(j=v[0]+1;j<=v[2];j++) {
- tbl[j]=1;
- }
- } else if(v[1]){
- fprintf(stderr,"Invalid char range spec:%s\n",v);
- return 2;
- }
- }
- printf("/*");
- for(i=0;i<sizeof(tbl);i++) {
- if(tbl[i]) putc(i, stdout);
- }
- printf("*/\n");
- printf("static const uint8_t %s[256] = {\n\t", argv[1]);
- for(i=0;i<sizeof(tbl);i++) {
- printf("%d",tbl[i]);
- if(i!=sizeof(tbl)-1) {
- putc(',', stdout);
- if(i%16==15)
- fputs("\n\t",stdout);
- else
- putc(' ', stdout);
- } else {
- putc('\n',stdout);
- }
- }
- printf("};\n");
-
- return 0;
-}
diff --git a/contrib/entitynorm/postprocess.c b/contrib/entitynorm/postprocess.c
deleted file mode 100644
index 3199337..0000000
--- a/contrib/entitynorm/postprocess.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2006 Török Edvin <edwin at clamav.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <clamav.h>
-
-int main(int argc,char* argv[])
-{
- char* line = NULL;
- size_t n = 0;
- int linecnt = 0;
- int line_wanted;
- int strip_color = 0;
-
- if(argc<2) {
- fprintf(stderr,"Usage: %s <line_wanted>|nocolor\n",argv[0]);
- }
- if(strcmp(argv[1],"nocolor")==0)
- strip_color = 1;
- else
- line_wanted = atoi(argv[1]);
-
- cl_debug();
- while(getline(&line,&n,stdin)!=-1) {
- if(strchr(line,'\033')) {
- linecnt++;
- if(linecnt == line_wanted || strip_color) {
- if(strip_color) {
- do {
- char* col = strchr(line,'\033');
- if(col) {
- *col++ = '\0';
- printf("%s",line);
- line = strchr(col,'m');
- if(line) line++;
- }
- else {
- printf("%s",line);
- line = NULL;
- }
- } while(line);
- }
- else
- printf("%s",line);
- }
- }
- else {
- if(strip_color)
- printf("%s",line);
- linecnt = 0;
- }
- line=NULL;
- }
-
- return 0;
-}
-
diff --git a/contrib/entitynorm/target.h b/contrib/entitynorm/target.h
deleted file mode 100644
index e69de29..0000000
diff --git a/contrib/mpoolparse/mpoolparse.pl b/contrib/mpoolparse/mpoolparse.pl
deleted file mode 100644
index 70b1ad8..0000000
--- a/contrib/mpoolparse/mpoolparse.pl
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-
-my %frags = ();
-
-while (<>) {
- chomp;
- next unless /^LibClamAV Warning: [mc]alloc .* size (\d+) .*$/;
- $frags{$1}++;
-}
-
-foreach (sort {$a<=>$b} (keys(%frags))) {
- print "$_, /* ($frags{$_}) */\n";
-}
-
diff --git a/contrib/phishing/generate_tables.c b/contrib/phishing/generate_tables.c
deleted file mode 100644
index 15003fd..0000000
--- a/contrib/phishing/generate_tables.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Phishing detection automated testing & tools.
- *
- * Copyright (C) 2006 Torok Edvin <edwintorok at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-enum wctype_t {ALNUM,DIGIT,PUNCT,ALPHA,GRAPH,SPACE,BLANK,LOWER,UPPER,CNTRL,PRINT,XDIGIT};
-static struct std_classmap {
- const char* classname;
- const enum wctype_t type;
-} std_class[] = {
- {"[:alnum:]",ALNUM},
- {"[:digit:]",DIGIT},
- {"[:punct:]",PUNCT},
- {"[:alpha:]",ALPHA},
- {"[:graph:]",GRAPH},
- {"[:space:]",SPACE},
- {"[:blank:]",BLANK},
- {"[:lower:]",LOWER},
- {"[:upper:]",UPPER},
- {"[:cntrl:]",CNTRL},
- {"[:print:]",PRINT},
- {"[:xdigit:]",XDIGIT}
-};
-
-static int cli_iswctype(const char c,const enum wctype_t type);
-
-/* -------------- NON_THREAD_SAFE BEGIN --------------*/
-/* Global variables and functions accessing them, not thread-safe!
- * they should be called on application startup/shutdown once! */
-static const size_t std_class_cnt = sizeof(std_class)/sizeof(std_class[0]);
-#define STD_CLASS_CNT sizeof(std_class)/sizeof(std_class[0])
-typedef char char_bitmap_t[32];
-static unsigned char* char_class_bitmap[STD_CLASS_CNT];
-static unsigned short int char_class[256];
-static int engine_ok = 0;
-static int cli_iswctype(const char c,const enum wctype_t type)
-{
- switch(type) {
- case ALNUM:
- return isalnum(c);
- case DIGIT:
- return isdigit(c);
- case PUNCT:
- return ispunct(c);
- case ALPHA:
- return isalpha(c);
- case GRAPH:
- return isgraph(c);
- case SPACE:
- return isspace(c);
- case BLANK:
- return c=='\t' || c==' ';
- case LOWER:
- return islower(c);
- case UPPER:
- return isupper(c);
- case CNTRL:
- return iscntrl(c);
- case PRINT:
- return isprint(c);
- case XDIGIT:
- return isxdigit(c);
- default: {
- return 0;
- }
- }
-}
-
-
-void setup_matcher_engine(void)
-{
- /*Set up std character classes*/
- printf("--------regex_list.c--------\n");
- printf("/* generated by contrib/phishing/generate_tables.c */\n");
- printf("static const unsigned char char_class_bitmap[STD_CLASS_CNT][32] = {\n");
-
-
- size_t i;
- size_t j;
- memset(char_class,0,256);
- for(i=0;i<std_class_cnt;i++) {
- enum wctype_t type = std_class[i].type;
- printf(" {");
- char_class_bitmap[i]=calloc(256>>3,1);
- for(j=0;j<256;j++)
- if(cli_iswctype(j,type)) {
- char_class[j] |= 1<<i;
- char_class_bitmap[i][j>>3] |= 1<<(j&0x07);
- }
- for(j=0;j<32;j++) {
- printf("0x%02x",char_class_bitmap[i][j]);
- if(j!=31) {
- printf(", ");
- if(j%8==7)
- printf("\n ");
- }
- }
- printf("}");
- if(i!=std_class_cnt-1)
- printf(",\n\n");
- }
- printf("\n};\n");
- printf("static const unsigned short int char_class[256] = {\n ");
- for(i=0;i<256;i++) {
- printf("0x%03x",char_class[i]);
- if(i!=255) {
- printf(", ");
- if(i%16==15)
- printf("\n ");
- }
- }
-
- printf("\n};\n");
- engine_ok = 1;
-}
-static short int hextable[256];
-static void init_hextable(void)
-{
- unsigned char c;
- int i;
- memset(hextable,0,256);
- for(c='0';c<='9';c++)
- hextable[c] = c-'0';
- for(c='a';c<='f';c++)
- hextable[c] = 10+c-'a';
- for(c='A';c<='F';c++)
- hextable[c] = 10+c-'A';
- printf("-------phishcheck.c---------\n");
- printf("/* generated by contrib/phishing/generate_tables.c */\n");
- printf("static const short int hextable[256] = {\n ");
- for(i=0;i<256;i++) {
- printf("0x%x",hextable[i]);
- if(i!=255) {
- printf(", ");
- if(i%16==15)
- printf("\n ");
- }
- }
- printf("\n};\n");
-}
-
-int main()
-{
- setup_matcher_engine();
- init_hextable();
- return 0;
-}
-
diff --git a/contrib/phishing/regex_opt.py b/contrib/phishing/regex_opt.py
deleted file mode 100755
index f6f2d60..0000000
--- a/contrib/phishing/regex_opt.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-def strlen(a,b):
- if len(a)<len(b):
- return -1;
- elif len(a)>len(b):
- return 1;
- else:
- return 0;
-
-def getcommon_prefix(a,b):
- if a==b:
- return b;
- if a[:-1]==b[:-1]:
- return a[:-1];
- else:
- return ""
-
-fil = file("iana_tld.h")
-left = fil.read().split("(")
-out=[]
-for i in range(1,len(left)):
- right = left[i].split(")")
- regex_split = right[0].split("|")
- regex_split.sort()
- regex_split.sort(strlen)
- prefix=''
- prefixlen=0;
- c_map=''
- list=[]
- for val in regex_split:
- if val[:prefixlen] == prefix:
- if len(val) == (prefixlen+1):
- c_map = c_map+val[prefixlen]
- else:
-
- if len(c_map)>1:
- c_map = "["+c_map+"]"
- if len(prefix+c_map)>0:
- list.append(prefix+c_map)
- prefix = val[:-1]
- prefixlen=len(prefix)
- c_map=val[prefixlen]
- else:
- if len(c_map)>1:
- c_map = "["+c_map+"]"
- list.append(prefix+c_map)
- prefix = getcommon_prefix(prefix,val)
- if len(prefix)==0:
- prefix=val[:-1]
- prefixlen=len(prefix)
- c_map=val[prefixlen]
- if i==1:
- left0=left[0]
- else:
- left0=""
- out.append(left0)
- out.append("(")
- out.append("|".join(list))
- out.append(")")
- out.append(right[1])
-print "".join(out)
diff --git a/contrib/phishing/update_iana_data.sh b/contrib/phishing/update_iana_data.sh
deleted file mode 100755
index ecef492..0000000
--- a/contrib/phishing/update_iana_data.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# Phishing detection automated testing & tools.
-# Copyright (C) 2006 Torok Edvin <edwintorok at gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-IANA_TLD="http://data.iana.org/TLD/tlds-alpha-by-domain.txt"
-IANA_CCTLD="http://www.iana.org/cctld/cctld-whois.htm";
-TMP=`tempfile`
-OUTFILE=iana_tld.h
-
-echo "Downloading updated tld list from iana.org"
-wget $IANA_TLD -O $TMP || exit 2
-echo "Download complete, parsing data"
-grep -Ev ^# $TMP | tr [A-Z] [a-z] | gperf -C -l -L ANSI-C -E -C -H tld_hash -N in_tld_set|grep -v '^#line' | sed -e 's/^const struct/static const struct/' -e 's/register //g' >iana_tld.h
-
-echo "Downloading updated country-code list from iana.org"
-wget $IANA_CCTLD -O $TMP || exit 2
-echo "Download complete, parsing data"
-cat $TMP | grep country-code|egrep -oi "<a
-href=[^>]+>\\.([a-zA-Z]+).+</a>"|egrep -o ">.[a-zA-Z]+" | colrm 1 2 | tr [A-Z]
-[a-z]| gperf -C -l -L ANSI-C -E -C -H cctld_hash -N in_cctld_set |grep -v '^#line'|sed -e 's/^const struct/static const struct/' -e 's/register //g' -e 's/^const char \*/static const char */' >iana_cctld.h
-echo "Done"
diff --git a/contrib/phishing/update_iana_tld.sh b/contrib/phishing/update_iana_tld.sh
deleted file mode 100755
index 2bf06ac..0000000
--- a/contrib/phishing/update_iana_tld.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Phishing detection automated testing & tools.
-# Copyright (C) 2006 Torok Edvin <edwintorok at gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-IANA_TLD="http://data.iana.org/TLD/tlds-alpha-by-domain.txt"
-TMP=`tempfile`
-OUTFILE=iana_tld.h
-
-echo "Downloading updated tld list from iana.org"
-wget $IANA_TLD -O $TMP || exit 2
-echo "Download complete, parsing data"
-# 174 is the code for |
-grep -Ev ^# $TMP | tr [A-Z] [a-z] | gperf -C -H tld_hash -N in_tld_set -l|grep -v '^#line' | sed -e 's/^const struct/static const struct/' -e 's/register //g'
diff --git a/contrib/phishing/whitelist_test.c b/contrib/phishing/whitelist_test.c
deleted file mode 100644
index 3742d87..0000000
--- a/contrib/phishing/whitelist_test.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Phishing detection automated testing & tools.
- *
- * Copyright (C) 2006 Torok Edvin <edwintorok at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-#include <stdio.h>
-#include <sys/time.h>
-#include <time.h>
-#include "whitelist.h"
-void show_time(struct timeval tv1,struct timeval tv2)
-{
- struct timeval diff;
- diff.tv_sec = tv2.tv_sec-tv1.tv_sec;
- diff.tv_usec = tv2.tv_usec-tv1.tv_usec;
- if(diff.tv_usec>0) {
- diff.tv_sec += diff.tv_usec/1000000;
- diff.tv_usec %= 1000000;
- }
- else {
- int x = diff.tv_usec/1000000;//<0
- diff.tv_sec += x-1;
- diff.tv_usec -= (x-1)*1000000;
- }
- printf("%d.%06d,",diff.tv_sec,diff.tv_usec);
-}
-int main(int argc,char* argv[])
-{
- if(argc<2)
- return 1;
- FILE* f=fopen("whitelist.wdb","rb");
- init_whitelist();
- printf("%d,",load_whitelist(f));
- struct timeval tv0,tv01;
- gettimeofday(&tv0,NULL);
- build_whitelist();
- gettimeofday(&tv01,NULL);
- show_time(tv0,tv01);
- fclose(f);
- FILE* f2=fopen(argv[1],"rb");
- fseek(f2,0,SEEK_END);
- long p=ftell(f2);
- fseek(f2,0,SEEK_SET);
- char* x = malloc(p+1);
- if(fread(x,p,1,f2)!=1)
- return 2;
- x[p]=0;
- fclose(f2);
- struct timeval tv1,tv2,diff;
- gettimeofday(&tv1,NULL);
- int rc=whitelist_match(x,"test",0);
- gettimeofday(&tv2,NULL);
- show_time(tv1,tv2);
- printf("%d\n",rc);
- free(x);
- whitelist_done();
-/* const char* real = "http://pics.ebaystatic.com/";
- const char* display = "http://www.ebay.com/";
- printf("%d\n",whitelist_match(real,display,0));*/
- return 0;
-}
diff --git a/contrib/phishing/why.py b/contrib/phishing/why.py
deleted file mode 100755
index a45d4f1..0000000
--- a/contrib/phishing/why.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-from popen2 import popen4;
-import sys;
-import os;
-out = popen4("clamscan/clamscan -d database --phishing-strict-url-check --debug "+sys.argv[1])[0]
-lines = out.read().split("\n")
-PHISH_FOUND="Phishing found"
-URL_CHECK="Checking url"
-j=-1
-for i in range(0,len(lines)):
- if lines[i].find(PHISH_FOUND)!=-1:
- j=i
- break
-
-if j!=-1:
- print lines[j]
- i=j
- while lines[i].find(URL_CHECK)==-1:
- i = i-1
- for k in range(i,j):
- print lines[k]
-# os.system("TEMPFILE=`tempfile -s .eml` ; echo $TEMPFILE; cp "+sys.argv[1]+" $TEMPFILE; thunderbird $TEMPFILE")
-else:
- print "Clean"
diff --git a/database/daily.cvd b/database/daily.cvd
index 8fa4635..38b6f9d 100644
Binary files a/database/daily.cvd and b/database/daily.cvd differ
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list