texlive[60357] Build/source/texk/upmendex: upmendex: accept \r\n in

[commits+takuji at tug.org]

Revision: 60357
          http://tug.org/svn/texlive?view=revision&revision=60357
Author:   takuji
Date:     2021-08-29 06:20:33 +0200 (Sun, 29 Aug 2021)
Log Message:
-----------
upmendex: accept \r\n in icu_attributes

Modified Paths:
--------------
    trunk/Build/source/texk/upmendex/styfile.c
    trunk/Build/source/texk/upmendex/tests/attr1.ist

Modified: trunk/Build/source/texk/upmendex/styfile.c
===================================================================
--- trunk/Build/source/texk/upmendex/styfile.c	2021-08-29 04:06:16 UTC (rev 60356)
+++ trunk/Build/source/texk/upmendex/styfile.c	2021-08-29 04:20:33 UTC (rev 60357)
@@ -323,7 +323,7 @@
 
 	for (i=0;i<UCOL_ATTRIBUTE_COUNT;i++) icu_attributes[i]=UCOL_DEFAULT;
 	tmp=icu_attr_str;
-	head=strtok(tmp, " \t");
+	head=strtok(tmp, " \t\r\n");
 	while (head!=NULL) {
 	    pos=head;
 	    if (strncmp(pos,"alternate:",10)==0) {
@@ -375,6 +375,6 @@
 	illegal:
 		verb_printf(efp,"\nWarning: Illegal input for icu_attributes (%s).",head);
 	    }
-	    head=strtok(NULL, " \t");
+	    head=strtok(NULL, " \t\r\n");
 	}
 }

Modified: trunk/Build/source/texk/upmendex/tests/attr1.ist
===================================================================
--- trunk/Build/source/texk/upmendex/tests/attr1.ist	2021-08-29 04:06:16 UTC (rev 60356)
+++ trunk/Build/source/texk/upmendex/tests/attr1.ist	2021-08-29 04:20:33 UTC (rev 60357)
@@ -1 +1,2 @@
-icu_attributes "case-first:upper-first 	numeric-ordering:on	 "
+icu_attributes "case-first:upper-first 	
+numeric-ordering:on	 "