texk/web2c: build fixes

git-svn-id: svn://tug.org/texlive/trunk@14276 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 129 insertions, 41 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index eab0bbc3bf7..bed0100ebfb 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -150,7 +150,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @OTANGLE_TRUE@am__append_33 = $(omegaware_tools)
 @OMFONTS_FALSE@@OTANGLE_TRUE@am__append_34 = $(omegaware_font_tools)
 @OTANGLE_TRUE@am__append_35 = omegaware/otangle.test
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_36 = omegaware/level1.test omegaware/omfonts.test
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_36 = omegaware/level1.test omegaware/omfonts.test omegaware/specialhex.test
 @OTANGLE_TRUE@am__append_37 = pltotf tftopl
 @ALEPH_TRUE@am__append_38 = aleph
 @TEX_SYNCTEX_TRUE@am__append_39 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
@@ -1055,32 +1055,33 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	tests/pagenum.dvi tests/pagenum.tex tests/patgen.in \
 	tests/patterns tests/plain.mft tests/pplr.dvi tests/pplr.tfm \
 	tests/ptmr.dvi tests/ptmr.tfm tests/ptmr.vf tests/ptmr.vpl \
-	tests/rpsyr.tfm tests/rptmr.tfm tests/story.dvi \
-	tests/testex.err tests/testex.mp tests/testex.tex \
-	tests/translate tests/uno.dos tests/write18.tex \
-	tests/xampl.bib ctiedir tiedir lib/mfmpi386.asm lib/mfmpw32.c \
-	lib/texmfmp.c texmfmem.h texmfmp-help.h texmfmp.h \
-	$(tex_ch_srcs) lib/texmfmp.c tmf-pool.h $(tex_tests) mf.web \
-	mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c tmf-pool.h \
-	$(mf_tests) triptrap/README triptrap/mftrap.diffs \
-	triptrap/mftrap.fot triptrap/mftrap.log triptrap/mftrap.pl \
-	triptrap/mftrap1.in triptrap/mftrap2.in triptrap/mftrapin.log \
-	triptrap/mptrap.diffs triptrap/mptrap.fot triptrap/mptrap.log \
-	triptrap/mptrap.pl triptrap/mptrap.readme triptrap/mptrap1.in \
-	triptrap/mptrap2.in triptrap/mptrapin.log triptrap/mtrap.0 \
-	triptrap/mtrap.1 triptrap/mtrap.log triptrap/mtrap.mp \
-	triptrap/texmf.cnf triptrap/trap.148 triptrap/trap.149 \
-	triptrap/trap.150 triptrap/trap.151 triptrap/trap.197 \
-	triptrap/trap.200 triptrap/trap.5 triptrap/trap.6 \
-	triptrap/trap.mf triptrap/trap.mp triptrap/trap.mpx \
-	triptrap/trap.typ triptrap/trapf.pl triptrap/trapman.tex \
-	triptrap/trip.diffs triptrap/trip.fot triptrap/trip.log \
-	triptrap/trip.pl triptrap/trip.tex triptrap/trip.typ \
-	triptrap/trip1.in triptrap/trip2.in triptrap/tripin.log \
-	triptrap/tripman.tex triptrap/tripos.tex triptrap/writeo \
-	triptrap/writeo.2 mplibdir/ChangeLog $(mpost_web) $(mp_tests) \
-	$(libmplib_web) mplibdir/lmplib.c $(etex_web_srcs) \
-	$(etex_ch_srcs) etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \
+	tests/rpsyr.tfm tests/rptmr.tfm tests/specialhex.ovp \
+	tests/story.dvi tests/testex.err tests/testex.mp \
+	tests/testex.tex tests/translate tests/uno.dos \
+	tests/write18.tex tests/xampl.bib ctiedir tiedir \
+	lib/mfmpi386.asm lib/mfmpw32.c lib/texmfmp.c texmfmem.h \
+	texmfmp-help.h texmfmp.h $(tex_ch_srcs) lib/texmfmp.c \
+	tmf-pool.h $(tex_tests) mf.web mf-binpool.ch mf.ch mftalk.h \
+	lib/texmfmp.c tmf-pool.h $(mf_tests) triptrap/README \
+	triptrap/mftrap.diffs triptrap/mftrap.fot triptrap/mftrap.log \
+	triptrap/mftrap.pl triptrap/mftrap1.in triptrap/mftrap2.in \
+	triptrap/mftrapin.log triptrap/mptrap.diffs \
+	triptrap/mptrap.fot triptrap/mptrap.log triptrap/mptrap.pl \
+	triptrap/mptrap.readme triptrap/mptrap1.in triptrap/mptrap2.in \
+	triptrap/mptrapin.log triptrap/mtrap.0 triptrap/mtrap.1 \
+	triptrap/mtrap.log triptrap/mtrap.mp triptrap/texmf.cnf \
+	triptrap/trap.148 triptrap/trap.149 triptrap/trap.150 \
+	triptrap/trap.151 triptrap/trap.197 triptrap/trap.200 \
+	triptrap/trap.5 triptrap/trap.6 triptrap/trap.mf \
+	triptrap/trap.mp triptrap/trap.mpx triptrap/trap.typ \
+	triptrap/trapf.pl triptrap/trapman.tex triptrap/trip.diffs \
+	triptrap/trip.fot triptrap/trip.log triptrap/trip.pl \
+	triptrap/trip.tex triptrap/trip.typ triptrap/trip1.in \
+	triptrap/trip2.in triptrap/tripin.log triptrap/tripman.tex \
+	triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \
+	mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \
+	mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \
+	etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \
 	etexdir/ChangeLog etexdir/INSTALL etexdir/README \
 	etexdir/etex_gen.tex $(etex_tests) etexdir/etrip/etrip.diffs \
 	etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \
@@ -1224,12 +1225,13 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	$(opl2ofm_sources) $(otangle_sources) $(ovf2ovp_sources) \
 	$(ovp2ovf_sources) omegaware/level1.test \
 	omegaware/omfonts.test omegaware/otangle.test \
-	$(aleph_web_srcs) $(aleph_ch_srcs) lib/texmfmp.c \
-	alephdir/ChangeLog alephdir/Makefile alephdir/aleph.defines \
-	alephdir/aleph.version alephdir/eomega.ech alephdir/etex.ch \
-	alephdir/omega.ch0 alephdir/omega.ch1 alephdir/omega.ch2 \
-	alephdir/omxml.ch alephdir/aleph.mk synctexdir/ChangeLog \
-	synctexdir/README.txt synctexdir/synctex_parser_readme.txt \
+	omegaware/specialhex.test $(aleph_web_srcs) $(aleph_ch_srcs) \
+	lib/texmfmp.c alephdir/ChangeLog alephdir/Makefile \
+	alephdir/aleph.defines alephdir/aleph.version \
+	alephdir/eomega.ech alephdir/etex.ch alephdir/omega.ch0 \
+	alephdir/omega.ch1 alephdir/omega.ch2 alephdir/omxml.ch \
+	alephdir/aleph.mk synctexdir/ChangeLog synctexdir/README.txt \
+	synctexdir/synctex_parser_readme.txt \
 	synctexdir/synctex_parser_version.txt synctexdir/tests \
 	synctexdir/synctex-common.h synctexdir/synctex-convert.sh \
 	synctexdir/synctex.c synctexdir/synctex.defines \
@@ -1275,8 +1277,11 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tests/xlevel1.ofm tests/xlevel1.opl tests/Cherokee.tfm \
 	tests/OCherokee.ofm tests/OCherokee.opl tests/OCherokee.ovf \
 	tests/xCherokee.pl tests/xOCherokee.ofm tests/xOCherokee.opl \
-	tests/xOCherokee.ovp cftest.p $(nodist_aleph_SOURCES) \
-	aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+	tests/xOCherokee.ovp cftest.p tests/specialhex.ofm \
+	tests/specialhex.opl tests/specialhex.ovf \
+	tests/xspecialhex.ofm tests/xspecialhex.opl \
+	tests/xspecialhex.ovp $(nodist_aleph_SOURCES) aleph.web \
+	aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = 
 web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert
 makecpool = web2c/makecpool
@@ -1848,7 +1853,7 @@ EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c
 nodist_EXTRA_xetex_SOURCES = dummy.cxx
 libxetex = libxetex.a $(am__append_23)
 xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir \
-	$(FREETYPE2_INCLUDES) $(ICU_INCLUDES) $(TECKIT_INCLUDES) \
+	$(ICU_INCLUDES) $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) \
 	$(am__append_22) $(am__append_24) $(am__append_27) \
 	$(ZLIB_INCLUDES)
 xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_25) \
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index 12a91412a9f..f678cb5b988 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -261,6 +261,7 @@ EXTRA_DIST += \
 	tests/ptmr.vpl \
 	tests/rpsyr.tfm \
 	tests/rptmr.tfm \
+	tests/specialhex.ovp \
 	tests/story.dvi \
 	tests/testex.err \
 	tests/testex.mp \
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index 95e0b5a28e0..72ad7e03905 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* specialhex.test (new): Shell script to test specials.
+	* am/omegaware.am: add the new test.
+
 2009-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* level1.test (new): Shell script to test ofm_level=1.
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index 0012c57e448..800ac8bc627 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -100,12 +100,13 @@ ovp2ovf.p: tangle$(EXEEXT) $(ovp2ovf_sources)
 
 ## Tests
 ##
-EXTRA_DIST += omegaware/level1.test omegaware/omfonts.test omegaware/otangle.test
+EXTRA_DIST += omegaware/level1.test omegaware/omfonts.test \
+	omegaware/otangle.test omegaware/specialhex.test
 
 if OTANGLE
 TESTS += omegaware/otangle.test
 if !OMFONTS
-TESTS += omegaware/level1.test omegaware/omfonts.test
+TESTS += omegaware/level1.test omegaware/omfonts.test omegaware/specialhex.test
 endif !OMFONTS
 endif OTANGLE
 
@@ -118,4 +119,8 @@ DISTCLEANFILES += tests/Cherokee.tfm tests/OCherokee.ofm \
 	tests/xOCherokee.opl tests/xOCherokee.ovp
 ## omegaware/otangle.test
 DISTCLEANFILES += cftest.p
+## omegaware/specialhex.test
+DISTCLEANFILES += tests/specialhex.ofm tests/specialhex.opl \
+	tests/specialhex.ovf tests/xspecialhex.ofm \
+	tests/xspecialhex.opl tests/xspecialhex.ovp
 
diff --git a/Build/source/texk/web2c/omegaware/specialhex.test b/Build/source/texk/web2c/omegaware/specialhex.test
new file mode 100755
index 00000000000..44cc82fbe2d
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/specialhex.test
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+test -d tests || mkdir -p tests
+
+TEXMFCNF=$srcdir/../kpathsea \
+  OFMFONTS=./tests \
+  ./ovp2ovf -verbose $srcdir/tests/specialhex tests/specialhex tests/specialhex || exit 1
+
+TEXMFCNF=$srcdir/../kpathsea \
+  ./ofm2opl -verbose tests/specialhex tests/specialhex || exit 1
+
+./opl2ofm -verbose tests/specialhex tests/xspecialhex || exit 1
+
+TEXMFCNF=$srcdir/../kpathsea \
+  ./ofm2opl -verbose tests/xspecialhex tests/xspecialhex || exit 1
+
+diff tests/specialhex.opl tests/xspecialhex.opl || exit 1
+
+TEXMFCNF=$srcdir/../kpathsea \
+  OFMFONTS=.:./tests \
+  ./ovf2ovp -verbose tests/specialhex tests/specialhex tests/xspecialhex || exit 1
+
+diff $srcdir/tests/specialhex.ovp tests/xspecialhex.ovp || exit 1
+
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index a252782944f..167d063da97 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* synctex_main.c: re-#include "web2c/c-auto.h", needed for AIX.
+
 2009-07-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/synctex.am: remove INSTALL.
diff --git a/Build/source/texk/web2c/synctexdir/synctex_main.c b/Build/source/texk/web2c/synctexdir/synctex_main.c
index 809f1505daf..a572d568381 100644
--- a/Build/source/texk/web2c/synctexdir/synctex_main.c
+++ b/Build/source/texk/web2c/synctexdir/synctex_main.c
@@ -57,7 +57,7 @@ This file is named "synctex_main.c".
 This is the command line interface to the synctex_parser.c.
 */
 
-//#   include "web2c/c-auto.h" /* for inline && HAVE_xxx */
+#   include "web2c/c-auto.h" /* for inline && HAVE_xxx */
 
 #   include <stdlib.h>
 #   include <stdio.h>
diff --git a/Build/source/texk/web2c/tests/specialhex.ovp b/Build/source/texk/web2c/tests/specialhex.ovp
new file mode 100644
index 00000000000..03a3bcf299f
--- /dev/null
+++ b/Build/source/texk/web2c/tests/specialhex.ovp
@@ -0,0 +1,34 @@
+(VTITLE Test SPECIALHEX handling)
+(OFMLEVEL H 0)
+(FONTDIR TL)
+(FAMILY UNSPECIFIED)
+(FACE F MRR)
+(CODINGSCHEME UNSPECIFIED)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 22286392)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+   (SLANT R 0.0)
+   (SPACE R 0.5)
+   (STRETCH R 0.3)
+   (SHRINK R 0.1)
+   (XHEIGHT R 0.8)
+   (QUAD R 1.0)
+   )
+(CHARACTER H 22
+   (CHARWD R 0.554)
+   (CHARHT R 0.7955)
+   (MAP
+      (SPECIAL a special string)
+      )
+   )
+(CHARACTER H 28
+   (CHARWD R 0.333)
+   (CHARHT R 0.852)
+   (CHARDP R 0.056)
+   (MAP
+      (SPECIALHEX  01234567 89ABCDEF)
+      )
+   )
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index b21d5f2b106..773619805be 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-16  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* am/xetex.am: Put ICU_INCLUDES first to avoid an installed
+	version.
+
 2009-05-13  Peter Breitenlohner <peb@mppmu.mpg.de>
 
 	* am/xetex.am: Put FREETYPE2_INCLUDES as early as possible to
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index e55f89af3da..295c9a186b4 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -16,10 +16,12 @@ nodist_EXTRA_xetex_SOURCES = dummy.cxx
 libxetex = libxetex.a
 
 xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir
-## Must add freetype2 includes as early as possible to avoid
+## Must add icu first to avoid an installed version.
+xetex_cppflags += $(ICU_INCLUDES)
+## Must add freetype2 includes early to avoid
 ## freetype1/freetype2 confusion -- what a mess.
 xetex_cppflags += $(FREETYPE2_INCLUDES)
-xetex_cppflags += $(ICU_INCLUDES) $(TECKIT_INCLUDES)
+xetex_cppflags += $(TECKIT_INCLUDES)
 xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS)
 xetex_dependencies = $(proglib)
 xetex_dependencies += $(ICU_DEPEND) $(TECKIT_DEPEND)