summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-29 04:20:33 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2021-08-29 04:20:33 +0000
commit78d9ba19a8f4ceb7ce76cea9c2837cef914b107c (patch)
tree3689b22317da85f1e69e37ee3cd7e6751b557c1d /Build
parente2861beed768a741fd41e8df0ab6a74f5b583d05 (diff)
upmendex: accept \r\n in icu_attributes
git-svn-id: svn://tug.org/texlive/trunk@60357 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/upmendex/styfile.c4
-rw-r--r--Build/source/texk/upmendex/tests/attr1.ist3
2 files changed, 4 insertions, 3 deletions
diff --git a/Build/source/texk/upmendex/styfile.c b/Build/source/texk/upmendex/styfile.c
index 961b5f7b6cc..cecf29d7255 100644
--- a/Build/source/texk/upmendex/styfile.c
+++ b/Build/source/texk/upmendex/styfile.c
@@ -323,7 +323,7 @@ void set_icu_attributes(void)
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 @@ void set_icu_attributes(void)
illegal:
verb_printf(efp,"\nWarning: Illegal input for icu_attributes (%s).",head);
}
- head=strtok(NULL, " \t");
+ head=strtok(NULL, " \t\r\n");
}
}
diff --git a/Build/source/texk/upmendex/tests/attr1.ist b/Build/source/texk/upmendex/tests/attr1.ist
index c8d71833adb..301aff0a6a1 100644
--- a/Build/source/texk/upmendex/tests/attr1.ist
+++ b/Build/source/texk/upmendex/tests/attr1.ist
@@ -1 +1,2 @@
-icu_attributes "case-first:upper-first numeric-ordering:on "
+icu_attributes "case-first:upper-first
+numeric-ordering:on "