diff options
| -rw-r--r-- | Build/source/texk/upmendex/ChangeLog | 9 | ||||
| -rwxr-xr-x | Build/source/texk/upmendex/configure | 22 | ||||
| -rw-r--r-- | Build/source/texk/upmendex/configure.ac | 2 | ||||
| -rw-r--r-- | Build/source/texk/upmendex/fwrite.c | 11 | ||||
| -rw-r--r-- | Build/source/texk/upmendex/sort.c | 4 |
5 files changed, 36 insertions, 12 deletions
diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog index 0d5f6c41b61..fe24a1cd3c2 100644 --- a/Build/source/texk/upmendex/ChangeLog +++ b/Build/source/texk/upmendex/ChangeLog @@ -1,3 +1,12 @@ +2022-11-16 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * version 1.06 Stable version. + * configure.ac: Bump version. + * sort.c: Add parameter option "@" to character_order, + which denotes character order is defined by icu_rules. + * fwrite.c: Better treatment for Marathi KSSA, JNYA. + * upmendex.ja.txt: Update document. + 2022-10-08 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * version 1.05 Stable version. diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure index 92ff289a71d..b906de77c5e 100755 --- a/Build/source/texk/upmendex/configure +++ b/Build/source/texk/upmendex/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for upmendex (TeX Live) 1.05. +# Generated by GNU Autoconf 2.71 for upmendex (TeX Live) 1.06. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -626,8 +626,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='upmendex (TeX Live)' PACKAGE_TARNAME='upmendex--tex-live-' -PACKAGE_VERSION='1.05' -PACKAGE_STRING='upmendex (TeX Live) 1.05' +PACKAGE_VERSION='1.06' +PACKAGE_STRING='upmendex (TeX Live) 1.06' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1390,7 +1390,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures upmendex (TeX Live) 1.05 to adapt to many kinds of systems. +\`configure' configures upmendex (TeX Live) 1.06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1462,7 +1462,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of upmendex (TeX Live) 1.05:";; + short | recursive ) echo "Configuration of upmendex (TeX Live) 1.06:";; esac cat <<\_ACEOF @@ -1587,7 +1587,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -upmendex (TeX Live) configure 1.05 +upmendex (TeX Live) configure 1.06 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2268,7 +2268,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by upmendex (TeX Live) $as_me 1.05, which was +It was created by upmendex (TeX Live) $as_me 1.06, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -8806,7 +8806,7 @@ fi # Define the identity of the package. PACKAGE='upmendex--tex-live-' - VERSION='1.05' + VERSION='1.06' # Some tools Automake needs. @@ -18942,7 +18942,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -upmendex (TeX Live) config.lt 1.05 +upmendex (TeX Live) config.lt 1.06 configured by $0, generated by GNU Autoconf 2.71. Copyright (C) 2011 Free Software Foundation, Inc. @@ -21114,7 +21114,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by upmendex (TeX Live) $as_me 1.05, which was +This file was extended by upmendex (TeX Live) $as_me 1.06, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21182,7 +21182,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -upmendex (TeX Live) config.status 1.05 +upmendex (TeX Live) config.status 1.06 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/upmendex/configure.ac b/Build/source/texk/upmendex/configure.ac index 78deb7b6501..33d5236a8a8 100644 --- a/Build/source/texk/upmendex/configure.ac +++ b/Build/source/texk/upmendex/configure.ac @@ -8,7 +8,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([upmendex (TeX Live)],[1.05]) +AC_INIT([upmendex (TeX Live)],[1.06]) AC_PREREQ([2.71]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/upmendex/fwrite.c b/Build/source/texk/upmendex/fwrite.c index e000d8b01bc..a27d269fb67 100644 --- a/Build/source/texk/upmendex/fwrite.c +++ b/Build/source/texk/upmendex/fwrite.c @@ -951,6 +951,17 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset) return; } } + /* Devanagary, Marathi */ + if ( (istr[0]==0x915 && istr[1]==0x94D && istr[2]== 0x937) /* KSSA क्ष */ + || (istr[0]==0x91C && istr[1]==0x94D && istr[2]== 0x91E)) { /* JNYA ज्ञ */ + strY[0]=istr[0]; strY[1]=istr[1]; strY[2]=istr[2]; strY[3]=L'\0'; + strZ[0]=0x939; strZ[1]=L'\0'; /* HA ह */ + order = ucol_strcoll(icu_collator, strZ, -1, strY, -1); + if (order==UCOL_LESS) { + u_strcpy(ini,strY); + return; + } + } if (ch==0x929||ch==0x931||ch==0x934||(0x958<=ch&&ch<=0x95F) /* Devanagary */ ||(0x622<=ch&&ch<=0x626)||ch==0x6C0||ch==0x6C2||ch==0x6D3 /* Arabic */ ||(0xFB50<=ch&&ch<=0xFDFF) /* Arabic Presentation Forms-A */ diff --git a/Build/source/texk/upmendex/sort.c b/Build/source/texk/upmendex/sort.c index 739a8f66ce7..0dd9e9e37cc 100644 --- a/Build/source/texk/upmendex/sort.c +++ b/Build/source/texk/upmendex/sort.c @@ -141,6 +141,10 @@ void wsort(struct index *ind, int num) hbrw=order++; break; + case '@': + sym=nmbr=ltn=kana=hngl=hnz=cyr=grk=dvng=thai=arab=hbrw=order++; + break; + default: verb_printf(efp,"\nWarning: Illegal input for character_order (%c).",character_order[i]); break; |