texlive[60341] Build/source/texk/mendexk: mendex: add a alias

[commits+takuji at tug.org]

Revision: 60341
          http://tug.org/svn/texlive?view=revision&revision=60341
Author:   takuji
Date:     2021-08-28 09:23:33 +0200 (Sat, 28 Aug 2021)
Log Message:
-----------
mendex: add a alias "headings_flag" of the keyword "heading_flag"

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

Modified: trunk/Build/source/texk/mendexk/ChangeLog
===================================================================
--- trunk/Build/source/texk/mendexk/ChangeLog	2021-08-27 23:48:44 UTC (rev 60340)
+++ trunk/Build/source/texk/mendexk/ChangeLog	2021-08-28 07:23:33 UTC (rev 60341)
@@ -1,3 +1,11 @@
+2021-08-28  TANAKA Takuji  <ttk at 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 at gmail.com>
 
 	* fwrite.c: Avoid segmentation fault for unwritable fopen.

Modified: trunk/Build/source/texk/mendexk/styfile.c
===================================================================
--- trunk/Build/source/texk/mendexk/styfile.c	2021-08-27 23:48:44 UTC (rev 60340)
+++ trunk/Build/source/texk/mendexk/styfile.c	2021-08-28 07:23:33 UTC (rev 60341)
@@ -75,16 +75,12 @@
 		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) {
+		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;
 		}
-		cc=scompare(buff,"heading_flag");
-		if (cc!= -1) {
-			lethead_flag=atoi(&buff[cc]);
-			continue;
-		}
 		cc=scompare(buff,"priority");
 		if (cc!= -1) {
 			priority=atoi(&buff[cc]);
@@ -134,6 +130,13 @@
 		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);
 

Modified: trunk/Build/source/texk/mendexk/version.h
===================================================================
--- trunk/Build/source/texk/mendexk/version.h	2021-08-27 23:48:44 UTC (rev 60340)
+++ trunk/Build/source/texk/mendexk/version.h	2021-08-28 07:23:33 UTC (rev 60341)
@@ -1,2 +1,2 @@
-#define VERSION  "version " PACKAGE_VERSION " [13-Jun-2021]"
+#define VERSION  "version " PACKAGE_VERSION " [28-Aug-2021]"
 #define BUG_ADDRESS "issue at texjp.org"