texlive[50255] Build/source/texk: upmendex: fix multibytelen()

[commits+hironobu at tug.org]

Revision: 50255
          http://tug.org/svn/texlive?view=revision&revision=50255
Author:   hironobu
Date:     2019-03-06 11:32:04 +0100 (Wed, 06 Mar 2019)
Log Message:
-----------
upmendex: fix multibytelen()

Modified Paths:
--------------
    trunk/Build/source/texk/README
    trunk/Build/source/texk/upmendex/ChangeLog
    trunk/Build/source/texk/upmendex/mendex.h

Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README	2019-03-06 09:31:40 UTC (rev 50254)
+++ trunk/Build/source/texk/README	2019-03-06 10:32:04 UTC (rev 50255)
@@ -106,7 +106,7 @@
 
 ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
 
-upmendex 0.51 - by Takuji Tanaka
+upmendex 0.52 - by Takuji Tanaka
   http://www.ctan.org/pkg/upmendex
   http://www.t-lab.opal.ne.jp/tex/uptex_en.html
 

Modified: trunk/Build/source/texk/upmendex/ChangeLog
===================================================================
--- trunk/Build/source/texk/upmendex/ChangeLog	2019-03-06 09:31:40 UTC (rev 50254)
+++ trunk/Build/source/texk/upmendex/ChangeLog	2019-03-06 10:32:04 UTC (rev 50255)
@@ -1,3 +1,7 @@
+2019-03-06  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	Fix a bug in multibytelen().
+
 2019-02-17  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* version 0.52  Beta version.

Modified: trunk/Build/source/texk/upmendex/mendex.h
===================================================================
--- trunk/Build/source/texk/upmendex/mendex.h	2019-03-06 09:31:40 UTC (rev 50254)
+++ trunk/Build/source/texk/upmendex/mendex.h	2019-03-06 10:32:04 UTC (rev 50255)
@@ -90,7 +90,7 @@
 struct index;
 void indwrite(char *filename, struct index *ind, int pagenum);
 
-#define  multibytelen(a)  ((a)<0xc2 ? 1 : ((a)<0xc2 ? -2 : ((a)<0xe0 ? 2 : ((a)<0xf0 ? 3 : ((a)<0xf5 ? 4 : -1)))))
+#define  multibytelen(a)  ((a)<0x80 ? 1 : ((a)<0xc2 ? -2 : ((a)<0xe0 ? 2 : ((a)<0xf0 ? 3 : ((a)<0xf5 ? 4 : -1)))))
 #define  is_surrogate_pair(a)   (U16_IS_LEAD(*(a)) && U16_IS_TRAIL(*(a+1)))
 
 #ifdef WIN32