-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into build/work000 r71232 #158
- Loading branch information
Showing
36 changed files
with
6,223 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,15 @@ | ||
| 2024-05-11 TANAKA Takuji <[email protected]> | ||
|
|
||
| * dvi.c: Ensure enc_name "UTF16" prior to encoding conversion | ||
| from UTF32 to UTF16. | ||
| * dvipdfmx-upjf3.test, tests/upjf3.{tex,dvi}, | ||
| tests/upj{f,v}-h{u,i}.tfm, | ||
| tests/upj{f,v}3_full.{vf,zvp0}, tests/upjf-noto.map, | ||
| tests/Makefile_upjf, Makefile.am: Add a test for | ||
| upTeX new encoding. It requires Noto Hentaigana fonts. | ||
| https://github.com/texjporg/tex-jp-build/issues/46 | ||
| * configure.ac: version 20240511. | ||
|
|
||
| 2024-04-29 TANAKA Takuji <[email protected]> | ||
|
|
||
| * tfm.c: Fix segfaults. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #! /bin/sh | ||
| # Guess values for system-dependent variables and create Makefiles. | ||
| # Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240429. | ||
| # Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240511. | ||
| # | ||
| # Report bugs to <[email protected]>. | ||
| # | ||
|
|
@@ -614,8 +614,8 @@ MAKEFLAGS= | |
| # Identity of this package. | ||
| PACKAGE_NAME='dvipdfm-x (TeX Live)' | ||
| PACKAGE_TARNAME='dvipdfm-x--tex-live-' | ||
| PACKAGE_VERSION='20240429' | ||
| PACKAGE_STRING='dvipdfm-x (TeX Live) 20240429' | ||
| PACKAGE_VERSION='20240511' | ||
| PACKAGE_STRING='dvipdfm-x (TeX Live) 20240511' | ||
| PACKAGE_BUGREPORT='[email protected]' | ||
| PACKAGE_URL='' | ||
|
|
||
|
|
@@ -1383,7 +1383,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 dvipdfm-x (TeX Live) 20240429 to adapt to many kinds of systems. | ||
| 'configure' configures dvipdfm-x (TeX Live) 20240511 to adapt to many kinds of systems. | ||
|
|
||
| Usage: $0 [OPTION]... [VAR=VALUE]... | ||
|
|
||
|
|
@@ -1455,7 +1455,7 @@ fi | |
|
|
||
| if test -n "$ac_init_help"; then | ||
| case $ac_init_help in | ||
| short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240429:";; | ||
| short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240511:";; | ||
| esac | ||
| cat <<\_ACEOF | ||
|
|
||
|
|
@@ -1586,7 +1586,7 @@ fi | |
| test -n "$ac_init_help" && exit $ac_status | ||
| if $ac_init_version; then | ||
| cat <<\_ACEOF | ||
| dvipdfm-x (TeX Live) configure 20240429 | ||
| dvipdfm-x (TeX Live) configure 20240511 | ||
| generated by GNU Autoconf 2.72 | ||
|
|
||
| Copyright (C) 2023 Free Software Foundation, Inc. | ||
|
|
@@ -2367,7 +2367,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 dvipdfm-x (TeX Live) $as_me 20240429, which was | ||
| It was created by dvipdfm-x (TeX Live) $as_me 20240511, which was | ||
| generated by GNU Autoconf 2.72. Invocation command line was | ||
|
|
||
| $ $0$ac_configure_args_raw | ||
|
|
@@ -9080,7 +9080,7 @@ fi | |
|
|
||
| # Define the identity of the package. | ||
| PACKAGE='dvipdfm-x--tex-live-' | ||
| VERSION='20240429' | ||
| VERSION='20240511' | ||
|
|
||
|
|
||
| printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h | ||
|
|
@@ -16159,7 +16159,7 @@ Usage: $0 [OPTIONS] | |
| Report bugs to <[email protected]>." | ||
|
|
||
| lt_cl_version="\ | ||
| dvipdfm-x (TeX Live) config.lt 20240429 | ||
| dvipdfm-x (TeX Live) config.lt 20240511 | ||
| configured by $0, generated by GNU Autoconf 2.72. | ||
|
|
||
| Copyright (C) 2011 Free Software Foundation, Inc. | ||
|
|
@@ -18102,7 +18102,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 dvipdfm-x (TeX Live) $as_me 20240429, which was | ||
| This file was extended by dvipdfm-x (TeX Live) $as_me 20240511, which was | ||
| generated by GNU Autoconf 2.72. Invocation command line was | ||
|
|
||
| CONFIG_FILES = $CONFIG_FILES | ||
|
|
@@ -18174,7 +18174,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="\\ | ||
| dvipdfm-x (TeX Live) config.status 20240429 | ||
| dvipdfm-x (TeX Live) config.status 20240511 | ||
| configured by $0, generated by GNU Autoconf 2.72, | ||
| with options \\"\$ac_cs_config\\" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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([dvipdfm-x (TeX Live)], [20240429], [[email protected]]) | ||
| AC_INIT([dvipdfm-x (TeX Live)], [20240511], [[email protected]]) | ||
| AC_PREREQ([2.65]) | ||
| AC_CONFIG_SRCDIR([agl.c]) | ||
| AC_CONFIG_AUX_DIR([../../build-aux]) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| #! /bin/sh -vx | ||
| # $Id$ | ||
| # Copyright 2020-2024 Japanese TeX Development Community <[email protected]> | ||
| # You may freely use, modify and/or distribute this file. | ||
|
|
||
| KpsDir=${KpsDir:-../kpathsea} | ||
| BinDir=${BinDir:-.} | ||
| ExeExt=${ExeExt:-} | ||
| _kpsewhich=$KpsDir/kpsewhich$ExeExt | ||
| _xdvipdfmx=$BinDir/xdvipdfmx$ExeExt | ||
|
|
||
| TEXMFCNF=$srcdir/../kpathsea | ||
| TFMFONTS=".;$srcdir/tests;$srcdir/data" | ||
| T1FONTS="$srcdir/tests;$srcdir/data" | ||
| TEXFONTMAPS="$srcdir/tests;$srcdir/data" | ||
| DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data" | ||
| TEXPICTS=$srcdir/tests | ||
| TEXFONTS=".;$srcdir/tests" | ||
| SOURCE_DATE_EPOCH=1588474800 | ||
| export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS SOURCE_DATE_EPOCH | ||
|
|
||
| failed= | ||
|
|
||
| ##### following tests require HaranoAji fonts and Noto Hentaigana font ##### | ||
|
|
||
| $_kpsewhich HaranoAjiMincho-Regular.otf | ||
| otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77 | ||
| OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'` | ||
| export OPENTYPEFONTS | ||
|
|
||
| $_kpsewhich NotoSerifHentaigana-Regular.ttf | ||
| ttfpath=`$_kpsewhich NotoSerifHentaigana-Regular.ttf` || exit 77 | ||
| TTFONTS=`echo $ttfpath | sed -e 's,NotoSerifHentaigana-Regular\.ttf,,' -e 's,/fonts/truetype/.*$,/fonts/truetype//,'` | ||
| export TTFONTS | ||
|
|
||
| rm -f upjf.vf upjv.vf upjf-r.ofm upjv-r.ofm upjf-g.ofm upjv-g.ofm | ||
|
|
||
| echo "*** dvipdfmx: test for upjf3_full-noto.pdf" && echo \ | ||
| && cp $srcdir/tests/upjf3_full.vf ./upjf.vf \ | ||
| && cp $srcdir/tests/upjv3_full.vf ./upjv.vf \ | ||
| && $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf-noto.map -o upjf3.pdf $srcdir/tests/upjf3.dvi \ | ||
| && mv ./upjf3.pdf ./upjf3_full-noto.pdf \ | ||
| && echo && echo "dvipdfmx-upjf3-vf_full-noto tests OK" && echo \ | ||
| || failed="$failed dvipdfmx-upjf3-vf_full-noto" | ||
|
|
||
|
|
||
| test -z "$failed" && exit 0 | ||
| echo | ||
| echo "failed tests:$failed" | ||
| exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| upjf-r unicode HaranoAjiMincho-Regular.otf | ||
| upjf-g unicode HaranoAjiGothic-Regular.otf | ||
| upjf-c Identity-H HaranoAjiMincho-Regular.otf | ||
| upjf-hu unicode NotoSerifHentaigana-Regular.ttf | ||
| upjf-hi Identity-H NotoSerifHentaigana-Regular.ttf | ||
| upjv-r unicode HaranoAjiMincho-Regular.otf -w 1 | ||
| upjv-g unicode HaranoAjiGothic-Regular.otf -w 1 | ||
| upjv-c Identity-V HaranoAjiMincho-Regular.otf | ||
| upjv-hu unicode NotoSerifHentaigana-Regular.ttf -w 1 | ||
| upjv-hi Identity-V NotoSerifHentaigana-Regular.ttf | ||
|
|
||
| ptmr8r 8r Times-Roman |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| % Copyright (C) 2020-2024 Japanese TeX Development Community | ||
| % You may freely use, modify and/or distribute this file. | ||
|
|
||
| \documentclass{ujarticle} | ||
| %\usepackage[T1]{fontenc} | ||
| %\usepackage{mathptmx} | ||
|
|
||
| \begin{document} | ||
| \pagestyle{empty} | ||
| \font\upjf=upjf at 10pt | ||
| \fbox{\hbox{\yoko | ||
| \upjf あいうえおｱｲｳｴｵ、☃~雪晴☀𠮟。生𛁛𛂦゙、う𛂁ぎ，𛂦𛂦゙𛂦゚．ABC xyz. | ||
| }} | ||
|
|
||
| \tbaselineshift0.3zh | ||
| \font\upjv=upjv at 10pt | ||
| \fbox{\hbox{\tate | ||
| \upjv あいうえお、☃~雪晴☀𠮟。生𛁛𛂦゙、う𛂁ぎ，𛂦𛂦゙𛂦゚．ABC xyz. | ||
| }} | ||
| \end{document} | ||
|
|
Binary file not shown.
Oops, something went wrong.