summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-15 14:15:50 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-15 14:15:50 +0000
commit6e80afc0d352d893cf66f956cb9a95d033ca4680 (patch)
treeebfcee96946ee99b0aeeebdfb54e0e6e73d285a3
parent911dc67a9c87f978296ce19551a7e621aeedcfe8 (diff)
ps2pk 1.7
git-svn-id: svn://tug.org/texlive/trunk@35828 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/Makefile.in2
-rwxr-xr-xBuild/source/configure26
-rw-r--r--Build/source/doc/Makefile.in2
-rw-r--r--Build/source/libs/Makefile.in2
-rwxr-xr-xBuild/source/libs/configure26
-rw-r--r--Build/source/m4/ChangeLog4
-rw-r--r--Build/source/m4/kpse-pkgs.m42
-rw-r--r--Build/source/texk/Makefile.in2
-rwxr-xr-xBuild/source/texk/configure36
-rw-r--r--Build/source/texk/ps2pk/CHANGES.type1 (renamed from Build/source/texk/ps2pkm/CHANGES.type1)0
-rw-r--r--Build/source/texk/ps2pk/ChangeLog (renamed from Build/source/texk/ps2pkm/ChangeLog)13
-rw-r--r--Build/source/texk/ps2pk/INSTALLATION (renamed from Build/source/texk/ps2pkm/INSTALLATION)0
-rw-r--r--Build/source/texk/ps2pk/Makefile.am (renamed from Build/source/texk/ps2pkm/Makefile.am)8
-rw-r--r--Build/source/texk/ps2pk/Makefile.in (renamed from Build/source/texk/ps2pkm/Makefile.in)47
-rw-r--r--Build/source/texk/ps2pk/README (renamed from Build/source/texk/ps2pkm/README)0
-rw-r--r--Build/source/texk/ps2pk/README.14m (renamed from Build/source/texk/ps2pkm/README.14m)0
-rw-r--r--Build/source/texk/ps2pk/README.type1 (renamed from Build/source/texk/ps2pkm/README.type1)0
-rw-r--r--Build/source/texk/ps2pk/Xstuff.h (renamed from Build/source/texk/ps2pkm/Xstuff.h)0
-rw-r--r--Build/source/texk/ps2pk/ac/withenable.ac7
-rw-r--r--Build/source/texk/ps2pk/aclocal.m4 (renamed from Build/source/texk/ps2pkm/aclocal.m4)0
-rw-r--r--Build/source/texk/ps2pk/arith.c (renamed from Build/source/texk/ps2pkm/arith.c)0
-rw-r--r--Build/source/texk/ps2pk/arith.h (renamed from Build/source/texk/ps2pkm/arith.h)0
-rw-r--r--Build/source/texk/ps2pk/basename.c (renamed from Build/source/texk/ps2pkm/basename.c)0
-rw-r--r--Build/source/texk/ps2pk/basics.c (renamed from Build/source/texk/ps2pkm/basics.c)2
-rw-r--r--Build/source/texk/ps2pk/basics.h (renamed from Build/source/texk/ps2pkm/basics.h)4
-rw-r--r--Build/source/texk/ps2pk/blues.h (renamed from Build/source/texk/ps2pkm/blues.h)0
-rw-r--r--Build/source/texk/ps2pk/bstring.c (renamed from Build/source/texk/ps2pkm/bstring.c)0
-rw-r--r--Build/source/texk/ps2pk/c-auto.in (renamed from Build/source/texk/ps2pkm/c-auto.in)0
-rw-r--r--Build/source/texk/ps2pk/cluts.h (renamed from Build/source/texk/ps2pkm/cluts.h)0
-rwxr-xr-xBuild/source/texk/ps2pk/configure (renamed from Build/source/texk/ps2pkm/configure)22
-rw-r--r--Build/source/texk/ps2pk/configure.ac (renamed from Build/source/texk/ps2pkm/configure.ac)2
-rw-r--r--Build/source/texk/ps2pk/curves.c (renamed from Build/source/texk/ps2pkm/curves.c)0
-rw-r--r--Build/source/texk/ps2pk/curves.h (renamed from Build/source/texk/ps2pkm/curves.h)0
-rw-r--r--Build/source/texk/ps2pk/digit.h (renamed from Build/source/texk/ps2pkm/digit.h)0
-rw-r--r--Build/source/texk/ps2pk/encoding.c (renamed from Build/source/texk/ps2pkm/encoding.c)9
-rw-r--r--Build/source/texk/ps2pk/ffilest.h (renamed from Build/source/texk/ps2pkm/ffilest.h)0
-rw-r--r--Build/source/texk/ps2pk/filenames.c (renamed from Build/source/texk/ps2pkm/filenames.c)65
-rw-r--r--Build/source/texk/ps2pk/filenames.h (renamed from Build/source/texk/ps2pkm/filenames.h)6
-rw-r--r--Build/source/texk/ps2pk/flisearch.c (renamed from Build/source/texk/ps2pkm/flisearch.c)0
-rw-r--r--Build/source/texk/ps2pk/font.h (renamed from Build/source/texk/ps2pkm/font.h)0
-rw-r--r--Build/source/texk/ps2pk/fontfcn.c (renamed from Build/source/texk/ps2pkm/fontfcn.c)0
-rw-r--r--Build/source/texk/ps2pk/fontfcn.h (renamed from Build/source/texk/ps2pkm/fontfcn.h)0
-rw-r--r--Build/source/texk/ps2pk/fontfile.h (renamed from Build/source/texk/ps2pkm/fontfile.h)0
-rw-r--r--Build/source/texk/ps2pk/fontmisc.h (renamed from Build/source/texk/ps2pkm/fontmisc.h)0
-rw-r--r--Build/source/texk/ps2pk/fonts.h (renamed from Build/source/texk/ps2pkm/fonts.h)0
-rw-r--r--Build/source/texk/ps2pk/fontstruct.h (renamed from Build/source/texk/ps2pkm/fontstruct.h)0
-rw-r--r--Build/source/texk/ps2pk/fontxlfd.h (renamed from Build/source/texk/ps2pkm/fontxlfd.h)0
-rw-r--r--Build/source/texk/ps2pk/fsmasks.h (renamed from Build/source/texk/ps2pkm/fsmasks.h)0
-rw-r--r--Build/source/texk/ps2pk/hdigit.h (renamed from Build/source/texk/ps2pkm/hdigit.h)0
-rw-r--r--Build/source/texk/ps2pk/hints.c (renamed from Build/source/texk/ps2pkm/hints.c)0
-rw-r--r--Build/source/texk/ps2pk/hints.h (renamed from Build/source/texk/ps2pkm/hints.h)0
-rw-r--r--Build/source/texk/ps2pk/lines.c (renamed from Build/source/texk/ps2pkm/lines.c)0
-rw-r--r--Build/source/texk/ps2pk/lines.h (renamed from Build/source/texk/ps2pkm/lines.h)0
-rw-r--r--Build/source/texk/ps2pk/mag.1 (renamed from Build/source/texk/ps2pkm/mag.1)0
-rw-r--r--Build/source/texk/ps2pk/mag.c (renamed from Build/source/texk/ps2pkm/mag.c)0
-rw-r--r--Build/source/texk/ps2pk/objects.c (renamed from Build/source/texk/ps2pkm/objects.c)0
-rw-r--r--Build/source/texk/ps2pk/objects.h (renamed from Build/source/texk/ps2pkm/objects.h)0
-rw-r--r--Build/source/texk/ps2pk/paths.c (renamed from Build/source/texk/ps2pkm/paths.c)0
-rw-r--r--Build/source/texk/ps2pk/paths.h (renamed from Build/source/texk/ps2pkm/paths.h)0
-rw-r--r--Build/source/texk/ps2pk/pfb2pfa.1 (renamed from Build/source/texk/ps2pkm/pfb2pfa.1)0
-rw-r--r--Build/source/texk/ps2pk/pfb2pfa.c (renamed from Build/source/texk/ps2pkm/pfb2pfa.c)0
-rw-r--r--Build/source/texk/ps2pk/pictures.h (renamed from Build/source/texk/ps2pkm/pictures.h)0
-rw-r--r--Build/source/texk/ps2pk/pk2bm.1 (renamed from Build/source/texk/ps2pkm/pk2bm.1)0
-rw-r--r--Build/source/texk/ps2pk/pk2bm.c (renamed from Build/source/texk/ps2pkm/pk2bm.c)0
-rw-r--r--Build/source/texk/ps2pk/pkin.c (renamed from Build/source/texk/ps2pkm/pkin.c)83
-rw-r--r--Build/source/texk/ps2pk/pkin.h (renamed from Build/source/texk/ps2pkm/pkin.h)0
-rw-r--r--Build/source/texk/ps2pk/pkout.c (renamed from Build/source/texk/ps2pkm/pkout.c)4
-rw-r--r--Build/source/texk/ps2pk/pkout.h (renamed from Build/source/texk/ps2pkm/pkout.h)3
-rw-r--r--Build/source/texk/ps2pk/pktest.c (renamed from Build/source/texk/ps2pkm/pktest.c)2
-rw-r--r--Build/source/texk/ps2pk/protos.h (renamed from Build/source/texk/ps2pkm/protos.h)0
-rw-r--r--Build/source/texk/ps2pk/ps2pk.1 (renamed from Build/source/texk/ps2pkm/ps2pk.1)0
-rw-r--r--Build/source/texk/ps2pk/ps2pk.c (renamed from Build/source/texk/ps2pkm/ps2pk.c)11
-rw-r--r--Build/source/texk/ps2pk/psearch.c (renamed from Build/source/texk/ps2pkm/psearch.c)2
-rw-r--r--Build/source/texk/ps2pk/psearch.h (renamed from Build/source/texk/ps2pkm/psearch.h)0
-rw-r--r--Build/source/texk/ps2pk/regions.c (renamed from Build/source/texk/ps2pkm/regions.c)0
-rw-r--r--Build/source/texk/ps2pk/regions.h (renamed from Build/source/texk/ps2pkm/regions.h)0
-rw-r--r--Build/source/texk/ps2pk/scanfont.c (renamed from Build/source/texk/ps2pkm/scanfont.c)0
-rw-r--r--Build/source/texk/ps2pk/sexpr.c (renamed from Build/source/texk/ps2pkm/sexpr.c)0
-rw-r--r--Build/source/texk/ps2pk/spaces.c (renamed from Build/source/texk/ps2pkm/spaces.c)0
-rw-r--r--Build/source/texk/ps2pk/spaces.h (renamed from Build/source/texk/ps2pkm/spaces.h)0
-rw-r--r--Build/source/texk/ps2pk/strexpr.c (renamed from Build/source/texk/ps2pkm/strexpr.c)0
-rw-r--r--Build/source/texk/ps2pk/strexpr.h (renamed from Build/source/texk/ps2pkm/strexpr.h)0
-rw-r--r--Build/source/texk/ps2pk/strokes.h (renamed from Build/source/texk/ps2pkm/strokes.h)0
-rw-r--r--Build/source/texk/ps2pk/t1funcs.c (renamed from Build/source/texk/ps2pkm/t1funcs.c)0
-rw-r--r--Build/source/texk/ps2pk/t1hdigit.h (renamed from Build/source/texk/ps2pkm/t1hdigit.h)0
-rw-r--r--Build/source/texk/ps2pk/t1imager.h (renamed from Build/source/texk/ps2pkm/t1imager.h)0
-rw-r--r--Build/source/texk/ps2pk/t1info.c (renamed from Build/source/texk/ps2pkm/t1info.c)0
-rw-r--r--Build/source/texk/ps2pk/t1intf.h (renamed from Build/source/texk/ps2pkm/t1intf.h)0
-rw-r--r--Build/source/texk/ps2pk/t1io.c (renamed from Build/source/texk/ps2pkm/t1io.c)0
-rw-r--r--Build/source/texk/ps2pk/t1snap.c (renamed from Build/source/texk/ps2pkm/t1snap.c)0
-rw-r--r--Build/source/texk/ps2pk/t1stdio.h (renamed from Build/source/texk/ps2pkm/t1stdio.h)0
-rw-r--r--Build/source/texk/ps2pk/t1stub.c (renamed from Build/source/texk/ps2pkm/t1stub.c)0
-rw-r--r--Build/source/texk/ps2pk/t1test.c (renamed from Build/source/texk/ps2pkm/t1test.c)0
-rw-r--r--Build/source/texk/ps2pk/tests/Symbol.afm (renamed from Build/source/texk/ps2pkm/tests/Symbol.afm)0
-rw-r--r--Build/source/texk/ps2pk/tests/Symbol.alpha.hex (renamed from Build/source/texk/ps2pkm/tests/Symbol.alpha.hex)0
-rw-r--r--Build/source/texk/ps2pk/tests/Symbol.alpha.pix (renamed from Build/source/texk/ps2pkm/tests/Symbol.alpha.pix)0
-rw-r--r--Build/source/texk/ps2pk/tests/Symbol.pfa (renamed from Build/source/texk/ps2pkm/tests/Symbol.pfa)0
-rw-r--r--Build/source/texk/ps2pk/tests/Symbol.pfb (renamed from Build/source/texk/ps2pkm/tests/Symbol.pfb)bin31586 -> 31586 bytes
-rw-r--r--Build/source/texk/ps2pk/tests/Symbol10.300pk (renamed from Build/source/texk/ps2pkm/tests/Symbol10.300pk)bin9216 -> 9216 bytes
-rwxr-xr-xBuild/source/texk/ps2pk/tests/lmmath.test (renamed from Build/source/texk/ps2pkm/tests/lmmath.test)0
-rw-r--r--Build/source/texk/ps2pk/tests/lmmi12.600pk (renamed from Build/source/texk/ps2pkm/tests/lmmi12.600pk)bin18700 -> 18700 bytes
-rwxr-xr-xBuild/source/texk/ps2pk/tests/ps2pk.test (renamed from Build/source/texk/ps2pkm/tests/ps2pk.test)0
-rw-r--r--Build/source/texk/ps2pk/texfiles.c (renamed from Build/source/texk/ps2pkm/texfiles.c)0
-rw-r--r--Build/source/texk/ps2pk/texfiles.h (renamed from Build/source/texk/ps2pkm/texfiles.h)0
-rw-r--r--Build/source/texk/ps2pk/token.c (renamed from Build/source/texk/ps2pkm/token.c)0
-rw-r--r--Build/source/texk/ps2pk/token.h (renamed from Build/source/texk/ps2pkm/token.h)0
-rw-r--r--Build/source/texk/ps2pk/tokst.h (renamed from Build/source/texk/ps2pkm/tokst.h)0
-rw-r--r--Build/source/texk/ps2pk/trig.h (renamed from Build/source/texk/ps2pkm/trig.h)0
-rw-r--r--Build/source/texk/ps2pk/type1.c (renamed from Build/source/texk/ps2pkm/type1.c)0
-rw-r--r--Build/source/texk/ps2pk/types.h (renamed from Build/source/texk/ps2pkm/types.h)2
-rw-r--r--Build/source/texk/ps2pk/usenet (renamed from Build/source/texk/ps2pkm/usenet)0
-rw-r--r--Build/source/texk/ps2pk/util.c (renamed from Build/source/texk/ps2pkm/util.c)0
-rw-r--r--Build/source/texk/ps2pk/util.h (renamed from Build/source/texk/ps2pkm/util.h)0
-rw-r--r--Build/source/texk/ps2pkm/ac/withenable.ac7
-rw-r--r--Build/source/utils/Makefile.in2
-rwxr-xr-xBuild/source/utils/configure26
116 files changed, 194 insertions, 235 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index cb61f92f2ad..0770d30c049 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -163,7 +163,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/texk/makeindexk/ac/withenable.ac \
$(top_srcdir)/texk/makejvf/ac/withenable.ac \
$(top_srcdir)/texk/mendexk/ac/withenable.ac \
- $(top_srcdir)/texk/ps2pkm/ac/withenable.ac \
+ $(top_srcdir)/texk/ps2pk/ac/withenable.ac \
$(top_srcdir)/texk/psutils/ac/withenable.ac \
$(top_srcdir)/texk/seetexk/ac/withenable.ac \
$(top_srcdir)/texk/tex4htk/ac/withenable.ac \
diff --git a/Build/source/configure b/Build/source/configure
index 802d3df9918..9ee2ceecb9c 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -882,7 +882,7 @@ enable_updmap
enable_makeindexk
enable_makejvf
enable_mendexk
-enable_ps2pkm
+enable_ps2pk
enable_psutils
enable_seetexk
enable_tex4htk
@@ -1695,7 +1695,7 @@ Optional Features:
--disable-makeindexk do not build the makeindexk package
--disable-makejvf do not build the makejvf package
--disable-mendexk do not build the mendexk package
- --disable-ps2pkm do not build the ps2pkm package
+ --disable-ps2pk do not build the ps2pk package
--disable-psutils do not build the psutils package
--disable-seetexk do not build the seetexk package
--disable-tex4htk do not build the tex4htk package
@@ -5346,25 +5346,25 @@ test "x$enable_mendexk" = xno || {
need_ptexenc=yes
}
-## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
-## configure options and TL libraries required for ps2pkm
-# Check whether --enable-ps2pkm was given.
-if test "${enable_ps2pkm+set}" = set; then :
- enableval=$enable_ps2pkm;
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test "${enable_ps2pk+set}" = set; then :
+ enableval=$enable_ps2pk;
fi
-case $enable_ps2pkm in #(
+case $enable_ps2pk in #(
yes|no) :
;; #(
*) :
- enable_ps2pkm=$enable_all_pkgs
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'"
+ enable_ps2pk=$enable_all_pkgs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
;;
esac
-test "x$enable_ps2pkm" = xno || {
+test "x$enable_ps2pk" = xno || {
need_kpathsea=yes
}
diff --git a/Build/source/doc/Makefile.in b/Build/source/doc/Makefile.in
index 5f695d686a3..bba4699e0f4 100644
--- a/Build/source/doc/Makefile.in
+++ b/Build/source/doc/Makefile.in
@@ -154,7 +154,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/texk/makeindexk/ac/withenable.ac \
$(top_srcdir)/texk/makejvf/ac/withenable.ac \
$(top_srcdir)/texk/mendexk/ac/withenable.ac \
- $(top_srcdir)/texk/ps2pkm/ac/withenable.ac \
+ $(top_srcdir)/texk/ps2pk/ac/withenable.ac \
$(top_srcdir)/texk/psutils/ac/withenable.ac \
$(top_srcdir)/texk/seetexk/ac/withenable.ac \
$(top_srcdir)/texk/tex4htk/ac/withenable.ac \
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index dd7ca4dcabe..e833b78eca8 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -161,7 +161,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
- $(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \
+ $(top_srcdir)/../texk/ps2pk/ac/withenable.ac \
$(top_srcdir)/../texk/psutils/ac/withenable.ac \
$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 924714ad6c0..6fb8c1dbfa7 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -794,7 +794,7 @@ enable_updmap
enable_makeindexk
enable_makejvf
enable_mendexk
-enable_ps2pkm
+enable_ps2pk
enable_psutils
enable_seetexk
enable_tex4htk
@@ -1602,7 +1602,7 @@ Optional Features:
--disable-makeindexk do not build the makeindexk package
--disable-makejvf do not build the makejvf package
--disable-mendexk do not build the mendexk package
- --disable-ps2pkm do not build the ps2pkm package
+ --disable-ps2pk do not build the ps2pk package
--disable-psutils do not build the psutils package
--disable-seetexk do not build the seetexk package
--disable-tex4htk do not build the tex4htk package
@@ -4594,25 +4594,25 @@ test "x$enable_mendexk" = xno || {
need_ptexenc=yes
}
-## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
-## configure options and TL libraries required for ps2pkm
-# Check whether --enable-ps2pkm was given.
-if test "${enable_ps2pkm+set}" = set; then :
- enableval=$enable_ps2pkm;
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test "${enable_ps2pk+set}" = set; then :
+ enableval=$enable_ps2pk;
fi
-case $enable_ps2pkm in #(
+case $enable_ps2pk in #(
yes|no) :
;; #(
*) :
- enable_ps2pkm=$enable_all_pkgs
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'"
+ enable_ps2pk=$enable_all_pkgs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
;;
esac
-test "x$enable_ps2pkm" = xno || {
+test "x$enable_ps2pk" = xno || {
need_kpathsea=yes
}
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index bf616b32a8d..dccc3008adc 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,5 +1,9 @@
2014-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * kpse-pkgs.m4 (kpse_texk_pkgs): Rename ps2pkm => ps2pk.
+
+2014-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
* kpse-options.m4: Set platform name to ${host_alias-$host}.
2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 5c751873252..cd6377e53ea 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -119,7 +119,7 @@ lcdf-typetools
makeindexk
makejvf
mendexk
-ps2pkm
+ps2pk
psutils
seetexk
tex4htk
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index d3a30cee3cb..fedd45b626d 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -161,7 +161,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
- $(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \
+ $(top_srcdir)/../texk/ps2pk/ac/withenable.ac \
$(top_srcdir)/../texk/psutils/ac/withenable.ac \
$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index f7c609b1769..268ddf0f033 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -794,7 +794,7 @@ enable_updmap
enable_makeindexk
enable_makejvf
enable_mendexk
-enable_ps2pkm
+enable_ps2pk
enable_psutils
enable_seetexk
enable_tex4htk
@@ -883,7 +883,7 @@ lcdf-typetools
makeindexk
makejvf
mendexk
-ps2pkm
+ps2pk
psutils
seetexk
tex4htk
@@ -1613,7 +1613,7 @@ Optional Features:
--disable-makeindexk do not build the makeindexk package
--disable-makejvf do not build the makejvf package
--disable-mendexk do not build the mendexk package
- --disable-ps2pkm do not build the ps2pkm package
+ --disable-ps2pk do not build the ps2pk package
--disable-psutils do not build the psutils package
--disable-seetexk do not build the seetexk package
--disable-tex4htk do not build the tex4htk package
@@ -4605,25 +4605,25 @@ test "x$enable_mendexk" = xno || {
need_ptexenc=yes
}
-## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
-## configure options and TL libraries required for ps2pkm
-# Check whether --enable-ps2pkm was given.
-if test "${enable_ps2pkm+set}" = set; then :
- enableval=$enable_ps2pkm;
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test "${enable_ps2pk+set}" = set; then :
+ enableval=$enable_ps2pk;
fi
-case $enable_ps2pkm in #(
+case $enable_ps2pk in #(
yes|no) :
;; #(
*) :
- enable_ps2pkm=$enable_all_pkgs
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'"
+ enable_ps2pk=$enable_all_pkgs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
;;
esac
-test "x$enable_ps2pkm" = xno || {
+test "x$enable_ps2pk" = xno || {
need_kpathsea=yes
}
@@ -6550,11 +6550,11 @@ if test -x $srcdir/mendexk/configure; then
fi
fi
-if test -x $srcdir/ps2pkm/configure; then
- test "x$enable_ps2pkm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pkm"
- CONF_SUBDIRS="$CONF_SUBDIRS ps2pkm"
+if test -x $srcdir/ps2pk/configure; then
+ test "x$enable_ps2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
+ CONF_SUBDIRS="$CONF_SUBDIRS ps2pk"
if false; then
- subdirs="$subdirs ps2pkm"
+ subdirs="$subdirs ps2pk"
fi
fi
diff --git a/Build/source/texk/ps2pkm/CHANGES.type1 b/Build/source/texk/ps2pk/CHANGES.type1
index 107a1e8100d..107a1e8100d 100644
--- a/Build/source/texk/ps2pkm/CHANGES.type1
+++ b/Build/source/texk/ps2pk/CHANGES.type1
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pk/ChangeLog
index 421f327b5d2..1586afe1198 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pk/ChangeLog
@@ -1,3 +1,16 @@
+2014-12-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Applied some changes from Version 1.6beta1 (ctan.org/pkg/ps2pk).
+ Renamed ./ps2pkm => ./ps2pk.
+
+ * filenames.c: Drop charptr() and use strchr(). Whitespace.
+ * filenames.[ch]: Constify ps_resource() argument.
+
+ * pkin.c: New function pksbyte(). Replace error() => fatal().
+ Correctly handle flag bytes 5 and 6.
+ * Makefile.am (pk2bm_SOURCES): Add basics.[ch].
+ Use AM_CPPFLAGS, AM_CFLAGS, and LDADD also for pk2bm.
+
2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* regions.c [WIN64]: Use __int64 (not long) as intptr_t.
diff --git a/Build/source/texk/ps2pkm/INSTALLATION b/Build/source/texk/ps2pk/INSTALLATION
index ebfbc1d5210..ebfbc1d5210 100644
--- a/Build/source/texk/ps2pkm/INSTALLATION
+++ b/Build/source/texk/ps2pk/INSTALLATION
diff --git a/Build/source/texk/ps2pkm/Makefile.am b/Build/source/texk/ps2pk/Makefile.am
index 188219dd53a..12c7d3f64e6 100644
--- a/Build/source/texk/ps2pkm/Makefile.am
+++ b/Build/source/texk/ps2pk/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am for the TeX Live subdirectory texk/ps2pkm/
+## Makefile.am for the TeX Live subdirectory texk/ps2pk/
##
## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
@@ -9,10 +9,6 @@ AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
-pk2bm_CPPFLAGS =
-pk2bm_CFLAGS = $(WARNING_CFLAGS)
-pk2bm_LDADD =
-
mag_SOURCES = \
basics.c \
basics.h \
@@ -26,6 +22,8 @@ pfb2pfa_SOURCES = \
pfb2pfa.c
pk2bm_SOURCES = \
+ basics.c \
+ basics.h \
pk2bm.c \
pkin.c \
pkin.h
diff --git a/Build/source/texk/ps2pkm/Makefile.in b/Build/source/texk/ps2pk/Makefile.in
index 6f0e79cf45d..5ac246e7c31 100644
--- a/Build/source/texk/ps2pkm/Makefile.in
+++ b/Build/source/texk/ps2pk/Makefile.in
@@ -130,12 +130,10 @@ am_pfb2pfa_OBJECTS = basics.$(OBJEXT) filenames.$(OBJEXT) \
pfb2pfa_OBJECTS = $(am_pfb2pfa_OBJECTS)
pfb2pfa_LDADD = $(LDADD)
pfb2pfa_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_pk2bm_OBJECTS = pk2bm-pk2bm.$(OBJEXT) pk2bm-pkin.$(OBJEXT)
+am_pk2bm_OBJECTS = basics.$(OBJEXT) pk2bm.$(OBJEXT) pkin.$(OBJEXT)
pk2bm_OBJECTS = $(am_pk2bm_OBJECTS)
-pk2bm_DEPENDENCIES =
-pk2bm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(pk2bm_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+pk2bm_LDADD = $(LDADD)
+pk2bm_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_ps2pk_OBJECTS = arith.$(OBJEXT) basics.$(OBJEXT) bstring.$(OBJEXT) \
curves.$(OBJEXT) encoding.$(OBJEXT) filenames.$(OBJEXT) \
fontfcn.$(OBJEXT) hints.$(OBJEXT) lines.$(OBJEXT) \
@@ -557,9 +555,6 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
-pk2bm_CPPFLAGS =
-pk2bm_CFLAGS = $(WARNING_CFLAGS)
-pk2bm_LDADD =
mag_SOURCES = \
basics.c \
basics.h \
@@ -573,6 +568,8 @@ pfb2pfa_SOURCES = \
pfb2pfa.c
pk2bm_SOURCES = \
+ basics.c \
+ basics.h \
pk2bm.c \
pkin.c \
pkin.h
@@ -762,7 +759,7 @@ pfb2pfa$(EXEEXT): $(pfb2pfa_OBJECTS) $(pfb2pfa_DEPENDENCIES) $(EXTRA_pfb2pfa_DEP
pk2bm$(EXEEXT): $(pk2bm_OBJECTS) $(pk2bm_DEPENDENCIES) $(EXTRA_pk2bm_DEPENDENCIES)
@rm -f pk2bm$(EXEEXT)
- $(AM_V_CCLD)$(pk2bm_LINK) $(pk2bm_OBJECTS) $(pk2bm_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(pk2bm_OBJECTS) $(pk2bm_LDADD) $(LIBS)
ps2pk$(EXEEXT): $(ps2pk_OBJECTS) $(ps2pk_DEPENDENCIES) $(EXTRA_ps2pk_DEPENDENCIES)
@rm -f ps2pk$(EXEEXT)
@@ -787,8 +784,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objects.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paths.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pfb2pfa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pk2bm-pk2bm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pk2bm-pkin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pk2bm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkin.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkout.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ps2pk.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regions.Po@am__quote@
@@ -826,34 +823,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-pk2bm-pk2bm.o: pk2bm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -MT pk2bm-pk2bm.o -MD -MP -MF $(DEPDIR)/pk2bm-pk2bm.Tpo -c -o pk2bm-pk2bm.o `test -f 'pk2bm.c' || echo '$(srcdir)/'`pk2bm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pk2bm-pk2bm.Tpo $(DEPDIR)/pk2bm-pk2bm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pk2bm.c' object='pk2bm-pk2bm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -c -o pk2bm-pk2bm.o `test -f 'pk2bm.c' || echo '$(srcdir)/'`pk2bm.c
-
-pk2bm-pk2bm.obj: pk2bm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -MT pk2bm-pk2bm.obj -MD -MP -MF $(DEPDIR)/pk2bm-pk2bm.Tpo -c -o pk2bm-pk2bm.obj `if test -f 'pk2bm.c'; then $(CYGPATH_W) 'pk2bm.c'; else $(CYGPATH_W) '$(srcdir)/pk2bm.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pk2bm-pk2bm.Tpo $(DEPDIR)/pk2bm-pk2bm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pk2bm.c' object='pk2bm-pk2bm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -c -o pk2bm-pk2bm.obj `if test -f 'pk2bm.c'; then $(CYGPATH_W) 'pk2bm.c'; else $(CYGPATH_W) '$(srcdir)/pk2bm.c'; fi`
-
-pk2bm-pkin.o: pkin.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -MT pk2bm-pkin.o -MD -MP -MF $(DEPDIR)/pk2bm-pkin.Tpo -c -o pk2bm-pkin.o `test -f 'pkin.c' || echo '$(srcdir)/'`pkin.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pk2bm-pkin.Tpo $(DEPDIR)/pk2bm-pkin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pkin.c' object='pk2bm-pkin.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -c -o pk2bm-pkin.o `test -f 'pkin.c' || echo '$(srcdir)/'`pkin.c
-
-pk2bm-pkin.obj: pkin.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -MT pk2bm-pkin.obj -MD -MP -MF $(DEPDIR)/pk2bm-pkin.Tpo -c -o pk2bm-pkin.obj `if test -f 'pkin.c'; then $(CYGPATH_W) 'pkin.c'; else $(CYGPATH_W) '$(srcdir)/pkin.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pk2bm-pkin.Tpo $(DEPDIR)/pk2bm-pkin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pkin.c' object='pk2bm-pkin.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pk2bm_CPPFLAGS) $(CPPFLAGS) $(pk2bm_CFLAGS) $(CFLAGS) -c -o pk2bm-pkin.obj `if test -f 'pkin.c'; then $(CYGPATH_W) 'pkin.c'; else $(CYGPATH_W) '$(srcdir)/pkin.c'; fi`
-
mostlyclean-libtool:
-rm -f *.lo
diff --git a/Build/source/texk/ps2pkm/README b/Build/source/texk/ps2pk/README
index b3103d2e235..b3103d2e235 100644
--- a/Build/source/texk/ps2pkm/README
+++ b/Build/source/texk/ps2pk/README
diff --git a/Build/source/texk/ps2pkm/README.14m b/Build/source/texk/ps2pk/README.14m
index 6a70ab18ce6..6a70ab18ce6 100644
--- a/Build/source/texk/ps2pkm/README.14m
+++ b/Build/source/texk/ps2pk/README.14m
diff --git a/Build/source/texk/ps2pkm/README.type1 b/Build/source/texk/ps2pk/README.type1
index 4ce796d75c4..4ce796d75c4 100644
--- a/Build/source/texk/ps2pkm/README.type1
+++ b/Build/source/texk/ps2pk/README.type1
diff --git a/Build/source/texk/ps2pkm/Xstuff.h b/Build/source/texk/ps2pk/Xstuff.h
index 523767da378..523767da378 100644
--- a/Build/source/texk/ps2pkm/Xstuff.h
+++ b/Build/source/texk/ps2pk/Xstuff.h
diff --git a/Build/source/texk/ps2pk/ac/withenable.ac b/Build/source/texk/ps2pk/ac/withenable.ac
new file mode 100644
index 00000000000..2fc8d86e84d
--- /dev/null
+++ b/Build/source/texk/ps2pk/ac/withenable.ac
@@ -0,0 +1,7 @@
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## configure options and TL libraries required for ps2pk
+KPSE_ENABLE_PROG([ps2pk], [kpathsea])
diff --git a/Build/source/texk/ps2pkm/aclocal.m4 b/Build/source/texk/ps2pk/aclocal.m4
index 0c7e233e40d..0c7e233e40d 100644
--- a/Build/source/texk/ps2pkm/aclocal.m4
+++ b/Build/source/texk/ps2pk/aclocal.m4
diff --git a/Build/source/texk/ps2pkm/arith.c b/Build/source/texk/ps2pk/arith.c
index eba1b5dcde7..eba1b5dcde7 100644
--- a/Build/source/texk/ps2pkm/arith.c
+++ b/Build/source/texk/ps2pk/arith.c
diff --git a/Build/source/texk/ps2pkm/arith.h b/Build/source/texk/ps2pk/arith.h
index 834f776dd50..834f776dd50 100644
--- a/Build/source/texk/ps2pkm/arith.h
+++ b/Build/source/texk/ps2pk/arith.h
diff --git a/Build/source/texk/ps2pkm/basename.c b/Build/source/texk/ps2pk/basename.c
index 624b7467785..624b7467785 100644
--- a/Build/source/texk/ps2pkm/basename.c
+++ b/Build/source/texk/ps2pk/basename.c
diff --git a/Build/source/texk/ps2pkm/basics.c b/Build/source/texk/ps2pk/basics.c
index 95fcc5b104f..a62827da9d1 100644
--- a/Build/source/texk/ps2pkm/basics.c
+++ b/Build/source/texk/ps2pk/basics.c
@@ -1,7 +1,7 @@
/* FILE: basics.c
* PURPOSE: basic functions
* AUTHOR: Piet Tutelaers
- * VERSION: 1.0 (September 1995)
+ * VERSION: 1.7 (December 2014)
*/
#include "basics.h"
diff --git a/Build/source/texk/ps2pkm/basics.h b/Build/source/texk/ps2pk/basics.h
index 97cadda6046..980de386b61 100644
--- a/Build/source/texk/ps2pkm/basics.h
+++ b/Build/source/texk/ps2pk/basics.h
@@ -1,7 +1,7 @@
/* FILE: basics.h
* PURPOSE: basic definitions
* AUTHOR: Piet Tutelaers
- * VERSION: 1.0 (September 1995)
+ * VERSION: 1.7 (December 2014)
*/
#ifdef HAVE_CONFIG_H
@@ -94,6 +94,6 @@ extern char *encfile, *afmfile;
*/
#include <stdio.h>
-
+#include <stdlib.h>
#include <sys/types.h> /* struct stat */
#include <sys/stat.h> /* stat() */
diff --git a/Build/source/texk/ps2pkm/blues.h b/Build/source/texk/ps2pk/blues.h
index 8d6a486e040..8d6a486e040 100644
--- a/Build/source/texk/ps2pkm/blues.h
+++ b/Build/source/texk/ps2pk/blues.h
diff --git a/Build/source/texk/ps2pkm/bstring.c b/Build/source/texk/ps2pk/bstring.c
index 250eece830e..250eece830e 100644
--- a/Build/source/texk/ps2pkm/bstring.c
+++ b/Build/source/texk/ps2pk/bstring.c
diff --git a/Build/source/texk/ps2pkm/c-auto.in b/Build/source/texk/ps2pk/c-auto.in
index e5814cef018..e5814cef018 100644
--- a/Build/source/texk/ps2pkm/c-auto.in
+++ b/Build/source/texk/ps2pk/c-auto.in
diff --git a/Build/source/texk/ps2pkm/cluts.h b/Build/source/texk/ps2pk/cluts.h
index fe51e02f9aa..fe51e02f9aa 100644
--- a/Build/source/texk/ps2pkm/cluts.h
+++ b/Build/source/texk/ps2pk/cluts.h
diff --git a/Build/source/texk/ps2pkm/configure b/Build/source/texk/ps2pk/configure
index 7909a0f8666..2567869b618 100755
--- a/Build/source/texk/ps2pkm/configure
+++ b/Build/source/texk/ps2pk/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ps2pkm (TeX Live) 1.5.
+# Generated by GNU Autoconf 2.69 for ps2pkm (TeX Live) 1.7.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ps2pkm (TeX Live)'
PACKAGE_TARNAME='ps2pkm--tex-live-'
-PACKAGE_VERSION='1.5'
-PACKAGE_STRING='ps2pkm (TeX Live) 1.5'
+PACKAGE_VERSION='1.7'
+PACKAGE_STRING='ps2pkm (TeX Live) 1.7'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ps2pkm (TeX Live) 1.5 to adapt to many kinds of systems.
+\`configure' configures ps2pkm (TeX Live) 1.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ps2pkm (TeX Live) 1.5:";;
+ short | recursive ) echo "Configuration of ps2pkm (TeX Live) 1.7:";;
esac
cat <<\_ACEOF
@@ -1518,7 +1518,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ps2pkm (TeX Live) configure 1.5
+ps2pkm (TeX Live) configure 1.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2128,7 +2128,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ps2pkm (TeX Live) $as_me 1.5, which was
+It was created by ps2pkm (TeX Live) $as_me 1.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7763,7 +7763,7 @@ fi
# Define the identity of the package.
PACKAGE='ps2pkm--tex-live-'
- VERSION='1.5'
+ VERSION='1.7'
# Some tools Automake needs.
@@ -14065,7 +14065,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-ps2pkm (TeX Live) config.lt 1.5
+ps2pkm (TeX Live) config.lt 1.7
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15500,7 +15500,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ps2pkm (TeX Live) $as_me 1.5, which was
+This file was extended by ps2pkm (TeX Live) $as_me 1.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15566,7 +15566,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ps2pkm (TeX Live) config.status 1.5
+ps2pkm (TeX Live) config.status 1.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/ps2pkm/configure.ac b/Build/source/texk/ps2pk/configure.ac
index 1e06fea270c..03c0c8eab0d 100644
--- a/Build/source/texk/ps2pkm/configure.ac
+++ b/Build/source/texk/ps2pk/configure.ac
@@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([ps2pkm (TeX Live)], [1.5], [tex-k@tug.org])
+AC_INIT([ps2pkm (TeX Live)], [1.7], [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([arith.c])
AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/ps2pkm/curves.c b/Build/source/texk/ps2pk/curves.c
index 08b7a866d1d..08b7a866d1d 100644
--- a/Build/source/texk/ps2pkm/curves.c
+++ b/Build/source/texk/ps2pk/curves.c
diff --git a/Build/source/texk/ps2pkm/curves.h b/Build/source/texk/ps2pk/curves.h
index cfa07b2bb70..cfa07b2bb70 100644
--- a/Build/source/texk/ps2pkm/curves.h
+++ b/Build/source/texk/ps2pk/curves.h
diff --git a/Build/source/texk/ps2pkm/digit.h b/Build/source/texk/ps2pk/digit.h
index 4ed89c765c3..4ed89c765c3 100644
--- a/Build/source/texk/ps2pkm/digit.h
+++ b/Build/source/texk/ps2pk/digit.h
diff --git a/Build/source/texk/ps2pkm/encoding.c b/Build/source/texk/ps2pk/encoding.c
index c8e28949a55..838019b11e7 100644
--- a/Build/source/texk/ps2pkm/encoding.c
+++ b/Build/source/texk/ps2pk/encoding.c
@@ -15,8 +15,7 @@
* globals: void fatal();
*
* Author: Piet Tutelaers
- * Version 1.3 (August 1992)
- * Version 1.4 (December 1993)
+ * Version 1.7 (December 2014)
*/
#include "types.h"
@@ -106,9 +105,9 @@ static char *nextpsname(void)
if (!isalpha((unsigned char)*pline)) fatal("invalid name in %s\n", encfile);
/* pt981009: added '_' Staszek Wawrykiewicz <staw@gust.org.pl> */
while (isalnum((unsigned char)*pline) || *pline == '-' || *pline == '_') {
- if (i > MAXSTRLEN-2)
- fatal("name too long in %s (%s)\n", line, encfile);
- the_nextname[i++] = *pline++;
+ if (i > MAXSTRLEN-2)
+ fatal("name too long in %s (%s)\n", line, encfile);
+ the_nextname[i++] = *pline++;
}
the_nextname[i] = '\0';
name = malloc(i+1);
diff --git a/Build/source/texk/ps2pkm/ffilest.h b/Build/source/texk/ps2pk/ffilest.h
index 006e5fa0423..006e5fa0423 100644
--- a/Build/source/texk/ps2pkm/ffilest.h
+++ b/Build/source/texk/ps2pk/ffilest.h
diff --git a/Build/source/texk/ps2pkm/filenames.c b/Build/source/texk/ps2pk/filenames.c
index a08827a31f9..e6b10aa16bc 100644
--- a/Build/source/texk/ps2pkm/filenames.c
+++ b/Build/source/texk/ps2pk/filenames.c
@@ -1,9 +1,7 @@
/* FILE: filenames.c
* PURPOSE: some handy functions for working with TeXfiles
* AUTHOR: Piet Tutelaers (internet: rcpt@urc.tue.nl)
- * VERSION: 1.3 (August 1992)
- * VERSION: 1.4 (January 1994)
- * VERSION: 1.5 (September 1995)
+ * VERSION: 1.7 (December 2014)
*/
#ifdef HAVE_CONFIG_H
@@ -22,30 +20,26 @@
#include "basics.h" /* basic definitions and fatal() */
#include "filenames.h"
-/* for those systems that don't provide an ANSI strchr() */
-static char *charptr(char *name, char c)
-{
- while (*name != c && *name != '\0') name++;
- if (*name == '\0') return NULL;
- else return name;
-}
-
/* comparing names (system dependant) */
static int equal(const char *s, const char *t)
{
# ifndef UNIX
while (tolower(*s) == tolower(*t)) {
- if (*s == '\0') break;
+ if (*s == '\0')
+ break;
s++; t++;
}
# else
while (*s == *t) {
- if (*s == '\0' || *t == '\0') break;
+ if (*s == '\0' || *t == '\0')
+ break;
s++; t++;
}
# endif
- if (*s == '\0' && *t == '\0') return 1;
- else return 0;
+ if (*s == '\0' && *t == '\0')
+ return 1;
+ else
+ return 0;
}
/*
@@ -54,10 +48,12 @@ static int equal(const char *s, const char *t)
char *extension(char *str) {
char *p, *base;
for (p = base = str; *p; ++p)
- /* if (*p++ == DIRSEP) base = p; */
- if (IS_DIR_SEP(*p)) base = p + 1;
+ /* if (*p++ == DIRSEP) base = p; */
+ if (IS_DIR_SEP(*p))
+ base = p + 1;
for (p = base ; *p; p++)
- if (*p == '.') break;
+ if (*p == '.')
+ break;
return p;
}
@@ -70,11 +66,13 @@ char *newname(char *name, const char *ext)
char *e, *nn; int len1, len2;
e = extension(name);
- if (equal(ext, e)) return name;
+ if (equal(ext, e))
+ return name;
len1 = strlen(name) - strlen(e);
len2 = len1 + strlen(ext) + 1;
nn = (char *) malloc(len2);
- if (nn == NULL) fatal("Out of memory\n");
+ if (nn == NULL)
+ fatal("Out of memory\n");
strncpy(nn, name, len1);
strcpy(nn+len1, ext);
return nn;
@@ -95,20 +93,25 @@ char *basename(char *str, const char *suffix){
#else
for (p = base = str; *p; p++) {
#endif
- /* if (*p++ == DIRSEP) { base = p; len = 0; } */
- if (IS_DIR_SEP(*p)) { base = p+1; len = 0; }
- else len++;
+ /* if (*p++ == DIRSEP) { base = p; len = 0; } */
+ if (IS_DIR_SEP(*p)) {
+ base = p+1;
+ len = 0;
+ } else len++;
}
printf("%s\n", base);
if (suffix != NULL) {
for (t = suffix; *t; ++t);
do {
- len--; t--; p--;
- if (*t != *p) break;
- if (t == suffix) { char *bn;
- if (len == 0) return NULL;
+ len--; t--; p--;
+ if (*t != *p) break;
+ if (t == suffix) {
+ char *bn;
+ if (len == 0)
+ return NULL;
bn = malloc(len+1);
- if (bn == NULL) fatal("Out of memory\n");
+ if (bn == NULL)
+ fatal("Out of memory\n");
strncpy(bn, base, len);
*(bn+len) = '\0'; /* RA */
return bn;
@@ -122,12 +125,12 @@ char *basename(char *str, const char *suffix){
* Return true if name can be the name of a PostScript resource
* (no extension and no absolute pathname).
*/
-int ps_resource(char *name) {
- if (charptr(name, '.')) return 0 ;
+int ps_resource(const char *name) {
+ if (strchr(name, '.')) return 0 ;
#ifdef KPATHSEA
if (kpse_absolute_p(name, true)) return 0;
#else
- if (charptr(name, DIRSEP)) return 0 ;
+ if (strchr(name, DIRSEP)) return 0 ;
#endif
return 1;
}
diff --git a/Build/source/texk/ps2pkm/filenames.h b/Build/source/texk/ps2pk/filenames.h
index 6913011477c..7ee9674cbf4 100644
--- a/Build/source/texk/ps2pkm/filenames.h
+++ b/Build/source/texk/ps2pk/filenames.h
@@ -1,8 +1,6 @@
/* FILE: filenames.h
* PURPOSE: functions for handling file names
- * VERSION: 1.3 (August 1992)
- * VERSION: 1.4 (January 1994)
- * VERSION: 1.5 (September 1995)
+ * VERSION: 1.7 (December 2014)
*/
/*
@@ -27,4 +25,4 @@ char *newname(char *name, const char *ext);
/*
* ps_resource returns true if name can be treated as a PS resource
*/
-int ps_resource(char *name);
+int ps_resource(const char *name);
diff --git a/Build/source/texk/ps2pkm/flisearch.c b/Build/source/texk/ps2pk/flisearch.c
index e196f6f1e29..e196f6f1e29 100644
--- a/Build/source/texk/ps2pkm/flisearch.c
+++ b/Build/source/texk/ps2pk/flisearch.c
diff --git a/Build/source/texk/ps2pkm/font.h b/Build/source/texk/ps2pk/font.h
index 8de6e908f31..8de6e908f31 100644
--- a/Build/source/texk/ps2pkm/font.h
+++ b/Build/source/texk/ps2pk/font.h
diff --git a/Build/source/texk/ps2pkm/fontfcn.c b/Build/source/texk/ps2pk/fontfcn.c
index dfaeb8ff57d..dfaeb8ff57d 100644
--- a/Build/source/texk/ps2pkm/fontfcn.c
+++ b/Build/source/texk/ps2pk/fontfcn.c
diff --git a/Build/source/texk/ps2pkm/fontfcn.h b/Build/source/texk/ps2pk/fontfcn.h
index fdabdd89cf7..fdabdd89cf7 100644
--- a/Build/source/texk/ps2pkm/fontfcn.h
+++ b/Build/source/texk/ps2pk/fontfcn.h
diff --git a/Build/source/texk/ps2pkm/fontfile.h b/Build/source/texk/ps2pk/fontfile.h
index 166aac3a01e..166aac3a01e 100644
--- a/Build/source/texk/ps2pkm/fontfile.h
+++ b/Build/source/texk/ps2pk/fontfile.h
diff --git a/Build/source/texk/ps2pkm/fontmisc.h b/Build/source/texk/ps2pk/fontmisc.h
index ffde14ff31d..ffde14ff31d 100644
--- a/Build/source/texk/ps2pkm/fontmisc.h
+++ b/Build/source/texk/ps2pk/fontmisc.h
diff --git a/Build/source/texk/ps2pkm/fonts.h b/Build/source/texk/ps2pk/fonts.h
index 497206bf2dd..497206bf2dd 100644
--- a/Build/source/texk/ps2pkm/fonts.h
+++ b/Build/source/texk/ps2pk/fonts.h
diff --git a/Build/source/texk/ps2pkm/fontstruct.h b/Build/source/texk/ps2pk/fontstruct.h
index 7b9212f1e3b..7b9212f1e3b 100644
--- a/Build/source/texk/ps2pkm/fontstruct.h
+++ b/Build/source/texk/ps2pk/fontstruct.h
diff --git a/Build/source/texk/ps2pkm/fontxlfd.h b/Build/source/texk/ps2pk/fontxlfd.h
index 9ea8090c309..9ea8090c309 100644
--- a/Build/source/texk/ps2pkm/fontxlfd.h
+++ b/Build/source/texk/ps2pk/fontxlfd.h
diff --git a/Build/source/texk/ps2pkm/fsmasks.h b/Build/source/texk/ps2pk/fsmasks.h
index dba6e8ec61b..dba6e8ec61b 100644
--- a/Build/source/texk/ps2pkm/fsmasks.h
+++ b/Build/source/texk/ps2pk/fsmasks.h
diff --git a/Build/source/texk/ps2pkm/hdigit.h b/Build/source/texk/ps2pk/hdigit.h
index adee64dd001..adee64dd001 100644
--- a/Build/source/texk/ps2pkm/hdigit.h
+++ b/Build/source/texk/ps2pk/hdigit.h
diff --git a/Build/source/texk/ps2pkm/hints.c b/Build/source/texk/ps2pk/hints.c
index 5cd52aab7e7..5cd52aab7e7 100644
--- a/Build/source/texk/ps2pkm/hints.c
+++ b/Build/source/texk/ps2pk/hints.c
diff --git a/Build/source/texk/ps2pkm/hints.h b/Build/source/texk/ps2pk/hints.h
index a3f91675cb9..a3f91675cb9 100644
--- a/Build/source/texk/ps2pkm/hints.h
+++ b/Build/source/texk/ps2pk/hints.h
diff --git a/Build/source/texk/ps2pkm/lines.c b/Build/source/texk/ps2pk/lines.c
index 41a1d5beb25..41a1d5beb25 100644
--- a/Build/source/texk/ps2pkm/lines.c
+++ b/Build/source/texk/ps2pk/lines.c
diff --git a/Build/source/texk/ps2pkm/lines.h b/Build/source/texk/ps2pk/lines.h
index 011955c2994..011955c2994 100644
--- a/Build/source/texk/ps2pkm/lines.h
+++ b/Build/source/texk/ps2pk/lines.h
diff --git a/Build/source/texk/ps2pkm/mag.1 b/Build/source/texk/ps2pk/mag.1
index 8d9f2d4a261..8d9f2d4a261 100644
--- a/Build/source/texk/ps2pkm/mag.1
+++ b/Build/source/texk/ps2pk/mag.1
diff --git a/Build/source/texk/ps2pkm/mag.c b/Build/source/texk/ps2pk/mag.c
index 2dd4715e8c8..2dd4715e8c8 100644
--- a/Build/source/texk/ps2pkm/mag.c
+++ b/Build/source/texk/ps2pk/mag.c
diff --git a/Build/source/texk/ps2pkm/objects.c b/Build/source/texk/ps2pk/objects.c
index ba18c9ca7fa..ba18c9ca7fa 100644
--- a/Build/source/texk/ps2pkm/objects.c
+++ b/Build/source/texk/ps2pk/objects.c
diff --git a/Build/source/texk/ps2pkm/objects.h b/Build/source/texk/ps2pk/objects.h
index a5c3633cf21..a5c3633cf21 100644
--- a/Build/source/texk/ps2pkm/objects.h
+++ b/Build/source/texk/ps2pk/objects.h
diff --git a/Build/source/texk/ps2pkm/paths.c b/Build/source/texk/ps2pk/paths.c
index fc7cb511cb9..fc7cb511cb9 100644
--- a/Build/source/texk/ps2pkm/paths.c
+++ b/Build/source/texk/ps2pk/paths.c
diff --git a/Build/source/texk/ps2pkm/paths.h b/Build/source/texk/ps2pk/paths.h
index f16fd551361..f16fd551361 100644
--- a/Build/source/texk/ps2pkm/paths.h
+++ b/Build/source/texk/ps2pk/paths.h
diff --git a/Build/source/texk/ps2pkm/pfb2pfa.1 b/Build/source/texk/ps2pk/pfb2pfa.1
index f81abb8ed2f..f81abb8ed2f 100644
--- a/Build/source/texk/ps2pkm/pfb2pfa.1
+++ b/Build/source/texk/ps2pk/pfb2pfa.1
diff --git a/Build/source/texk/ps2pkm/pfb2pfa.c b/Build/source/texk/ps2pk/pfb2pfa.c
index ae9d74e264d..ae9d74e264d 100644
--- a/Build/source/texk/ps2pkm/pfb2pfa.c
+++ b/Build/source/texk/ps2pk/pfb2pfa.c
diff --git a/Build/source/texk/ps2pkm/pictures.h b/Build/source/texk/ps2pk/pictures.h
index cd9aab1e094..cd9aab1e094 100644
--- a/Build/source/texk/ps2pkm/pictures.h
+++ b/Build/source/texk/ps2pk/pictures.h
diff --git a/Build/source/texk/ps2pkm/pk2bm.1 b/Build/source/texk/ps2pk/pk2bm.1
index 5b9c6d599db..5b9c6d599db 100644
--- a/Build/source/texk/ps2pkm/pk2bm.1
+++ b/Build/source/texk/ps2pk/pk2bm.1
diff --git a/Build/source/texk/ps2pkm/pk2bm.c b/Build/source/texk/ps2pk/pk2bm.c
index 9e620581f0e..9e620581f0e 100644
--- a/Build/source/texk/ps2pkm/pk2bm.c
+++ b/Build/source/texk/ps2pk/pk2bm.c
diff --git a/Build/source/texk/ps2pkm/pkin.c b/Build/source/texk/ps2pk/pkin.c
index a424a239787..cc4e2145519 100644
--- a/Build/source/texk/ps2pkm/pkin.c
+++ b/Build/source/texk/ps2pk/pkin.c
@@ -27,11 +27,6 @@
#include "pkin.h"
/*
- * Forward declaration
- */
-static void error(const char *s);
-
-/*
* Now we have some routines to get stuff from the pk file. pkbyte returns
* the next byte from the pk file.
*/
@@ -44,18 +39,25 @@ pkbyte(void)
register shalfword i ;
if ((i=getc(pkfile))==EOF)
- error("! unexpected eof in pk file") ;
+ fatal("unexpected eof in pk file\n") ;
return(i) ;
}
+static shalfword
+pksbyte(void)
+{
+ register shalfword i ;
+
+ i = pkbyte() ;
+ return i > 127 ? i -256 : i ;
+}
+
static integer
pkquad(void)
{
register integer i ;
- i = pkbyte() ;
- if (i > 127)
- i -= 256 ;
+ i = pksbyte() ;
i = i * 256 + pkbyte() ;
i = i * 256 + pkbyte() ;
i = i * 256 + pkbyte() ;
@@ -88,14 +90,11 @@ pkspair(void)
{
register integer i ;
- i = pkbyte() ;
- if (i > 127)
- i -= 256;
+ i = pksbyte() ;
i = i * 256 + pkbyte();
return (i);
}
-static char errbuf[80] ;
/*
* pkopen opens the pk file. This is system dependent.
*/
@@ -104,9 +103,7 @@ static Boolean
pkopen(const char *name)
{
if ((pkfile=fopen(name, RB))==NULL) {
- (void)sprintf(errbuf, "Could not open %s", name) ;
- error(errbuf) ;
- return(0) ;
+ fatal("Could not open %s\n", name) ;
} else
return(1) ;
}
@@ -208,7 +205,7 @@ static halfword rest (void)
return ( i ) ;
}
} else {
- error("! shouldn't happen") ;
+ fatal("shouldn't happen\n") ;
}
/*NOTREACHED*/
@@ -254,7 +251,7 @@ unpack(chardesc *cd)
i = 2 ;
cd->raster = (halfword *)malloc((unsigned)i) ;
if (cd->raster == NULL)
- error("! out of memory during allocation") ;
+ fatal("out of memory during allocation\n") ;
raster = cd->raster;
realfunc = pkpackednum ;
dynf = flagbyte / 16 ;
@@ -328,7 +325,7 @@ unpack(chardesc *cd)
}
putchar('\n') ;
if ( ( rowsleft != 0 ) || ( hbit != cd->cwidth ) )
- error ( "! error while unpacking; more bits than required" ) ;
+ fatal( "error while unpacking; more bits than required\n" ) ;
}
}
@@ -349,15 +346,15 @@ readchar(char *name, shalfword c, chardesc *cd)
* Check the preamble of the pkfile
*/
if (pkbyte()!=247)
- error("! bad pk file, expected pre") ;
+ fatal("bad pk file, expected pre\n") ;
if (pkbyte()!=89)
- error("! bad version of pk file") ;
+ fatal("bad version of pk file\n") ;
for(i=pkbyte(); i>0; i--) /* creator of pkfile */
(void)pkbyte() ;
- (void)pkquad(); /* design size */
- k = pkquad() ; /* checksum */
- k = pkquad() ; /* hppp */
- k = pkquad() ; /* vppp */
+ (void) pkquad() ; /* design size */
+ (void) pkquad() ; /* checksum */
+ (void) pkquad() ; /* hppp */
+ (void) pkquad() ; /* vppp */
/*
* Now we skip to the desired character definition
*/
@@ -370,24 +367,21 @@ case 0: case 1: case 2: case 3:
(void) pktrio() ; /* TFMwidth */
(void) pkbyte() ; /* pixel width */
break ;
-case 4:
- length = pkbyte() * 256 ;
- length = length + pkbyte() - 5 ;
+case 4: case 5: case 6:
+ length = (flagbyte & 3) * 65536 + pkpair() * 256 - 5 ;
cd->charcode = pkbyte() ;
(void) pktrio() ; /* TFMwidth */
- i = pkbyte() ;
- i = i * 256 + pkbyte() ; /* pixelwidth */
+ (void) pkpair() ; /* pixelwidth */
break ;
-case 5: case 6:
- error("! lost sync in pk file (character too big)") ;
case 7:
length = pkquad() - 12 ;
cd->charcode = pkquad() ;
(void) pkquad() ; /* TFMwidth */
-/* cd->pixelwidth = (pkquad() + 32768) >> 16 ; */
(void) pkquad(); /* pixelwidth */
- k = pkquad() ;
+ (void) pkquad(); /* pixelheight */
}
+ if (length <= 0)
+ fatal("packet length (%d) too small\n", length) ;
if (cd->charcode == c) {
if (flagbyte & 4) {
if ((flagbyte & 7) == 7) { /* long format */
@@ -404,12 +398,8 @@ case 7:
} else { /* short format */
cd->cwidth = pkbyte() ;
cd->cheight = pkbyte() ;
- cd->xoff = pkbyte() ;
- cd->yoff = pkbyte() ;
- if (cd->xoff > 127)
- cd->xoff -= 256 ;
- if (cd->yoff > 127)
- cd->yoff -= 256 ;
+ cd->xoff = pksbyte() ;
+ cd->yoff = pksbyte() ;
}
unpack(cd);
(void)fclose(pkfile) ;
@@ -421,9 +411,7 @@ case 7:
k = 0 ;
switch (flagbyte) {
case 243:
- k = pkbyte() ;
- if (k > 127)
- k -= 256 ;
+ k = pksbyte() ;
case 242:
k = k * 256 + pkbyte() ;
case 241:
@@ -439,17 +427,10 @@ case 244:
case 246:
break ;
default:
- error("! lost sync in pk file") ;
+ fatal("unexpected command (%d)\n", flagbyte) ;
}
}
}
(void)fclose(pkfile) ;
return(0); /* character not found */
}
-
-static void
-error(const char *s)
-{
- fprintf(stderr, "%s\n", s);
- exit(1);
-}
diff --git a/Build/source/texk/ps2pkm/pkin.h b/Build/source/texk/ps2pk/pkin.h
index ce5db039554..ce5db039554 100644
--- a/Build/source/texk/ps2pkm/pkin.h
+++ b/Build/source/texk/ps2pk/pkin.h
diff --git a/Build/source/texk/ps2pkm/pkout.c b/Build/source/texk/ps2pk/pkout.c
index 6f7a07d7a2c..780b033f714 100644
--- a/Build/source/texk/ps2pkm/pkout.c
+++ b/Build/source/texk/ps2pk/pkout.c
@@ -8,9 +8,7 @@
* (Porting `top-down' WEB code into modular readable C-code is
* not a trivial exercise.)
*
- * VERSION: Febr. 1992
- * Dec. 1993
- * Sep. 1995
+ * VERSION: 1.7 (December 2014)
*
* AUTHOR: Piet Tutelaers (rcpt@urc.tue.nl)
*/
diff --git a/Build/source/texk/ps2pkm/pkout.h b/Build/source/texk/ps2pk/pkout.h
index 525246ad4fe..218fdd60a91 100644
--- a/Build/source/texk/ps2pkm/pkout.h
+++ b/Build/source/texk/ps2pk/pkout.h
@@ -5,8 +5,7 @@
*
* COMMENT: See the pktest.c example program how to use the PK functions.
*
- * VERSION: Febr. 1992
- * Dec. 1993
+ * VERSION: 1.7 (December 2014)
*
* AUTHOR: Piet Tutelaers (rcpt@urc.tue.nl)
*/
diff --git a/Build/source/texk/ps2pkm/pktest.c b/Build/source/texk/ps2pk/pktest.c
index 5b401e6948d..c6fc7ea8b71 100644
--- a/Build/source/texk/ps2pkm/pktest.c
+++ b/Build/source/texk/ps2pk/pktest.c
@@ -7,7 +7,7 @@
* USAGE: pktest -c<char_code> -W<with> -H<Height> pkname < test.bm
* (test.bm contains the character from `The GFtoPK processor')
*
- * VERSION: Febr. 1992
+ * VERSION: 1.7 (December 2014)
*
* AUTHOR: Piet Tutelaers (rcpt@urc.tue.nl)
*/
diff --git a/Build/source/texk/ps2pkm/protos.h b/Build/source/texk/ps2pk/protos.h
index eb8e62c32f5..eb8e62c32f5 100644
--- a/Build/source/texk/ps2pkm/protos.h
+++ b/Build/source/texk/ps2pk/protos.h
diff --git a/Build/source/texk/ps2pkm/ps2pk.1 b/Build/source/texk/ps2pk/ps2pk.1
index dbeed0cdbfc..dbeed0cdbfc 100644
--- a/Build/source/texk/ps2pkm/ps2pk.1
+++ b/Build/source/texk/ps2pk/ps2pk.1
diff --git a/Build/source/texk/ps2pkm/ps2pk.c b/Build/source/texk/ps2pk/ps2pk.c
index 6c4ce589fea..1aabd6504df 100644
--- a/Build/source/texk/ps2pkm/ps2pk.c
+++ b/Build/source/texk/ps2pk/ps2pk.c
@@ -171,11 +171,8 @@
* mtpk(1)
* pk2bm(1)
* pkfonts(1)
- * VERSIONS
- * 1.1 (May 1992)
- * 1.3 (August 1992)
- * 1.4 (December 1994)
- * 1.5 (Januari 1996)
+ * VERSION
+ * 1.7 (December 2014)
* AUTHOR
* Piet Tutelaers
* rcpt@urc.tue.nl
@@ -350,8 +347,8 @@ int main(int argc, char *argv[])
}
if (argc < 1 || argc >2) {
- msg ("Ps2pk: version 1.5 (1992-96)\n");
- msg ("Usage: %s [ options ] type1font [pkname]\n", myname);
+ msg ("Ps2pk: version 1.7 (1992-2014)\n");
+ msg ("Usage: %s [options] type1font [pkname]\n", myname);
msg ("options: -d -v -e<enc> -X<xres> -E<expansion> -S<slant>\n");
fatal("options: -O -P<pointsize> -Y<yres> -a<AFM> -R<baseres>\n");
}
diff --git a/Build/source/texk/ps2pkm/psearch.c b/Build/source/texk/ps2pk/psearch.c
index 19e44251cd0..319eaa50233 100644
--- a/Build/source/texk/ps2pkm/psearch.c
+++ b/Build/source/texk/ps2pk/psearch.c
@@ -1,7 +1,7 @@
/*
* FILE: psearch.c
* PURPOSE: PATH search module
- * VERSION: 1.0 (Nov. 1995)
+ * VERSION: 1.7 (December 2014)
* AUTHOR: Piet Tutelaers (rcpt@urc.tue.nl)
*/
diff --git a/Build/source/texk/ps2pkm/psearch.h b/Build/source/texk/ps2pk/psearch.h
index 5058d679258..5058d679258 100644
--- a/Build/source/texk/ps2pkm/psearch.h
+++ b/Build/source/texk/ps2pk/psearch.h
diff --git a/Build/source/texk/ps2pkm/regions.c b/Build/source/texk/ps2pk/regions.c
index f1b4b8b4700..f1b4b8b4700 100644
--- a/Build/source/texk/ps2pkm/regions.c
+++ b/Build/source/texk/ps2pk/regions.c
diff --git a/Build/source/texk/ps2pkm/regions.h b/Build/source/texk/ps2pk/regions.h
index aec9323f29f..aec9323f29f 100644
--- a/Build/source/texk/ps2pkm/regions.h
+++ b/Build/source/texk/ps2pk/regions.h
diff --git a/Build/source/texk/ps2pkm/scanfont.c b/Build/source/texk/ps2pk/scanfont.c
index 92249282468..92249282468 100644
--- a/Build/source/texk/ps2pkm/scanfont.c
+++ b/Build/source/texk/ps2pk/scanfont.c
diff --git a/Build/source/texk/ps2pkm/sexpr.c b/Build/source/texk/ps2pk/sexpr.c
index d069cce1c0b..d069cce1c0b 100644
--- a/Build/source/texk/ps2pkm/sexpr.c
+++ b/Build/source/texk/ps2pk/sexpr.c
diff --git a/Build/source/texk/ps2pkm/spaces.c b/Build/source/texk/ps2pk/spaces.c
index a8845e3a22e..a8845e3a22e 100644
--- a/Build/source/texk/ps2pkm/spaces.c
+++ b/Build/source/texk/ps2pk/spaces.c
diff --git a/Build/source/texk/ps2pkm/spaces.h b/Build/source/texk/ps2pk/spaces.h
index baadecf1678..baadecf1678 100644
--- a/Build/source/texk/ps2pkm/spaces.h
+++ b/Build/source/texk/ps2pk/spaces.h
diff --git a/Build/source/texk/ps2pkm/strexpr.c b/Build/source/texk/ps2pk/strexpr.c
index ebfcc8fcdf5..ebfcc8fcdf5 100644
--- a/Build/source/texk/ps2pkm/strexpr.c
+++ b/Build/source/texk/ps2pk/strexpr.c
diff --git a/Build/source/texk/ps2pkm/strexpr.h b/Build/source/texk/ps2pk/strexpr.h
index 6012a8be56f..6012a8be56f 100644
--- a/Build/source/texk/ps2pkm/strexpr.h
+++ b/Build/source/texk/ps2pk/strexpr.h
diff --git a/Build/source/texk/ps2pkm/strokes.h b/Build/source/texk/ps2pk/strokes.h
index 59076329847..59076329847 100644
--- a/Build/source/texk/ps2pkm/strokes.h
+++ b/Build/source/texk/ps2pk/strokes.h
diff --git a/Build/source/texk/ps2pkm/t1funcs.c b/Build/source/texk/ps2pk/t1funcs.c
index e95623f6938..e95623f6938 100644
--- a/Build/source/texk/ps2pkm/t1funcs.c
+++ b/Build/source/texk/ps2pk/t1funcs.c
diff --git a/Build/source/texk/ps2pkm/t1hdigit.h b/Build/source/texk/ps2pk/t1hdigit.h
index 9979ef55ceb..9979ef55ceb 100644
--- a/Build/source/texk/ps2pkm/t1hdigit.h
+++ b/Build/source/texk/ps2pk/t1hdigit.h
diff --git a/Build/source/texk/ps2pkm/t1imager.h b/Build/source/texk/ps2pk/t1imager.h
index 78eae98fd7f..78eae98fd7f 100644
--- a/Build/source/texk/ps2pkm/t1imager.h
+++ b/Build/source/texk/ps2pk/t1imager.h
diff --git a/Build/source/texk/ps2pkm/t1info.c b/Build/source/texk/ps2pk/t1info.c
index fd86c3c797a..fd86c3c797a 100644
--- a/Build/source/texk/ps2pkm/t1info.c
+++ b/Build/source/texk/ps2pk/t1info.c
diff --git a/Build/source/texk/ps2pkm/t1intf.h b/Build/source/texk/ps2pk/t1intf.h
index b79e1cf481e..b79e1cf481e 100644
--- a/Build/source/texk/ps2pkm/t1intf.h
+++ b/Build/source/texk/ps2pk/t1intf.h
diff --git a/Build/source/texk/ps2pkm/t1io.c b/Build/source/texk/ps2pk/t1io.c
index 384e3d19c31..384e3d19c31 100644
--- a/Build/source/texk/ps2pkm/t1io.c
+++ b/Build/source/texk/ps2pk/t1io.c
diff --git a/Build/source/texk/ps2pkm/t1snap.c b/Build/source/texk/ps2pk/t1snap.c
index 7f1f29c1bc4..7f1f29c1bc4 100644
--- a/Build/source/texk/ps2pkm/t1snap.c
+++ b/Build/source/texk/ps2pk/t1snap.c
diff --git a/Build/source/texk/ps2pkm/t1stdio.h b/Build/source/texk/ps2pk/t1stdio.h
index f19d9627edd..f19d9627edd 100644
--- a/Build/source/texk/ps2pkm/t1stdio.h
+++ b/Build/source/texk/ps2pk/t1stdio.h
diff --git a/Build/source/texk/ps2pkm/t1stub.c b/Build/source/texk/ps2pk/t1stub.c
index 6405b64c106..6405b64c106 100644
--- a/Build/source/texk/ps2pkm/t1stub.c
+++ b/Build/source/texk/ps2pk/t1stub.c
diff --git a/Build/source/texk/ps2pkm/t1test.c b/Build/source/texk/ps2pk/t1test.c
index 66291173785..66291173785 100644
--- a/Build/source/texk/ps2pkm/t1test.c
+++ b/Build/source/texk/ps2pk/t1test.c
diff --git a/Build/source/texk/ps2pkm/tests/Symbol.afm b/Build/source/texk/ps2pk/tests/Symbol.afm
index 1cdbdae695f..1cdbdae695f 100644
--- a/Build/source/texk/ps2pkm/tests/Symbol.afm
+++ b/Build/source/texk/ps2pk/tests/Symbol.afm
diff --git a/Build/source/texk/ps2pkm/tests/Symbol.alpha.hex b/Build/source/texk/ps2pk/tests/Symbol.alpha.hex
index 53999742d7c..53999742d7c 100644
--- a/Build/source/texk/ps2pkm/tests/Symbol.alpha.hex
+++ b/Build/source/texk/ps2pk/tests/Symbol.alpha.hex
diff --git a/Build/source/texk/ps2pkm/tests/Symbol.alpha.pix b/Build/source/texk/ps2pk/tests/Symbol.alpha.pix
index fe8cbb32c6d..fe8cbb32c6d 100644
--- a/Build/source/texk/ps2pkm/tests/Symbol.alpha.pix
+++ b/Build/source/texk/ps2pk/tests/Symbol.alpha.pix
diff --git a/Build/source/texk/ps2pkm/tests/Symbol.pfa b/Build/source/texk/ps2pk/tests/Symbol.pfa
index f8671f45af1..f8671f45af1 100644
--- a/Build/source/texk/ps2pkm/tests/Symbol.pfa
+++ b/Build/source/texk/ps2pk/tests/Symbol.pfa
diff --git a/Build/source/texk/ps2pkm/tests/Symbol.pfb b/Build/source/texk/ps2pk/tests/Symbol.pfb
index ff00dde4481..ff00dde4481 100644
--- a/Build/source/texk/ps2pkm/tests/Symbol.pfb
+++ b/Build/source/texk/ps2pk/tests/Symbol.pfb
Binary files differ
diff --git a/Build/source/texk/ps2pkm/tests/Symbol10.300pk b/Build/source/texk/ps2pk/tests/Symbol10.300pk
index f4c2aa9ccd1..f4c2aa9ccd1 100644
--- a/Build/source/texk/ps2pkm/tests/Symbol10.300pk
+++ b/Build/source/texk/ps2pk/tests/Symbol10.300pk
Binary files differ
diff --git a/Build/source/texk/ps2pkm/tests/lmmath.test b/Build/source/texk/ps2pk/tests/lmmath.test
index 074abe3c4f0..074abe3c4f0 100755
--- a/Build/source/texk/ps2pkm/tests/lmmath.test
+++ b/Build/source/texk/ps2pk/tests/lmmath.test
diff --git a/Build/source/texk/ps2pkm/tests/lmmi12.600pk b/Build/source/texk/ps2pk/tests/lmmi12.600pk
index 5d2fa7d66df..5d2fa7d66df 100644
--- a/Build/source/texk/ps2pkm/tests/lmmi12.600pk
+++ b/Build/source/texk/ps2pk/tests/lmmi12.600pk
Binary files differ
diff --git a/Build/source/texk/ps2pkm/tests/ps2pk.test b/Build/source/texk/ps2pk/tests/ps2pk.test
index eae7c950266..eae7c950266 100755
--- a/Build/source/texk/ps2pkm/tests/ps2pk.test
+++ b/Build/source/texk/ps2pk/tests/ps2pk.test
diff --git a/Build/source/texk/ps2pkm/texfiles.c b/Build/source/texk/ps2pk/texfiles.c
index 0ec4ce95e08..0ec4ce95e08 100644
--- a/Build/source/texk/ps2pkm/texfiles.c
+++ b/Build/source/texk/ps2pk/texfiles.c
diff --git a/Build/source/texk/ps2pkm/texfiles.h b/Build/source/texk/ps2pk/texfiles.h
index 960c1d7a499..960c1d7a499 100644
--- a/Build/source/texk/ps2pkm/texfiles.h
+++ b/Build/source/texk/ps2pk/texfiles.h
diff --git a/Build/source/texk/ps2pkm/token.c b/Build/source/texk/ps2pk/token.c
index fd768072e32..fd768072e32 100644
--- a/Build/source/texk/ps2pkm/token.c
+++ b/Build/source/texk/ps2pk/token.c
diff --git a/Build/source/texk/ps2pkm/token.h b/Build/source/texk/ps2pk/token.h
index 272da4cbaa6..272da4cbaa6 100644
--- a/Build/source/texk/ps2pkm/token.h
+++ b/Build/source/texk/ps2pk/token.h
diff --git a/Build/source/texk/ps2pkm/tokst.h b/Build/source/texk/ps2pk/tokst.h
index 53471c97af8..53471c97af8 100644
--- a/Build/source/texk/ps2pkm/tokst.h
+++ b/Build/source/texk/ps2pk/tokst.h
diff --git a/Build/source/texk/ps2pkm/trig.h b/Build/source/texk/ps2pk/trig.h
index ebc253f243b..ebc253f243b 100644
--- a/Build/source/texk/ps2pkm/trig.h
+++ b/Build/source/texk/ps2pk/trig.h
diff --git a/Build/source/texk/ps2pkm/type1.c b/Build/source/texk/ps2pk/type1.c
index edb112c70d5..edb112c70d5 100644
--- a/Build/source/texk/ps2pkm/type1.c
+++ b/Build/source/texk/ps2pk/type1.c
diff --git a/Build/source/texk/ps2pkm/types.h b/Build/source/texk/ps2pk/types.h
index 16df811bd98..aec3e3fedb8 100644
--- a/Build/source/texk/ps2pkm/types.h
+++ b/Build/source/texk/ps2pk/types.h
@@ -2,7 +2,7 @@
* File: types.h
* Purpose: define basic types so that program is portable to non 32 bits
* platforms
- * Version: 1.0 (Dec. 1993)
+ * Version: 1.7 (December 2014)
* Author: Piet Tutelaers
*/
diff --git a/Build/source/texk/ps2pkm/usenet b/Build/source/texk/ps2pk/usenet
index 14dd5523f77..14dd5523f77 100644
--- a/Build/source/texk/ps2pkm/usenet
+++ b/Build/source/texk/ps2pk/usenet
diff --git a/Build/source/texk/ps2pkm/util.c b/Build/source/texk/ps2pk/util.c
index 3c7b82ca9d8..3c7b82ca9d8 100644
--- a/Build/source/texk/ps2pkm/util.c
+++ b/Build/source/texk/ps2pk/util.c
diff --git a/Build/source/texk/ps2pkm/util.h b/Build/source/texk/ps2pk/util.h
index f38f9519d7c..f38f9519d7c 100644
--- a/Build/source/texk/ps2pkm/util.h
+++ b/Build/source/texk/ps2pk/util.h
diff --git a/Build/source/texk/ps2pkm/ac/withenable.ac b/Build/source/texk/ps2pkm/ac/withenable.ac
deleted file mode 100644
index f96aef61269..00000000000
--- a/Build/source/texk/ps2pkm/ac/withenable.ac
+++ /dev/null
@@ -1,7 +0,0 @@
-## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
-dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-dnl You may freely use, modify and/or distribute this file.
-dnl
-## configure options and TL libraries required for ps2pkm
-KPSE_ENABLE_PROG([ps2pkm], [kpathsea])
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 52d5044b6e8..190b538dad7 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -161,7 +161,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
- $(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \
+ $(top_srcdir)/../texk/ps2pk/ac/withenable.ac \
$(top_srcdir)/../texk/psutils/ac/withenable.ac \
$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 9787423f6d2..ff8f21eeb3c 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -794,7 +794,7 @@ enable_updmap
enable_makeindexk
enable_makejvf
enable_mendexk
-enable_ps2pkm
+enable_ps2pk
enable_psutils
enable_seetexk
enable_tex4htk
@@ -1592,7 +1592,7 @@ Optional Features:
--disable-makeindexk do not build the makeindexk package
--disable-makejvf do not build the makejvf package
--disable-mendexk do not build the mendexk package
- --disable-ps2pkm do not build the ps2pkm package
+ --disable-ps2pk do not build the ps2pk package
--disable-psutils do not build the psutils package
--disable-seetexk do not build the seetexk package
--disable-tex4htk do not build the tex4htk package
@@ -4584,25 +4584,25 @@ test "x$enable_mendexk" = xno || {
need_ptexenc=yes
}
-## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
-## configure options and TL libraries required for ps2pkm
-# Check whether --enable-ps2pkm was given.
-if test "${enable_ps2pkm+set}" = set; then :
- enableval=$enable_ps2pkm;
+## texk/ps2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pk/
+## configure options and TL libraries required for ps2pk
+# Check whether --enable-ps2pk was given.
+if test "${enable_ps2pk+set}" = set; then :
+ enableval=$enable_ps2pk;
fi
-case $enable_ps2pkm in #(
+case $enable_ps2pk in #(
yes|no) :
;; #(
*) :
- enable_ps2pkm=$enable_all_pkgs
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&5
-$as_echo "$as_me: Assuming \`--enable-ps2pkm=$enable_ps2pkm'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-ps2pkm=$enable_ps2pkm'"
+ enable_ps2pk=$enable_all_pkgs
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&5
+$as_echo "$as_me: Assuming \`--enable-ps2pk=$enable_ps2pk'" >&6;}
+ ac_configure_args="$ac_configure_args '--enable-ps2pk=$enable_ps2pk'"
;;
esac
-test "x$enable_ps2pkm" = xno || {
+test "x$enable_ps2pk" = xno || {
need_kpathsea=yes
}