From be62200a7e0420b4a11f6cbca5848f9ea5666c93 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 30 Sep 2011 13:10:51 +0000 Subject: TeX&Co: bug fix for unititialized line number also add a test cases for e-TeX and pdfTeX git-svn-id: svn://tug.org/texlive/trunk@24155 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/etexdir/ChangeLog | 4 ++++ Build/source/texk/web2c/etexdir/am/etex.am | 7 +++++-- Build/source/texk/web2c/etexdir/etex.ch | 7 +++---- Build/source/texk/web2c/etexdir/wprob.test | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100755 Build/source/texk/web2c/etexdir/wprob.test (limited to 'Build/source/texk/web2c/etexdir') diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index ed0003af67b..37e2bf36777 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-09-30 Peter Breitenlohner + + * etex.ch: Slightly reformulate printing of current line. + 2011-04-07 Peter Breitenlohner * etex.ch: Version 2.3, dated April 7, 2011. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 68ed516016e..4aaad707fa1 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -1,6 +1,6 @@ ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX. ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner +## Copyright (C) 2009-2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## e-TeX @@ -76,7 +76,7 @@ EXTRA_DIST += \ # e-TeX Tests # -etex_tests = etexdir/etrip.test +etex_tests = etexdir/wprob.test etexdir/etrip.test EXTRA_DIST += $(etex_tests) @@ -88,6 +88,9 @@ TRIPTRAP_CLEAN += etrip-clean endif ETEX DISTCLEANFILES += etrip.diffs +# wprob.test +EXTRA_DIST += tests/wprob.tex +DISTCLEANFILES += wprob.log wprob.tex # etrip.test etrip.diffs: etex$(EXEEXT) $(triptrap_diffs) $@ diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch index d662fb062cf..551504aad59 100644 --- a/Build/source/texk/web2c/etexdir/etex.ch +++ b/Build/source/texk/web2c/etexdir/etex.ch @@ -871,10 +871,9 @@ corresponding token types must precede |write_text|. @x [22] m.313 l.6809 - e-TeX scan_tokens else begin print_nl("l."); print_int(line); @y -else if index<>in_open then {input from a pseudo file} - begin print_nl("l."); print_int(line_stack[index+1]); - end -else begin print_nl("l."); print_int(line); +else begin print_nl("l."); + if index=in_open then print_int(line) + else print_int(line_stack[index+1]); {input from a pseudo file} @z %--------------------------------------- @x [22] m.314 l.6831 - e-TeX basic diff --git a/Build/source/texk/web2c/etexdir/wprob.test b/Build/source/texk/web2c/etexdir/wprob.test new file mode 100755 index 00000000000..c1908c516c4 --- /dev/null +++ b/Build/source/texk/web2c/etexdir/wprob.test @@ -0,0 +1,14 @@ +#! /bin/sh + +# Copyright (C) 2011 Peter Breitenlohner +# You may freely use, modify and/or distribute this file. + +rm -rf wprob.* +cp $srcdir/tests/wprob.tex . + +TEXMFCNF=$srcdir/../kpathsea \ + ./etex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex + +grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \ + wprob.log || exit 1 + -- cgit v1.2.3