diff options
Diffstat (limited to 'Build/source/texk/web2c/lib')
-rw-r--r-- | Build/source/texk/web2c/lib/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/Makefile.am | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/Makefile.in | 52 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/openclose.c | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/printversion.c | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/texmfmp.c | 2 |
6 files changed, 89 insertions, 5 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 50d68cf357f..86e29509d6e 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -7,6 +7,11 @@ * lib.h: Move extern declaration of fullnameoffile to here ... * texmfmp.c: ... from here ... * openclose.c: ... and from here. + * texmfmp.c [XeTeX]: Move extern declarations of papersize and + outputdriver from here to ../xetexdir/XeTeX_ext.h. + + * Makefile.am, openclose.c, printversion.c: + Integrate libp.a for pTeX. 2010-04-18 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/web2c/lib/Makefile.am b/Build/source/texk/web2c/lib/Makefile.am index 2257fd1ad13..e6b368a3fdf 100644 --- a/Build/source/texk/web2c/lib/Makefile.am +++ b/Build/source/texk/web2c/lib/Makefile.am @@ -10,6 +10,10 @@ AM_CFLAGS = $(WARNING_CFLAGS) @KPATHSEA_RULE@ noinst_LIBRARIES = lib.a +if PTEX +noinst_LIBRARIES += libp.a +endif PTEX +EXTRA_LIBRARIES = libp.a ## We don't compile `texmfmp.c'; this file is converted into 'texextra.c' ## for TeX, 'mfextra.c' for Metafont, ... @@ -31,6 +35,13 @@ lib_a_SOURCES = \ version.c \ zround.c +## Replacements for pTeX. +## +libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES) +libp_a_SOURCES = \ + openclose.c \ + printversion.c + ## Not yet used ## EXTRA_DIST = alloca.c win32main.c diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 87be2f8e63b..a5d87322f0f 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -34,6 +34,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@PTEX_TRUE@am__append_1 = libp.a subdir = lib DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ChangeLog @@ -85,6 +86,11 @@ am_lib_a_OBJECTS = basechsuffix.$(OBJEXT) chartostring.$(OBJEXT) \ uexit.$(OBJEXT) usage.$(OBJEXT) version.$(OBJEXT) \ zround.$(OBJEXT) lib_a_OBJECTS = $(am_lib_a_OBJECTS) +libp_a_AR = $(AR) $(ARFLAGS) +libp_a_LIBADD = +am_libp_a_OBJECTS = libp_a-openclose.$(OBJEXT) \ + libp_a-printversion.$(OBJEXT) +libp_a_OBJECTS = $(am_libp_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -98,8 +104,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(lib_a_SOURCES) -DIST_SOURCES = $(lib_a_SOURCES) +SOURCES = $(lib_a_SOURCES) $(libp_a_SOURCES) +DIST_SOURCES = $(lib_a_SOURCES) $(libp_a_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -293,7 +299,8 @@ x_ext_lib = @x_ext_lib@ x_tool_libs = @x_tool_libs@ INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) -noinst_LIBRARIES = lib.a +noinst_LIBRARIES = lib.a $(am__append_1) +EXTRA_LIBRARIES = libp.a lib_a_SOURCES = \ basechsuffix.c \ chartostring.c \ @@ -312,6 +319,11 @@ lib_a_SOURCES = \ version.c \ zround.c +libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES) +libp_a_SOURCES = \ + openclose.c \ + printversion.c + EXTRA_DIST = alloca.c win32main.c all: all-am @@ -354,6 +366,10 @@ lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) -rm -f lib.a $(lib_a_AR) lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD) $(RANLIB) lib.a +libp.a: $(libp_a_OBJECTS) $(libp_a_DEPENDENCIES) + -rm -f libp.a + $(libp_a_AR) libp.a $(libp_a_OBJECTS) $(libp_a_LIBADD) + $(RANLIB) libp.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -368,6 +384,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fprintreal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input2int.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inputint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libp_a-openclose.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libp_a-printversion.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openclose.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printversion.Po@am__quote@ @@ -398,6 +416,34 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +libp_a-openclose.o: openclose.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-openclose.o -MD -MP -MF $(DEPDIR)/libp_a-openclose.Tpo -c -o libp_a-openclose.o `test -f 'openclose.c' || echo '$(srcdir)/'`openclose.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libp_a-openclose.Tpo $(DEPDIR)/libp_a-openclose.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openclose.c' object='libp_a-openclose.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-openclose.o `test -f 'openclose.c' || echo '$(srcdir)/'`openclose.c + +libp_a-openclose.obj: openclose.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-openclose.obj -MD -MP -MF $(DEPDIR)/libp_a-openclose.Tpo -c -o libp_a-openclose.obj `if test -f 'openclose.c'; then $(CYGPATH_W) 'openclose.c'; else $(CYGPATH_W) '$(srcdir)/openclose.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libp_a-openclose.Tpo $(DEPDIR)/libp_a-openclose.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='openclose.c' object='libp_a-openclose.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-openclose.obj `if test -f 'openclose.c'; then $(CYGPATH_W) 'openclose.c'; else $(CYGPATH_W) '$(srcdir)/openclose.c'; fi` + +libp_a-printversion.o: printversion.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-printversion.o -MD -MP -MF $(DEPDIR)/libp_a-printversion.Tpo -c -o libp_a-printversion.o `test -f 'printversion.c' || echo '$(srcdir)/'`printversion.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libp_a-printversion.Tpo $(DEPDIR)/libp_a-printversion.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='printversion.c' object='libp_a-printversion.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-printversion.o `test -f 'printversion.c' || echo '$(srcdir)/'`printversion.c + +libp_a-printversion.obj: printversion.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libp_a-printversion.obj -MD -MP -MF $(DEPDIR)/libp_a-printversion.Tpo -c -o libp_a-printversion.obj `if test -f 'printversion.c'; then $(CYGPATH_W) 'printversion.c'; else $(CYGPATH_W) '$(srcdir)/printversion.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libp_a-printversion.Tpo $(DEPDIR)/libp_a-printversion.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='printversion.c' object='libp_a-printversion.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libp_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libp_a-printversion.obj `if test -f 'printversion.c'; then $(CYGPATH_W) 'printversion.c'; else $(CYGPATH_W) '$(srcdir)/printversion.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c index a753cceb8de..a0d5f0bb35a 100644 --- a/Build/source/texk/web2c/lib/openclose.c +++ b/Build/source/texk/web2c/lib/openclose.c @@ -8,6 +8,9 @@ #include <kpathsea/tex-file.h> #include <kpathsea/variable.h> #include <kpathsea/absolute.h> +#ifdef PTEX +#include <ptexenc/ptexenc.h> +#endif /* The globals we use to communicate. */ extern string nameoffile; @@ -188,6 +191,12 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) free (fname); /* This fopen is not allowed to fail. */ +#ifdef PTEX + if (filefmt == kpse_tex_format || + filefmt == kpse_bib_format) { + *f_ptr = nkf_open (nameoffile + 1, fopen_mode); + } else +#endif *f_ptr = xfopen (nameoffile + 1, fopen_mode); } } @@ -274,7 +283,11 @@ close_file (FILE *f) if (!f) return; +#ifdef PTEX + if (nkf_close (f) == EOF) { +#else if (fclose (f) == EOF) { +#endif /* It's not always nameoffile, we might have opened something else in the meantime. And it's not easy to extract the filenames out of the pool array. So just punt on the filename. Sigh. This diff --git a/Build/source/texk/web2c/lib/printversion.c b/Build/source/texk/web2c/lib/printversion.c index 2cfb751d58f..85399a44916 100644 --- a/Build/source/texk/web2c/lib/printversion.c +++ b/Build/source/texk/web2c/lib/printversion.c @@ -5,6 +5,9 @@ #include "config.h" #include "lib.h" #include <kpathsea/version.h> +#ifdef PTEX +#include <ptexenc/ptexenc.h> +#endif /* We're passed in the original WEB banner string, which has the form This is PROGRAM, Version VERSION-NUMBER @@ -36,8 +39,16 @@ printversionandexit (const_string banner, prog_name[len] = 0; /* The Web2c version string starts with a space. */ +#ifdef PTEX + printf ("%s %s (%s)%s\n", prog_name, prog_version, get_enc_string(), + versionstring); +#else printf ("%s %s%s\n", prog_name, prog_version, versionstring); +#endif puts (kpathsea_version_string); +#ifdef PTEX + puts (ptexenc_version_string); +#endif if (copyright_holder) { printf ("Copyright 2009 %s.\n", copyright_holder); diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index ed624d134d7..d5781f8dcbb 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -1404,10 +1404,8 @@ parse_options (int argc, string *argv) #ifdef XeTeX } else if (ARGUMENT_IS ("papersize")) { - extern const_string papersize; papersize = optarg; } else if (ARGUMENT_IS ("output-driver")) { - extern const_string outputdriver; outputdriver = optarg; #endif |