summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/ptexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-07-20 07:00:05 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-07-20 07:00:05 +0000
commit89755f7344de571c4b1b7c68e90de39363a4d1ff (patch)
treed735587f7030f0536272048df7a4b53cefc133a4 /Build/source/texk/web2c/ptexdir
parent713aef9b071ca2b5dd68d014e99897f0e5e2036c (diff)
libs/t1lib + texk/ps2pkm: bug fix and update
git-svn-id: svn://tug.org/texlive/trunk@23187 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/ptexdir')
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog12
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am28
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex-base.ch44
-rw-r--r--Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf2
4 files changed, 47 insertions, 39 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 7c7790a62e8..37600573f4d 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am (pweb_tests): New variable for tests of pTeX
+ related Web programs (split off ptex_tests).
+
+ * ptrip/texmf.cnf (main_memory): Increase for SyncTeX.
+
+2011-06-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am (ptex_ch_srcs): SyncTeX infrastructure.
+ * ptex-base.ch: Slightly reformulate to simplify SyncTeX.
+
2011-04-19 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index 9a989dd1647..51c38bdf5f2 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -1,6 +1,6 @@
## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
##
-## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -11,14 +11,14 @@ pweb_programs = pbibtex pdvitype ppltotf ptftopl
# pTeX Tests
#
-ptex_tests = \
+ptex_tests = ptexdir/ptrip.test
+pweb_tests = \
ptexdir/pbibtex.test \
ptexdir/pdvitype.test \
ptexdir/ppltotf.test \
- ptexdir/ptftopl.test \
- ptexdir/ptrip.test
+ ptexdir/ptftopl.test
-EXTRA_DIST += $(ptex_tests)
+EXTRA_DIST += $(ptex_tests) $(pweb_tests)
DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
$(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
@@ -41,10 +41,10 @@ libkanji_a_CPPFLAGS = $(ptex_cppflags)
##
if PTEX
bin_PROGRAMS += ptex
-if WEB
-bin_PROGRAMS += $(pweb_programs)
-endif WEB
endif PTEX
+if PWEB
+bin_PROGRAMS += $(pweb_programs)
+endif PWEB
EXTRA_PROGRAMS += ptex $(pweb_programs)
ptex_CPPFLAGS = $(ptex_cppflags)
@@ -93,6 +93,7 @@ ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
$(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
ptex_ch_srcs = \
ptexdir/ptex-base.ch \
+ $(ptex_ch_synctex) \
tex-binpool.ch
EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines
@@ -116,8 +117,8 @@ pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
$(tie) -m pbibtex.web bibtex.web bibtex.ch
EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
-ptex_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
-ptex_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
+pweb_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
+pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
## pDVItype
##
@@ -135,7 +136,7 @@ pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
$(tie) -m pdvitype.web dvitype.web dvitype.ch
EXTRA_DIST += ptexdir/pdvitype.ch
-ptex_tests += ptexdir/sample.test
+pweb_tests += ptexdir/sample.test
## pPLtoTF
##
@@ -169,7 +170,7 @@ ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
$(tie) -m ptftopl.web tftopl.web tftopl.ch
EXTRA_DIST += ptexdir/ptftopl.ch
-ptex_tests += ptexdir/yokotate.test
+pweb_tests += ptexdir/yokotate.test
##
EXTRA_DIST += \
@@ -186,6 +187,9 @@ check_PROGRAMS += dvitype pltotf tftopl
TRIPTRAP += ptrip.diffs
TRIPTRAP_CLEAN += ptrip-clean
endif PTEX
+if PWEB
+TESTS += $(pweb_tests)
+endif PWEB
## Test data and results
##
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index acbcf143a81..051df8a7fce 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -673,37 +673,32 @@ end
@x [13.202] l.4056 - pTeX:
kern_node,math_node,penalty_node: do_nothing;
@y
- kern_node,disp_node,math_node,penalty_node: do_nothing;
+ disp_node,
+ kern_node,math_node,penalty_node: do_nothing;
@z
@x [14.206] l.4121 - pTeX: space_ptr, xspace_ptr, dir_node, disp_node
@ @<Case statement to copy...@>=
-case type(p) of
+@y
+@ @<Case statement to copy...@>=
+@z
+@x [14.206] l.4123
hlist_node,vlist_node,unset_node: begin r:=get_node(box_node_size);
mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
- list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|}
- words:=5;
- end;
-rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size;
- end;
+@y
+dir_node,
+hlist_node,vlist_node,unset_node: begin r:=get_node(box_node_size);
+ mem[r+7]:=mem[p+7];
+ mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words}
+ add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+@z
+@x [14.206] l.4130
ins_node: begin r:=get_node(ins_node_size); mem[r+4]:=mem[p+4];
add_glue_ref(split_top_ptr(p));
ins_ptr(r):=copy_node_list(ins_ptr(p)); {this affects |mem[r+4]|}
words:=ins_node_size-1;
end;
@y
-@ @<Case statement to copy...@>=
-case type(p) of
-hlist_node,vlist_node,dir_node,unset_node:
- begin r:=get_node(box_node_size);
- mem[r+7]:=mem[p+7];
- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words}
- add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
- list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|}
- words:=5;
- end;
-rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size;
- end;
ins_node: begin r:=get_node(ins_node_size);
mem[r+5]:=mem[p+5]; mem[r+4]:=mem[p+4];
add_glue_ref(split_top_ptr(p));
@@ -714,12 +709,9 @@ ins_node: begin r:=get_node(ins_node_size);
@x [14.206] l.4140 - pTeX: disp_node
kern_node,math_node,penalty_node: begin r:=get_node(small_node_size);
- words:=small_node_size;
- end;
@y
-kern_node,disp_node,math_node,penalty_node:
- begin r:=get_node(small_node_size); words:=small_node_size;
- end;
+disp_node,
+kern_node,math_node,penalty_node: begin r:=get_node(small_node_size);
@z
@x [15.207] l.4201 - pTeX: Add kanji, kana, other_kchar category codes.
@@ -2568,10 +2560,10 @@ fget; read_sixteen(nk);
fget; read_sixteen(ne);
fget; read_sixteen(np);
if jfm_flag<>dir_default then
- begin if lf<>7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort
+ begin if lf<>7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort;
end
else
- begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort
+ begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort;
end;
if (nw=0)or(nh=0)or(nd=0)or(ni=0) then abort;
end
diff --git a/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf b/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
index 79e15b44a37..b6f41d3b62c 100644
--- a/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
+++ b/Build/source/texk/web2c/ptexdir/ptrip/texmf.cnf
@@ -8,7 +8,7 @@ max_print_line = 72
% pTeX.
mem_bot = 1
-main_memory = 3500
+main_memory = 4500
max_strings = 3000
pool_size = 40000