diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-14 21:44:28 +0000 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-14 21:44:28 +0000 |
commit | 5582fc9ddacf1f772faec89f45ffb0e7dfef5b1c (patch) | |
tree | f8f7dfd0c0a70bf7b044f9273ce9cf9bc77f9220 | |
parent | 4f919c611cf0d93c4e4a9234e5d3eca1883343bc (diff) |
Sync XeTeX
git-svn-id: svn://tug.org/texlive/trunk@34603 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/web2c/xetexdir/NEWS | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/am/xetex.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/tests/bug73.log | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/tests/bug73.tex | 7 | ||||
-rwxr-xr-x | Build/source/texk/web2c/xetexdir/xetex-bug73.test | 26 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.web | 16 |
6 files changed, 54 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/xetexdir/NEWS b/Build/source/texk/web2c/xetexdir/NEWS index 35596854573..b9213dc0114 100644 --- a/Build/source/texk/web2c/xetexdir/NEWS +++ b/Build/source/texk/web2c/xetexdir/NEWS @@ -1,5 +1,5 @@ ============================================================== -XeTeX 0.99991 was released 2014???? +XeTeX 0.99991 was released 20140614 ============================================================== XeTeX: diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index 7307db3e3ce..416a45ed8e6 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -194,7 +194,9 @@ EXTRA_DIST += \ # XeTeX Tests # -xetex_tests = xetexdir/xetex.test +xetex_tests = \ + xetexdir/xetex-bug73.test \ + xetexdir/xetex.test EXTRA_DIST += $(xetex_tests) diff --git a/Build/source/texk/web2c/xetexdir/tests/bug73.log b/Build/source/texk/web2c/xetexdir/tests/bug73.log new file mode 100644 index 00000000000..bafe3392319 --- /dev/null +++ b/Build/source/texk/web2c/xetexdir/tests/bug73.log @@ -0,0 +1,8 @@ +entering extended mode + restricted \write18 enabled. + %&-line parsing enabled. +**tests/bug73.tex +(./tests/bug73.tex +\everyvbox->\relax +[1] ) +Output written on bug73.pdf (1 page). diff --git a/Build/source/texk/web2c/xetexdir/tests/bug73.tex b/Build/source/texk/web2c/xetexdir/tests/bug73.tex new file mode 100644 index 00000000000..e9351ca31dc --- /dev/null +++ b/Build/source/texk/web2c/xetexdir/tests/bug73.tex @@ -0,0 +1,7 @@ +\begingroup % Just there to minimize tracing output + \tracingmacros=2 + \tracingonline=1 + \everyvbox{\relax} % or whatever, non-empty. + \vbox{} +\endgroup +\end diff --git a/Build/source/texk/web2c/xetexdir/xetex-bug73.test b/Build/source/texk/web2c/xetexdir/xetex-bug73.test new file mode 100755 index 00000000000..e9142806832 --- /dev/null +++ b/Build/source/texk/web2c/xetexdir/xetex-bug73.test @@ -0,0 +1,26 @@ +#! /bin/sh + +# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +TEXMFCNF=$srcdir/../kpathsea +TFMFONTS="$srcdir/tests;$srcdir/data" +T1FONTS="$srcdir/tests;$srcdir/data" +TEXFONTMAPS="$srcdir/tests;$srcdir/data" +DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data" +TEXPICTS=$srcdir/tests +export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS + +failed= + +echo "*** xetex bug73" && echo \ + && ./xetex $srcdir/tests/bug73 \ + && diff $srcdir/tests/bug73.log <(tail -n+2 bug73.log) + && echo && echo "xetex-bug73 tests OK" && echo \ + || failed="$failed xetex-bug73" + +test -z "$failed" && exit 0 +echo +echo "failed tests:$failed" +exit 1 + diff --git a/Build/source/texk/web2c/xetexdir/xetex.web b/Build/source/texk/web2c/xetexdir/xetex.web index 3961b732f58..e897b6aabb3 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.web +++ b/Build/source/texk/web2c/xetexdir/xetex.web @@ -324,8 +324,8 @@ known as `\eTeX'. @d eTeX_version_string=='-2.6' {current \eTeX\ version} @# @d XeTeX_version=0 { \.{\\XeTeXversion} } -@d XeTeX_revision==".99991" { \.{\\XeTeXrevision} } -@d XeTeX_version_string=='-0.99991' {current \XeTeX\ version} +@d XeTeX_revision==".99992" { \.{\\XeTeXrevision} } +@d XeTeX_version_string=='-0.99992' {current \XeTeX\ version} @# @d XeTeX_banner=='This is XeTeX, Version 3.14159265',eTeX_version_string,XeTeX_version_string {printed when \XeTeX\ starts} @@ -7497,12 +7497,14 @@ corresponding token types must precede |write_text|. @d every_job_text=13 {|token_type| code for \.{\\everyjob}} @d every_cr_text=14 {|token_type| code for \.{\\everycr}} @d mark_text=15 {|token_type| code for \.{\\topmark}, etc.} -@d inter_char_text=16 {text from \\XeTeXinterchartoks} @# -@d eTeX_text_offset=output_routine_loc-output_text-1 {1 more to make space for the |inter_char_text|} +@d eTeX_text_offset=output_routine_loc-output_text @d every_eof_text=every_eof_loc-eTeX_text_offset {|token_type| code for \.{\\everyeof}} @# +@d inter_char_text=XeTeX_inter_char_loc-eTeX_text_offset + {|token_type| code for \.{\\XeTeXinterchartoks}} +@# @d write_text=toks_base-eTeX_text_offset {|token_type| code for \.{\\write}} @ The |param_stack| is an auxiliary array used to hold pointers to the token @@ -7614,7 +7616,7 @@ print_char(" ") case token_type of parameter: print_nl("<argument> "); u_template,v_template: print_nl("<template> "); -backed_up_char,backed_up: if loc=null then print_nl("<recently read> ") +backed_up,backed_up_char: if loc=null then print_nl("<recently read> ") else print_nl("<to be read again> "); inserted: print_nl("<inserted text> "); macro: begin print_ln; print_cs(name); @@ -7628,8 +7630,8 @@ every_vbox_text: print_nl("<everyvbox> "); every_job_text: print_nl("<everyjob> "); every_cr_text: print_nl("<everycr> "); mark_text: print_nl("<mark> "); -inter_char_text: print_nl("<XeTeXinterchartoks> "); every_eof_text: print_nl("<everyeof> "); +inter_char_text: print_nl("<XeTeXinterchartoks> "); write_text: print_nl("<write> "); othercases print_nl("?") {this should never happen} endcases @@ -7769,7 +7771,7 @@ if t>=macro then {the token list starts with a reference count} case t of mark_text:print_esc("mark"); write_text:print_esc("write"); - othercases print_cmd_chr(assign_toks,t-output_text+output_routine_loc+1) + othercases print_cmd_chr(assign_toks,t-output_text+output_routine_loc) endcases;@/ print("->"); token_show(p); end_diagnostic(false); end; |