diff options
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in | 145 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h | 6 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp | 75 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c | 85 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h (renamed from Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/intl.h) | 2 |
6 files changed, 168 insertions, 149 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am index a5e247c645d..2864abed4bf 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am @@ -54,6 +54,7 @@ libfontforge_a_SOURCES = \ fontforge/stemdb.c \ fontforge/stemdb.h \ fontforge/tables.h \ + fontforge/tmpfile2.cpp \ fontforge/tottf.c \ fontforge/tottfaat.c \ fontforge/tottfgpos.c \ @@ -65,17 +66,16 @@ libfontforge_a_SOURCES = \ fontforge/uiinterface.h \ fontforge/unialt.c \ fontforge/ustring.c \ - fontforge/utils.c \ fontforge/utype.c \ fontforge/woff.c \ inc/basics.h \ inc/chardata.h \ inc/charset.h \ inc/dlist.h \ + inc/ffintl.h \ inc/gimage.h \ inc/gnetwork.h \ inc/gwwiconv.h \ - inc/intl.h \ inc/ustring.h \ inc/utype.h diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in index 3aca1fd0a66..b6048ddaffa 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in @@ -88,23 +88,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = dvisvgm-src/libs/ff-woff +target_triplet = @target@ +subdir = libs/ff-woff ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ - $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ - $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ - $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ - $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ - $(top_srcdir)/../../m4/kpse-win32.m4 \ - $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ - $(top_srcdir)/../../m4/libtool.m4 \ - $(top_srcdir)/../../m4/ltoptions.m4 \ - $(top_srcdir)/../../m4/ltsugar.m4 \ - $(top_srcdir)/../../m4/ltversion.m4 \ - $(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -144,11 +135,11 @@ am_libfontforge_a_OBJECTS = fontforge/alphabet.$(OBJEXT) \ fontforge/splinesaveafm.$(OBJEXT) \ fontforge/splineutil.$(OBJEXT) fontforge/splineutil2.$(OBJEXT) \ fontforge/start.$(OBJEXT) fontforge/stemdb.$(OBJEXT) \ - fontforge/tottf.$(OBJEXT) fontforge/tottfaat.$(OBJEXT) \ - fontforge/tottfgpos.$(OBJEXT) fontforge/tottfvar.$(OBJEXT) \ - fontforge/ttfinstrs.$(OBJEXT) fontforge/ttfspecial.$(OBJEXT) \ - fontforge/unialt.$(OBJEXT) fontforge/ustring.$(OBJEXT) \ - fontforge/utils.$(OBJEXT) fontforge/utype.$(OBJEXT) \ + fontforge/tmpfile2.$(OBJEXT) fontforge/tottf.$(OBJEXT) \ + fontforge/tottfaat.$(OBJEXT) fontforge/tottfgpos.$(OBJEXT) \ + fontforge/tottfvar.$(OBJEXT) fontforge/ttfinstrs.$(OBJEXT) \ + fontforge/ttfspecial.$(OBJEXT) fontforge/unialt.$(OBJEXT) \ + fontforge/ustring.$(OBJEXT) fontforge/utype.$(OBJEXT) \ fontforge/woff.$(OBJEXT) libfontforge_a_OBJECTS = $(am_libfontforge_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) @@ -164,7 +155,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp +depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -189,6 +180,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libfontforge_a_SOURCES) DIST_SOURCES = $(libfontforge_a_SOURCES) am__can_run_installinfo = \ @@ -215,14 +224,14 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/../../build-aux/depcomp +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ -AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -230,31 +239,35 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@ +CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ -CXXLD = @CXXLD@ CYGPATH_W = @CYGPATH_W@ +DATE = @DATE@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DVISVGM_TREE = @DVISVGM_TREE@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ -FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ -FREETYPE2_LIBS = @FREETYPE2_LIBS@ -FT2_CONFIG = @FT2_CONFIG@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +GCOV = @GCOV@ +GENHTML = @GENHTML@ GREP = @GREP@ HAVE_CXX11 = @HAVE_CXX11@ INSTALL = @INSTALL@ @@ -262,13 +275,9 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KPATHSEA_DEPEND = @KPATHSEA_DEPEND@ -KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@ -KPATHSEA_LIBS = @KPATHSEA_LIBS@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBGS_INCLUDES = @LIBGS_INCLUDES@ -LIBGS_LIBS = @LIBGS_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -276,7 +285,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,19 +303,15 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POTRACE_DEPEND = @POTRACE_DEPEND@ -POTRACE_INCLUDES = @POTRACE_INCLUDES@ -POTRACE_LIBS = @POTRACE_LIBS@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -WARNING_CFLAGS = @WARNING_CFLAGS@ -WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -ZLIB_DEPEND = @ZLIB_DEPEND@ -ZLIB_INCLUDES = @ZLIB_INCLUDES@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -354,11 +358,16 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +target = @target@ target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -417,6 +426,7 @@ libfontforge_a_SOURCES = \ fontforge/stemdb.c \ fontforge/stemdb.h \ fontforge/tables.h \ + fontforge/tmpfile2.cpp \ fontforge/tottf.c \ fontforge/tottfaat.c \ fontforge/tottfgpos.c \ @@ -428,17 +438,16 @@ libfontforge_a_SOURCES = \ fontforge/uiinterface.h \ fontforge/unialt.c \ fontforge/ustring.c \ - fontforge/utils.c \ fontforge/utype.c \ fontforge/woff.c \ inc/basics.h \ inc/chardata.h \ inc/charset.h \ inc/dlist.h \ + inc/ffintl.h \ inc/gimage.h \ inc/gnetwork.h \ inc/gwwiconv.h \ - inc/intl.h \ inc/ustring.h \ inc/utype.h @@ -448,8 +457,8 @@ CLEANFILES = *.gcda *.gcno all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +.SUFFIXES: .c .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -458,9 +467,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/libs/ff-woff/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/ff-woff/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign dvisvgm-src/libs/ff-woff/Makefile + $(AUTOMAKE) --foreign libs/ff-woff/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -473,9 +482,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -561,6 +570,8 @@ fontforge/start.$(OBJEXT): fontforge/$(am__dirstamp) \ fontforge/$(DEPDIR)/$(am__dirstamp) fontforge/stemdb.$(OBJEXT): fontforge/$(am__dirstamp) \ fontforge/$(DEPDIR)/$(am__dirstamp) +fontforge/tmpfile2.$(OBJEXT): fontforge/$(am__dirstamp) \ + fontforge/$(DEPDIR)/$(am__dirstamp) fontforge/tottf.$(OBJEXT): fontforge/$(am__dirstamp) \ fontforge/$(DEPDIR)/$(am__dirstamp) fontforge/tottfaat.$(OBJEXT): fontforge/$(am__dirstamp) \ @@ -577,8 +588,6 @@ fontforge/unialt.$(OBJEXT): fontforge/$(am__dirstamp) \ fontforge/$(DEPDIR)/$(am__dirstamp) fontforge/ustring.$(OBJEXT): fontforge/$(am__dirstamp) \ fontforge/$(DEPDIR)/$(am__dirstamp) -fontforge/utils.$(OBJEXT): fontforge/$(am__dirstamp) \ - fontforge/$(DEPDIR)/$(am__dirstamp) fontforge/utype.$(OBJEXT): fontforge/$(am__dirstamp) \ fontforge/$(DEPDIR)/$(am__dirstamp) fontforge/woff.$(OBJEXT): fontforge/$(am__dirstamp) \ @@ -633,6 +642,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/splineutil2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/start.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/stemdb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/tmpfile2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/tottf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/tottfaat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/tottfgpos.Po@am__quote@ @@ -641,7 +651,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/ttfspecial.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/unialt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/ustring.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/utype.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@fontforge/$(DEPDIR)/woff.Po@am__quote@ @@ -669,6 +678,30 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< + mostlyclean-libtool: -rm -f *.lo diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h index fe6a7201f50..2ec8413c280 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h @@ -33,18 +33,14 @@ #include "libffstamp.h" #include <stdio.h> #include <string.h> -#include <intl.h> +#include <ffintl.h> #include "splinefont.h" #include "uiinterface.h" static const unsigned unicode4_size = 17*65536; /* Unicode goes up to 0x10ffff */ -#ifdef _WIN32 extern FILE* tmpfile2 (); -#else -#define tmpfile2 tmpfile -#endif extern int32 unicode_from_adobestd[256]; diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp new file mode 100644 index 00000000000..704207b1927 --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp @@ -0,0 +1,75 @@ +/* This file is part of ff-woff, a reduced version of the FontForge library. +* It provides the function tmpfile2() with the functionality of tmpfile() but +* works on POSIX and Windows systems. +* License: Revised BSD license used by FontForge +* https://github.com/fontforge/fontforge/blob/master/LICENSE +* (C) 2017 Martin Gieseking <martin.gieseking@uos.de> */ + +#include <cstdio> +#include <cstdlib> +#include <exception> +#include <iostream> +#include <string> + +#if _WIN32 +#include <fcntl.h> +#include <sys/stat.h> +#include <windows.h> +#ifdef _MSC_VER +#include <io.h> +#endif +#endif + +using namespace std; + +class TmpFileException : public exception { + public: + TmpFileException (const char *msg) : _message(msg) {} + const char* what () const noexcept override {return _message.c_str();} + + private: + string _message; +}; + + +static inline void tmpfile_error (const char *msg) { +#if defined(_MSC_VER) || defined(__MINGW32__) + // Visual C++ and MinGW support exception handling + // between extern "C" and C++ functions. + throw TmpFileException(msg); +#else + cerr << msg << endl; + exit(EXIT_FAILURE); +#endif +} + + +/* Creates a temporary binary file in the system's temp folder and returns +* its file pointer. The file is automatically removed when closing it. +* If the temp file can't be created for some reason, the function calls +* exit() or throws a TmpFileException (depending on OS and compiler). */ +extern "C" FILE* tmpfile2 () { +#ifndef _WIN32 + if (FILE *fp = std::tmpfile()) + return fp; +#else + char tmpdir[MAX_PATH+1]; + DWORD len = GetTempPath(MAX_PATH+1, tmpdir); + if (len > 0) { + if (len >= MAX_PATH-14) + tmpfile_error("path to temp folder too long"); + char fname[MAX_PATH]; + if (GetTempFileName(tmpdir, "tmp", 0, fname)) { + int fd = _open(fname, _O_CREAT | _O_TEMPORARY | _O_RDWR | _O_BINARY, _S_IREAD | _S_IWRITE); + if (fd >= 0) { + if (FILE *fp = _fdopen(fd, "w+b")) + return fp; + int saved_errno = errno; + _close(fd); + errno = saved_errno; + } + } + } +#endif + tmpfile_error("failed to create temporary file"); +} diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c deleted file mode 100644 index 7f3e5a41e45..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c +++ /dev/null @@ -1,85 +0,0 @@ -/* Copyright (C) 2000-2012 by George Williams */ -/* - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - - * The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef _WIN32 - -#include <fcntl.h> -#include <stdio.h> -#include <sys/stat.h> -#include <windows.h> -#ifdef _MSC_VER -#include <io.h> -#endif - -FILE* tmpfile2() { - FILE *fp = 0; - char tmpdir[MAX_PATH]; - char fname[MAX_PATH-14]; - if (!GetTempPath(MAX_PATH, tmpdir)) - strcpy(tmpdir, "."); - if (GetTempFileName(tmpdir, "tmp", 0, fname)) { - int fd = _open(fname, _O_CREAT | _O_TEMPORARY | _O_RDWR | _O_BINARY, _S_IREAD | _S_IWRITE); - if (fd >= 0) { - fp = _fdopen(fd, "w+b"); - if (fp == NULL) { - int saved_errno = errno; - _close(fd); - errno = saved_errno; - } - } - } - return fp; -} - -#endif - -#if 0 - -struct library_version_configuration exe_library_version_configuration = { - FONTFORGE_LIBFFE_VERSION_MAJOR, - FONTFORGE_LIBFFE_VERSION_MINOR, - LibFF_ModTime, /* Seconds since 1970 (standard unix time) */ - LibFF_ModTime_Str, /* Version date (in char string format) */ - LibFF_VersionDate, /* Version as long value, Year, month, day */ - sizeof(struct library_version_configuration), - sizeof(struct splinefont), - sizeof(struct splinechar), - sizeof(struct fontviewbase), - sizeof(struct charviewbase), - sizeof(struct cvcontainer), - 1, - 1, - -#ifdef _NO_PYTHON - 0, -#else - 1, -#endif - 0xff /* Not currently defined */ -}; -#endif // 0 - diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/intl.h b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h index 1154554e153..902db5f8f9f 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/intl.h +++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h @@ -28,7 +28,7 @@ #ifndef _INTL_H #define _INTL_H -#if !defined( HAVE_LIBINTL_H ) +#if 1 /* don't include libintl.h, it's not required by dvisvgm */ # define _(str) (str) # define P_(str1,str_non1,n) ((n)==1?str1:str_non1) |