neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated for 1.2.0.7 development

This commit is contained in:
Gerald Schmidt 2009-12-01 13:33:22 +00:00
parent 32abbb9470
commit e3a5c7abeb
28 changed files with 2802 additions and 2670 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -26,6 +26,7 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
findreplacepanel.cpp commandpanel.cpp xercescatalogresolver.cpp \ findreplacepanel.cpp commandpanel.cpp xercescatalogresolver.cpp \
binaryfile.cpp xmlencodingspy.cpp wrapaspell.cpp validationthread.cpp \ binaryfile.cpp xmlencodingspy.cpp wrapaspell.cpp validationthread.cpp \
wrapdaisy.cpp exportdialog.cpp mp3album.cpp xmlprodnote.cpp \ wrapdaisy.cpp exportdialog.cpp mp3album.cpp xmlprodnote.cpp \
xmlsuppressprodnote.cpp xmlcopyimg.cpp \
rulesets png rng xpm templates copying help po \ rulesets png rng xpm templates copying help po \
xmlcopyeditor.spec xmlcopyeditor.png custom.xpm \ xmlcopyeditor.spec xmlcopyeditor.png custom.xpm \
xmlcopyeditor.desktop xmlcopyeditor.desktop
@ -68,7 +69,7 @@ nobase_xmlcopyeditor_DATA = png/*.png \
po/zh_CN/messages.mo \ po/zh_CN/messages.mo \
po/zh_TW/messages.mo \ po/zh_TW/messages.mo \
po/uk_UA/messages.mo \ po/uk_UA/messages.mo \
po/uk_UA/messages.mo \ po/ca/messages.mo \
po/en_us/messages.po po/en_us/messages.po
pixmap_DATA = xmlcopyeditor.png pixmap_DATA = xmlcopyeditor.png

349
src/Makefile.in
View File

@ -1,8 +1,9 @@
# Makefile.in generated by automake 1.10.2 from Makefile.am. # Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
@ -18,8 +19,9 @@
VPATH = @srcdir@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = $(install_sh) -c
@ -44,9 +46,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applicationsdir)" \
"$(DESTDIR)$(xmlcopyeditordir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(xmlcopyeditordir)" "$(DESTDIR)$(pixmapdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \ am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \
associatedialog.$(OBJEXT) casehandler.$(OBJEXT) \ associatedialog.$(OBJEXT) casehandler.$(OBJEXT) \
@ -73,7 +75,10 @@ am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \
findreplacepanel.$(OBJEXT) commandpanel.$(OBJEXT) \ findreplacepanel.$(OBJEXT) commandpanel.$(OBJEXT) \
xercescatalogresolver.$(OBJEXT) binaryfile.$(OBJEXT) \ xercescatalogresolver.$(OBJEXT) binaryfile.$(OBJEXT) \
xmlencodingspy.$(OBJEXT) wrapaspell.$(OBJEXT) \ xmlencodingspy.$(OBJEXT) wrapaspell.$(OBJEXT) \
validationthread.$(OBJEXT) validationthread.$(OBJEXT) wrapdaisy.$(OBJEXT) \
exportdialog.$(OBJEXT) mp3album.$(OBJEXT) \
xmlprodnote.$(OBJEXT) xmlsuppressprodnote.$(OBJEXT) \
xmlcopyimg.$(OBJEXT)
xmlcopyeditor_OBJECTS = $(am_xmlcopyeditor_OBJECTS) xmlcopyeditor_OBJECTS = $(am_xmlcopyeditor_OBJECTS)
xmlcopyeditor_LDADD = $(LDADD) xmlcopyeditor_LDADD = $(LDADD)
xmlcopyeditor_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ xmlcopyeditor_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@ -82,6 +87,7 @@ xmlcopyeditor_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
DEFAULT_INCLUDES = -I.@am__isrc@ DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@ -98,11 +104,24 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
desktopDATA_INSTALL = $(INSTALL_DATA) am__install_max = 40
nobase_xmlcopyeditorDATA_INSTALL = $(install_sh_DATA) am__nobase_strip_setup = \
pixmapDATA_INSTALL = $(INSTALL_DATA) srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
DATA = $(desktop_DATA) $(nobase_xmlcopyeditor_DATA) $(pixmap_DATA) am__nobase_strip = \
for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
am__nobase_list = $(am__nobase_strip_setup); \
for p in $$list; do echo "$$p $$p"; done | \
sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
$(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
if (++n[$$2] == $(am__install_max)) \
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
END { for (dir in files) print dir, files[dir] }'
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
DATA = $(applications_DATA) $(nobase_xmlcopyeditor_DATA) \
$(pixmap_DATA)
HEADERS = $(noinst_HEADERS) HEADERS = $(noinst_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
@ -110,6 +129,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AR = @AR@ AR = @AR@
ASPELL_LIBS = @ASPELL_LIBS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
@ -132,6 +152,8 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
ENCHANT_LIBS = @ENCHANT_LIBS@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FGREP = @FGREP@ FGREP = @FGREP@
GREP = @GREP@ GREP = @GREP@
@ -161,8 +183,10 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SED = @SED@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
@ -225,10 +249,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
# these are the headers for your project # these are the headers for your project
noinst_HEADERS = $(srcdir)/*.h noinst_HEADERS = *.h
xmlcopyeditordir = ${datarootdir}/xmlcopyeditor xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
pixmapdir = ${datarootdir}/pixmaps pixmapdir = /usr/share/pixmaps
desktopdir = ${datarootdir}/applications applicationsdir = /usr/share/applications
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
@ -243,55 +267,57 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
xmlparseschemans.cpp xmlshallowvalidator.cpp wrapxerces.cpp \ xmlparseschemans.cpp xmlshallowvalidator.cpp wrapxerces.cpp \
findreplacepanel.cpp commandpanel.cpp xercescatalogresolver.cpp \ findreplacepanel.cpp commandpanel.cpp xercescatalogresolver.cpp \
binaryfile.cpp xmlencodingspy.cpp wrapaspell.cpp validationthread.cpp \ binaryfile.cpp xmlencodingspy.cpp wrapaspell.cpp validationthread.cpp \
wrapdaisy.cpp exportdialog.cpp mp3album.cpp xmlprodnote.cpp \
xmlsuppressprodnote.cpp xmlcopyimg.cpp \
rulesets png rng xpm templates copying help po \
xmlcopyeditor.spec xmlcopyeditor.png custom.xpm \ xmlcopyeditor.spec xmlcopyeditor.png custom.xpm \
xmlcopyeditor.desktop xmlcopyeditor.desktop
# rulesets png rng xpm templates copying help po
xmlcopyeditor_LDFLAGS = $(WX_LIBS) \ xmlcopyeditor_LDFLAGS = $(WX_LIBS) \
-lexpat -lxslt -lxml2 -lpcre -lxerces-c -laspell -lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS)
nobase_xmlcopyeditor_DATA = $(srcdir)/png/*.png\ nobase_xmlcopyeditor_DATA = png/*.png \
$(srcdir)/rulesets/*.* \ rulesets/*.* \
$(srcdir)/rng/*.rng \ rng/*.rng \
$(srcdir)/rng/*.rnc \ rng/*.rnc \
$(srcdir)/rng/exclude/*.rng \ rng/exclude/*.rng \
$(srcdir)/rng/modules/*.rng \ rng/modules/*.rng \
$(srcdir)/xpm/*.xpm \ xpm/*.xpm \
$(srcdir)/templates/*.xml \ templates/*.xml \
$(srcdir)/templates/*.dtd \ templates/*.dtd \
$(srcdir)/templates/*.xsl \ templates/*.xsl \
$(srcdir)/templates/*.rss \ templates/*.rss \
$(srcdir)/templates/*.html \ templates/*.html \
$(srcdir)/templates/*.xtm \ templates/*.xtm \
$(srcdir)/templates/*.xsd \ templates/*.xsd \
$(srcdir)/templates/*.rng \ templates/*.rng \
$(srcdir)/templates/*.lzx \ templates/*.lzx \
$(srcdir)/templates/*.xlf \ templates/*.xlf \
$(srcdir)/help/*.* $(srcdir)/help/html/*.* \ help/*.* help/html/*.* \
$(srcdir)/copying/*.txt $(srcdir)/copying/boost_shared_ptr/* \ copying/*.txt copying/boost_shared_ptr/* \
$(srcdir)/copying/Expat/* $(srcdir)/copying/libxml2/* $(srcdir)/copying/libxslt/* \ copying/Expat/* copying/libxml2/* copying/libxslt/* \
$(srcdir)/copying/PCRE/* $(srcdir)/copying/Scintilla/* \ copying/PCRE/* copying/Scintilla/* \
$(srcdir)/copying/wxStyledTextCtrl/* \ copying/wxStyledTextCtrl/* \
$(srcdir)/copying/wxStEditor/* \ copying/wxStEditor/* \
$(srcdir)/copying/xmlcopyeditor/* \ copying/xmlcopyeditor/* \
$(srcdir)/copying/Aspell/* \ copying/Aspell/* \
$(srcdir)/copying/Apache/LICENSE-2.0 \ copying/Apache/LICENSE-2.0 \
$(srcdir)/copying/Apache/LICENSE-2_files/* \ copying/Apache/LICENSE-2_files/* \
$(srcdir)/po/sk/messages.mo \ po/sk/messages.mo \
$(srcdir)/po/sv/messages.mo \ po/sv/messages.mo \
$(srcdir)/po/fr/messages.mo \ po/fr/messages.mo \
$(srcdir)/po/de/messages.mo \ po/de/messages.mo \
$(srcdir)/po/ru/messages.mo \ po/ru/messages.mo \
$(srcdir)/po/es/messages.mo \ po/es/messages.mo \
$(srcdir)/po/zh_CN/messages.mo \ po/zh_CN/messages.mo \
$(srcdir)/po/zh_TW/messages.mo \ po/zh_TW/messages.mo \
$(srcdir)/po/uk_UA/messages.mo \ po/uk_UA/messages.mo \
$(srcdir)/po/uk_UA/messages.mo \ po/ca/messages.mo \
$(srcdir)/po/en_us/messages.po po/en_us/messages.po
pixmap_DATA = xmlcopyeditor.png pixmap_DATA = xmlcopyeditor.png
desktop_DATA = xmlcopyeditor.desktop applications_DATA = xmlcopyeditor.desktop
INCLUDES = -I/usr/include/libxml2 INCLUDES = -I/usr/include/libxml2 $(ENCHANT_CFLAGS)
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@ -306,7 +332,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
cd $(top_srcdir) && \ $(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile $(AUTOMAKE) --gnu src/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@ -325,34 +351,50 @@ $(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS) install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ for p in $$list; do echo "$$p $$p"; done | \
if test -f $$p \ sed 's/$(EXEEXT)$$//' | \
|| test -f $$p1 \ while read p p1; do if test -f $$p || test -f $$p1; \
; then \ then echo "$$p"; echo "$$p"; else :; fi; \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ done | \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
else :; fi; \ sed 'N;N;N;s,\n, ,g' | \
done $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
{ d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
if ($$2 == $$4) files[d] = files[d] " " $$1; \
else { print "f", $$3 "/" $$4, $$1; } } \
END { for (d in files) print "f", d, files[d] }' | \
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \
; done
uninstall-binPROGRAMS: uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ files=`for p in $$list; do echo "$$p"; done | \
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
rm -f "$(DESTDIR)$(bindir)/$$f"; \ -e 's/$$/$(EXEEXT)/' `; \
done test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS: clean-binPROGRAMS:
@list='$(bin_PROGRAMS)'; for p in $$list; do \ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \
echo " rm -f $$p $$f"; \ rm -f $$list || exit $$?; \
rm -f $$p $$f ; \ test -n "$(EXEEXT)" || exit 0; \
done list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
xmlcopyeditor$(EXEEXT): $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_DEPENDENCIES) xmlcopyeditor$(EXEEXT): $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_DEPENDENCIES)
@rm -f xmlcopyeditor$(EXEEXT) @rm -f xmlcopyeditor$(EXEEXT)
$(xmlcopyeditor_LINK) $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_LDADD) $(LIBS) $(xmlcopyeditor_LINK) $(xmlcopyeditor_OBJECTS) $(xmlcopyeditor_LDADD) $(LIBS)
@ -370,6 +412,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catalogresolver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catalogresolver.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandpanel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandpanel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contexthandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contexthandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exportdialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findreplacepanel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findreplacepanel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlinuxappdir.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlinuxappdir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getword.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getword.Po@am__quote@
@ -379,6 +422,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestylewriter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/housestylewriter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/insertpanel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/insertpanel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locationpanel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locationpanel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp3album.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myhtmlpane.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myhtmlpane.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myipc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/myipc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mynotebook.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mynotebook.Po@am__quote@
@ -391,6 +435,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/styledialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/styledialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validationthread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validationthread.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapaspell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapaspell.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapdaisy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapexpat.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)/wraplibxml.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapregex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapregex.Po@am__quote@
@ -401,37 +446,40 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlassociatexsl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyeditor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyeditor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlcopyimg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlctrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlctrl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmldoc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmldoc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodinghandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodinghandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodingspy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlencodingspy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlfilterreader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlfilterreader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparseschemans.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparseschemans.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlprodnote.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlpromptgenerator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlpromptgenerator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrulereader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrulereader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemalocator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlschemalocator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlshallowvalidator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlshallowvalidator.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlsuppressprodnote.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlutf8reader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlutf8reader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlwordcount.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlwordcount.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsllocator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsllocator.Po@am__quote@
.cpp.o: .cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cpp.obj: .cpp.obj:
@am__fastdepCXX_TRUE@ $(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@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo: .cpp.lo:
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
@ -441,59 +489,69 @@ mostlyclean-libtool:
clean-libtool: clean-libtool:
-rm -rf .libs _libs -rm -rf .libs _libs
install-desktopDATA: $(desktop_DATA) install-applicationsDATA: $(applications_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" test -z "$(applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(applicationsdir)"
@list='$(desktop_DATA)'; for p in $$list; do \ @list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \ echo "$$d$$p"; \
echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ done | $(am__base_list) | \
$(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(applicationsdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(applicationsdir)" || exit $$?; \
done done
uninstall-desktopDATA: uninstall-applicationsDATA:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(desktop_DATA)'; for p in $$list; do \ @list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \
f=$(am__strip_dir) \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ test -n "$$files" || exit 0; \
rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ echo " ( cd '$(DESTDIR)$(applicationsdir)' && rm -f" $$files ")"; \
done cd "$(DESTDIR)$(applicationsdir)" && rm -f $$files
install-nobase_xmlcopyeditorDATA: $(nobase_xmlcopyeditor_DATA) install-nobase_xmlcopyeditorDATA: $(nobase_xmlcopyeditor_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(xmlcopyeditordir)" || $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)" test -z "$(xmlcopyeditordir)" || $(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)"
@$(am__vpath_adj_setup) \ @list='$(nobase_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
list='$(nobase_xmlcopyeditor_DATA)'; for p in $$list; do \ $(am__nobase_list) | while read dir files; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ xfiles=; for file in $$files; do \
$(am__vpath_adj) \ if test -f "$$file"; then xfiles="$$xfiles $$file"; \
echo " $(nobase_xmlcopyeditorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmlcopyeditordir)/$$f'"; \ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
$(nobase_xmlcopyeditorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmlcopyeditordir)/$$f"; \ test -z "$$xfiles" || { \
test "x$$dir" = x. || { \
echo "$(MKDIR_P) '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
$(MKDIR_P) "$(DESTDIR)$(xmlcopyeditordir)/$$dir"; }; \
echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(xmlcopyeditordir)/$$dir'"; \
$(INSTALL_DATA) $$xfiles "$(DESTDIR)$(xmlcopyeditordir)/$$dir" || exit $$?; }; \
done done
uninstall-nobase_xmlcopyeditorDATA: uninstall-nobase_xmlcopyeditorDATA:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@$(am__vpath_adj_setup) \ @list='$(nobase_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
list='$(nobase_xmlcopyeditor_DATA)'; for p in $$list; do \ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
$(am__vpath_adj) \ test -n "$$files" || exit 0; \
echo " rm -f '$(DESTDIR)$(xmlcopyeditordir)/$$f'"; \ echo " ( cd '$(DESTDIR)$(xmlcopyeditordir)' && rm -f" $$files ")"; \
rm -f "$(DESTDIR)$(xmlcopyeditordir)/$$f"; \ cd "$(DESTDIR)$(xmlcopyeditordir)" && rm -f $$files
done
install-pixmapDATA: $(pixmap_DATA) install-pixmapDATA: $(pixmap_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)" test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
@list='$(pixmap_DATA)'; for p in $$list; do \ @list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \ echo "$$d$$p"; \
echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \ done | $(am__base_list) | \
$(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \ while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
done done
uninstall-pixmapDATA: uninstall-pixmapDATA:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(pixmap_DATA)'; for p in $$list; do \ @list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
f=$(am__strip_dir) \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \ test -n "$$files" || exit 0; \
rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \ echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
done cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -507,7 +565,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ set x; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
@ -515,29 +573,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \ done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \ test -n "$$unique" || unique=$$empty_fix; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \ "$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi fi
ctags: CTAGS ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@ -558,13 +621,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ if test -d "$(distdir)/$$file"; then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \ fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \ || exit 1; \
fi; \ fi; \
done done
@ -572,7 +639,7 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
installdirs: installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(xmlcopyeditordir)" "$(DESTDIR)$(pixmapdir)"; do \ 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 done
install: install-am install: install-am
@ -595,6 +662,7 @@ clean-generic:
distclean-generic: distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@ -615,27 +683,39 @@ dvi-am:
html: html-am html: html-am
html-am:
info: info-am info: info-am
info-am: info-am:
install-data-am: install-desktopDATA install-nobase_xmlcopyeditorDATA \ install-data-am: install-applicationsDATA \
install-pixmapDATA install-nobase_xmlcopyeditorDATA install-pixmapDATA
install-dvi: install-dvi-am install-dvi: install-dvi-am
install-dvi-am:
install-exec-am: install-binPROGRAMS install-exec-am: install-binPROGRAMS
install-html: install-html-am install-html: install-html-am
install-html-am:
install-info: install-info-am install-info: install-info-am
install-info-am:
install-man: install-man:
install-pdf: install-pdf-am install-pdf: install-pdf-am
install-pdf-am:
install-ps: install-ps-am install-ps: install-ps-am
install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
@ -656,7 +736,7 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \
uninstall-nobase_xmlcopyeditorDATA uninstall-pixmapDATA uninstall-nobase_xmlcopyeditorDATA uninstall-pixmapDATA
.MAKE: install-am install-strip .MAKE: install-am install-strip
@ -665,8 +745,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
clean-generic clean-libtool ctags distclean distclean-compile \ clean-generic clean-libtool ctags distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \ distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \ dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am \ install-applicationsDATA install-binPROGRAMS install-data \
install-desktopDATA install-dvi install-dvi-am install-exec \ install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \ install-exec-am install-html install-html-am install-info \
install-info-am install-man install-nobase_xmlcopyeditorDATA \ install-info-am install-man install-nobase_xmlcopyeditorDATA \
install-pdf install-pdf-am install-pixmapDATA install-ps \ install-pdf install-pdf-am install-pixmapDATA install-ps \
@ -674,9 +754,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
installdirs maintainer-clean maintainer-clean-generic \ installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \ uninstall-am uninstall-applicationsDATA uninstall-binPROGRAMS \
uninstall-nobase_xmlcopyeditorDATA uninstall-pixmapDATA uninstall-nobase_xmlcopyeditorDATA uninstall-pixmapDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

6
src/binaryfile.cpp
View File

@ -30,7 +30,7 @@ BinaryFile::BinaryFile ( const char *fname ) : m_data ( 0 ), m_dataLen ( 0 )
pFile = fopen ( fname, "rb" ); pFile = fopen ( fname, "rb" );
if ( pFile == NULL ) if ( pFile == NULL )
{ {
throw; return;
} }
// obtain file size // obtain file size
@ -44,7 +44,7 @@ BinaryFile::BinaryFile ( const char *fname ) : m_data ( 0 ), m_dataLen ( 0 )
buffer = ( char* ) malloc ( sizeof ( char ) *lSize ); buffer = ( char* ) malloc ( sizeof ( char ) *lSize );
if ( buffer == NULL ) if ( buffer == NULL )
{ {
throw; return;
} }
// copy the file into the buffer: // copy the file into the buffer:
@ -52,7 +52,7 @@ BinaryFile::BinaryFile ( const char *fname ) : m_data ( 0 ), m_dataLen ( 0 )
if ( result != lSize ) if ( result != lSize )
{ {
if ( !feof ( pFile ) ) if ( !feof ( pFile ) )
throw; return;
} }
/* the whole file is now loaded in the memory buffer. */ /* the whole file is now loaded in the memory buffer. */

2
src/exportdialog.cpp
View File

@ -134,7 +134,7 @@ ExportDialog::ExportDialog (
wxID_ANY, wxID_ANY,
_ ( "Download DAISY extension" ), _ ( "Download DAISY extension" ),
#ifdef __WXMSW__ #ifdef __WXMSW__
_T ( "https://sourceforge.net/projects/xml-copy-editor/files/xmlcopyeditor-daisy/xmlcopyeditor-daisy-1.0.exe/download" ) _T ( "https://sourceforge.net/projects/xml-copy-editor/files/xmlcopyeditor-daisy/xmlcopyeditor-daisy-1.0.1.exe/download" )
#else #else
_T ( "http://xml-copy-editor.sourceforge.net" ) _T ( "http://xml-copy-editor.sourceforge.net" )
#endif #endif

2
src/findreplacepanel.cpp
View File

@ -255,7 +255,7 @@ void FindReplacePanel::setReplaceVisible ( bool b )
void FindReplacePanel::flagNotFound ( bool b ) void FindReplacePanel::flagNotFound ( bool b )
{ {
if ( notFoundSet && b || !notFoundSet && !b ) if ( ( notFoundSet && b ) || ( !notFoundSet && !b ) )
return; return;
notFoundSet = b; notFoundSet = b;

BIN
src/help/xmlcopyeditor.chm
View File

Binary file not shown.

2
src/help/xmlcopyeditor.hhp
View File

@ -2,7 +2,7 @@
Binary Index=No Binary Index=No
Compatibility=1.1 or later Compatibility=1.1 or later
Compiled file=xmlcopyeditor.chm Compiled file=xmlcopyeditor.chm
Contents file=Table of Contents.hhc Contents file=Table_of_Contents.hhc
Default Font=@Arial Unicode MS,8,0 Default Font=@Arial Unicode MS,8,0
Default topic=html\features.html Default topic=html\features.html
Display compile progress=No Display compile progress=No

1
src/replace.cpp
View File

@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <cstdio>
#include <cstring> #include <cstring>
#include "replace.h" #include "replace.h"

2
src/stringset.h
View File

@ -20,6 +20,8 @@
#ifndef STRINGSET_H #ifndef STRINGSET_H
#define STRINGSET_H #define STRINGSET_H
#include <stdint.h>
#include <cstdio>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <cmath> #include <cmath>

4
src/styledialog.cpp
View File

@ -137,7 +137,6 @@ StyleDialog::StyleDialog (
ruleSetCombo->GetSize ( &width, &height ); ruleSetCombo->GetSize ( &width, &height );
wxSize buttonSize ( 100, height ); wxSize buttonSize ( 100, height );
filterCombo = new wxComboBox ( filterCombo = new wxComboBox (
this, this,
ID_STYLE_COMBO_FILTER, ID_STYLE_COMBO_FILTER,
@ -329,6 +328,7 @@ StyleDialog::StyleDialog (
if ( !ruleFile.empty() ) if ( !ruleFile.empty() )
{ {
ruleFile.Replace ( _T ( ".xml" ), _T ( "" ) ); ruleFile.Replace ( _T ( ".xml" ), _T ( "" ) );
ruleFile.Replace ( _T ( "_" ), _T ( " " ) );
ruleSetCombo->Append ( wxFileNameFromPath ( ruleFile ) ); ruleSetCombo->Append ( wxFileNameFromPath ( ruleFile ) );
for ( ;; ) for ( ;; )
{ {
@ -336,6 +336,7 @@ StyleDialog::StyleDialog (
if ( ruleFile.empty() ) if ( ruleFile.empty() )
break; break;
ruleFile.Replace ( _T ( ".xml" ), _T ( "" ) ); ruleFile.Replace ( _T ( ".xml" ), _T ( "" ) );
ruleFile.Replace ( _T ( "_" ), _T ( " " ) );
ruleSetCombo->Append ( wxFileNameFromPath ( ruleFile ) ); ruleSetCombo->Append ( wxFileNameFromPath ( ruleFile ) );
} }
} }
@ -455,6 +456,7 @@ void StyleDialog::OnReport ( wxCommandEvent& event )
// reconstitute short filenames // reconstitute short filenames
wxString ruleSet, filter; wxString ruleSet, filter;
ruleSet = ruleSetPreset + _T ( ".xml" ); ruleSet = ruleSetPreset + _T ( ".xml" );
ruleSet.Replace ( _(" "), _T("_") );
filter = filterPreset + _T ( ".xml" ); filter = filterPreset + _T ( ".xml" );
std::string ruleSetDirectoryUtf8, std::string ruleSetDirectoryUtf8,

1
src/wrapaspell.cpp
View File

@ -18,6 +18,7 @@
*/ */
#include <iostream> #include <iostream>
#include <cstdio>
#include <stdexcept> #include <stdexcept>
#include "wrapaspell.h" #include "wrapaspell.h"
#ifdef USE_ENCHANT #ifdef USE_ENCHANT

43
src/wrapdaisy.cpp
View File

@ -11,7 +11,6 @@
#include "xmlcopyimg.h" #include "xmlcopyimg.h"
#include "binaryfile.h" #include "binaryfile.h"
#include "replace.h" #include "replace.h"
#include "playlistrenamer.h"
#include "mp3album.h" #include "mp3album.h"
#ifdef __WXMSW__ #ifdef __WXMSW__
@ -109,6 +108,9 @@ bool WrapDaisy::run (
{ {
// #1: convert to canonical XHTML // #1: convert to canonical XHTML
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 10, _T("Preparing canonical XHTML...") ) ) if ( !pd->Update ( 10, _T("Preparing canonical XHTML...") ) )
{ {
error = _T( "Cancelled" ); error = _T( "Cancelled" );
@ -136,12 +138,10 @@ bool WrapDaisy::run (
} }
else // no stylesheet else // no stylesheet
{ {
try {
BinaryFile bf( stdFileIn.c_str() ); BinaryFile bf( stdFileIn.c_str() );
output.append ( bf.getData(), bf.getDataLen() ); if ( !bf.getData() )
}
catch ( ... )
{ {
output.append ( bf.getData(), bf.getDataLen() );
error = _( "Cannot read [b]" ) + fileIn + ( _("[/b]") ); error = _( "Cannot read [b]" ) + fileIn + ( _("[/b]") );
return false; return false;
} }
@ -150,6 +150,8 @@ bool WrapDaisy::run (
if ( suppressOptional ) if ( suppressOptional )
{ {
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 15, _("Suppressing optional production notes...") ) ) if ( !pd->Update ( 15, _("Suppressing optional production notes...") ) )
{ {
error = _ ( "Cancelled" ); error = _ ( "Cancelled" );
@ -171,6 +173,8 @@ bool WrapDaisy::run (
{ {
// #1.5: apply quiet setting if req'd // #1.5: apply quiet setting if req'd
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 20, _("De-emphasizing production notes...") ) ) if ( !pd->Update ( 20, _("De-emphasizing production notes...") ) )
{ {
error = _ ( "Cancelled" ); error = _ ( "Cancelled" );
@ -238,6 +242,9 @@ bool WrapDaisy::run (
// copy images // copy images
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 25, _("Copying images and audio files...") ) ) if ( !pd->Update ( 25, _("Copying images and audio files...") ) )
{ {
error = _ ( "Cancelled" ); error = _ ( "Cancelled" );
@ -270,6 +277,9 @@ bool WrapDaisy::run (
// #2: convert to DTBook // #2: convert to DTBook
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 40, _T("Preparing DTBook...") ) ) if ( !pd->Update ( 40, _T("Preparing DTBook...") ) )
{ {
error = _T ( "Cancelled" ); error = _T ( "Cancelled" );
@ -320,6 +330,9 @@ bool WrapDaisy::run (
// #2.5: create EPUB version // #2.5: create EPUB version
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 50, _T("Preparing ePub...") ) ) if ( !pd->Update ( 50, _T("Preparing ePub...") ) )
{ {
error = _T ( "Cancelled" ); error = _T ( "Cancelled" );
@ -371,6 +384,9 @@ bool WrapDaisy::run (
// #2.9: convert to RTF // #2.9: convert to RTF
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 60, _T("Preparing RTF...") ) ) if ( !pd->Update ( 60, _T("Preparing RTF...") ) )
{ {
error = _T ( "Cancelled" ); error = _T ( "Cancelled" );
@ -426,6 +442,9 @@ bool WrapDaisy::run (
// (Win only; otherwise create copy with *.doc extension) // (Win only; otherwise create copy with *.doc extension)
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 60, _T("Preparing Word document...") ) ) if ( !pd->Update ( 60, _T("Preparing Word document...") ) )
{ {
error = _T ( "Cancelled" ); error = _T ( "Cancelled" );
@ -468,6 +487,9 @@ bool WrapDaisy::run (
// #3: convert to full DAISY book // #3: convert to full DAISY book
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 70, _T("Preparing DAISY books...") ) ) if ( !pd->Update ( 70, _T("Preparing DAISY books...") ) )
{ {
error = _T ( "Cancelled" ); error = _T ( "Cancelled" );
@ -521,6 +543,9 @@ bool WrapDaisy::run (
// #4: create MP3 album // #4: create MP3 album
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 80, _T("Preparing MP3 album...") ) ) if ( !pd->Update ( 80, _T("Preparing MP3 album...") ) )
{ {
error = _T ( "Cancelled" ); error = _T ( "Cancelled" );
@ -595,6 +620,9 @@ bool WrapDaisy::run (
pd->ProcessPendingEvents(); pd->ProcessPendingEvents();
while (wxTheApp->Pending())
wxTheApp->Dispatch();
if ( !pd->Update ( 90, _T("Updating playlists...") ) ) if ( !pd->Update ( 90, _T("Updating playlists...") ) )
{ {
error = _T ( "Cancelled" ); error = _T ( "Cancelled" );
@ -621,11 +649,8 @@ bool WrapDaisy::run (
auto_ptr<Mp3Album> ma ( new Mp3Album() ); auto_ptr<Mp3Album> ma ( new Mp3Album() );
BinaryFile *binaryfile; BinaryFile *binaryfile;
try
{
binaryfile = new BinaryFile ( file.c_str() ); binaryfile = new BinaryFile ( file.c_str() );
} if ( !binaryfile->getData() )
catch ( ... )
{ {
error.Printf ( _ ( "Cannot open %s" ), file.c_str() ); error.Printf ( _ ( "Cannot open %s" ), file.c_str() );
return false; return false;

1
src/xmlassociatedtd.cpp
View File

@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <cstdio>
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdexcept> #include <stdexcept>

1
src/xmlassociatexsd.h
View File

@ -20,6 +20,7 @@
#ifndef XML_ASSOCIATE_XSD_H #ifndef XML_ASSOCIATE_XSD_H
#define XML_ASSOCIATE_XSD_H #define XML_ASSOCIATE_XSD_H
#include <cstdio>
#include <vector> #include <vector>
#include <expat.h> #include <expat.h>
#include <string> #include <string>

1
src/xmlassociatexsl.h
View File

@ -20,6 +20,7 @@
#ifndef XML_ASSOCIATE_XSL_H #ifndef XML_ASSOCIATE_XSL_H
#define XML_ASSOCIATE_XSL_H #define XML_ASSOCIATE_XSL_H
#include <cstdio>
#include <vector> #include <vector>
#include <expat.h> #include <expat.h>
#include <string> #include <string>

27
src/xmlcopyeditor.cpp
View File

@ -1242,7 +1242,7 @@ void MyFrame::OnAbout ( wxCommandEvent& WXUNUSED ( event ) )
info.AddTranslator ( _ ( "Siarhei Kuchuk (Russian) <Cuchuk dot Sergey at gmail dot com>" ) ); info.AddTranslator ( _ ( "Siarhei Kuchuk (Russian) <Cuchuk dot Sergey at gmail dot com>" ) );
info.AddTranslator ( _ ( "Marcos Pérez González (Spanish) <marcos_pg at yahoo dot com>" ) ); info.AddTranslator ( _ ( "Marcos Pérez González (Spanish) <marcos_pg at yahoo dot com>" ) );
info.AddTranslator ( _ ( "Rob Elemans (Dutch) <relemans at gmail dot com>" ) ); info.AddTranslator ( _ ( "Rob Elemans (Dutch) <relemans at gmail dot com>" ) );
info.AddTranslator ( _ ( "Robert Falco Miramontes <rfalco at acett dot org>" ) ); info.AddTranslator ( _ ( "Robert Falc\xf3 Miramontes <rfalco at acett dot org>" ) );
info.SetLicense ( ABOUT_LICENSE ); info.SetLicense ( ABOUT_LICENSE );
info.SetDescription ( description ); info.SetDescription ( description );
wxAboutBox ( info ); wxAboutBox ( info );
@ -2727,6 +2727,7 @@ void MyFrame::OnNew ( wxCommandEvent& WXUNUSED ( event ) )
templateFile = wxFindNextFile(); templateFile = wxFindNextFile();
if ( templateFile.empty() ) if ( templateFile.empty() )
break; break;
templateFile.Replace ( _T("_"), _T(" ") );
fn.Assign ( templateFile ); fn.Assign ( templateFile );
name = fn.GetName(); name = fn.GetName();
extension = fn.GetExt(); extension = fn.GetExt();
@ -2765,6 +2766,7 @@ void MyFrame::OnNew ( wxCommandEvent& WXUNUSED ( event ) )
typeSelection.Replace ( _T ( " (*" ), wxEmptyString ); typeSelection.Replace ( _T ( " (*" ), wxEmptyString );
typeSelection.Replace ( _T ( ")" ), wxEmptyString ); typeSelection.Replace ( _T ( ")" ), wxEmptyString );
typeSelection.Replace ( _T ( " " ), _T ( "_" ) );
templateFile = templateDir + typeSelection; templateFile = templateDir + typeSelection;
std::string templateFileLocal, buffer; std::string templateFileLocal, buffer;
templateFileLocal = templateFile.mb_str ( wxConvLocal ); templateFileLocal = templateFile.mb_str ( wxConvLocal );
@ -2926,9 +2928,15 @@ bool MyFrame::openFile ( wxString& fileName, bool largeFile )
//wxMemoryMappedFile *memorymap = NULL; //wxMemoryMappedFile *memorymap = NULL;
BinaryFile *binaryfile = NULL; BinaryFile *binaryfile = NULL;
try
{
binaryfile = new BinaryFile ( ( const char * ) fileName.mb_str ( wxConvLocal ) ); binaryfile = new BinaryFile ( ( const char * ) fileName.mb_str ( wxConvLocal ) );
if ( !binaryfile->getData() )
{
wxString message;
message.Printf ( _ ( "Cannot open %s" ), fileName.c_str() );
messagePane ( message, CONST_STOP );
statusProgress ( wxEmptyString );
return false;
}
/* /*
memorymap = new wxMemoryMappedFile( memorymap = new wxMemoryMappedFile(
fileName, fileName,
@ -2937,21 +2945,12 @@ bool MyFrame::openFile ( wxString& fileName, bool largeFile )
); );
*/ */
}
/* /*
catch (wxMemoryMappedFileEmptyException&) catch (wxMemoryMappedFileEmptyException&)
{ {
fileEmpty = true; fileEmpty = true;
} }
*/ */
catch ( ... )
{
wxString message;
message.Printf ( _ ( "Cannot open %s" ), fileName.c_str() );
messagePane ( message, CONST_STOP );
statusProgress ( wxEmptyString );
return false;
}
bool isUtf8 = false; bool isUtf8 = false;
@ -5369,9 +5368,11 @@ void MyFrame::updateFileMenu ( bool deleteExisting )
wxMenuItem *saveAsItem = wxMenuItem *saveAsItem =
new wxMenuItem ( NULL, wxID_SAVEAS, _ ( "S&ave As...\tF12" ), _ ( "Save As..." ) ); new wxMenuItem ( NULL, wxID_SAVEAS, _ ( "S&ave As...\tF12" ), _ ( "Save As..." ) );
saveAsItem->SetBitmap ( wxNullBitmap ); saveAsItem->SetBitmap ( wxNullBitmap );
#ifdef __WXMSW__
wxMenuItem *exportItem = wxMenuItem *exportItem =
new wxMenuItem ( NULL, ID_EXPORT, _ ( "&DAISY Export..." ), _ ( "DAISY Export..." ) ); new wxMenuItem ( NULL, ID_EXPORT, _ ( "&DAISY Export..." ), _ ( "DAISY Export..." ) );
exportItem->SetBitmap ( wxNullBitmap ); exportItem->SetBitmap ( wxNullBitmap );
#endif
wxMenuItem *reloadItem = wxMenuItem *reloadItem =
new wxMenuItem ( NULL, ID_RELOAD, _ ( "&Reload" ), _ ( "Reload" ) ); new wxMenuItem ( NULL, ID_RELOAD, _ ( "&Reload" ), _ ( "Reload" ) );
reloadItem->SetBitmap ( wxNullBitmap ); reloadItem->SetBitmap ( wxNullBitmap );
@ -5415,9 +5416,9 @@ void MyFrame::updateFileMenu ( bool deleteExisting )
fileMenu->Append ( printSetupItem ); fileMenu->Append ( printSetupItem );
fileMenu->Append ( printPreviewItem ); fileMenu->Append ( printPreviewItem );
fileMenu->Append ( printItem ); fileMenu->Append ( printItem );
#ifdef __WXMSW__
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
fileMenu->Append ( exportItem ); fileMenu->Append ( exportItem );
#ifdef __WXMSW__
fileMenu->Append ( importMSWordItem ); fileMenu->Append ( importMSWordItem );
fileMenu->Append ( exportMSWordItem ); fileMenu->Append ( exportMSWordItem );
#endif #endif

2
src/xmlcopyeditorcopy.h
View File

@ -25,7 +25,7 @@
#endif #endif
#define ABOUT_COPYRIGHT _("Copyright © 2005-2009 Gerald Schmidt <gnschmidt@users.sourceforge.net>") #define ABOUT_COPYRIGHT _("Copyright © 2005-2009 Gerald Schmidt <gnschmidt@users.sourceforge.net>")
#define ABOUT_DESCRIPTION _("\nXML Copy Editor is free software released under the GNU\nGeneral Public License.\n\nMany thanks are due to Tim van Niekerk, Matt Smigielski,\nDavid Scholl, Jan Merka, Marcus Bingenheimer, Roberto\nRosselli Del Turco, Ken Zalewski, C.J. Meidlinger,\nThomas Zajic, Viliam Búr, David Håsäther, François\nBadier, Thomas Wenzel, Roger Sperberg, SHiNE CsyFeK,\nHSU PICHAN, YANG SHUFUN, CHENG PAULIAN,\nCHUANG KUO-PING, Justin Dearing, Serhij Dubyk,\nAntonio Angelo, Jose Luis Rivero, Siarhei Kuchuk,\nIan Abbott, Kev James, Marcos Pérez González, Anh\nTrinh, Rob Elemans and Robert Falco Miramontes.") #define ABOUT_DESCRIPTION _("\nXML Copy Editor is free software released under the GNU\nGeneral Public License.\n\nMany thanks are due to Tim van Niekerk, Matt Smigielski,\nDavid Scholl, Jan Merka, Marcus Bingenheimer, Roberto\nRosselli Del Turco, Ken Zalewski, C.J. Meidlinger,\nThomas Zajic, Viliam Búr, David Håsäther, François\nBadier, Thomas Wenzel, Roger Sperberg, SHiNE CsyFeK,\nHSU PICHAN, YANG SHUFUN, CHENG PAULIAN,\nCHUANG KUO-PING, Justin Dearing, Serhij Dubyk,\nAntonio Angelo, Jose Luis Rivero, Siarhei Kuchuk,\nIan Abbott, Kev James, Marcos Pérez González, Anh\nTrinh, Rob Elemans and Robert Falc\xf3 Miramontes.")
#define ABOUT_LICENSE _T(\ #define ABOUT_LICENSE _T(\
"This program is free software; you can redistribute it\n"\ "This program is free software; you can redistribute it\n"\
"and/or modify it under the terms of the GNU General Public\n"\ "and/or modify it under the terms of the GNU General Public\n"\

3
src/xmlcopyimg.cpp
View File

@ -135,6 +135,7 @@ void XMLCALL XmlCopyImg::start ( void *data,
{ {
wxString cmd; wxString cmd;
cmd += IMAGEMAGICK_CONVERT_PATH; cmd += IMAGEMAGICK_CONVERT_PATH;
cmd += _T(" -resize 720x1440>");
cmd += _T(" \""); cmd += _T(" \"");
cmd += wideFile; cmd += wideFile;
cmd += _T("\" \""); cmd += _T("\" \"");
@ -156,7 +157,7 @@ void XMLCALL XmlCopyImg::start ( void *data,
} // img + src } // img + src
else if ( !strcmp ( el, "a" ) && else if ( !strcmp ( el, "a" ) &&
!strcmp (*attr, "href") && !strcmp (*attr, "href") &&
strstr ( value.c_str(), ".mp3" ) || strstr ( value.c_str(), ".pdf" ) ) ( strstr ( value.c_str(), ".mp3" ) || strstr ( value.c_str(), ".pdf" ) ) )
{ {
wideFile = wxString ( value.c_str(), wxConvUTF8, value.size() ); wideFile = wxString ( value.c_str(), wxConvUTF8, value.size() );
wxFileName fn ( wideFile ); wxFileName fn ( wideFile );

1
src/xmlprodnote.h
View File

@ -20,6 +20,7 @@
#ifndef XML_PRODNOTE_H #ifndef XML_PRODNOTE_H
#define XML_PRODNOTE_H #define XML_PRODNOTE_H
#include <cstdio>
#include <vector> #include <vector>
#include <expat.h> #include <expat.h>
#include <string> #include <string>

2
src/xmlpromptgenerator.cpp
View File

@ -31,7 +31,9 @@
#include "catalogresolver.h" #include "catalogresolver.h"
// Xerces-C req'd for Schema parsing // Xerces-C req'd for Schema parsing
#ifdef __WXMSW__
#define XERCES_TMPLSINC #define XERCES_TMPLSINC
#endif
#include <xercesc/util/NameIdPool.hpp> #include <xercesc/util/NameIdPool.hpp>
#include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/PlatformUtils.hpp>

1
src/xmlsuppressprodnote.h
View File

@ -1,6 +1,7 @@
#ifndef XML_SUPPRESS_PRODNOTE_H #ifndef XML_SUPPRESS_PRODNOTE_H
#define XML_SUPPRESS_PRODNOTE_H #define XML_SUPPRESS_PRODNOTE_H
#include <cstdio>
#include <vector> #include <vector>
#include <expat.h> #include <expat.h>
#include <string> #include <string>

1
src/xmlutf8reader.cpp
View File

@ -17,6 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <cstdio>
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdexcept> #include <stdexcept>

5
src/xpm/appicon.xpm
View File

@ -1,5 +1,10 @@
/* XPM */ /* XPM */
#ifdef __WXMSW__
static char * appicon_xpm[] = { static char * appicon_xpm[] = {
#else
static const char * appicon_xpm[] = {
#endif
"16 16 238 2", "16 16 238 2",
" c #742719", " c #742719",
". c #9A3320", ". c #9A3320",

4
src/xsllocator.cpp
View File

@ -46,7 +46,11 @@ void XMLCALL XslLocator::processingInstructionHandler (
return; return;
char *value, *iterator; char *value, *iterator;
#ifdef __WXMSW__
value = strstr ( ( const char * ) data, "href=" ); value = strstr ( ( const char * ) data, "href=" );
#else
value = ( char *) strstr ( data, "href=" );
#endif
if ( !value || strlen ( value ) < 7 ) if ( !value || strlen ( value ) < 7 )
return; return;
value += 6; value += 6;