Skip to content

Commit 2a57cf3

Browse files
committed
Merge branch 'texlive-trunk' r75367
2 parents f72e7ae + e5be811 commit 2a57cf3

File tree

16 files changed

+999
-145
lines changed

16 files changed

+999
-145
lines changed

source/libs/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ graphite2 1.3.14 - checked 10apr20
2828
https://sourceforge.net/projects/silgraphite/files/graphite2/
2929
(requires C++11)
3030

31-
harfbuzz 11.2.0 - checked 29apr25
31+
harfbuzz 11.2.1 - checked 13may25
3232
https://github.com/harfbuzz/harfbuzz/releases/latest
3333

3434
icu 76.1 - checked 27oct24 (requires C++17, e.g., g++13)

source/texk/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ ttf2pk2 - maintained here, by us
107107

108108
ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
109109

110-
upmendex 1.11 - by Takuji Tanaka
110+
upmendex 1.20 - by Takuji Tanaka
111111
https://ctan.org/pkg/upmendex
112112
https://github.com/t-tk/upmendex-package
113113

source/texk/upmendex/ChangeLog

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
2025-06-01 TANAKA Takuji <[email protected]>
2+
3+
* fwrite.c: Support digraph AA and
4+
better treatment of Ø,ø,Ö,ö,Æ,æ,Ä,ä in Danish and Norwegian.
5+
Better treatment of Ø,ø,Ö,ö,Æ,æ,Ä,ä in Icelandic.
6+
Better treatment of Ö,ö,Ø,ø,Ő,ő,Õ,õ,Ü,ü,Ű,ű,Œ,œ,Æ,æ,Ä,ä in Finnish.
7+
8+
2025-05-29 TANAKA Takuji <[email protected]>
9+
10+
* version 1.20 Stable version.
11+
* configure.ac: Bump version.
12+
* main.c, sort.c, convert.c, fwrite.c, styfile.c,
13+
kana.h, {,ex}var.h, mendex.h:
14+
Support Brahmic (Bengali, Gurmukhi, Gujarati, Kannada,
15+
Lao, Malayalam, Oriya, Sinhala, Tamil and Telugu)
16+
scripts (experimental).
17+
Add options "script_head" in style file.
18+
https://github.com/t-tk/upmendex-package/issues/14
19+
* styfile.c:
20+
Remove deprecated keyword "tumunja" from style file.
21+
* fwrite.c:
22+
Enhance treatment of S,T comma below in Romanian.
23+
Support V-W ordering in Finnish traditional collation.
24+
* sort.c:
25+
Prepare to support CJK Unified Ideographs Extention J in Unicode 17.0.
26+
It will work with future version of ICU.
27+
Treat U+3192..3195, U+3280..3289, U+A830..A835 as "other number".
28+
129
2025-03-07 Karl Berry <[email protected]>
230

331
* TL'25 release.

source/texk/upmendex/configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.72 for upmendex (TeX Live) 1.11.
3+
# Generated by GNU Autoconf 2.72 for upmendex (TeX Live) 1.20.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
@@ -611,8 +611,8 @@ MAKEFLAGS=
611611
# Identity of this package.
612612
PACKAGE_NAME='upmendex (TeX Live)'
613613
PACKAGE_TARNAME='upmendex--tex-live-'
614-
PACKAGE_VERSION='1.11'
615-
PACKAGE_STRING='upmendex (TeX Live) 1.11'
614+
PACKAGE_VERSION='1.20'
615+
PACKAGE_STRING='upmendex (TeX Live) 1.20'
616616
PACKAGE_BUGREPORT=''
617617
PACKAGE_URL=''
618618

@@ -1382,7 +1382,7 @@ if test "$ac_init_help" = "long"; then
13821382
# Omit some internal or obsolete options to make the list less imposing.
13831383
# This message is too long to be a string in the A/UX 3.1 sh.
13841384
cat <<_ACEOF
1385-
'configure' configures upmendex (TeX Live) 1.11 to adapt to many kinds of systems.
1385+
'configure' configures upmendex (TeX Live) 1.20 to adapt to many kinds of systems.
13861386

13871387
Usage: $0 [OPTION]... [VAR=VALUE]...
13881388

@@ -1454,7 +1454,7 @@ fi
14541454

14551455
if test -n "$ac_init_help"; then
14561456
case $ac_init_help in
1457-
short | recursive ) echo "Configuration of upmendex (TeX Live) 1.11:";;
1457+
short | recursive ) echo "Configuration of upmendex (TeX Live) 1.20:";;
14581458
esac
14591459
cat <<\_ACEOF
14601460

@@ -1580,7 +1580,7 @@ fi
15801580
test -n "$ac_init_help" && exit $ac_status
15811581
if $ac_init_version; then
15821582
cat <<\_ACEOF
1583-
upmendex (TeX Live) configure 1.11
1583+
upmendex (TeX Live) configure 1.20
15841584
generated by GNU Autoconf 2.72
15851585

15861586
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2284,7 +2284,7 @@ cat >config.log <<_ACEOF
22842284
This file contains any messages produced by compilers while
22852285
running configure, to aid debugging if configure makes a mistake.
22862286

2287-
It was created by upmendex (TeX Live) $as_me 1.11, which was
2287+
It was created by upmendex (TeX Live) $as_me 1.20, which was
22882288
generated by GNU Autoconf 2.72. Invocation command line was
22892289

22902290
$ $0$ac_configure_args_raw
@@ -9392,7 +9392,7 @@ fi
93929392

93939393
# Define the identity of the package.
93949394
PACKAGE='upmendex--tex-live-'
9395-
VERSION='1.11'
9395+
VERSION='1.20'
93969396

93979397

93989398
# Some tools Automake needs.
@@ -20955,7 +20955,7 @@ Usage: $0 [OPTIONS]
2095520955
Report bugs to <[email protected]>."
2095620956

2095720957
lt_cl_version="\
20958-
upmendex (TeX Live) config.lt 1.11
20958+
upmendex (TeX Live) config.lt 1.20
2095920959
configured by $0, generated by GNU Autoconf 2.72.
2096020960

2096120961
Copyright (C) 2024 Free Software Foundation, Inc.
@@ -23173,7 +23173,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2317323173
# report actual input values of CONFIG_FILES etc. instead of their
2317423174
# values after options handling.
2317523175
ac_log="
23176-
This file was extended by upmendex (TeX Live) $as_me 1.11, which was
23176+
This file was extended by upmendex (TeX Live) $as_me 1.20, which was
2317723177
generated by GNU Autoconf 2.72. Invocation command line was
2317823178

2317923179
CONFIG_FILES = $CONFIG_FILES
@@ -23241,7 +23241,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
2324123241
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2324223242
ac_cs_config='$ac_cs_config_escaped'
2324323243
ac_cs_version="\\
23244-
upmendex (TeX Live) config.status 1.11
23244+
upmendex (TeX Live) config.status 1.20
2324523245
configured by $0, generated by GNU Autoconf 2.72,
2324623246
with options \\"\$ac_cs_config\\"
2324723247

source/texk/upmendex/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dnl This file is free software; the copyright holder
88
dnl gives unlimited permission to copy and/or distribute it,
99
dnl with or without modifications, as long as this notice is preserved.
1010
dnl
11-
AC_INIT([upmendex (TeX Live)],[1.11])
11+
AC_INIT([upmendex (TeX Live)],[1.20])
1212
AC_PREREQ([2.71])
1313
AC_CONFIG_SRCDIR([main.c])
1414
AC_CONFIG_AUX_DIR([../../build-aux])

source/texk/upmendex/convert.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ int convert(UChar *buff1, UChar *buff2)
234234
else if (is_latin(buff3)||is_cyrillic(buff3)||is_greek(buff3)
235235
||is_jpn_kana(buff3)||is_kor_hngl(buff3)||is_zhuyin(buff3)
236236
||is_numeric(buff3)==1||is_type_symbol(buff3)==1
237-
||is_devanagari(buff3)||is_thai(buff3)||is_arabic(buff3)||is_hebrew(buff3)
237+
||is_brahmic(buff3)||is_thai(buff3)||is_lao(buff3)
238+
||is_arabic(buff3)||is_hebrew(buff3)
238239
||is_type_mark_or_punct(buff3)) {
239240
buff2[j]=buff3[0];
240241
if (wclen==2) buff2[j+1]=buff3[1];

source/texk/upmendex/exvar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extern char numhead_positive[],numhead_negative[];
3232
extern int symbol_flag;
3333
extern int letter_head;
3434
extern UChar atama[],hangul_head[],hanzi_head[],kana_head[];
35-
extern UChar devanagari_head[],thai_head[];
35+
extern UChar brahmic_head[][STYBUFSIZE];
3636
extern char page_compositor[],page_precedence[];
3737
extern char character_order[];
3838
extern char script_preamble[][STYBUFSIZE],script_postamble[][STYBUFSIZE];

0 commit comments

Comments
 (0)