summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-29 01:36:13 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-29 01:36:13 +0000
commit2a5ab9d04556bdef2373c3b78f48cea876df4861 (patch)
treee5dd78c98a5bc56691bfce582e5490c9b918e092 /Build/source/texk
parentb136fee29103594e68df08d2cd42f74c637a773a (diff)
mendex: fix bug of symbol_flag=0
git-svn-id: svn://tug.org/texlive/trunk@60352 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/mendexk/ChangeLog8
-rw-r--r--Build/source/texk/mendexk/fwrite.c6
-rw-r--r--Build/source/texk/mendexk/sort.c1
-rw-r--r--Build/source/texk/mendexk/version.h2
4 files changed, 13 insertions, 4 deletions
diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog
index 40bd534bc40..8c620696f80 100644
--- a/Build/source/texk/mendexk/ChangeLog
+++ b/Build/source/texk/mendexk/ChangeLog
@@ -1,3 +1,11 @@
+2021-08-29 TANAKA Takuji <ttk@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@t-lab.opal.ne.jp>
* styfile.c:
diff --git a/Build/source/texk/mendexk/fwrite.c b/Build/source/texk/mendexk/fwrite.c
index 078e334c845..523a7c81ee4 100644
--- a/Build/source/texk/mendexk/fwrite.c
+++ b/Build/source/texk/mendexk/fwrite.c
@@ -146,8 +146,8 @@ void indwrite(char *filename, struct index *ind, int pagenum)
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 @@ void indwrite(char *filename, struct index *ind, int pagenum)
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);
}
diff --git a/Build/source/texk/mendexk/sort.c b/Build/source/texk/mendexk/sort.c
index 6c925e4df36..bdf30c4180d 100644
--- a/Build/source/texk/mendexk/sort.c
+++ b/Build/source/texk/mendexk/sort.c
@@ -42,6 +42,7 @@ void wsort(struct index *ind, int num)
break;
default:
+ verb_printf(efp,"\nWarning: Illegal input for character_order (%c).",character_order[i]);
break;
}
}
diff --git a/Build/source/texk/mendexk/version.h b/Build/source/texk/mendexk/version.h
index 53827634d69..ec3235a6629 100644
--- a/Build/source/texk/mendexk/version.h
+++ b/Build/source/texk/mendexk/version.h
@@ -1,2 +1,2 @@
-#define VERSION "version " PACKAGE_VERSION " [28-Aug-2021]"
+#define VERSION "version " PACKAGE_VERSION " [29-Aug-2021]"
#define BUG_ADDRESS "issue@texjp.org"