texlive[60352] Build/source/texk/mendexk: mendex: fix bug of

[commits+takuji at tug.org]

Revision: 60352
          http://tug.org/svn/texlive?view=revision&revision=60352
Author:   takuji
Date:     2021-08-29 03:36:13 +0200 (Sun, 29 Aug 2021)
Log Message:
-----------
mendex: fix bug of symbol_flag=0

Modified Paths:
--------------
    trunk/Build/source/texk/mendexk/ChangeLog
    trunk/Build/source/texk/mendexk/fwrite.c
    trunk/Build/source/texk/mendexk/sort.c
    trunk/Build/source/texk/mendexk/version.h

Modified: trunk/Build/source/texk/mendexk/ChangeLog
===================================================================
--- trunk/Build/source/texk/mendexk/ChangeLog	2021-08-29 01:26:23 UTC (rev 60351)
+++ trunk/Build/source/texk/mendexk/ChangeLog	2021-08-29 01:36:13 UTC (rev 60352)
@@ -1,3 +1,11 @@
+2021-08-29  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* sort.c:
+	Strict check for "character_order" in style file.
+	* fwrite.c:
+	Fix a bug when "symbol_flag" is 0.
+	* version.h: Date [29-Aug-2021]
+
 2021-08-28  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* styfile.c:

Modified: trunk/Build/source/texk/mendexk/fwrite.c
===================================================================
--- trunk/Build/source/texk/mendexk/fwrite.c	2021-08-29 01:26:23 UTC (rev 60351)
+++ trunk/Build/source/texk/mendexk/fwrite.c	2021-08-29 01:36:13 UTC (rev 60352)
@@ -146,8 +146,8 @@
 	for (i=line_length=0;i<lines;i++) {
 		if (i==0) {
 			if (!((alphabet(ind[i].dic[0][0]))||(japanese(ind[i].dic[0])))) {
-				if (lethead_flag) {
-					if (symbol_flag && strlen(symbol)) {
+				if (lethead_flag!=0 && symbol_flag) {
+					if (strlen(symbol)) {
 						fprintf(fp,"%s%s%s",lethead_prefix,symbol,lethead_suffix);
 					}
 					else if (lethead_flag>0) {
@@ -218,7 +218,7 @@
 			if (!((alphabet(ind[i].dic[0][0]))||(japanese(ind[i].dic[0])))) {
 				if ((alphabet(ind[i-1].dic[0][0]))||(japanese(ind[i-1].dic[0]))){
 					fputs(group_skip,fp);
-					if (lethead_flag && symbol_flag) {
+					if (lethead_flag!=0 && symbol_flag) {
 						if (strlen(symbol)) {
 							fprintf(fp,"%s%s%s",lethead_prefix,symbol,lethead_suffix);
 						}

Modified: trunk/Build/source/texk/mendexk/sort.c
===================================================================
--- trunk/Build/source/texk/mendexk/sort.c	2021-08-29 01:26:23 UTC (rev 60351)
+++ trunk/Build/source/texk/mendexk/sort.c	2021-08-29 01:36:13 UTC (rev 60352)
@@ -42,6 +42,7 @@
 			break;
 
 		default:
+			verb_printf(efp,"\nWarning: Illegal input for character_order (%c).",character_order[i]);
 			break;
 		}
 	}

Modified: trunk/Build/source/texk/mendexk/version.h
===================================================================
--- trunk/Build/source/texk/mendexk/version.h	2021-08-29 01:26:23 UTC (rev 60351)
+++ trunk/Build/source/texk/mendexk/version.h	2021-08-29 01:36:13 UTC (rev 60352)
@@ -1,2 +1,2 @@
-#define VERSION  "version " PACKAGE_VERSION " [28-Aug-2021]"
+#define VERSION  "version " PACKAGE_VERSION " [29-Aug-2021]"
 #define BUG_ADDRESS "issue at texjp.org"