files structure reorganization

git-svn-id: http://svn.miranda-ng.org/main/trunk@492 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

58 files changed, 1030 insertions, 1251 deletions

diff --git a/plugins/MirOTR/ekhtml/AUTHORS b/plugins/MirOTR/ekhtml/Docs/AUTHORS
index aee01fdd05..aee01fdd05 100644
--- a/plugins/MirOTR/ekhtml/AUTHORS
+++ b/plugins/MirOTR/ekhtml/Docs/AUTHORS
diff --git a/plugins/MirOTR/ekhtml/COPYING b/plugins/MirOTR/ekhtml/Docs/COPYING
index 4efab56fa9..4efab56fa9 100644
--- a/plugins/MirOTR/ekhtml/COPYING
+++ b/plugins/MirOTR/ekhtml/Docs/COPYING
diff --git a/plugins/MirOTR/ekhtml/ChangeLog b/plugins/MirOTR/ekhtml/Docs/ChangeLog
index 46c42b505a..46c42b505a 100644
--- a/plugins/MirOTR/ekhtml/ChangeLog
+++ b/plugins/MirOTR/ekhtml/Docs/ChangeLog
diff --git a/plugins/MirOTR/ekhtml/INSTALL b/plugins/MirOTR/ekhtml/Docs/INSTALL
index 0dabfff248..0dabfff248 100644
--- a/plugins/MirOTR/ekhtml/INSTALL
+++ b/plugins/MirOTR/ekhtml/Docs/INSTALL
diff --git a/plugins/MirOTR/ekhtml/Docs/Makefile b/plugins/MirOTR/ekhtml/Docs/Makefile
new file mode 100644
index 0000000000..8eb9fc8abb
--- /dev/null
+++ b/plugins/MirOTR/ekhtml/Docs/Makefile
@@ -0,0 +1,419 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Generated automatically from Makefile.in by configure.
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = .
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/ekhtml
+pkglibdir = $(libdir)/ekhtml
+pkgincludedir = $(includedir)/ekhtml
+top_builddir = .
+
+ACLOCAL = ${SHELL} /z/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /z/missing --run autoconf
+AUTOMAKE = ${SHELL} /z/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /z/missing --run autoheader
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = 
+host_triplet = i686-pc-mingw32
+
+EXEEXT = .exe
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /z/missing --run tar
+AS = @AS@
+AWK = gawk
+CC = gcc
+DEPDIR = .deps
+DLLTOOL = @DLLTOOL@
+ECHO = echo
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+MAINT = #
+OBJDUMP = @OBJDUMP@
+PACKAGE = ekhtml
+RANLIB = ranlib
+STRIP = strip
+VERSION = 0.3.2
+am__include = include
+am__quote = 
+install_sh = /z/install-sh
+SUBDIRS = src testsuite include docs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/ekhtml_config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+	Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
+	config.sub configure configure.in depcomp install-sh ltmain.sh \
+	missing mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: # Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+Makefile: # $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: # $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4): # configure.in 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distcleancheck_listfiles = find . -type f -print
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkinstalldirs) $(distdir)/docs
+	@list='$(DISTFILES)'; for file in $$list; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	$(am__remove_distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+	  && cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	      || { echo "ERROR: files left after uninstall:" ; \
+	           find $$dc_install_base -type f -print ; \
+	           exit 1; } >&2 ) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@echo "$(distdir).tar.gz is ready for distribution" | \
+	  sed 'h;s/./=/g;p;x;p;x'
+distcleancheck: distclean
+	if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf autom4te.cache
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive dist dist-all \
+	dist-gzip distcheck distclean distclean-generic \
+	distclean-libtool distclean-recursive distclean-tags \
+	distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
+	info-recursive install install-am install-data install-data-am \
+	install-data-recursive install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am installdirs-recursive maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/plugins/MirOTR/ekhtml/Docs/Makefile.am b/plugins/MirOTR/ekhtml/Docs/Makefile.am
new file mode 100644
index 0000000000..85d6d13b2c
--- /dev/null
+++ b/plugins/MirOTR/ekhtml/Docs/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src testsuite include docs
diff --git a/plugins/MirOTR/ekhtml/Docs/Makefile.in b/plugins/MirOTR/ekhtml/Docs/Makefile.in
new file mode 100644
index 0000000000..974845e861
--- /dev/null
+++ b/plugins/MirOTR/ekhtml/Docs/Makefile.in
@@ -0,0 +1,419 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
+AS = @AS@
+AWK = @AWK@
+CC = @CC@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAINT = @MAINT@
+OBJDUMP = @OBJDUMP@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+STRIP = @STRIP@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+SUBDIRS = src testsuite include docs
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/ekhtml_config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+	Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
+	config.sub configure configure.in depcomp install-sh ltmain.sh \
+	missing mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
+
+.SUFFIXES:
+
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = .
+distdir = $(PACKAGE)-$(VERSION)
+
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distcleancheck_listfiles = find . -type f -print
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkinstalldirs) $(distdir)/docs
+	@list='$(DISTFILES)'; for file in $$list; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	$(am__remove_distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+	  && cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	      || { echo "ERROR: files left after uninstall:" ; \
+	           find $$dc_install_base -type f -print ; \
+	           exit 1; } >&2 ) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+	  && rm -f $(distdir).tar.gz \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@echo "$(distdir).tar.gz is ready for distribution" | \
+	  sed 'h;s/./=/g;p;x;p;x'
+distcleancheck: distclean
+	if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf autom4te.cache
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+	clean-generic clean-libtool clean-recursive dist dist-all \
+	dist-gzip distcheck distclean distclean-generic \
+	distclean-libtool distclean-recursive distclean-tags \
+	distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
+	info-recursive install install-am install-data install-data-am \
+	install-data-recursive install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am installdirs-recursive maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	uninstall-info-recursive uninstall-recursive
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/plugins/MirOTR/ekhtml/NEWS b/plugins/MirOTR/ekhtml/Docs/NEWS
index 532dc31406..532dc31406 100644
--- a/plugins/MirOTR/ekhtml/NEWS
+++ b/plugins/MirOTR/ekhtml/Docs/NEWS
diff --git a/plugins/MirOTR/ekhtml/README b/plugins/MirOTR/ekhtml/Docs/README
index 9b8e4bb6e5..9b8e4bb6e5 100644
--- a/plugins/MirOTR/ekhtml/README
+++ b/plugins/MirOTR/ekhtml/Docs/README
diff --git a/plugins/MirOTR/ekhtml/TODO b/plugins/MirOTR/ekhtml/Docs/TODO
index 6a0ddaff19..6a0ddaff19 100644
--- a/plugins/MirOTR/ekhtml/TODO
+++ b/plugins/MirOTR/ekhtml/Docs/TODO
diff --git a/plugins/MirOTR/ekhtml/acconfig.h b/plugins/MirOTR/ekhtml/Docs/acconfig.h
index 3aabfaa448..3aabfaa448 100644
--- a/plugins/MirOTR/ekhtml/acconfig.h
+++ b/plugins/MirOTR/ekhtml/Docs/acconfig.h
diff --git a/plugins/MirOTR/ekhtml/aclocal.m4 b/plugins/MirOTR/ekhtml/Docs/aclocal.m4
index a0d7b33876..a0d7b33876 100644
--- a/plugins/MirOTR/ekhtml/aclocal.m4
+++ b/plugins/MirOTR/ekhtml/Docs/aclocal.m4
diff --git a/plugins/MirOTR/ekhtml/config.guess b/plugins/MirOTR/ekhtml/Docs/config.guess
index dff9e481b7..dff9e481b7 100644
--- a/plugins/MirOTR/ekhtml/config.guess
+++ b/plugins/MirOTR/ekhtml/Docs/config.guess
diff --git a/plugins/MirOTR/ekhtml/config.in b/plugins/MirOTR/ekhtml/Docs/config.in
index 95806fc799..95806fc799 100644
--- a/plugins/MirOTR/ekhtml/config.in
+++ b/plugins/MirOTR/ekhtml/Docs/config.in
diff --git a/plugins/MirOTR/ekhtml/config.log b/plugins/MirOTR/ekhtml/Docs/config.log
index a26eaaf178..a26eaaf178 100644
--- a/plugins/MirOTR/ekhtml/config.log
+++ b/plugins/MirOTR/ekhtml/Docs/config.log
diff --git a/plugins/MirOTR/ekhtml/config.status b/plugins/MirOTR/ekhtml/Docs/config.status
index a18965d6cd..a18965d6cd 100644
--- a/plugins/MirOTR/ekhtml/config.status
+++ b/plugins/MirOTR/ekhtml/Docs/config.status
diff --git a/plugins/MirOTR/ekhtml/config.sub b/plugins/MirOTR/ekhtml/Docs/config.sub
index 393f13d373..393f13d373 100644
--- a/plugins/MirOTR/ekhtml/config.sub
+++ b/plugins/MirOTR/ekhtml/Docs/config.sub
diff --git a/plugins/MirOTR/ekhtml/configure b/plugins/MirOTR/ekhtml/Docs/configure
index 8cf5a5673a..8cf5a5673a 100644
--- a/plugins/MirOTR/ekhtml/configure
+++ b/plugins/MirOTR/ekhtml/Docs/configure
diff --git a/plugins/MirOTR/ekhtml/configure.in b/plugins/MirOTR/ekhtml/Docs/configure.in
index 573b812782..573b812782 100644
--- a/plugins/MirOTR/ekhtml/configure.in
+++ b/plugins/MirOTR/ekhtml/Docs/configure.in
diff --git a/plugins/MirOTR/ekhtml/depcomp b/plugins/MirOTR/ekhtml/Docs/depcomp
index 807b991f4a..807b991f4a 100644
--- a/plugins/MirOTR/ekhtml/depcomp
+++ b/plugins/MirOTR/ekhtml/Docs/depcomp
diff --git a/plugins/MirOTR/ekhtml/install-sh b/plugins/MirOTR/ekhtml/Docs/install-sh
index 11870f1b01..11870f1b01 100644
--- a/plugins/MirOTR/ekhtml/install-sh
+++ b/plugins/MirOTR/ekhtml/Docs/install-sh
diff --git a/plugins/MirOTR/ekhtml/libtool b/plugins/MirOTR/ekhtml/Docs/libtool
index 7070e77c88..7070e77c88 100644
--- a/plugins/MirOTR/ekhtml/libtool
+++ b/plugins/MirOTR/ekhtml/Docs/libtool
diff --git a/plugins/MirOTR/ekhtml/ltmain.sh b/plugins/MirOTR/ekhtml/Docs/ltmain.sh
index d1da39f2d0..d1da39f2d0 100644
--- a/plugins/MirOTR/ekhtml/ltmain.sh
+++ b/plugins/MirOTR/ekhtml/Docs/ltmain.sh
diff --git a/plugins/MirOTR/ekhtml/missing b/plugins/MirOTR/ekhtml/Docs/missing
index 6a37006e8f..6a37006e8f 100644
--- a/plugins/MirOTR/ekhtml/missing
+++ b/plugins/MirOTR/ekhtml/Docs/missing
diff --git a/plugins/MirOTR/ekhtml/mkinstalldirs b/plugins/MirOTR/ekhtml/Docs/mkinstalldirs
index 8ab885ec92..8ab885ec92 100644
--- a/plugins/MirOTR/ekhtml/mkinstalldirs
+++ b/plugins/MirOTR/ekhtml/Docs/mkinstalldirs
diff --git a/plugins/MirOTR/ekhtml/EkHtml.vcxproj b/plugins/MirOTR/ekhtml/EkHtml.vcxproj
new file mode 100644
index 0000000000..51e07c52c4
--- /dev/null
+++ b/plugins/MirOTR/ekhtml/EkHtml.vcxproj
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Libs\Debug\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\Libs\Debug64\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Libs\Release\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\Libs\Release64\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+    </ClCompile>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <WarningLevel>Level3</WarningLevel>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+    </ClCompile>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <AdditionalIncludeDirectories>include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <WarningLevel>Level3</WarningLevel>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+    </ClCompile>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="src\ekhtml.c" />

+    <ClCompile Include="src\ekhtml_comment.c" />

+    <ClCompile Include="src\ekhtml_data.c" />

+    <ClCompile Include="src\ekhtml_endtag.c" />

+    <ClCompile Include="src\ekhtml_mktables.c" />

+    <ClCompile Include="src\ekhtml_special.c" />

+    <ClCompile Include="src\ekhtml_starttag.c" />

+    <ClCompile Include="src\ekhtml_util.c" />

+    <ClCompile Include="src\hash.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="include\ekhtml.h" />

+    <ClInclude Include="include\ekhtml_config.h" />

+    <ClInclude Include="include\ekhtml_private.h" />

+    <ClInclude Include="include\ekhtml_tables.h" />

+    <ClInclude Include="include\hash.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/MirOTR/ekhtml/vc9/EkHtml.vcxproj.filters b/plugins/MirOTR/ekhtml/EkHtml.vcxproj.filters
index 106bf5f37c..f685538610 100644
--- a/plugins/MirOTR/ekhtml/vc9/EkHtml.vcxproj.filters
+++ b/plugins/MirOTR/ekhtml/EkHtml.vcxproj.filters
@@ -15,48 +15,48 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\ekhtml.c">

+    <ClCompile Include="src\ekhtml.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ekhtml_comment.c">

+    <ClCompile Include="src\ekhtml_comment.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ekhtml_data.c">

+    <ClCompile Include="src\ekhtml_data.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ekhtml_endtag.c">

+    <ClCompile Include="src\ekhtml_endtag.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ekhtml_mktables.c">

+    <ClCompile Include="src\ekhtml_mktables.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ekhtml_special.c">

+    <ClCompile Include="src\ekhtml_special.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ekhtml_starttag.c">

+    <ClCompile Include="src\ekhtml_starttag.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\ekhtml_util.c">

+    <ClCompile Include="src\ekhtml_util.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\hash.c">

+    <ClCompile Include="src\hash.c">

       <Filter>Quelldateien</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\include\ekhtml.h">

+    <ClInclude Include="include\ekhtml.h">

       <Filter>Headerdateien</Filter>

     </ClInclude>

-    <ClInclude Include="..\include\ekhtml_config.h">

+    <ClInclude Include="include\ekhtml_config.h">

       <Filter>Headerdateien</Filter>

     </ClInclude>

-    <ClInclude Include="..\include\ekhtml_private.h">

+    <ClInclude Include="include\ekhtml_private.h">

       <Filter>Headerdateien</Filter>

     </ClInclude>

-    <ClInclude Include="..\include\ekhtml_tables.h">

+    <ClInclude Include="include\ekhtml_tables.h">

       <Filter>Headerdateien</Filter>

     </ClInclude>

-    <ClInclude Include="..\include\hash.h">

+    <ClInclude Include="include\hash.h">

       <Filter>Headerdateien</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/MirOTR/ekhtml/include/ekhtml_private.h b/plugins/MirOTR/ekhtml/include/ekhtml_private.h
index 90d99caeb2..47d31282fa 100644
--- a/plugins/MirOTR/ekhtml/include/ekhtml_private.h
+++ b/plugins/MirOTR/ekhtml/include/ekhtml_private.h
@@ -150,8 +150,8 @@ char *ekhtml_find_notcharsmap(const char *buf, int len,
 {
     const char *endp = buf + len;
     
-    for (;buf<endp;buf++)
-        if (!(charmap[(unsigned char )*buf] & mask))
+    for(;buf<endp;buf++)
+        if(!(charmap[(unsigned char )*buf] & mask))
             break;
     
     return (char *)((buf == endp) ? endp : buf);
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml.Plo b/plugins/MirOTR/ekhtml/src/.deps/ekhtml.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_comment.Plo b/plugins/MirOTR/ekhtml/src/.deps/ekhtml_comment.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_comment.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_data.Plo b/plugins/MirOTR/ekhtml/src/.deps/ekhtml_data.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_data.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_endtag.Plo b/plugins/MirOTR/ekhtml/src/.deps/ekhtml_endtag.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_endtag.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_mktables.Po b/plugins/MirOTR/ekhtml/src/.deps/ekhtml_mktables.Po
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_mktables.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_special.Plo b/plugins/MirOTR/ekhtml/src/.deps/ekhtml_special.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_special.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_starttag.Plo b/plugins/MirOTR/ekhtml/src/.deps/ekhtml_starttag.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_starttag.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_util.Plo b/plugins/MirOTR/ekhtml/src/.deps/ekhtml_util.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/ekhtml_util.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/.deps/hash.Plo b/plugins/MirOTR/ekhtml/src/.deps/hash.Plo
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/src/.deps/hash.Plo
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/src/ekhtml.c b/plugins/MirOTR/ekhtml/src/ekhtml.c
index 8c432cc00e..f3697469f6 100644
--- a/plugins/MirOTR/ekhtml/src/ekhtml.c
+++ b/plugins/MirOTR/ekhtml/src/ekhtml.c
@@ -89,7 +89,7 @@ static void ekhtml_buffer_grow(ekhtml_parser_t *parser){
     
     newsize = parser->nalloced + EKHTML_BLOCKSIZE;
     
-    if ((newbuf = realloc(parser->buf, newsize)) == NULL){
+    if((newbuf = realloc(parser->buf, newsize)) == NULL){
         fprintf(stderr, "BAD! Can't allocate %d bytes in ekhtml_buffer_grow\n",
                 newsize);
         fflush(stderr); /* Just in case someone changes the buffering scheme */
@@ -119,7 +119,7 @@ int parser_state_determine(const char *startp, const char *endp){
     
     assert(startp != endp);
     
-    if (*startp != '<')
+    if(*startp != '<')
         return EKHTML_STATE_INDATA;
     
     firstchar = startp + 1;
@@ -130,7 +130,7 @@ int parser_state_determine(const char *startp, const char *endp){
     if(newstate == EKHTML_STATE_NONE){
         if(firstchar + 2 >= endp) /* Not enough data to evaluate */
             return EKHTML_STATE_NONE;
-        if (*(firstchar + 1) == '-' && *(firstchar + 2) == '-')
+        if(*(firstchar + 1) == '-' && *(firstchar + 2) == '-')
             return EKHTML_STATE_COMMENT;
         else
             return EKHTML_STATE_SPECIAL;
@@ -238,7 +238,7 @@ void ekhtml_parser_feed(ekhtml_parser_t *parser, ekhtml_string_t *str){
         parser->nbuf += tocopy;
         if(parser->nalloced == parser->nbuf){
             /* Process the buffer */
-            if (!ekhtml_parser_flush(parser, 0)) {
+            if(!ekhtml_parser_flush(parser, 0)){
                 /* If we didn't actually process anything, grow our buffer */
                 ekhtml_buffer_grow(parser);
             }
@@ -270,7 +270,7 @@ ekhtml_parser_startendcb_add(ekhtml_parser_t *parser, const char *tag,
     unsigned int taglen;
     hnode_t *hn;
 
-    if (!tag){
+    if(!tag){
         if(isStart)
             parser->startcb_unk = startcb;
         else
@@ -289,7 +289,7 @@ ekhtml_parser_startendcb_add(ekhtml_parser_t *parser, const char *tag,
     lookup_str.str = newtag;
     lookup_str.len = taglen;
 
-    if ((hn = hash_lookup(parser->startendcb, &lookup_str))) {
+    if((hn = hash_lookup(parser->startendcb, &lookup_str))){
         cont = hnode_get(hn);
         free(newtag);
         if(isStart)
@@ -333,7 +333,7 @@ static hash_val_t ekhtml_string_hash(const void *key){
     size_t len = s->len;
     int c;
 
-    while(len--) {
+    while(len--){
         c = str[len];
         res = ((res << 5) + res) + c; /* res * 33 + c */
     }
@@ -353,7 +353,7 @@ void ekhtml_parser_destroy(ekhtml_parser_t *ekparser){
     hscan_t hs;
 
     hash_scan_begin(&hs, ekparser->startendcb);
-    while((hn = hash_scan_next(&hs))) {
+    while((hn = hash_scan_next(&hs))){
         ekhtml_string_t *key = (ekhtml_string_t *)hnode_getkey(hn);
         ekhtml_tag_container *cont = hnode_get(hn);
 
diff --git a/plugins/MirOTR/ekhtml/src/ekhtml_comment.c b/plugins/MirOTR/ekhtml/src/ekhtml_comment.c
index 11c4e8cf2e..e37cc487b5 100644
--- a/plugins/MirOTR/ekhtml/src/ekhtml_comment.c
+++ b/plugins/MirOTR/ekhtml/src/ekhtml_comment.c
@@ -66,22 +66,22 @@ char *ekhtml_parse_comment(ekhtml_parser_t *parser, void **state_data,
         if(comstate->dashes == 0){  /* Still on the quest for the double dash*/
             /* XXX -- Searching for '--' could be faster, doing 
                multibyte searching, or something similar */
-            for (; workp < endp - 1; workp += 2){
-                if (*workp == '-')
+            for(; workp < endp - 1; workp += 2){
+                if(*workp == '-')
                     break;
             }
 
-            if (!(workp < endp - 1)) {
+            if(!(workp < endp - 1)){
                 *offset = endp - 1 - curp;
                 return NULL;
             }
 
-            if ((*(workp - 1) == '-') && 
+            if((*(workp - 1) == '-') && 
                (workp - curp) > (sizeof("<!--") - 1))
             {
                 comstate->lastdash = workp - 1 - curp;
                 comstate->dashes = 1;
-            } else if (*(workp + 1) == '-') {
+            } else if(*(workp + 1) == '-'){
                 comstate->lastdash = workp - curp;
                 comstate->dashes = 1;
             } else {
@@ -99,7 +99,7 @@ char *ekhtml_parse_comment(ekhtml_parser_t *parser, void **state_data,
             return NULL;  
         }
         
-        if (*workp == '>') {
+        if(*workp == '>'){
             if(parser->commentcb){
                 ekhtml_string_t str;
 
diff --git a/plugins/MirOTR/ekhtml/src/ekhtml_endtag.c b/plugins/MirOTR/ekhtml/src/ekhtml_endtag.c
index 7e4ba7650d..f7095dcdfe 100644
--- a/plugins/MirOTR/ekhtml/src/ekhtml_endtag.c
+++ b/plugins/MirOTR/ekhtml/src/ekhtml_endtag.c
@@ -47,7 +47,7 @@ static void handle_endtag(ekhtml_parser_t *parser, ekhtml_string_t *str){
     ekhtml_tag_container *container;
     hnode_t *hn;
     
-    if ((hn = hash_lookup(parser->startendcb, str)) &&
+    if((hn = hash_lookup(parser->startendcb, str)) &&
        (container = hnode_get(hn)) && 
        container->endfunc)
     {
@@ -73,8 +73,8 @@ char *ekhtml_parse_endtag(ekhtml_parser_t *parser, void **state_data,
         const char *secondchar = curp + 2;
 
         /* Initial check to make sure this isn't some bad tag */
-        if (!isalpha(*secondchar)) {
-            if (*secondchar != '>' && *secondchar != '<') {
+        if(!isalpha(*secondchar)){
+            if(*secondchar != '>' && *secondchar != '<'){
                 /* Bogus tag */
                 *baddata = EKHTML_STATE_BADDATA;
                 return (char *)curp;
@@ -100,7 +100,7 @@ char *ekhtml_parse_endtag(ekhtml_parser_t *parser, void **state_data,
         arrowp != endp && *arrowp != '<' && *arrowp != '>';
         arrowp++)
     {
-        if (!(EKCMap_CharMap[(unsigned char)*arrowp] & EKHTML_CHAR_WHITESPACE))
+        if(!(EKCMap_CharMap[(unsigned char)*arrowp] & EKHTML_CHAR_WHITESPACE))
             endstate->lastchar = arrowp - curp;
     }
     
@@ -120,7 +120,7 @@ char *ekhtml_parse_endtag(ekhtml_parser_t *parser, void **state_data,
     handle_endtag(parser, &str);
     *state_data = NULL;
     assert(arrowp < endp);
-    if (*arrowp == '<') { /* Malformed HTML */
+    if(*arrowp == '<'){ /* Malformed HTML */
         return (char *)(arrowp);
     } else {
         return (char *)(arrowp + 1);
diff --git a/plugins/MirOTR/ekhtml/src/ekhtml_mktables.c b/plugins/MirOTR/ekhtml/src/ekhtml_mktables.c
index 235a0a7e75..9a8dea2a03 100644
--- a/plugins/MirOTR/ekhtml/src/ekhtml_mktables.c
+++ b/plugins/MirOTR/ekhtml/src/ekhtml_mktables.c
@@ -106,21 +106,21 @@ static EKHTML_CHARMAP_TYPE charmap_values(char in){
 
 #define EKHTML_STRINGIFY(x) #x
 
-static void print_charmap(char *name, EKHTML_CHARMAP_TYPE (*cmap_func)(char)) {
+static void print_charmap(char *name, EKHTML_CHARMAP_TYPE (*cmap_func)(char)){
     int ch;
     char sbuf[256];
     
     sprintf_s(sbuf, 256, "0x%%0%dx ", EKHTML_CHARMAP_LEN * 2);
     printf("#ifdef EKHTML_USE_TABLES\n");
     printf("const %s %s[256] = {\n", EKHTML_CHARMAP_TYPE_S, name);
-    for(ch=0; ch < 256; ch++) {
+    for(ch=0; ch < 256; ch++){
         printf(sbuf, cmap_func((char)ch));
         if(isgraph(ch))
             printf("/*  '%c' */", ch);
         else
             printf("/* 0x%.2x */", ch);
         printf(",  ");
-        if (!((ch + 1) % 4))
+        if(!((ch + 1) % 4))
             printf("\n");
     }
     printf("};\n\n");
@@ -129,7 +129,7 @@ static void print_charmap(char *name, EKHTML_CHARMAP_TYPE (*cmap_func)(char)) {
     printf("#endif\n");
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[]){
     printf("#ifndef EKHTML_MKTABLES_DOT_H\n");
     printf("#define EKHTML_MKTABLES_DOT_H\n");
     
diff --git a/plugins/MirOTR/ekhtml/src/ekhtml_special.c b/plugins/MirOTR/ekhtml/src/ekhtml_special.c
index b29e6422cd..f43a62dac4 100644
--- a/plugins/MirOTR/ekhtml/src/ekhtml_special.c
+++ b/plugins/MirOTR/ekhtml/src/ekhtml_special.c
@@ -41,13 +41,13 @@ char *ekhtml_parse_special(ekhtml_parser_t *parser, void **state_data,
     
     assert(*curp == '<' && *(curp + 1) == '!');
     
-    if (*state_data == NULL){/* Only called the first time the tag is started */
+    if(*state_data == NULL){/* Only called the first time the tag is started */
         *offset = 2;
         *state_data = (void *)1;  /* Assign it any non-NULL value */
     }
     
     for(workp=curp + *offset;workp != endp; workp++)
-        if (*workp == '<' || *workp == '>')  
+        if(*workp == '<' || *workp == '>')  
             break;
     
     if(workp == endp){
@@ -65,7 +65,7 @@ char *ekhtml_parse_special(ekhtml_parser_t *parser, void **state_data,
     }
     
     *state_data = NULL;
-    if (*workp == '<')  /* Malformed HTML */
+    if(*workp == '<')  /* Malformed HTML */
         return (char *)workp;
     else
         return (char *)workp + 1;
diff --git a/plugins/MirOTR/ekhtml/src/ekhtml_starttag.c b/plugins/MirOTR/ekhtml/src/ekhtml_starttag.c
index ea0b213ec7..cfd3ea4fd4 100644
--- a/plugins/MirOTR/ekhtml/src/ekhtml_starttag.c
+++ b/plugins/MirOTR/ekhtml/src/ekhtml_starttag.c
@@ -133,7 +133,7 @@ static void handle_starttag(ekhtml_parser_t *parser, char *curp,
     str.str = upper_str;
     str.len = taglen;
 
-    if ((hn = hash_lookup(parser->startendcb, &str)) &&
+    if((hn = hash_lookup(parser->startendcb, &str)) &&
        (container = hnode_get(hn)) &&
        container->startfunc)
     {
@@ -141,14 +141,14 @@ static void handle_starttag(ekhtml_parser_t *parser, char *curp,
     } else if(parser->startcb_unk)
         cback = parser->startcb_unk;
     
-    if (!cback)
+    if(!cback)
         return;
     
     /* Formulate real attribute callback data from the 'offset' 
        pointer values */
     for(attr=sstate->attrs;attr;attr=attr->next){
         attr->name.str = curp + (int)attr->name.str;
-        if (!attr->isBoolean)
+        if(!attr->isBoolean)
             attr->val.str = curp + (int)attr->val.str;
     }
     
@@ -223,7 +223,7 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
             if(workp == endp)
                 break;
             
-            if (!(EKCMap_CharMap[(unsigned char)*workp] & 
+            if(!(EKCMap_CharMap[(unsigned char)*workp] & 
                  EKHTML_CHAR_BEGATTRNAME))
             {
                 /* Bad attrname character */
@@ -254,11 +254,11 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
                of file */
             startstate->curattr->name.len = 
                 workp - (curp + (int)startstate->curattr->name.str);
-            if (*workp == '=') {
+            if(*workp == '='){
                 startstate->mode = EKHTML_STMODE_BEGVALUE;
                 workp++;  /* Skip the equals sign */
             } else {
-                if (!(EKCMap_CharMap[(unsigned char)*workp] & 
+                if(!(EKCMap_CharMap[(unsigned char)*workp] & 
                      EKHTML_CHAR_WHITESPACE))
             {
                 /* Found something we weren't expecting.  Use the current
@@ -277,7 +277,7 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
             if(workp == endp)
                 break;
       
-            if (*workp != '=') { 
+            if(*workp != '='){ 
                 /* Unexpected value.  Could either be time to suck, or this was
                    really only a boolean value */
                 scroll_attribute(startstate);
@@ -306,12 +306,12 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
             startstate->curattr->isBoolean = 0;
             startstate->curattr->val.str = (char *)NULL + (workp - curp);
             startstate->quote        = '\0';
-            if (*workp == '"' || *workp == '\'') {
+            if(*workp == '"' || *workp == '\''){
                 startstate->curattr->val.str++;  /* Skip the quote */
                 startstate->mode   = EKHTML_STMODE_GETVALUE;
                 startstate->quote  = *workp;
                 workp++;
-            } else if (!(EKCMap_CharMap[(unsigned char)*workp] & 
+            } else if(!(EKCMap_CharMap[(unsigned char)*workp] & 
                         EKHTML_CHAR_ATTRVALUE))
             {
                 /* Bad value .. */
@@ -326,8 +326,8 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
         
         if(startstate->mode == EKHTML_STMODE_GETVALUE){
             if(startstate->quote){
-                for (;workp != endp && *workp != '>' && *workp != '<'; workp++) {
-                    if (*workp == startstate->quote){
+                for(;workp != endp && *workp != '>' && *workp != '<'; workp++){
+                    if(*workp == startstate->quote){
                         startstate->curattr->val.len = 
                             workp - (curp + (int)startstate->curattr->val.str);
                         scroll_attribute(startstate);
@@ -351,12 +351,12 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
                 workp - (curp + (int)startstate->curattr->val.str);
             scroll_attribute(startstate);
             
-            if (*workp == '>' || *workp == '<') {
+            if(*workp == '>' || *workp == '<') {
                 *offset = workp - curp;
                 handle_starttag(parser, curp, startstate);
                 release_attributes(parser, startstate);
                 *state_data = NULL;
-                if (*workp == '<')
+                if(*workp == '<')
                     return workp;
                 else
                     return workp + 1;
@@ -369,7 +369,7 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
         if(startstate->mode == EKHTML_STMODE_SUCK){
             /* The sucking mode is here in case someone puts a bad character
                in an attribute name. We suck until what looks like end of tag*/
-            for (;workp != endp && *workp != '<' && *workp != '>'; workp++)
+            for(;workp != endp && *workp != '<' && *workp != '>'; workp++)
                 ;
             if(workp == endp)
                 break;
@@ -378,7 +378,7 @@ char *ekhtml_parse_starttag(ekhtml_parser_t *parser, void **state_data,
             handle_starttag(parser, curp, startstate);
             release_attributes(parser, startstate);
             *state_data = NULL;
-            if (*workp == '<')
+            if(*workp == '<')
                 return workp;
             else
                 return workp + 1;
diff --git a/plugins/MirOTR/ekhtml/testsuite/.deps/tester.Po b/plugins/MirOTR/ekhtml/testsuite/.deps/tester.Po
deleted file mode 100644
index 9ce06a81ea..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/.deps/tester.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/plugins/MirOTR/ekhtml/testsuite/ek_sgmllib.py b/plugins/MirOTR/ekhtml/testsuite/ek_sgmllib.py
deleted file mode 100644
index f71496d3ce..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/ek_sgmllib.py
+++ /dev/null
@@ -1,489 +0,0 @@
-"""A parser for SGML, using the derived class as a static DTD."""
-
-# Stolen from the Python 2.0 distribution and tweaked by JMT
-
-# XXX This only supports those SGML features used by HTML.
-
-# XXX There should be a way to distinguish between PCDATA (parsed
-# character data -- the normal case), RCDATA (replaceable character
-# data -- only char and entity references and end tags are special)
-# and CDATA (character data -- only end tags are special).
-
-
-import re
-import string
-
-
-# Regular expressions used for parsing
-
-interesting = re.compile('[&<]')
-incomplete = re.compile('&([a-zA-Z][a-zA-Z0-9]*|#[0-9]*)?|'
-                           '<([a-zA-Z][^<>]*|'
-                              '/([a-zA-Z][^<>]*)?|'
-                              '![^<>]*)?')
-
-entityref = re.compile('&([a-zA-Z][-.a-zA-Z0-9]*);')
-charref = re.compile('&#([0-9]+)[^0-9];')
-
-starttagopen = re.compile('<[>a-zA-Z]')
-shorttagopen = re.compile('<[a-zA-Z][-.a-zA-Z0-9]*/')
-shorttag = re.compile('<([a-zA-Z][-.a-zA-Z0-9]*)/([^/]*)/')
-piopen = re.compile('<\?')
-piclose = re.compile('>')
-endtagopen = re.compile('</[<>a-zA-Z]')
-endbracket = re.compile('[<>]')
-special = re.compile('<![^<>]*>')
-commentopen = re.compile('<!--')
-commentclose = re.compile('--[%s]*>' % string.whitespace)
-tagfind = re.compile('[a-zA-Z][-.a-zA-Z0-9]*')
-attrfind = re.compile(
-    '[%s]*([a-zA-Z_][-.a-zA-Z_0-9]*)' % string.whitespace
-    + ('([%s]*=[%s]*' % (string.whitespace, string.whitespace))
-    + r'(\'[^\'<>]*[\'<>]|"[^"<>]*["<>]|[-a-zA-Z0-9@./:+*%?!&$\(\)_#=~]*))?')
-
-
-# SGML parser base class -- find tags and call handler functions.
-# Usage: p = SGMLParser(); p.feed(data); ...; p.close().
-# The dtd is defined by deriving a class which defines methods
-# with special names to handle tags: start_foo and end_foo to handle
-# <foo> and </foo>, respectively, or do_foo to handle <foo> by itself.
-# (Tags are converted to lower case for this purpose.)  The data
-# between tags is passed to the parser by calling self.handle_data()
-# with some data as argument (the data may be split up in arbitrary
-# chunks).  Entity references are passed by calling
-# self.handle_entityref() with the entity reference as argument.
-
-class SGMLParser:
-
-    # Interface -- initialize and reset this instance
-    def __init__(self, verbose=0):
-        self.verbose = verbose
-        self.reset()
-
-    # Interface -- reset this instance.  Loses all unprocessed data
-    def reset(self):
-        self.rawdata = ''
-        self.stack = []
-        self.lasttag = '???'
-        self.nomoretags = 0
-        self.literal = 0
-
-    # For derived classes only -- enter literal mode (CDATA) till EOF
-    def setnomoretags(self):
-        self.nomoretags = self.literal = 1
-
-    # For derived classes only -- enter literal mode (CDATA)
-    def setliteral(self, *args):
-        self.literal = 1
-
-    # Interface -- feed some data to the parser.  Call this as
-    # often as you want, with as little or as much text as you
-    # want (may include '\n').  (This just saves the text, all the
-    # processing is done by goahead().)
-    def feed(self, data):
-        self.rawdata = self.rawdata + data
-        self.goahead(0)
-
-    # Interface -- handle the remaining data
-    def close(self):
-        self.goahead(1)
-
-    # Internal -- handle data as far as reasonable.  May leave state
-    # and data to be processed by a subsequent call.  If 'end' is
-    # true, force handling all data as if followed by EOF marker.
-    def goahead(self, end):
-        rawdata = self.rawdata
-        i = 0
-        n = len(rawdata)
-        while i < n:
-            if self.nomoretags:
-                self.handle_data(rawdata[i:n])
-                i = n
-                break
-            match = interesting.search(rawdata, i)
-            if match: j = match.start(0)
-            else: j = n
-            if i < j: self.handle_data(rawdata[i:j])
-            i = j
-            if i == n: break
-            if rawdata[i] == '<':
-                if starttagopen.match(rawdata, i):
-                    if self.literal:
-                        self.handle_data(rawdata[i])
-                        i = i+1
-                        continue
-                    k = self.parse_starttag(i)
-                    if k < 0: break
-                    i = k
-                    continue
-                if endtagopen.match(rawdata, i):
-                    k = self.parse_endtag(i)
-                    if k < 0: break
-                    i =  k
-                    self.literal = 0
-                    continue
-                if commentopen.match(rawdata, i):
-                    if self.literal:
-                        self.handle_data(rawdata[i])
-                        i = i+1
-                        continue
-                    k = self.parse_comment(i)
-                    if k < 0: break
-                    i = i+k
-                    continue
-                if piopen.match(rawdata, i):
-                    if self.literal:
-                        self.handle_data(rawdata[i])
-                        i = i+1
-                        continue
-                    k = self.parse_pi(i)
-                    if k < 0: break
-                    i = i+k
-                    continue                    
-                match = special.match(rawdata, i)
-                if match:
-                    if self.literal:
-                        self.handle_data(rawdata[i])
-                        i = i+1
-                        continue
-                    start = i
-                    i = match.end(0)
-                    self.handle_data(rawdata[start:i])
-                    continue
-            elif rawdata[i] == '&':
-                match = charref.match(rawdata, i)
-                if match:
-                    name = match.group(1)
-                    self.handle_charref(name)
-                    i = match.end(0)
-                    if rawdata[i-1] != ';': i = i-1
-                    continue
-                match = entityref.match(rawdata, i)
-                if match:
-                    name = match.group(1)
-                    self.handle_entityref(name)
-                    i = match.end(0)
-                    if rawdata[i-1] != ';': i = i-1
-                    continue
-            else:
-                raise RuntimeError, 'neither < nor & ??'
-            # We get here only if incomplete matches but
-            # nothing else
-            match = incomplete.match(rawdata, i)
-            if not match:
-                self.handle_data(rawdata[i])
-                i = i+1
-                continue
-            j = match.end(0)
-            if j == n:
-                break # Really incomplete
-            self.handle_data(rawdata[i:j])
-            i = j
-        # end while
-        if end and i < n:
-            self.handle_data(rawdata[i:n])
-            i = n
-        self.rawdata = rawdata[i:]
-        # XXX if end: check for empty stack
-
-    # Internal -- parse comment, return length or -1 if not terminated
-    def parse_comment(self, i):
-        rawdata = self.rawdata
-        if rawdata[i:i+4] <> '<!--':
-            raise RuntimeError, 'unexpected call to handle_comment'
-        match = commentclose.search(rawdata, i+4)
-        if not match:
-            return -1
-        j = match.start(0)
-        self.handle_comment(rawdata[i+4: j])
-        j = match.end(0)
-        return j-i
-
-    # Internal -- parse processing instr, return length or -1 if not terminated
-    def parse_pi(self, i):
-        rawdata = self.rawdata
-        if rawdata[i:i+2] <> '<?':
-            raise RuntimeError, 'unexpected call to handle_pi'
-        match = piclose.search(rawdata, i+2)
-        if not match:
-            return -1
-        j = match.start(0)
-        self.handle_pi(rawdata[i+2: j])
-        j = match.end(0)
-        return j-i
-
-    __starttag_text = None
-    def get_starttag_text(self):
-        return self.__starttag_text
-    
-    # Internal -- handle starttag, return length or -1 if not terminated
-    def parse_starttag(self, i):
-        self.__starttag_text = None
-        start_pos = i
-        rawdata = self.rawdata
-        if shorttagopen.match(rawdata, i):
-            # SGML shorthand: <tag/data/ == <tag>data</tag>
-            # XXX Can data contain &... (entity or char refs)?
-            # XXX Can data contain < or > (tag characters)?
-            # XXX Can there be whitespace before the first /?
-            match = shorttag.match(rawdata, i)
-            if not match:
-                return -1
-            tag, data = match.group(1, 2)
-            self.__starttag_text = '<%s/' % tag
-            tag = string.lower(tag)
-            k = match.end(0)
-            self.finish_shorttag(tag, data)
-            self.__starttag_text = rawdata[start_pos:match.end(1) + 1]
-            return k
-        # XXX The following should skip matching quotes (' or ")
-        match = endbracket.search(rawdata, i+1)
-        if not match:
-            return -1
-        j = match.start(0)
-        # Now parse the data between i+1 and j into a tag and attrs
-        attrs = []
-        if rawdata[i:i+2] == '<>':
-            # SGML shorthand: <> == <last open tag seen>
-            k = j
-            self.handle_data('<>')
-            return k + 1
-        else:
-            match = tagfind.match(rawdata, i+1)
-            if not match:
-                raise RuntimeError, 'unexpected call to parse_starttag'
-            k = match.end(0)
-            tag = string.lower(rawdata[i+1:k])
-            self.lasttag = tag
-        while k < j:
-            match = attrfind.match(rawdata, k)
-            if not match: break
-            attrname, rest, attrvalue = match.group(1, 2, 3)
-            if not rest:
-                attrvalue = attrname
-            elif attrvalue[:1] == '\'' or attrvalue[:1] == '"':
-                attrvalue = attrvalue[1:-1]
-            attrs.append((string.lower(attrname), attrvalue))
-            k = match.end(0)
-        if rawdata[j] == '>':
-            j = j+1
-        self.__starttag_text = rawdata[start_pos:j]
-        self.finish_starttag(tag, attrs)
-        return j
-
-    # Internal -- parse endtag
-    def parse_endtag(self, i):
-        rawdata = self.rawdata
-        match = endbracket.search(rawdata, i+1)
-        if not match:
-            return -1
-        j = match.start(0)
-        tag = string.lower(string.strip(rawdata[i+2:j]))
-        if rawdata[j] == '>':
-            j = j+1
-        self.finish_endtag(tag)
-        return j
-
-    # Internal -- finish parsing of <tag/data/ (same as <tag>data</tag>)
-    def finish_shorttag(self, tag, data):
-        self.finish_starttag(tag, [])
-        self.handle_data(data)
-        self.finish_endtag(tag)
-
-    # Internal -- finish processing of start tag
-    # Return -1 for unknown tag, 0 for open-only tag, 1 for balanced tag
-    def finish_starttag(self, tag, attrs):
-        try:
-            method = getattr(self, 'start_' + tag)
-        except AttributeError:
-            try:
-                method = getattr(self, 'do_' + tag)
-            except AttributeError:
-                self.unknown_starttag(tag, attrs)
-                return -1
-            else:
-                self.handle_starttag(tag, method, attrs)
-                return 0
-        else:
-            self.stack.append(tag)
-            self.handle_starttag(tag, method, attrs)
-            return 1
-
-    # Internal -- finish processing of end tag
-    def finish_endtag(self, tag):
-        if not tag:
-            found = len(self.stack) - 1
-            if found < 0:
-                self.unknown_endtag(tag)
-                return
-        else:
-            if tag not in self.stack:
-                try:
-                    method = getattr(self, 'end_' + tag)
-                except AttributeError:
-                    self.unknown_endtag(tag)
-                else:
-                    self.report_unbalanced(tag)
-                return
-            found = len(self.stack)
-            for i in range(found):
-                if self.stack[i] == tag: found = i
-        while len(self.stack) > found:
-            tag = self.stack[-1]
-            try:
-                method = getattr(self, 'end_' + tag)
-            except AttributeError:
-                method = None
-            if method:
-                self.handle_endtag(tag, method)
-            else:
-                self.unknown_endtag(tag)
-            del self.stack[-1]
-
-    # Overridable -- handle start tag
-    def handle_starttag(self, tag, method, attrs):
-        method(attrs)
-
-    # Overridable -- handle end tag
-    def handle_endtag(self, tag, method):
-        method()
-
-    # Example -- report an unbalanced </...> tag.
-    def report_unbalanced(self, tag):
-        if self.verbose:
-            print '*** Unbalanced </' + tag + '>'
-            print '*** Stack:', self.stack
-
-    # Example -- handle character reference, no need to override
-    def handle_charref(self, name):
-        try:
-            n = string.atoi(name)
-        except string.atoi_error:
-            self.unknown_charref(name)
-            return
-        if not 0 <= n <= 255:
-            self.unknown_charref(name)
-            return
-        self.handle_data(chr(n))
-
-    # Definition of entities -- derived classes may override
-    entitydefs = \
-            {'lt': '<', 'gt': '>', 'amp': '&', 'quot': '"', 'apos': '\''}
-
-    # Example -- handle entity reference, no need to override
-    def handle_entityref(self, name):
-        table = self.entitydefs
-        if table.has_key(name):
-            self.handle_data(table[name])
-        else:
-            self.unknown_entityref(name)
-            return
-
-    # Example -- handle data, should be overridden
-    def handle_data(self, data):
-        pass
-
-    # Example -- handle comment, could be overridden
-    def handle_comment(self, data):
-        pass
-
-    # Example -- handle processing instruction, could be overridden
-    def handle_pi(self, data):
-        pass
-
-    # To be overridden -- handlers for unknown objects
-    def unknown_starttag(self, tag, attrs): pass
-    def unknown_endtag(self, tag): pass
-    def unknown_charref(self, ref): pass
-    def unknown_entityref(self, ref): pass
-
-
-class TestSGMLParser(SGMLParser):
-
-    def __init__(self, verbose=0):
-        self.testdata = ""
-        SGMLParser.__init__(self, verbose)
-
-    def handle_data(self, data):
-        self.testdata = self.testdata + data
-        if len(`self.testdata`) >= 70:
-            self.flush()
-
-    def flush(self):
-        data = self.testdata
-        if data:
-            self.testdata = ""
-            print 'data:', `data`
-
-    def handle_comment(self, data):
-        self.flush()
-        r = `data`
-        if len(r) > 68:
-            r = r[:32] + '...' + r[-32:]
-        print 'comment:', r
-
-    def unknown_starttag(self, tag, attrs):
-        self.flush()
-        if not attrs:
-            print 'start tag: <' + tag + '>'
-        else:
-            print 'start tag: <' + tag,
-            for name, value in attrs:
-                print name + '=' + '"' + value + '"',
-            print '>'
-
-    def unknown_endtag(self, tag):
-        self.flush()
-        print 'end tag: </' + tag + '>'
-
-    def unknown_entityref(self, ref):
-        self.flush()
-        print '*** unknown entity ref: &' + ref + ';'
-
-    def unknown_charref(self, ref):
-        self.flush()
-        print '*** unknown char ref: &#' + ref + ';'
-
-    def close(self):
-        SGMLParser.close(self)
-        self.flush()
-
-
-def test(args = None):
-    import sys
-
-    if not args:
-        args = sys.argv[1:]
-
-    if args and args[0] == '-s':
-        args = args[1:]
-        klass = SGMLParser
-    else:
-        klass = TestSGMLParser
-
-    if args:
-        file = args[0]
-    else:
-        file = 'test.html'
-
-    if file == '-':
-        f = sys.stdin
-    else:
-        try:
-            f = open(file, 'r')
-        except IOError, msg:
-            print file, ":", msg
-            sys.exit(1)
-
-    data = f.read()
-    if f is not sys.stdin:
-        f.close()
-
-    x = klass()
-    for c in data:
-        x.feed(c)
-    x.close()
-
-
-if __name__ == '__main__':
-    test()
diff --git a/plugins/MirOTR/ekhtml/testsuite/gen_html.py b/plugins/MirOTR/ekhtml/testsuite/gen_html.py
deleted file mode 100644
index dc61ffc4ec..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/gen_html.py
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/env python
-
-#
-# gen_html: An HTML generation utility
-#
-# This utility is used to generate random HTML for the parser to
-# deal with.  Flags for each of the components allow variations
-# on HTML, so as to spew either valid or invalid HTML.
-#
-
-from string import *
-from ek_sgmllib import tagfind
-from random import randint
-import re, sys
-
-attrname   = re.compile('[a-zA-Z_][-.a-zA-Z_0-9]*')
-attrvalue  = re.compile('[-a-zA-Z0-9@./:+*%?!&$\(\)_#=~]')    
-quotedattrvalueset = digits + '#$%&()*+,-./:;=?@[\]^_`{|}~' 
-attrvalueset = '-@./:+*%?!&$()_#=~*' + letters + digits
-
-DataString = ['In A.D. 2101',
-	      'War was beginning.',
-	      'What happen?',
-              'Somebody set up us the bomb',
-              'We get signal',
-              'What!',
-              'Main screen turn on',
-              "It's You!!",
-              'How are you gentlemen!!',
-              'All your base are belong to us',
-              'You are on the way to destruction',
-              'What you say!!',
-              'You have no chance to survive make your time',
-              'HA HA HA HA ....',
-              "Take off every 'zig'",
-              'You know what you doing',
-              "Move 'zig'",
-              'For great justice']
-
-DataWords = split(join(DataString, ' '))
-
-def get_word(matcher, bogus=0):
-    while 1:
-        res = DataWords[randint(0, len(DataWords)-1)]
-        if not bogus:
-            z = matcher.match(res)
-            if not z or z.end(0) != len(res):
-                continue
-        return res
-    
-def get_tagname(bogus=0):
-    return upper(get_word(tagfind, bogus))
-
-def get_whitespace():
-    return join(map(lambda x: whitespace[randint(0,len(whitespace) - 1)],
-                                         range(randint(0, 3))), '')
-
-def get_attrname(bogus=0):
-    return get_word(attrname, bogus)
-
-
-def get_quoted_attrvalue(bogus=0):
-    quoteidx   = randint(0, 1)
-    quote      = ["'", '"'][quoteidx]
-    otherquote = ["'", '"'][not quoteidx]
-
-    res = quote
-    for i in range(randint(0, 20)):
-        if not randint(0, 5):
-            res = res +quotedattrvalueset[randint(0,len(quotedattrvalueset)-1)]
-        elif not randint(0, 5):
-            res = res + otherquote
-        elif not randint(0, 5):
-            res = res + get_whitespace()
-        else:
-            res = res + get_attrname(0)
-
-    if not bogus:
-        res = res + quote
-    else:
-        res = res + [otherquote, '<', '>'][randint(0, 2)]
-    return res
-
-def get_unquoted_attrvalue(bogus=0):
-    res = ''
-    for i in range(randint(not bogus, 20)):
-        if not randint(0, 5):
-            res = res + get_tagname(bogus)
-        elif bogus and not randint(0, 5):
-            res = res + get_whitespace()
-        else:
-            res = res + attrvalueset[randint(0, len(attrvalueset)-1)]
-
-    return res
-
-def get_starttag(bogus=0):
-    res = '<'
-    if bogus and not randint(0, 10):
-        res = res + whitespace[randint(0, len(whitespace)-1)]
-
-    res = res + get_tagname(bogus)
-    if not randint(0, 5):
-        res = res + get_whitespace()
-
-    for nattrs in range(randint(0, 4)):
-        res = res + whitespace[randint(0, len(whitespace)-1)]
-        res = res + get_whitespace()
-        res = res + get_attrname(bogus)
-        t = randint(0, 1)
-        if t:
-            res = res + get_whitespace() + '=' + get_whitespace() + \
-                  get_quoted_attrvalue(randint(0, bogus))
-        else:
-            res = res + get_whitespace() + '=' + get_whitespace() + \
-                  get_unquoted_attrvalue(randint(0, bogus))
-
-    if bogus and not randint(0, 5):
-        res = res + get_whitespace() + '>'
-    else:
-        res = res + '>'
-
-    return res
-
-def get_comment():
-    res = '<!--'
-
-    for i in range(randint(0, 100)):
-        res = res + get_whitespace()
-        res = res + get_attrname(0)
-        if not randint(0, 5):
-            res = res + '--'
-        elif not randint(0, 10):
-            res = res + '->'
-    res = res + get_whitespace() + '--' + get_whitespace() + '>'
-    return res
-
-def get_endtag():
-    return '</' + get_attrname() + get_whitespace() + '>'
-    
-
-if __name__ == '__main__':
-    if len(sys.argv) < 3:
-        print 'Syntax: %s <# items> <bogus>' % sys.argv[0]
-        sys.exit(1)
-        
-    isbogus = int(sys.argv[2])
-    for i in xrange(int(sys.argv[1])):
-        x = randint(0, 2)
-        if x == 0:
-            print get_starttag(isbogus)
-        elif x == 1:
-            print get_comment()
-        elif x == 2:
-            print get_endtag()
diff --git a/plugins/MirOTR/ekhtml/testsuite/plparser.pl b/plugins/MirOTR/ekhtml/testsuite/plparser.pl
deleted file mode 100644
index f7ee4a150b..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/plparser.pl
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-use HTML::Parser();
-use strict;
-sub start_handler
-{
-    my ($tag, $self) = @_;
-    print "START: \"".$tag."\"\n";
-}
-
-sub end_handler
-{
-    my ($tag, $self) = @_;
-    print "END: \"".$tag."\"\n";
-}
-
-sub text_handler
-{
-    my ($text, $self) = @_;
-    print $text;
-}
-
-sub comment_handler
-{
-    my ($text, $self) = @_;
-    print "COMMENT: \"";
-    foreach my $cur_comment (@$text) {
-        print $cur_comment;
-    }
-    print "\"\n";
-}
-
-my $p = HTML::Parser->new(api_version => 3);
-$p->handler( start => \&start_handler, "tagname,self");
-$p->handler( end => \&end_handler, "tagname,self");
-$p->handler( text => \&text_handler, "dtext, self");
-$p->handler( comment => \&comment_handler, "tokens, self");
-$p->parse_file(shift || die) || die $!;
-
diff --git a/plugins/MirOTR/ekhtml/testsuite/pyparser.py b/plugins/MirOTR/ekhtml/testsuite/pyparser.py
deleted file mode 100644
index a96d999bb7..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/pyparser.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env python
-
-import ek_sgmllib, sys, string
-
-class myparser(ek_sgmllib.SGMLParser):
-    def __init__(self):
-        ek_sgmllib.SGMLParser.__init__(self)
-
-    def handle_data(self, data):
-        sys.stdout.write(data)
-
-    def start_way(self, attrs):
-        print 'GOT WAY START!'
-        
-    def unknown_starttag(self, tag, attrs):
-        print 'START: "%s"' % tag
-        for i in range(len(attrs) - 1, -1, -1):
-            key, val = attrs[i]
-            print 'ATTRIBUTE: "%s" = "%s"' % (key, val)
-        
-    def unknown_endtag(self, tag):
-        print 'END: "%s"' % tag
-    
-    def handle_comment(self, comment):
- 	print 'COMMENT: "%s"' % comment
-    
-    def handle_entityref(self, name):
-        self.handle_data('&' + name + ';')
-
-    def handle_charref(self, name):
-        self.handle_data('&#' + name + ';')
-        
-def testit(data):
-    x = myparser()
-    x.feed(data)
-    x.close()
-    
-if __name__ == '__main__':
-    if len(sys.argv) == 1:
-        f = sys.stdin
-    else:
-        f = open(sys.argv[1])
-        
-    testit(f.read())
diff --git a/plugins/MirOTR/ekhtml/testsuite/test_basic.sh b/plugins/MirOTR/ekhtml/testsuite/test_basic.sh
deleted file mode 100644
index 87d2e64690..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/test_basic.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-for i in `find tstpages -type f | sort`
-do
-    echo Testing page: $i
-    ./tester 1 < $i > ek.test
-    ./pyparser.py $i > py.test
-    diff -a -i -u ek.test py.test || exit 1
-done
-
diff --git a/plugins/MirOTR/ekhtml/testsuite/test_bogus_feedsize.sh b/plugins/MirOTR/ekhtml/testsuite/test_bogus_feedsize.sh
deleted file mode 100644
index 12cf9abae3..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/test_bogus_feedsize.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/bash
-#
-# Test the e-k parser to make sure that altering the feedsize doesn't change
-# which tags get recognized.  This is really a boundary condition.
-#
-
-NUMTAGS=1000
-NUMFEED=1024
-
-echo Generating crazy.page with $NUMTAGS tags
-python gen_html.py $NUMTAGS 1 > crazy.page
-
-feedsize=1
-
-echo "Parsing with $NUMFEED different feed sizes"
-while [ $(($feedsize < $NUMFEED)) -eq 1 ]; do
-    ./tester $feedsize < crazy.page > crazy.page.out.$feedsize
-    feedsize=$(($feedsize + 1))
-done
-
-NUMSIZES=`ls -la crazy.page.out.* | awk '{print $5}' | sort | uniq | wc -l`
-if [ $NUMSIZES -ne 1 ] ; then
-    echo 'FAILURE -- Leaving crazy.page.out.* for examination'
-    exit 1
-fi
-
-rm -f crazy.page.out.*
diff --git a/plugins/MirOTR/ekhtml/testsuite/test_crazypage.sh b/plugins/MirOTR/ekhtml/testsuite/test_crazypage.sh
deleted file mode 100644
index adcd98c97f..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/test_crazypage.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/bash
-
-for ntags in 1 10 100 1000
-do
-    for bogus in 0 1
-    do
-	python gen_html.py $ntags $bogus > crazy.page
-	for bytesize in 1 13 162 983 8192
-	do
-	    echo numElements=$ntags allowBogusTags=$bogus feedSize=$bytesize
-	    ./tester $bytesize < crazy.page > ek.test
-	    ./pyparser.py < crazy.page > py.test
-	    diff -i -u ek.test py.test || exit 1
-	done
-    done
-done
diff --git a/plugins/MirOTR/ekhtml/testsuite/tester.c b/plugins/MirOTR/ekhtml/testsuite/tester.c
deleted file mode 100644
index 226cb21393..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/tester.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2002, Jon Travis
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "ekhtml.h"
-
-#define MAGIC_DOODIE 0xf9d33bc1
-
-typedef struct {
-    unsigned int n_starttags;
-    unsigned int n_endtags;
-    unsigned int n_comments;
-    unsigned int n_data;
-    unsigned int magic_doodie;
-    unsigned int only_parse;
-} tester_cbdata;
-
-static void handle_starttag_way(void *cbdata, ekhtml_string_t *tag,
-                                ekhtml_attr_t *attrs)
-{
-    printf("GOT WAY START!\n");
-}
-
-static void handle_starttag(void *cbdata, ekhtml_string_t *tag,
-			    ekhtml_attr_t *attrs)
-{
-    ekhtml_attr_t *attr;
-    tester_cbdata *tdata = cbdata;
-    
-    assert(tdata->magic_doodie == MAGIC_DOODIE);
-    tdata->n_starttags++;
-    if(tdata->only_parse)
-        return;
-    
-    printf("START: \"%.*s\"\n", tag->len, tag->str);
-    for(attr=attrs; attr; attr=attr->next) {
-        printf("ATTRIBUTE: \"%.*s\" = ", attr->name.len, attr->name.str);
-        if (!attr->isBoolean)
-            printf("\"%.*s\"\n", attr->val.len, attr->val.str);
-        else
-            printf("\"%.*s\"\n", attr->name.len, attr->name.str);
-    }
-}
-
-static void handle_endtag(void *cbdata, ekhtml_string_t *str){
-    tester_cbdata *tdata = cbdata;
-    
-    assert(tdata->magic_doodie == MAGIC_DOODIE);
-    tdata->n_endtags++;
-    if(tdata->only_parse)
-        return;
-    
-    printf("END: \"%.*s\"\n", str->len, str->str);
-}
-
-static void handle_comment(void *cbdata, ekhtml_string_t *str){
-    tester_cbdata *tdata = cbdata;
-    
-    assert(tdata->magic_doodie == MAGIC_DOODIE);
-    tdata->n_comments++;
-    if(tdata->only_parse)
-        return;
-    
-    printf("COMMENT: \"%.*s\"\n", str->len, str->str);
-}
-
-static void handle_data(void *cbdata, ekhtml_string_t *str){
-    tester_cbdata *tdata = cbdata;
-    
-    assert(tdata->magic_doodie == MAGIC_DOODIE);
-    tdata->n_data++;
-    if(tdata->only_parse)
-        return;
-    
-    fwrite(str->str, str->len, 1, stdout);
-}
-
-int main(int argc, char *argv[]) {
-    tester_cbdata cbdata;
-    ekhtml_parser_t *ekparser;
-    char *buf;
-    size_t nbuf;
-    int feedsize;
-    
-    if(argc < 2){
-        fprintf(stderr, "Syntax: %s <feedsize> [1|0 (to print debug)]\n", 
-                argv[0]);
-        return -1;
-    }
-    
-    feedsize = atoi(argv[1]);
-    
-    ekparser = ekhtml_parser_new(NULL);
-    
-    cbdata.n_starttags  = 0;
-    cbdata.n_endtags    = 0;
-    cbdata.n_comments   = 0;
-    cbdata.n_data       = 0;
-    cbdata.magic_doodie = MAGIC_DOODIE;
-    cbdata.only_parse   = argc == 3;
-    
-    ekhtml_parser_datacb_set(ekparser, handle_data);
-    ekhtml_parser_commentcb_set(ekparser, handle_comment);
-    ekhtml_parser_startcb_add(ekparser, "WAY", handle_starttag_way);
-    ekhtml_parser_startcb_add(ekparser, NULL, handle_starttag);
-    ekhtml_parser_endcb_add(ekparser, NULL, handle_endtag);
-    ekhtml_parser_cbdata_set(ekparser, &cbdata);
-    buf = malloc(feedsize);
-    
-    while((nbuf = fread(buf, 1, feedsize, stdin))) {
-        ekhtml_string_t str;
-
-        str.str = buf;
-        str.len = nbuf;
-        ekhtml_parser_feed(ekparser, &str);
-        ekhtml_parser_flush(ekparser, 0);
-    }
-    ekhtml_parser_flush(ekparser, 1);
-    ekhtml_parser_destroy(ekparser);
-    free(buf);
-    
-    if(argc == 3){
-        fprintf(stderr, 
-                "# starttags: %u\n"
-                "# endtags:   %u\n"
-                "# comments:  %u\n"
-                "# data:      %u\n", cbdata.n_starttags,
-                cbdata.n_endtags, cbdata.n_comments, cbdata.n_data);
-    }
-    
-    return 0;
-}
diff --git a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/comment.suite b/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/comment.suite
deleted file mode 100644
index 88ce043511..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/comment.suite
+++ /dev/null
@@ -1,18 +0,0 @@
-<!---->
-<!-- -->
-<!-- -- >
-<!--
-
---
-
---
-
->
-<!-- A comment string -->
-<!-- More comments
--- 
->
-<!-- More comments
--->
-<!-- And even -- more -- comments - from the -- peanut -- gallery -->
-
diff --git a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/endtag.suite b/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/endtag.suite
deleted file mode 100644
index 869db71255..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/endtag.suite
+++ /dev/null
@@ -1,13 +0,0 @@
-First start out with some properly formed end tags
-</F></FO></FOO>
-
-Now something a little more interesting
-</></FOO BAR></FOO BAR >
-
-Some weird stuff
-</ ></ FOO BAR></ FOO BAR  >
-</FOO
-
-></ 
-
->
diff --git a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/special.suite b/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/special.suite
deleted file mode 100644
index ffd6517d9d..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/special.suite
+++ /dev/null
@@ -1,11 +0,0 @@
-<!>
-<!->
-<!- >
-<!FOOBAR BAZ QUUX!>
-<!FOO
-BAR
-BAZ
->
-<!FOO
-BAR
-BAZ>
diff --git a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/starttag.suite b/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/starttag.suite
deleted file mode 100644
index c1a03af7bf..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/starttag.suite
+++ /dev/null
@@ -1,21 +0,0 @@
-First, valid tags
-<TAG>
-<TAG BOOLATTR>
-<TAG ATTR1=1>
-<TAG ATTR1="1">
-<TAG ATTR1='1'>
-<TAG ATTR1='"1'>
-<TAG ATTR1='""1'>
-<TAG ATTR1='""1"'>
-<TAG ATTR1='""1""'>
-<TAG ATTR1='"1""'>
-<TAG ATTR1='1""'>
-<TAG ATTR1='1"'>
-
-<TAG ATTR1
-ATTR2>
-<TAG ATTR1
-ATTR2
->
-<TAG ATTR1="foo"
-ATTR2>
diff --git a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/way.suite b/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/way.suite
deleted file mode 100644
index c33756cc0c..0000000000
--- a/plugins/MirOTR/ekhtml/testsuite/tstpages/01_stock_cases/way.suite
+++ /dev/null
@@ -1,4 +0,0 @@
-<WAY>
-
-<WAY COOL>
-<WAY COOL=bar>
\ No newline at end of file
diff --git a/plugins/MirOTR/ekhtml/vc9/EkHtml.vcxproj b/plugins/MirOTR/ekhtml/vc9/EkHtml.vcxproj
deleted file mode 100644
index c315e8ca78..0000000000
--- a/plugins/MirOTR/ekhtml/vc9/EkHtml.vcxproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug Unicode|Win32">

-      <Configuration>Debug Unicode</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug Unicode|x64">

-      <Configuration>Debug Unicode</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release Unicode|Win32">

-      <Configuration>Release Unicode</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release Unicode|x64">

-      <Configuration>Release Unicode</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}</ProjectGuid>

-    <RootNamespace>EkHtml</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <UseOfMfc>Static</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <UseOfMfc>Static</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(ProjectDir)$(Platform)\obj\$(Configuration)\</IntDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">$(ProjectDir)$(Platform)\obj\$(Configuration)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(ProjectDir)$(Platform)\obj\$(Configuration)\</IntDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">$(ProjectDir)$(Platform)\obj\$(Configuration)\</IntDir>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" />

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" />

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" />

-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">

-    <ClCompile>

-      <Optimization>MinSpace</Optimization>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <FunctionLevelLinking>false</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>CompileAsC</CompileAs>

-      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <CreateHotpatchableImage>false</CreateHotpatchableImage>

-      <MultiProcessorCompilation>false</MultiProcessorCompilation>

-      <UseUnicodeForAssemblerListing>false</UseUnicodeForAssemblerListing>

-      <CompileAsManaged>false</CompileAsManaged>

-      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

-      <StringPooling>true</StringPooling>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">

-    <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>CompileAsC</CompileAs>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <FloatingPointExceptions>false</FloatingPointExceptions>

-      <CreateHotpatchableImage>false</CreateHotpatchableImage>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\src\ekhtml.c" />

-    <ClCompile Include="..\src\ekhtml_comment.c" />

-    <ClCompile Include="..\src\ekhtml_data.c" />

-    <ClCompile Include="..\src\ekhtml_endtag.c" />

-    <ClCompile Include="..\src\ekhtml_mktables.c" />

-    <ClCompile Include="..\src\ekhtml_special.c" />

-    <ClCompile Include="..\src\ekhtml_starttag.c" />

-    <ClCompile Include="..\src\ekhtml_util.c" />

-    <ClCompile Include="..\src\hash.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\include\ekhtml.h" />

-    <ClInclude Include="..\include\ekhtml_config.h" />

-    <ClInclude Include="..\include\ekhtml_private.h" />

-    <ClInclude Include="..\include\ekhtml_tables.h" />

-    <ClInclude Include="..\include\hash.h" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file