summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/README.config4
-rw-r--r--Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex16
-rw-r--r--Build/source/texk/web2c/Makefile.in22
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c10
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/uptexdir/updvitype.ch8
7 files changed, 32 insertions, 36 deletions
diff --git a/Build/source/README.config b/Build/source/README.config
index bb2ad81d640..81481d1f4d7 100644
--- a/Build/source/README.config
+++ b/Build/source/README.config
@@ -128,8 +128,8 @@ This option causes TeX & MF to produce a core dump when a particular
hacky filename is encountered.
2.3.4. --disable-dump-share
-Make the fmt/base/mem dump files architecture dependent (somewhat faster
-on little-endian architectures).
+Make the fmt/base dump files architecture dependent (somewhat faster on
+little-endian architectures).
2.3.5. --disable-ipc
If enabled (by default) allow TeX's '--ipc' option.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
index 3a4bb5407d5..f621caea2af 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-04-uptex
@@ -1,6 +1,6 @@
diff -ur dvipdfmx-20110311.orig/src/dvi.c dvipdfmx-20110311/src/dvi.c
---- dvipdfmx-20110311.orig/src/dvi.c Wed Mar 09 20:02:16 2011
-+++ dvipdfmx-20110311/src/dvi.c Wed Sep 07 16:53:19 2011
+--- dvipdfmx-20110311.orig/src/dvi.c 2011-03-09 08:43:18.000000000 +0100
++++ dvipdfmx-20110311/src/dvi.c 2011-09-07 10:55:45.000000000 +0200
@@ -58,6 +58,12 @@
#define TEX_FONTS_ALLOC_SIZE 16u
#define VF_NESTING_MAX 16u
@@ -137,8 +137,8 @@ diff -ur dvipdfmx-20110311.orig/src/dvi.c dvipdfmx-20110311/src/dvi.c
case PUT_RULE:
diff -ur dvipdfmx-20110311.orig/src/spc_pdfm.c dvipdfmx-20110311/src/spc_pdfm.c
---- dvipdfmx-20110311.orig/src/spc_pdfm.c Wed Mar 09 20:02:16 2011
-+++ dvipdfmx-20110311/src/spc_pdfm.c Wed Sep 07 17:01:47 2011
+--- dvipdfmx-20110311.orig/src/spc_pdfm.c 2011-03-08 03:08:35.000000000 +0100
++++ dvipdfmx-20110311/src/spc_pdfm.c 2011-09-07 10:55:45.000000000 +0200
@@ -419,6 +419,98 @@
return 0;
}
@@ -289,8 +289,8 @@ diff -ur dvipdfmx-20110311.orig/src/spc_pdfm.c dvipdfmx-20110311/src/spc_pdfm.c
/* :( */
if (cd->unescape_backslash)
diff -ur dvipdfmx-20110311.orig/src/tfm.c dvipdfmx-20110311/src/tfm.c
---- dvipdfmx-20110311.orig/src/tfm.c Sun Apr 12 08:56:39 2009
-+++ dvipdfmx-20110311/src/tfm.c Wed Sep 07 17:19:36 2011
+--- dvipdfmx-20110311.orig/src/tfm.c 2011-03-05 05:44:49.000000000 +0100
++++ dvipdfmx-20110311/src/tfm.c 2011-09-07 10:55:45.000000000 +0200
@@ -55,6 +55,14 @@
#define IS_JFM(i) ((i) == JFM_ID || (i) == JFMV_ID)
#endif /* !WITHOUT_ASCII_PTEX */
@@ -388,8 +388,8 @@ diff -ur dvipdfmx-20110311.orig/src/tfm.c dvipdfmx-20110311/src/tfm.c
fm->source = SOURCE_TYPE_JFM;
}
diff -ur dvipdfmx-20110311.orig/src/vf.c dvipdfmx-20110311/src/vf.c
---- dvipdfmx-20110311.orig/src/vf.c Wed May 21 10:08:58 2008
-+++ dvipdfmx-20110311/src/vf.c Wed Sep 07 17:28:52 2011
+--- dvipdfmx-20110311.orig/src/vf.c 2011-03-05 05:44:49.000000000 +0100
++++ dvipdfmx-20110311/src/vf.c 2011-09-07 10:55:45.000000000 +0200
@@ -238,11 +238,19 @@
ch = get_unsigned_quad (vf_file);
/* Skip over TFM width since we already know it */
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index cb9036f28f2..9722f286359 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -154,7 +154,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@EUPTEX_TRUE@am__append_54 = euptrip.diffs
@EUPTEX_TRUE@am__append_55 = euptrip-clean
@PDFTEX_TRUE@am__append_56 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_57 = $(pdftex_tests)
+@PDFTEX_TRUE@am__append_57 = $(pdftex_tests) $(pdftosrc_tests)
@MINGW32_TRUE@am__append_58 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
@@ -1429,11 +1429,13 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
pdftexdir/ChangeLog pdftexdir/NEWS pdftexdir/README \
pdftexdir/change-files.txt $(pdftex_tests) \
pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
- luatexdir/ptexlib.h luatexdir/getluatexsvnversion.sh \
- $(luatex_tests) luatexdir/lua51/Makefile \
- luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \
- luatexdir/lua51/luac.c luatexdir/lua51/print.c \
- luatexdir/luasocket/src/socket_lua.c \
+ $(pdftosrc_tests) pdftexdir/tests/test-13.pdf \
+ pdftexdir/tests/test-13.xref pdftexdir/tests/test-15.pdf \
+ pdftexdir/tests/test-15.xref luatexdir/ptexlib.h \
+ luatexdir/getluatexsvnversion.sh $(luatex_tests) \
+ luatexdir/lua51/Makefile luatexdir/lua51/liolib.c \
+ luatexdir/lua51/lua.c luatexdir/lua51/luac.c \
+ luatexdir/lua51/print.c luatexdir/luasocket/src/socket_lua.c \
luatexdir/luasocket/src/ftp_lua.c \
luatexdir/luasocket/src/http_lua.c \
luatexdir/luasocket/src/smtp_lua.c \
@@ -1614,9 +1616,10 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
euptex.p euptex.pool euptex-tangle euptrip.diffs \
$(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
- pdftex.pool pdftex-tangle $(nodist_libluatex_a_SOURCES) \
- txt2zlib.c $(nodist_xetex_SOURCES) xetex.web xetex-web2c \
- xetex.p xetex.pool xetex-tangle $(omegaware_programs:=.c) \
+ pdftex.pool pdftex-tangle test-13.pdf test-13.xref test-15.pdf \
+ test-15.xref $(nodist_libluatex_a_SOURCES) txt2zlib.c \
+ $(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \
+ xetex.pool xetex-tangle $(omegaware_programs:=.c) \
$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
$(omegaware_programs:=-web2c) omegaware/tests/xlevel1.ofm \
omegaware/tests/xlevel1.opl ofont*vf omegaware/tests/xofont* \
@@ -2107,6 +2110,7 @@ pdftosrc_CXXFLAGS = # $(WARNING_CXXFLAGS)
pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
pdftosrc_DEPENDENCIES = $(pdftex_dependencies)
+pdftosrc_tests = pdftexdir/pdftosrc.test
# Force Automake to use CXXLD for linking
nodist_EXTRA_luatex_SOURCES = dummy.cxx
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index dfa2173a773..7cf1287d475 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-30 Peter Breitenlohner <peb@mp.mpg.de>
+
+ * texmfmp.c [Aleph]: Remove unused variable `eightbitp'.
+
2011-09-21 Peter Breitenlohner <peb@mp.mpg.de>
* texmfmp.c [IPC]: More changes to reduce diffs with W32TeX.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 985927925e2..fbb02aa0736 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -595,13 +595,6 @@ static void parse_options (int, string *);
/* Try to figure out if we have been given a filename. */
static string get_input_file_name (void);
-#if defined(Aleph)
-/* Declare this for Omega family, so they can parse the -8bit option,
- * even though it is a no-op for them.
- */
-static int eightbitp;
-#endif /* Aleph */
-
/* Get a true/false value for a variable from texmf.cnf and the environment. */
static boolean
texmf_yesno(const_string var)
@@ -1630,12 +1623,9 @@ parse_options (int argc, string *argv)
translate_filename = optarg;
} else if (ARGUMENT_IS ("default-translate-file")) {
default_translate_filename = optarg;
- } else if (ARGUMENT_IS ("8bit")) {
- /* FIXME: print snippy message? Possibly also for above? */
#endif /* !Aleph */
} else if (ARGUMENT_IS ("mktex")) {
kpse_maketex_option (optarg, true);
-
} else if (ARGUMENT_IS ("no-mktex")) {
kpse_maketex_option (optarg, false);
#endif /* TeX or MF */
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 6dd1bfdfe80..d7e332014a7 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * updvitype.ch: Use const stringcast for get_enc_string().
+
2011-09-05 Takuji Tanaka <KXD02663@nifty.ne.jp>
* updvitype.ch: show encoding in the banner.
diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch
index 6ceaf51f394..c7723bf1f3b 100644
--- a/Build/source/texk/web2c/uptexdir/updvitype.ch
+++ b/Build/source/texk/web2c/uptexdir/updvitype.ch
@@ -5,18 +5,12 @@
@z
@x procedure initialize
- kpse_set_program_name (argv[0], nil);
- init_kanji;
- parse_arguments;
print (banner);
print_ln (version_string);
@y
- kpse_set_program_name (argv[0], nil);
- init_kanji;
- parse_arguments;
print (banner);
print (' (');
- print (stringcast(getencstring));
+ print (conststringcast(get_enc_string));
print (')');
print_ln (version_string);
@z
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 04:03:55 +0000