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

View File

@ -26,6 +26,7 @@ xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
findreplacepanel.cpp commandpanel.cpp xercescatalogresolver.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.desktop
@ -68,7 +69,7 @@ nobase_xmlcopyeditor_DATA = png/*.png \
po/zh_CN/messages.mo \
po/zh_TW/messages.mo \
po/uk_UA/messages.mo \
po/uk_UA/messages.mo \
po/ca/messages.mo \
po/en_us/messages.po
pixmap_DATA = xmlcopyeditor.png

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@
# 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
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -18,8 +19,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@ -44,9 +46,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applicationsdir)" \
"$(DESTDIR)$(xmlcopyeditordir)" "$(DESTDIR)$(pixmapdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \
associatedialog.$(OBJEXT) casehandler.$(OBJEXT) \
@ -73,7 +75,10 @@ am_xmlcopyeditor_OBJECTS = xmlcopyeditor.$(OBJEXT) \
findreplacepanel.$(OBJEXT) commandpanel.$(OBJEXT) \
xercescatalogresolver.$(OBJEXT) binaryfile.$(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_LDADD = $(LDADD)
xmlcopyeditor_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@ -82,6 +87,7 @@ xmlcopyeditor_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@ -98,11 +104,24 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
desktopDATA_INSTALL = $(INSTALL_DATA)
nobase_xmlcopyeditorDATA_INSTALL = $(install_sh_DATA)
pixmapDATA_INSTALL = $(INSTALL_DATA)
DATA = $(desktop_DATA) $(nobase_xmlcopyeditor_DATA) $(pixmap_DATA)
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
am__install_max = 40
am__nobase_strip_setup = \
srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
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)
ETAGS = etags
CTAGS = ctags
@ -110,6 +129,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
ASPELL_LIBS = @ASPELL_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@ -132,6 +152,8 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENCHANT_CFLAGS = @ENCHANT_CFLAGS@
ENCHANT_LIBS = @ENCHANT_LIBS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
@ -161,8 +183,10 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@ -225,10 +249,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# these are the headers for your project
noinst_HEADERS = $(srcdir)/*.h
xmlcopyeditordir = ${datarootdir}/xmlcopyeditor
pixmapdir = ${datarootdir}/pixmaps
desktopdir = ${datarootdir}/applications
noinst_HEADERS = *.h
xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
pixmapdir = /usr/share/pixmaps
applicationsdir = /usr/share/applications
# the application source, library search path, and link libraries
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 \
findreplacepanel.cpp commandpanel.cpp xercescatalogresolver.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.desktop
# rulesets png rng xpm templates copying help po
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\
$(srcdir)/rulesets/*.* \
$(srcdir)/rng/*.rng \
$(srcdir)/rng/*.rnc \
$(srcdir)/rng/exclude/*.rng \
$(srcdir)/rng/modules/*.rng \
$(srcdir)/xpm/*.xpm \
$(srcdir)/templates/*.xml \
$(srcdir)/templates/*.dtd \
$(srcdir)/templates/*.xsl \
$(srcdir)/templates/*.rss \
$(srcdir)/templates/*.html \
$(srcdir)/templates/*.xtm \
$(srcdir)/templates/*.xsd \
$(srcdir)/templates/*.rng \
$(srcdir)/templates/*.lzx \
$(srcdir)/templates/*.xlf \
$(srcdir)/help/*.* $(srcdir)/help/html/*.* \
$(srcdir)/copying/*.txt $(srcdir)/copying/boost_shared_ptr/* \
$(srcdir)/copying/Expat/* $(srcdir)/copying/libxml2/* $(srcdir)/copying/libxslt/* \
$(srcdir)/copying/PCRE/* $(srcdir)/copying/Scintilla/* \
$(srcdir)/copying/wxStyledTextCtrl/* \
$(srcdir)/copying/wxStEditor/* \
$(srcdir)/copying/xmlcopyeditor/* \
$(srcdir)/copying/Aspell/* \
$(srcdir)/copying/Apache/LICENSE-2.0 \
$(srcdir)/copying/Apache/LICENSE-2_files/* \
$(srcdir)/po/sk/messages.mo \
$(srcdir)/po/sv/messages.mo \
$(srcdir)/po/fr/messages.mo \
$(srcdir)/po/de/messages.mo \
$(srcdir)/po/ru/messages.mo \
$(srcdir)/po/es/messages.mo \
$(srcdir)/po/zh_CN/messages.mo \
$(srcdir)/po/zh_TW/messages.mo \
$(srcdir)/po/uk_UA/messages.mo \
$(srcdir)/po/uk_UA/messages.mo \
$(srcdir)/po/en_us/messages.po
nobase_xmlcopyeditor_DATA = png/*.png \
rulesets/*.* \
rng/*.rng \
rng/*.rnc \
rng/exclude/*.rng \
rng/modules/*.rng \
xpm/*.xpm \
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/wxStyledTextCtrl/* \
copying/wxStEditor/* \
copying/xmlcopyeditor/* \
copying/Aspell/* \
copying/Apache/LICENSE-2.0 \
copying/Apache/LICENSE-2_files/* \
po/sk/messages.mo \
po/sv/messages.mo \
po/fr/messages.mo \
po/de/messages.mo \
po/ru/messages.mo \
po/es/messages.mo \
po/zh_CN/messages.mo \
po/zh_TW/messages.mo \
po/uk_UA/messages.mo \
po/ca/messages.mo \
po/en_us/messages.po
pixmap_DATA = xmlcopyeditor.png
desktop_DATA = xmlcopyeditor.desktop
INCLUDES = -I/usr/include/libxml2
applications_DATA = xmlcopyeditor.desktop
INCLUDES = -I/usr/include/libxml2 $(ENCHANT_CFLAGS)
all: all-am
.SUFFIXES:
@ -306,7 +332,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
cd $(top_srcdir) && \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
.PRECIOUS: Makefile
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
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p || test -f $$p1; \
then echo "$$p"; echo "$$p"; else :; fi; \
done | \
sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
sed 'N;N;N;s,\n, ,g' | \
$(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:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-e 's/$$/$(EXEEXT)/' `; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
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)
@rm -f xmlcopyeditor$(EXEEXT)
$(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)/commandpanel.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)/getlinuxappdir.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)/insertpanel.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)/myipc.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)/validationthread.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)/wraplibxml.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)/xmlassociatexsl.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)/xmldoc.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)/xmlfilterreader.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)/xmlrulereader.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)/xmlsuppressprodnote.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)/xsllocator.Po@am__quote@
.cpp.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@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cpp.obj:
@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@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo:
@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@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
@ -441,59 +489,69 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
install-desktopDATA: $(desktop_DATA)
install-applicationsDATA: $(applications_DATA)
@$(NORMAL_INSTALL)
test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; for p in $$list; do \
test -z "$(applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(applicationsdir)"
@list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
$(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(applicationsdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(applicationsdir)" || exit $$?; \
done
uninstall-desktopDATA:
uninstall-applicationsDATA:
@$(NORMAL_UNINSTALL)
@list='$(desktop_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
done
@list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(applicationsdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(applicationsdir)" && rm -f $$files
install-nobase_xmlcopyeditorDATA: $(nobase_xmlcopyeditor_DATA)
@$(NORMAL_INSTALL)
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; \
$(am__vpath_adj) \
echo " $(nobase_xmlcopyeditorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xmlcopyeditordir)/$$f'"; \
$(nobase_xmlcopyeditorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xmlcopyeditordir)/$$f"; \
@list='$(nobase_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
$(am__nobase_list) | while read dir files; do \
xfiles=; for file in $$files; do \
if test -f "$$file"; then xfiles="$$xfiles $$file"; \
else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
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
uninstall-nobase_xmlcopyeditorDATA:
@$(NORMAL_UNINSTALL)
@$(am__vpath_adj_setup) \
list='$(nobase_xmlcopyeditor_DATA)'; for p in $$list; do \
$(am__vpath_adj) \
echo " rm -f '$(DESTDIR)$(xmlcopyeditordir)/$$f'"; \
rm -f "$(DESTDIR)$(xmlcopyeditordir)/$$f"; \
done
@list='$(nobase_xmlcopyeditor_DATA)'; test -n "$(xmlcopyeditordir)" || list=; \
$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(xmlcopyeditordir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(xmlcopyeditordir)" && rm -f $$files
install-pixmapDATA: $(pixmap_DATA)
@$(NORMAL_INSTALL)
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; \
f=$(am__strip_dir) \
echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \
$(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
done
uninstall-pixmapDATA:
@$(NORMAL_UNINSTALL)
@list='$(pixmap_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \
rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \
done
@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pixmapdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -507,7 +565,7 @@ tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@ -515,29 +573,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
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; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
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; nonempty = 1; } \
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) \
$$tags $$unique
$$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
distclean-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 -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; \
if test -d "$(distdir)/$$file"; then \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
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 \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@ -572,7 +639,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
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"; \
done
install: install-am
@ -595,6 +662,7 @@ clean-generic:
distclean-generic:
-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:
@echo "This command is intended for maintainers to use"
@ -615,27 +683,39 @@ dvi-am:
html: html-am
html-am:
info: info-am
info-am:
install-data-am: install-desktopDATA install-nobase_xmlcopyeditorDATA \
install-pixmapDATA
install-data-am: install-applicationsDATA \
install-nobase_xmlcopyeditorDATA install-pixmapDATA
install-dvi: install-dvi-am
install-dvi-am:
install-exec-am: install-binPROGRAMS
install-html: install-html-am
install-html-am:
install-info: install-info-am
install-info-am:
install-man:
install-pdf: install-pdf-am
install-pdf-am:
install-ps: install-ps-am
install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -656,7 +736,7 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
uninstall-am: uninstall-applicationsDATA uninstall-binPROGRAMS \
uninstall-nobase_xmlcopyeditorDATA uninstall-pixmapDATA
.MAKE: install-am install-strip
@ -665,8 +745,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
clean-generic clean-libtool ctags distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am \
install-desktopDATA install-dvi install-dvi-am install-exec \
install-applicationsDATA install-binPROGRAMS install-data \
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-pdf install-pdf-am install-pixmapDATA install-ps \
@ -674,9 +754,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
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
# 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:

View File

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

View File

@ -134,7 +134,7 @@ ExportDialog::ExportDialog (
wxID_ANY,
_ ( "Download DAISY extension" ),
#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
_T ( "http://xml-copy-editor.sourceforge.net" )
#endif

View File

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

Binary file not shown.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

@ -25,7 +25,7 @@
#endif
#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(\
"This program is free software; you can redistribute it\n"\
"and/or modify it under the terms of the GNU General Public\n"\

View File

@ -135,6 +135,7 @@ void XMLCALL XmlCopyImg::start ( void *data,
{
wxString cmd;
cmd += IMAGEMAGICK_CONVERT_PATH;
cmd += _T(" -resize 720x1440>");
cmd += _T(" \"");
cmd += wideFile;
cmd += _T("\" \"");
@ -156,7 +157,7 @@ void XMLCALL XmlCopyImg::start ( void *data,
} // img + src
else if ( !strcmp ( el, "a" ) &&
!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() );
wxFileName fn ( wideFile );

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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