Update for 1.1.0.7-2

src/Makefile.am

@@ -26,7 +26,7 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
 	findreplacepanel.cpp commandpanel.cpp \
 	binaryfile.cpp xmlencodingspy.cpp wrapaspell.cpp \
 	rulesets filters png rng xpm templates copying help po \
-	docbook xmlcopyeditor.spec xmlcopyeditor.png custom.xpm \
+	xmlcopyeditor.spec xmlcopyeditor.png custom.xpm \
 	xmlcopyeditor.desktop
 xmlcopyeditor_LDFLAGS = $(WX_LIBS) \
 	-lexpat -lxslt -lxml2 -lpcre -lxerces-c -laspell
@@ -53,8 +53,7 @@ nobase_xmlcopyeditor_DATA = png/*.png \
 	copying/*.txt copying/boost_shared_ptr/* \
 	copying/Expat/* copying/libxml2/* copying/libxslt/* \
 	copying/PCRE/* copying/Scintilla/* \
-	copying/scowl/* \
+	copying/wxStyledTextCtrl/* \
-	copying/wxStyledTextCtrl/* copying/ximian/* \
 	copying/wxStEditor/* \
 	copying/xmlcopyeditor/* \
 	copying/Aspell/* \
@@ -64,11 +63,12 @@ nobase_xmlcopyeditor_DATA = png/*.png \
 	po/sv/messages.mo \
 	po/fr/messages.mo \
 	po/de/messages.mo \
+	po/ru/messages.mo \
         po/zh_CN/messages.mo \
         po/zh_TW/messages.mo \
 	po/uk_UA/messages.mo \
         po/uk_UA/messages.mo \
-        po/en_us/messages.po \
+        po/en_us/messages.po
 
 pixmap_DATA = xmlcopyeditor.png
 

src/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -16,15 +16,11 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -36,8 +32,6 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
 bin_PROGRAMS = xmlcopyeditor$(EXEEXT)
 subdir = src
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -57,8 +51,8 @@ am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \
 	contexthandler.$(OBJEXT) globalreplacedialog.$(OBJEXT) \
 	housestyle.$(OBJEXT) housestylereader.$(OBJEXT) \
 	myhtmlpane.$(OBJEXT) nocasecompare.$(OBJEXT) \
-	readfile.$(OBJEXT) replace.$(OBJEXT) \
+	readfile.$(OBJEXT) replace.$(OBJEXT) styledialog.$(OBJEXT) \
-	styledialog.$(OBJEXT) wraplibxml.$(OBJEXT) wrapregex.$(OBJEXT) \
+	wraplibxml.$(OBJEXT) wrapregex.$(OBJEXT) \
 	wraptempfilename.$(OBJEXT) xmlassociatedtd.$(OBJEXT) \
 	xmlassociatexsd.$(OBJEXT) xmlassociatexsl.$(OBJEXT) \
 	xmlctrl.$(OBJEXT) xmldoc.$(OBJEXT) \
@@ -74,22 +68,21 @@ am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \
 	locationpanel.$(OBJEXT) catalogresolver.$(OBJEXT) \
 	getlinuxappdir.$(OBJEXT) xmlparseschemans.$(OBJEXT) \
 	xmlshallowvalidator.$(OBJEXT) wrapxerces.$(OBJEXT) \
-	findreplacepanel.$(OBJEXT) wrapaspell.$(OBJEXT) \
+	findreplacepanel.$(OBJEXT) commandpanel.$(OBJEXT) \
-	commandpanel.$(OBJEXT) binaryfile.$(OBJEXT) \
+	binaryfile.$(OBJEXT) xmlencodingspy.$(OBJEXT) \
-	xmlencodingspy.$(OBJEXT)
+	wrapaspell.$(OBJEXT)
 xmlcopyeditor_OBJECTS = $(am_xmlcopyeditor_OBJECTS)
 xmlcopyeditor_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
+xmlcopyeditor_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+	$(xmlcopyeditor_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	-o $@
 SOURCES = $(xmlcopyeditor_SOURCES)
 DIST_SOURCES = $(xmlcopyeditor_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -108,10 +101,7 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -128,14 +118,13 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
+GREP = @GREP@
-FFLAGS = @FFLAGS@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,10 +132,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -155,56 +143,53 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WX_LIBS = @WX_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = ${prefix}/bin
-build = @build@
 build_alias = @build_alias@
-build_cpu = @build_cpu@
+builddir = @builddir@
-build_os = @build_os@
-build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-host = @host@
 host_alias = @host_alias@
-host_cpu = @host_cpu@
+htmldir = @htmldir@
-host_os = @host_os@
-host_vendor = @host_vendor@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
-datarootdir = @datarootdir@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # these are the headers for your project
 noinst_HEADERS = *.h
@@ -240,13 +225,21 @@ nobase_xmlcopyeditor_DATA = png/*.png \
 	rng/exclude/*.rng \
 	rng/modules/*.rng \
 	xpm/*.xpm \
-	templates/*.* \
+	templates/*.xml \
+	templates/*.dtd \
+	templates/*.xsl \
+	templates/*.rss \
+	templates/*.html \
+	templates/*.xtm \
+	templates/*.xsd \
+	templates/*.rng \
+	templates/*.lzx \
+	templates/*.xlf \
 	help/*.* help/html/*.* \
 	copying/*.txt copying/boost_shared_ptr/* \
 	copying/Expat/* copying/libxml2/* copying/libxslt/* \
 	copying/PCRE/* copying/Scintilla/* \
-	copying/scowl/* \
+	copying/wxStyledTextCtrl/* \
-	copying/wxStyledTextCtrl/* copying/ximian/* \
 	copying/wxStEditor/* \
 	copying/xmlcopyeditor/* \
 	copying/Aspell/* \
@@ -256,8 +249,11 @@ nobase_xmlcopyeditor_DATA = png/*.png \
 	po/sv/messages.mo \
 	po/fr/messages.mo \
 	po/de/messages.mo \
+	po/ru/messages.mo \
         po/zh_CN/messages.mo \
         po/zh_TW/messages.mo \
+	po/uk_UA/messages.mo \
+        po/uk_UA/messages.mo \
         po/en_us/messages.po
 
 pixmap_DATA = xmlcopyeditor.png
@@ -266,7 +262,7 @@ INCLUDES = -I/usr/include/libxml2
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .cpp .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -298,15 +294,14 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
-	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -319,14 +314,10 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
 xmlcopyeditor$(EXEEXT): $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_DEPENDENCIES) 
 	@rm -f xmlcopyeditor$(EXEEXT)
-	$(CXXLINK) $(xmlcopyeditor_LDFLAGS) $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_LDADD) $(LIBS)
+	$(xmlcopyeditor_LINK) $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -360,6 +351,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/replace.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rule.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/styledialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapaspell.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapexpat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wraplibxml.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapregex.Po@am__quote@
@@ -384,38 +376,21 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsllocator.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
 install-applicationsDATA: $(applications_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(applicationsdir)" || $(mkdir_p) "$(DESTDIR)$(applicationsdir)"
+	test -z "$(applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(applicationsdir)"
 	@list='$(applications_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -432,7 +407,7 @@ uninstall-applicationsDATA:
 	done
 install-nobase_xmlcopyeditorDATA: $(nobase_xmlcopyeditor_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(xmlcopyeditordir)" || $(mkdir_p) "$(DESTDIR)$(xmlcopyeditordir)"
+	test -z "$(xmlcopyeditordir)" || $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)"
 	@$(am__vpath_adj_setup) \
 	list='$(nobase_xmlcopyeditor_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -451,7 +426,7 @@ uninstall-nobase_xmlcopyeditorDATA:
 	done
 install-pixmapDATA: $(pixmap_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
 	@list='$(pixmap_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -472,8 +447,8 @@ ID: $(HEADERS) $(SOURCES) $(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; } \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -485,8 +460,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -496,13 +471,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	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; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	       END { for (i in files) print i; }'`; \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -516,22 +490,21 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	  esac; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; 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"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -547,7 +520,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applicationsdir)" "$(DESTDIR)$(xmlcopyeditordir)" "$(DESTDIR)$(pixmapdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -575,13 +548,13 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -596,12 +569,20 @@ info-am:
 install-data-am: install-applicationsDATA \
 	install-nobase_xmlcopyeditorDATA install-pixmapDATA
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -611,8 +592,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
-	mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -623,25 +603,26 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-nobase_xmlcopyeditorDATA \
+	uninstall-nobase_xmlcopyeditorDATA uninstall-pixmapDATA
-	uninstall-pixmapDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
+	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
-	dvi-am html html-am info info-am install install-am \
+	html-am info info-am install install-am \
 	install-applicationsDATA install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-nobase_xmlcopyeditorDATA \
-	install-pixmapDATA install-strip installcheck installcheck-am \
+	install-pdf install-pdf-am install-pixmapDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	ps ps-am tags uninstall uninstall-am \
-	uninstall-am uninstall-applicationsDATA uninstall-binPROGRAMS \
+	uninstall-applicationsDATA uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-nobase_xmlcopyeditorDATA \
+	uninstall-nobase_xmlcopyeditorDATA uninstall-pixmapDATA
-	uninstall-pixmapDATA
 
 # 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:
-

src/getword.cpp

@@ -19,13 +19,14 @@
 
 #include "getword.h"
 
-char *GetWord::run ( char **s, size_t *len )
+char *GetWord::run ( char **s, size_t *len, bool skipTagsActive )
 {
 	size_t bytes;
 	char *t, *u;
 	int offset;
 
 	t = *s;
+	bool openAngleBracketEndingWord = false;
 
 	while ( *t )
 	{
@@ -35,9 +36,15 @@ char *GetWord::run ( char **s, size_t *len )
 			{
 				if ( !GetWord::isWordCharacter ( u, &bytes ) )
 				{
+					if (*u == '<')
+						openAngleBracketEndingWord = true;	
 					*len = u - t;
 					offset = t - *s;
-					*s += *len + offset + bytes;
+					*s += *len + offset;
+
+					if (!openAngleBracketEndingWord)
+						*s += bytes;
+					
 					return t;
 				}
 				else
@@ -52,7 +59,7 @@ char *GetWord::run ( char **s, size_t *len )
 			}
 			t = u;
 		}
-		else if ( *t == '<' )
+		else if ( *t == '<' && skipTagsActive )
 		{
 			t = skipTags ( t );
 		}
@@ -147,5 +154,5 @@ char *GetWord::skipTags ( char *s )
 			}
 		}
 	}
-	return s;
+	return ++s;
 }

src/getword.h

@@ -25,7 +25,7 @@
 class GetWord
 {
 	public:
-		static char *run ( char **s, size_t *len );
+		static char *run ( char **s, size_t *len, bool skipTagsActive = true );
 	private:
 		static bool isWordCharacter ( char *s, size_t *bytes );
 		static char *skipTags ( char *s );

src/locationpanel.cpp

@@ -120,7 +120,7 @@ void LocationPanel::indentStructure ( std::string& structure )
 	std::string indented;
 	char *s = (char *) structure.c_str();
 	int indent = 0;
-	char *indentMark = "\t";
+	const char *indentMark = "\t";
 
 	int count = 0;
 	bool justSeenContent = false;
@@ -136,7 +136,7 @@ void LocationPanel::indentStructure ( std::string& structure )
 				indented += *s;
 			for ( int i = 0; i < indent; i++ )
 			{
-				indented += indentMark;
+				indented += (char *)indentMark;
 			}
 			if (justSeenContent)
 				indented += *s;
@@ -146,7 +146,7 @@ void LocationPanel::indentStructure ( std::string& structure )
 			indented += '\n';
 		
 			for (int i = 0; indent && i < indent; i++)
-				indented += indentMark;				
+				indented += (char *)indentMark;				
 			justSeenContent = false;
 		}
 		else if (*s == ')')
@@ -157,13 +157,13 @@ void LocationPanel::indentStructure ( std::string& structure )
 			}
 			indent--;
 			for (int i = 0; indent && i < indent; i++)
-				indented += indentMark;
+				indented += (char *)indentMark;
 			indented += *s;
 			indented += '\n';
 			if (*( s + 1 ) && *(s + 1) != ')' )
 			{
 				for (int i = 0; i < indent; i++)
-					indented += indentMark;
+					indented += (char *)indentMark;
 			}
 			justSeenContent = false;
 		}

src/mypropertysheet.cpp

@@ -192,6 +192,7 @@ MyPropertySheet::MyPropertySheet (
 	languageBox->Insert ( _T ( "French" ), INDEX_FRENCH );
 	languageBox->Insert ( _T ( "German" ), INDEX_GERMAN );
 	languageBox->Insert ( _T ( "Italian" ), INDEX_ITALIAN );
+	languageBox->Insert ( _T ( "Russian" ), INDEX_RUSSIAN );
 	languageBox->Insert ( _T ( "Slovak" ), INDEX_SLOVAK );
 	languageBox->Insert ( _T ( "Swedish" ), INDEX_SWEDISH );
 	languageBox->Insert ( _T ( "Ukrainian" ), INDEX_UKRAINIAN );
@@ -213,6 +214,9 @@ MyPropertySheet::MyPropertySheet (
 		case wxLANGUAGE_SWEDISH:
 			languageBox->SetSelection ( INDEX_SWEDISH );
 			break;
+		case wxLANGUAGE_RUSSIAN:
+			languageBox->SetSelection ( INDEX_RUSSIAN );
+			break;
 		case wxLANGUAGE_CHINESE_SIMPLIFIED:
 			languageBox->SetSelection ( INDEX_CHINESE_SIMPLIFIED );
 			break;
@@ -341,6 +345,9 @@ void MyPropertySheet::OnOk ( wxCommandEvent& e )
 		case INDEX_CHINESE_TRADITIONAL:
 			lang = wxLANGUAGE_CHINESE_TRADITIONAL;
 			break;
+		case INDEX_RUSSIAN:
+			lang = wxLANGUAGE_RUSSIAN;
+			break;
 		case INDEX_FRENCH:
 			lang = wxLANGUAGE_FRENCH;
 			break;

src/mypropertysheet.h

@@ -40,6 +40,7 @@ enum langIndex
 	INDEX_FRENCH,
 	INDEX_GERMAN,
 	INDEX_ITALIAN,
+	INDEX_RUSSIAN,
 	INDEX_SLOVAK,
 	INDEX_SWEDISH,
 	INDEX_UKRAINIAN

src/xmlcopyeditor.cpp

@@ -2904,7 +2904,10 @@ bool MyFrame::openFile ( wxString& fileName, bool largeFile )
 		XmlEncodingSpy es;
 		es.parse ( docBuffer, docBufferLen );
 		encoding = es.getEncoding();
-		if ( encoding == "UTF-8" || encoding == "US-ASCII" ) // US-ASCII is a subset of UTF-8
+		if ( encoding == "UTF-8" ||
+			encoding == "utf-8" ||
+			encoding == "US-ASCII" ||
+			encoding == "us-ascii" ) // US-ASCII is a subset of UTF-8
 			isUtf8 = true;
 	}
 

src/xmlshallowvalidator.cpp

@@ -62,11 +62,7 @@ void XMLCALL XmlShallowValidator::start ( void *data,
 	XmlShallowValidatorData *vd;
 	vd = ( XmlShallowValidatorData * ) data;
 
-#ifdef __WXMSW__
 	if ( XML_GetCurrentLineNumber ( vd->p ) > ( unsigned ) ( vd->maxLine + 1 ) )
-#else
-	if ( XML_GetCurrentLineNumber ( vd->p ) > ( vd->maxLine + 1 ) )
-#endif
 	{
 		XML_StopParser ( vd->p, true );
 	}