summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/uptexdir
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-10 18:39:13 +0000
committerKarl Berry <karl@freefriends.org>2019-12-10 18:39:13 +0000
commitfb79a713b57e5f60ec8b94b5559602fb12368c80 (patch)
tree5cb515f13dcdf1af615ad11024fd981637161a91 /Build/source/texk/web2c/uptexdir
parent2bc8de74125743b8e3fb84e02f33c65bf9959e82 (diff)
compress (with zlib) .fmt files for all but tex and aleph, following xetex; from Hironori KITAGAWA
git-svn-id: svn://tug.org/texlive/trunk@53078 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/uptexdir')
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am9
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.h5
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji_dump.c7
4 files changed, 24 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index a08660abef2..c97932c658c 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,14 @@
+2019-12-10 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * am/uptex.am (uptex_cppflags): append $(ZLIB_INCLUDES).
+ (uptex_ldadd): append $(ZLIB_LIBS.)
+ (uptex_dependencies): append $(ZLIB_DEPEND)
+ (uptex_web_srcs): append zlib-fmt.ch.
+ * kanji.h: #include <zlib.h>
+ (dump_kanji, undump_kanji): arg is now type gzFile instead of FILE *.
+ * kanji_dump.c (pTeX) [!upTeX]: #define if not already.
+ (dump_kanji, undump_kanji): chang arg type.
+
2019-05-28 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
* am/uptex.am: Add a new test.
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index ed9c00e431f..941ec617d5a 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -4,9 +4,9 @@
## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
-uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
-uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
-uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
+uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
+uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE)
upweb_programs = upbibtex updvitype uppltotf uptftopl
@@ -66,7 +66,8 @@ uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
$(tie_m) $(uptex_web_srcs)
uptex_web_srcs = \
tex.web \
- tex.ch
+ tex.ch \
+ zlib-fmt.ch
# Generate uptex.ch
uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h
index 20f87f33f41..601e88d81f6 100644
--- a/Build/source/texk/web2c/uptexdir/kanji.h
+++ b/Build/source/texk/web2c/uptexdir/kanji.h
@@ -10,6 +10,7 @@
#define getintone(w) ((w).cint1)
#define setintone(w,a) ((w).cint1=(a))
#endif
+#include <zlib.h>
#ifndef KANJI
#define KANJI
@@ -64,8 +65,8 @@ extern void init_default_kanji_select (void);
#endif
extern void init_kanji (const_string file_str, const_string internal_str);
-extern void dump_kanji (FILE *fp);
-extern void undump_kanji (FILE *fp);
+extern void dump_kanji (gzFile fp);
+extern void undump_kanji (gzFile fp);
#define dumpkanji dump_kanji
#define undumpkanji undump_kanji
diff --git a/Build/source/texk/web2c/uptexdir/kanji_dump.c b/Build/source/texk/web2c/uptexdir/kanji_dump.c
index 8dda93edaff..795ed7497a1 100644
--- a/Build/source/texk/web2c/uptexdir/kanji_dump.c
+++ b/Build/source/texk/web2c/uptexdir/kanji_dump.c
@@ -3,9 +3,12 @@
*/
#include "kanji.h"
+#ifndef upTeX
+#define upTeX
+#endif
#include <texmfmp.h>
-void dump_kanji (FILE *fp)
+void dump_kanji (gzFile fp)
{
char buffer[12];
const char *p = get_enc_string ();
@@ -22,7 +25,7 @@ void dump_kanji (FILE *fp)
do_dump (buffer, 1, 12, fp);
}
-void undump_kanji (FILE *fp)
+void undump_kanji (gzFile fp)
{
char buffer[12];
char *p;