From 50f43a1ab6f142722d1a8f0ec5cecd1c1eeb5d93 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 12 Feb 2014 08:50:58 +0000 Subject: web2c: ctangle, ctie, and tie: Handle input files with CRLF git-svn-id: svn://tug.org/texlive/trunk@32948 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ctiedir/ChangeLog | 4 ++++ Build/source/texk/web2c/ctiedir/ctie-k.ch | 14 ++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'Build/source/texk/web2c/ctiedir') diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog index 4c5001aafe5..9e16d1d1e91 100644 --- a/Build/source/texk/web2c/ctiedir/ChangeLog +++ b/Build/source/texk/web2c/ctiedir/ChangeLog @@ -1,3 +1,7 @@ +2014-02-12 Peter Breitenlohner + + * ctie-k.ch: Handle input lines with CRLF. + 2013-06-28 Peter Breitenlohner * ctie-k.ch: Include after . diff --git a/Build/source/texk/web2c/ctiedir/ctie-k.ch b/Build/source/texk/web2c/ctiedir/ctie-k.ch index b527aa373ea..ebb0fa0d910 100644 --- a/Build/source/texk/web2c/ctiedir/ctie-k.ch +++ b/Build/source/texk/web2c/ctiedir/ctie-k.ch @@ -151,6 +151,20 @@ static boolean get_line (file_index i, boolean do_includes) @z +Handle input lines with CRLF + +@x l.376 + if ((*(k++) = c) != ' ') inp_desc->limit = k; +@y + if ((*(k++) = c) != ' ' && c != '\r') inp_desc->limit = k; +@z + +@x l.436 + if ((*(k++) = c) != ' ') inp_desc->limit = k; +@y + if ((*(k++) = c) != ' ' && c != '\r') inp_desc->limit = k; +@z + The next piece is simplified using the kpathsea kpse_find_file function. -- cgit v1.2.3