texlive[50223] Build/source/texk/bibtex-x: bibtexu: default to 8bit

[commits+hironobu at tug.org]

Revision: 50223
          http://tug.org/svn/texlive?view=revision&revision=50223
Author:   hironobu
Date:     2019-03-04 12:35:09 +0100 (Mon, 04 Mar 2019)
Log Message:
-----------
bibtexu: default to 8bit mode; no longer require csf files

Modified Paths:
--------------
    trunk/Build/source/texk/bibtex-x/ChangeLog
    trunk/Build/source/texk/bibtex-x/bibtex-4.c
    trunk/Build/source/texk/bibtex-x/utils.c

Modified: trunk/Build/source/texk/bibtex-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/bibtex-x/ChangeLog	2019-03-04 11:30:33 UTC (rev 50222)
+++ trunk/Build/source/texk/bibtex-x/ChangeLog	2019-03-04 11:35:09 UTC (rev 50223)
@@ -1,6 +1,9 @@
 2019-03-04  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
 
 	* 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  <karl at tug.org>

Modified: trunk/Build/source/texk/bibtex-x/bibtex-4.c
===================================================================
--- trunk/Build/source/texk/bibtex-x/bibtex-4.c	2019-03-04 11:30:33 UTC (rev 50222)
+++ trunk/Build/source/texk/bibtex-x/bibtex-4.c	2019-03-04 11:35:09 UTC (rev 50223)
@@ -1825,10 +1825,20 @@
 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);

Modified: trunk/Build/source/texk/bibtex-x/utils.c
===================================================================
--- trunk/Build/source/texk/bibtex-x/utils.c	2019-03-04 11:30:33 UTC (rev 50222)
+++ trunk/Build/source/texk/bibtex-x/utils.c	2019-03-04 11:35:09 UTC (rev 50223)
@@ -986,7 +986,11 @@
     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;