summaryrefslogtreecommitdiff
path: root/Build/source/texk/mendexk
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-28 07:23:33 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-28 07:23:33 +0000
commit83f55c1bec106dbd9a9bda411b48567b20c2c34a (patch)
tree1c18c88293853846d4487761c450fd70a2eefb28 /Build/source/texk/mendexk
parentb2dfa19a3e06c3246430b0c5bd38eb34e4b31004 (diff)
mendex: add a alias "headings_flag" of the keyword "heading_flag"
git-svn-id: svn://tug.org/texlive/trunk@60341 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/mendexk')
-rw-r--r--Build/source/texk/mendexk/ChangeLog8
-rw-r--r--Build/source/texk/mendexk/styfile.c17
-rw-r--r--Build/source/texk/mendexk/version.h2
3 files changed, 19 insertions, 8 deletions
diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog
index dda22c2955c..40bd534bc40 100644
--- a/Build/source/texk/mendexk/ChangeLog
+++ b/Build/source/texk/mendexk/ChangeLog
@@ -1,3 +1,11 @@
+2021-08-28 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * styfile.c:
+ Add a alias "headings_flag" of the keyword "heading_flag"
+ in style file for compatibility with makeindex.
+ Warn if specifier in style file is unknown.
+ * version.h: Date [28-Aug-2021]
+
2021-06-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
* fwrite.c: Avoid segmentation fault for unwritable fopen.
diff --git a/Build/source/texk/mendexk/styfile.c b/Build/source/texk/mendexk/styfile.c
index db5651cf0cb..054b24b4283 100644
--- a/Build/source/texk/mendexk/styfile.c
+++ b/Build/source/texk/mendexk/styfile.c
@@ -75,13 +75,9 @@ void styread(const char *filename)
if (getparam(buff,"symhead_negative",symhead_negative)) continue;
if (getparam(buff,"numhead_positive",numhead_positive)) continue;
if (getparam(buff,"numhead_negative",numhead_negative)) continue;
- cc=scompare(buff,"lethead_flag");
- if (cc!= -1) {
- lethead_flag=atoi(&buff[cc]);
- continue;
- }
- cc=scompare(buff,"heading_flag");
- if (cc!= -1) {
+ if ( (cc=scompare(buff,"lethead_flag")) != -1 ||
+ (cc=scompare(buff,"heading_flag")) != -1 ||
+ (cc=scompare(buff,"headings_flag")) != -1 ) {
lethead_flag=atoi(&buff[cc]);
continue;
}
@@ -134,6 +130,13 @@ void styread(const char *filename)
if (getparam(buff,"page_compositor",page_compositor)) continue;
if (getparam(buff,"page_precedence",page_precedence)) continue;
if (getparam(buff,"character_order",character_order)) continue;
+
+ cc=strcspn(buff," \t\r\n");
+ if (cc>0) buff[cc]='\0';
+ if (buff[0]=='%' || buff[0]=='\n') continue;
+ if (strlen(buff)>0) {
+ verb_printf(efp,"\nWarning: Unknown specifier (%s).", buff);
+ }
}
nkf_close(fp);
diff --git a/Build/source/texk/mendexk/version.h b/Build/source/texk/mendexk/version.h
index 565459f3239..53827634d69 100644
--- a/Build/source/texk/mendexk/version.h
+++ b/Build/source/texk/mendexk/version.h
@@ -1,2 +1,2 @@
-#define VERSION "version " PACKAGE_VERSION " [13-Jun-2021]"
+#define VERSION "version " PACKAGE_VERSION " [28-Aug-2021]"
#define BUG_ADDRESS "issue@texjp.org"