From 44a9f4188160b309de307a135225022554b1f419 Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Mon, 4 Mar 2019 11:35:09 +0000 Subject: bibtexu: default to 8bit mode; no longer require csf files git-svn-id: svn://tug.org/texlive/trunk@50223 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/bibtex-x/ChangeLog | 3 +++ Build/source/texk/bibtex-x/bibtex-4.c | 18 ++++++++++++++---- Build/source/texk/bibtex-x/utils.c | 4 ++++ 3 files changed, 21 insertions(+), 4 deletions(-) (limited to 'Build/source/texk/bibtex-x') diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog index 2b285944e4f..b040f64ff3b 100644 --- a/Build/source/texk/bibtex-x/ChangeLog +++ b/Build/source/texk/bibtex-x/ChangeLog @@ -1,6 +1,9 @@ 2019-03-04 Hironobu Yamashita * bibtex.c, utils.c: Print ICU version in BibTeXu. + * utils.c: Default to Flag_8bit in BibTeXu. We should NOT + read any csf file in BibTeXu. (BibTeX8 is unaffected) + * bibtex-4.c: Fix x_purify() for BibTeXu. * bibtex-2.c: Suppress compiler warnings. 2017-04-27 Karl Berry diff --git a/Build/source/texk/bibtex-x/bibtex-4.c b/Build/source/texk/bibtex-x/bibtex-4.c index 95f30801fca..3a41e44911f 100644 --- a/Build/source/texk/bibtex-x/bibtex-4.c +++ b/Build/source/texk/bibtex-x/bibtex-4.c @@ -1825,10 +1825,20 @@ When we processe the character UTF-8, the length has been changed. This focntion quick_sort. 23/sep/2009 */ DO_UTF8(ex_buf[ex_buf_ptr], - ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr++], - ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; ex_buf_xptr += 2, - ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; ex_buf_xptr += 3, - ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; ex_buf_xptr += 4); + ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; + ex_buf_xptr += 1, + ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; + ex_buf[ex_buf_xptr+1] = ex_buf[ex_buf_ptr+1]; + ex_buf_xptr += 2; ex_buf_ptr += 1, + ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; + ex_buf[ex_buf_xptr+1] = ex_buf[ex_buf_ptr+1]; + ex_buf[ex_buf_xptr+2] = ex_buf[ex_buf_ptr+2]; + ex_buf_xptr += 3; ex_buf_ptr += 2, + ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; + ex_buf[ex_buf_xptr+1] = ex_buf[ex_buf_ptr+1]; + ex_buf[ex_buf_xptr+2] = ex_buf[ex_buf_ptr+2]; + ex_buf[ex_buf_xptr+3] = ex_buf[ex_buf_ptr+3]; + ex_buf_xptr += 4; ex_buf_ptr += 3); #else ex_buf[ex_buf_xptr] = ex_buf[ex_buf_ptr]; INCR (ex_buf_xptr); diff --git a/Build/source/texk/bibtex-x/utils.c b/Build/source/texk/bibtex-x/utils.c index c05c475a25b..0f8d2adf572 100644 --- a/Build/source/texk/bibtex-x/utils.c +++ b/Build/source/texk/bibtex-x/utils.c @@ -986,7 +986,11 @@ void parse_cmd_line (int argc, char **argv) int no_files; Flag_7bit = FALSE; +#ifdef UTF_8 + Flag_8bit = TRUE; +#else Flag_8bit = FALSE; +#endif Flag_big = FALSE; Flag_debug = FALSE; Flag_huge = FALSE; -- cgit v1.2.3