Merge branch 'mendex-fix'

texjporg · Jun 16, 2021 · 518774f · 518774f
2 parents c913588 + 9254c05
commit 518774f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/source/texk/mendexk/fwrite.c b/source/texk/mendexk/fwrite.c
@@ -121,11 +121,12 @@ void indwrite(char *filename, struct index *ind, int pagenum)
 {
 	int i,j,hpoint=0;
 	char datama[2048],lbuff[BUFFERLEN];
-	FILE *fp;
+	FILE *fp=NULL;
 	int conv_euc_to_euc;
 
-	if (filename && kpse_out_name_ok(filename)) fp=fopen(filename,"wb");
-	else {
+	if (filename && kpse_out_name_ok(filename))
+		fp=fopen(filename,"wb");
+	if (fp == NULL) {
 		fp=stdout;
 #ifdef WIN32
 		setmode(fileno(fp), _O_BINARY);
@@ -218,7 +219,15 @@ void indwrite(char *filename, struct index *ind, int pagenum)
 				if ((alphabet(ind[i-1].dic[0][0]))||(japanese(ind[i-1].dic[0]))){
 					fputs(group_skip,fp);
 					if (lethead_flag && symbol_flag) {
-						fprintf(fp,"%s%s%s",lethead_prefix,symbol,lethead_suffix);
+						if (strlen(symbol)) {
+							fprintf(fp,"%s%s%s",lethead_prefix,symbol,lethead_suffix);
+						}
+						else if (lethead_flag>0) {
+							fprintf(fp,"%s%s%s",lethead_prefix,symhead_positive,lethead_suffix);
+						}
+						else if (lethead_flag<0) {
+							fprintf(fp,"%s%s%s",lethead_prefix,symhead_negative,lethead_suffix);
+						}
 					}
 				}
 			}
@@ -309,7 +318,7 @@ void indwrite(char *filename, struct index *ind, int pagenum)
 	}
 	fputs(postamble,fp);
 
-	if (filename) fclose(fp);
+	if (fp!=stdout) fclose(fp);
 }
 
 /*   write page block   */

diff --git a/source/texk/mendexk/pageread.c b/source/texk/mendexk/pageread.c
@@ -39,7 +39,7 @@ int lastpage(const char *filename)
 		fp=NULL;
 	if (fp==NULL) {
 		fprintf(stderr,"No log file, %s.\n",logfile);
-		exit(0);
+		exit(255);
 	}
 
 	while (1) {

diff --git a/source/texk/mendexk/styfile.c b/source/texk/mendexk/styfile.c
@@ -46,7 +46,7 @@ void styread(const char *filename)
 		fp=NULL;
 	if (fp==NULL) {
 		fprintf(stderr,"%s does not exist.\n",filename);
-		exit(0);
+		exit(255);
 	}
 	verb_printf(efp,"Scanning style file %s.",filename);
 

diff --git a/source/texk/upmendex/fwrite.c b/source/texk/upmendex/fwrite.c
@@ -154,11 +154,12 @@ void indwrite(char *filename, struct index *ind, int pagenum)
 	char lbuff[BUFFERLEN],obuff[BUFFERLEN];
 	UChar datama[256],initial[INITIALLENGTH],initial_prev[INITIALLENGTH];
 	int chset,chset_prev;
-	FILE *fp;
+	FILE *fp=NULL;
 	UErrorCode perr;
 
-	if (filename && kpse_out_name_ok(filename)) fp=fopen(filename,"wb");
-	else {
+	if (filename && kpse_out_name_ok(filename))
+		fp=fopen(filename,"wb");
+	if (fp == NULL) {
 		fp=stdout;
 #ifdef WIN32
 		setmode(fileno(fp), _O_BINARY);
@@ -402,7 +403,7 @@ void indwrite(char *filename, struct index *ind, int pagenum)
 	}
 	fputs(postamble,fp);
 
-	if (filename) fclose(fp);
+	if (fp!=stdout) fclose(fp);
 }
 
 /*   write page block   */

diff --git a/source/texk/upmendex/pageread.c b/source/texk/upmendex/pageread.c
@@ -39,7 +39,7 @@ int lastpage(const char *filename)
 		fp=NULL;
 	if (fp==NULL) {
 		fprintf(stderr,"No log file, %s.\n",logfile);
-		exit(0);
+		exit(255);
 	}
 
 	while (1) {

diff --git a/source/texk/upmendex/styfile.c b/source/texk/upmendex/styfile.c
@@ -47,7 +47,7 @@ void styread(const char *filename)
 		fp=NULL;
 	if (fp==NULL) {
 		fprintf(stderr,"%s does not exist.\n",filename);
-		exit(0);
+		exit(255);
 	}
 	verb_printf(efp,"Scanning style file %s.",filename);