summaryrefslogtreecommitdiff
path: root/Build/source/texk/upmendex
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-28 07:26:00 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-28 07:26:00 +0000
commit4f68faefa41044c6b76908408d6d43c72b0b28ee (patch)
treebb69865657f6f5b26c1132131a313c760d977de9 /Build/source/texk/upmendex
parent83f55c1bec106dbd9a9bda411b48567b20c2c34a (diff)
upmendex: add a alias "headings_flag" of the keyword "heading_flag"
git-svn-id: svn://tug.org/texlive/trunk@60342 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/upmendex')
-rw-r--r--Build/source/texk/upmendex/ChangeLog7
-rw-r--r--Build/source/texk/upmendex/styfile.c17
2 files changed, 17 insertions, 7 deletions
diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog
index a105b375f9b..39ebf28ffdb 100644
--- a/Build/source/texk/upmendex/ChangeLog
+++ b/Build/source/texk/upmendex/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2021-08-26 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* sort.c:
diff --git a/Build/source/texk/upmendex/styfile.c b/Build/source/texk/upmendex/styfile.c
index 619e4a5625e..f7f00bab5ca 100644
--- a/Build/source/texk/upmendex/styfile.c
+++ b/Build/source/texk/upmendex/styfile.c
@@ -76,13 +76,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;
}
@@ -164,6 +160,13 @@ void styread(const char *filename)
continue;
}
if (getparam(buff,"icu_attributes", icu_attr_str )) 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);
+ }
}
fclose(fp);