diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-22 12:31:25 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-22 12:31:25 +0000 |
commit | 9ab647a519c9349087025e280cfac5b2035585a8 (patch) | |
tree | 6d5e3ab1f12a42ff17c1155bfc826f6bd397648b /Build/source/texk/ptexenc | |
parent | 8eeb471c78437a3fc1ad286d4ff02ee2a41d50b0 (diff) |
minor pTeX fixes
git-svn-id: svn://tug.org/texlive/trunk@17960 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ptexenc')
-rw-r--r-- | Build/source/texk/ptexenc/ChangeLog.TL | 6 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/ptexenc.c | 13 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/ptexenc.h | 4 |
3 files changed, 6 insertions, 17 deletions
diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL index b1ccd18f891..bc6c66bab18 100644 --- a/Build/source/texk/ptexenc/ChangeLog.TL +++ b/Build/source/texk/ptexenc/ChangeLog.TL @@ -1,6 +1,12 @@ ChangeLog.TL: TeX Live (TL) changes for ptexenc =============================================== +2010-04-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ptexenc.[ch] (input_line3): Removed. + * ptexenc.h (inputline3): Removed. + (inputline2): Moved from here to ../web2c/ptexdir/kanji.h. + 2010-04-19 Peter Breitenlohner <peb@mppmu.mpg.de> * jisx0208.h (new): Copy of ../../libs/gd/gd-2.0.35/jisx0208.h. diff --git a/Build/source/texk/ptexenc/ptexenc.c b/Build/source/texk/ptexenc/ptexenc.c index bf8378c0044..9fc23129cea 100644 --- a/Build/source/texk/ptexenc/ptexenc.c +++ b/Build/source/texk/ptexenc/ptexenc.c @@ -579,19 +579,6 @@ long input_line2(FILE *fp, string buff, long pos, } -/* only for pbibtex */ -long input_line3(FILE *fp, string buff, long pos, const long buffsize) -{ - int i; - long last; - - last = input_line2(fp, buff, pos, buffsize, &i); - if (i == EOF && pos == last) return -1; - if (i != EOF && i != '\n' && i != '\r') return -1; - return last; -} - - static const_string in_filter = NULL; static FILE *piped_fp[NOFILE]; static int piped_num = 0; diff --git a/Build/source/texk/ptexenc/ptexenc.h b/Build/source/texk/ptexenc/ptexenc.h index 32dd464cb70..3fc2fe2711e 100644 --- a/Build/source/texk/ptexenc/ptexenc.h +++ b/Build/source/texk/ptexenc/ptexenc.h @@ -49,10 +49,6 @@ extern KPSEDLL int fputs2(const char *s, FILE *fp); /* input line with encoding conversion */ extern KPSEDLL long input_line2(FILE *fp, string buff, long pos, const long buffsize, int *lastchar); -#define inputline2(fp,buff,pos,size) input_line2(fp,buff,pos,size,NULL) -extern KPSEDLL long input_line3(FILE *fp, string buff, long pos, - const long buffsize); -#define inputline3(fp,buff,pos,size) input_line3(fp,buff,pos,size) /* open/close through nkf */ extern KPSEDLL void nkf_disable(void); |