Merge branch 'master' into build/work000 r67916 #158

texjporg · Aug 13, 2023 · 12a4590 · 12a4590
2 parents 3776f1f + 56eef6a
commit 12a4590
Show file tree

Hide file tree

Showing 75 changed files with 1,453 additions and 1,124 deletions.
diff --git a/source/texk/.gitattributes b/source/texk/.gitattributes
@@ -10,12 +10,16 @@
 *.pl  text eol=lf
 *.typ text eol=lf
 *.p   text eol=lf
+*.vpl text eol=lf
+*.opl text eol=lf
+*.ovp text eol=lf
+*.out text eol=lf
 
 # for dvi2tty
 *.tty text eol=lf
 *.dis text eol=lf
 
-# for mendex, upmendex
+# for makeindex, mendex, upmendex
 *.ind text eol=lf
 
 # for bibtex-x
@@ -30,6 +34,32 @@
 *.xps text eol=lf
 /dvipsk/testdata/pfbincl.xps binary
 
+# for lcdf-typetools
+*.pfa text eol=lf
+*.afm text eol=lf
+*.t42 text eol=lf
+*.enc text eol=lf
+*.map text eol=lf
+*.tables text eol=lf
+*.info   text eol=lf
+
+# for ps2pk
+*.hex text eol=lf
+*.pix text eol=lf
+
+# for psutils
+*.eps text eol=lf
+
+# for ttfdump
+*.glyf text eol=lf
+*.gpos text eol=lf
+*.gsub text eol=lf
+*.head text eol=lf
+*.os_2 text eol=lf
+*.bad  text eol=lf
+*.gasp text eol=lf
+*.maxp text eol=lf
+
 # for windows_wrapper
 /texlive/windows_wrapper/**/*.c   text eol=crlf
 /texlive/windows_wrapper/**/*.txt text eol=crlf
diff --git a/source/texk/bibtex-x/ChangeLog b/source/texk/bibtex-x/ChangeLog
@@ -1,3 +1,11 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* tests/bibtex{8,u}.test, tests/bibtex8-{char,sort}.test,
+	tests/bibtex8u-mem.test, bibtexu-{basic,char,range,sort,yannis}.test:
+	Make easier to test on Windows.
+	In bibtexu-char.test, all tests are skipped on MinGW
+	since it does not pass. More study is required.
+
 2023-07-15  TANAKA Takuji  <[email protected]>
 
 	* configure.ac, version.h:

diff --git a/source/texk/bibtex-x/tests/bibtexu-basic.test b/source/texk/bibtex-x/tests/bibtexu-basic.test
@@ -24,9 +24,9 @@ BIBINPUTS=$srcdir/tests; export BIBINPUTS
 if $_bibtexu -t -d all tests/x$testname; then :; else
   echo "*** bibtexu failed, tests/x$testname.blg is:" >&2
   cat tests/x$testname.blg >&2
-  exit 1
+  exit 2
 fi
 
-diff $srcdir/tests/$testname.bbl tests/x$testname.bbl || exit 1
+diff $srcdir/tests/$testname.bbl tests/x$testname.bbl || exit 3
 
 exit 0
diff --git a/source/texk/bibtex-x/tests/bibtexu-char.test b/source/texk/bibtex-x/tests/bibtexu-char.test
@@ -20,8 +20,8 @@ BIBINPUTS=$srcdir/tests; export BIBINPUTS
 rc=0
 
 if [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
-  echo "*** skip test $0 on MINGW"
-  exit $rc
+  echo "*** skip test $0 on MinGW"
+  exit 77
 fi
 
 ## test for add.period$

diff --git a/source/texk/dvi2tty/ChangeLog b/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* dvi2tty.h:
+	Enable to build with MS Visual C on Windows.
+	* dvi2tty.test, disdvi.test:
+	Make easier to test on Windows.
+
 2022-05-01  TANAKA Takuji  <[email protected]>
 
 	dvi2tty-6.0.2.

diff --git a/source/texk/dvidvi/ChangeLog b/source/texk/dvidvi/ChangeLog
@@ -1,3 +1,11 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* dvidvi.c:
+        Skip Unicode conversion if command line arguments are missing
+        in order to prevent unwanted looking for texmf.cnf. (Windows only)
+	* dvidvi.test:
+	Make easier to test on Windows.
+
 2021-02-19  Karl Berry  <[email protected]>
 
 	* dvidvi.test,

diff --git a/source/texk/dviout-util/ChangeLog b/source/texk/dviout-util/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* dvispc.c, chkdvifont.c, dd.h, msvcdir.h, Makefile.am:
+	Enable to build with MinGW & MSYS2 on Windows.
+	* dvispc.test, chkdvifont.test:
+	Make easier to test on Windows.
+
 2022-08-30  Karl Berry  <[email protected]>
 
 	* chkdvifont.man: typo fixes from Hilmar Preu\ss{}e,

diff --git a/source/texk/dviout-util/Makefile.am b/source/texk/dviout-util/Makefile.am
@@ -3,7 +3,7 @@
 ## Copyright (C) 2018-2021 Japanese TeX Development Community <[email protected]>
 ## You may freely use, modify and/or distribute this file.
 ##
-AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DPTEXENC
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA -DPTEXENC
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 $(dviout_util_OBJECTS): $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND)

diff --git a/source/texk/dviout-util/Makefile.in b/source/texk/dviout-util/Makefile.in
@@ -556,7 +556,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DPTEXENC
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA -DPTEXENC
 AM_CFLAGS = $(WARNING_CFLAGS)
 dvispc_SOURCES = dvispc.c common.h
 chkdvifont_SOURCES = chkdvifont.c dd.h msvcdir.h common.h

diff --git a/source/texk/dviout-util/chkdvifont.c b/source/texk/dviout-util/chkdvifont.c
@@ -41,18 +41,15 @@
  *
  */
 
-#ifdef __GNUC__
-/* Validate in case of UNIX */
-#define UNIX 1
-#define GCC 1
-#else
-/* Win32 MSVC is assumed */
-#define WIN32 1
+#ifdef WIN32
 #define MSVC 1
+#else
+#define UNIX 1
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifndef UNIX
 #include <dos.h>
 #ifdef MSVC
@@ -62,10 +59,10 @@
 #endif
 #include <io.h>
 #endif
-#include <string.h>
 
-#ifdef GCC
+#ifdef __GNUC__
 #include <ctype.h>
+#define GCC 1
 #endif
 
 #include <config.h>

diff --git a/source/texk/dviout-util/dd.h b/source/texk/dviout-util/dd.h
@@ -67,11 +67,6 @@ char	*stpcpy(char *, const char *);
 #define MAXFILE 128
 #define MAXEXT  128
 #define O_BINARY 0
-#define PATH_SEP '/'
-#define DELIMITER   ':'
-#else
-#define PATH_SEP '\\'
-#define DELIMITER   ';'
 #endif
 
 #ifndef	max

diff --git a/source/texk/dviout-util/dvispc.c b/source/texk/dviout-util/dvispc.c
@@ -11,13 +11,8 @@
  *       January 2003
  */
 
-#ifdef __GNUC__
-/* Validate in case of UNIX */
+#ifndef WIN32
 #define UNIX 1
-#else
-/* Validate if SHIFT JIS is used for a filename */
-/* Win32 MSVC is assumed */
-#define SHIFT_JIS 1
 #endif
 
 /*     %%% Contents of an extended DVI file  %%%
@@ -103,15 +98,12 @@
 #define Long  int
 
 #ifdef UNIX
-#define PATH_SEP     '/'
 #define READ_TEXT    "r"
 #define READ_BINARY  "r"
 #define WRITE_BINARY "w"
 #define WRITE_TEXT   "w"
 #define StrCmp strcmp
 #else
-#define PATH_SEP     '\\'
-#define PATH_SEPU    '/'
 #define READ_TEXT    "rt"
 #define READ_BINARY  "rb"
 #define WRITE_BINARY "wb"

diff --git a/source/texk/dviout-util/msvcdir.h b/source/texk/dviout-util/msvcdir.h
@@ -1,7 +1,7 @@
 /*/msvcdir.h */
 
 #if !defined(MSVCDIR_H)
-#define MSVCDIR_H 
+#define MSVCDIR_H
 #include <stdlib.h>  /*_splitpath */
 #include <direct.h>
 #include <assert.h> /*assert */
@@ -29,4 +29,4 @@ void getftime(int handle, struct ftime *ft);
 #pragma warning( disable : 4244 4018 4102 4761 4146 4047 4305 4245 4113)
 #endif
 
-#endif MSVCDIR_H
+#endif /* MSVCDIR_H */
diff --git a/source/texk/dvipdfm-x/ChangeLog b/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* dpxfile.c: Avoid compiler warning on MinGW.
+	* xdvipdfm-{ann,bad,bb,bkm,psz,ptx,res,rev,ttc}.test,
+	xdvipdfmx.test, dvipdfmx-upjf.test:
+	Make easier to test on Windows.
+
 2023-07-08  TANAKA Takuji  <[email protected]>
 
 	* cidtype0.c, pdffont.c:

diff --git a/source/texk/dvipdfm-x/dpxfile.c b/source/texk/dvipdfm-x/dpxfile.c
@@ -160,6 +160,8 @@ static char  _tmpbuf[PATH_MAX+1];
 #endif /* MIKTEX */
 
 #if defined(_WIN32)
+#undef stat
+#define stat _stat
 extern int utf8name_failed;
 int fsyscp_stat(const char *path, struct stat *buffer)
 {

diff --git a/source/texk/dvipsk/ChangeLog b/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,9 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* beginfontk1.test, eepic-nan.test, pfbincl.test, same-name.test,
+	test-{afm2tfm,dvips,missing-image,overflow-buffers}.test,
+	uptex-vf.test: Make easier to test on Windows.
+
 2023-04-29  TANAKA Takuji  <[email protected]>
 
 	* {virtualfont,pprescan,scanpage,dopage,tfmload}.c, dvips.h:

diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,12 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* tests/{cnfline,cnfnewline,cnfnull,cnfprog,kpsestat,kpsewhich}.test:
+	Make easier to test on Windows.
+	{kpseaccess,kpsereadlink}.test are not modified since
+	they are not used for tests on Windows.
+	* tests/windows/texmf.cnf:
+	New cnf for testing windows MS Visual C build.
+
 2023-07-16  TANAKA Takuji  <[email protected]>
 
 	* kpsewhich.c: Allow Unicode file name for bibtex8 and bibtexu

diff --git a/source/texk/kpathsea/tests/cnfline.test b/source/texk/kpathsea/tests/cnfline.test
@@ -33,14 +33,14 @@ fi
 
 # Make sure we get expected values from the test texmf.cnf.
 val=`$_kpsewhich --var-value=maxpr`; remove_cr
-test x"$val" = x200 || exit 1
+test x"$val" = x200 || exit 2
 #
 val=`$_kpsewhich --progname=foo --var-value=maxpr`; remove_cr
-test x"$val" = x100 || exit 1
+test x"$val" = x100 || exit 3
 #
 val=`$_kpsewhich --var-value=othervar`; remove_cr
-test x"$val" = x300 || exit 1
+test x"$val" = x300 || exit 4
 
 # Now override on cmd line -- both texmf.cnf values should get overridden.
 val=`$_kpsewhich --cnf-line=maxpr=99 --var-value=maxpr`; remove_cr
-test x"$val" = x99 || exit 1
+test x"$val" = x99 || exit 5
diff --git a/source/texk/kpathsea/tests/cnfnull.test b/source/texk/kpathsea/tests/cnfnull.test
@@ -17,11 +17,11 @@ cnf_file=$cnf_dir/texmf.cnf
 rm -rf $cnf_dir
 mkdir $cnf_dir
 test -d $cnf_dir || exit 1
-printf 'x\0=1\n\0' >$cnf_file || exit 1
+printf 'x\0=1\n\0' >$cnf_file || exit 2
 
 val=`$_kpsewhich "--cnf-line=TEXMFCNF=$cnf_dir" --var-value=x`
 if [ $exe = ".exe" ]; then val=`echo $val | sed -e 's/\\r//'`; fi
-test x"$val" = x1 || exit 1
+test x"$val" = x1 || exit 3
 
 # Before we dropped nul bytes in 2020, kpse gave a warning:
 #   warning: cnfnull/texmf.cnf:1: (kpathsea) No cnf value on line: x.

diff --git a/source/texk/kpathsea/tests/kpsestat.test b/source/texk/kpathsea/tests/kpsestat.test
@@ -21,5 +21,3 @@ done
 echo "kpsestat = \$srcdir => `$_kpsestat = $srcdir`"
 echo "kpsestat = \$srcdir/ => `$_kpsestat = $srcdir/`"
 echo "kpsestat = \$srcdir/kpsestat.c => `$_kpsestat = $srcdir/kpsestat.c`"
-
-exit 0
diff --git a/source/texk/kpathsea/tests/windows/texmf.cnf b/source/texk/kpathsea/tests/windows/texmf.cnf
@@ -1,16 +1,16 @@
-# Public domain.
-# This tiny texmf.cnf is for testing windows CMake & MSVC build
+% Public domain.
+% This tiny texmf.cnf is for testing windows MS Visual C build
 
 TEXMFMAIN = $TEXMFCNF
 
 TEXINPUTS = .;$srcroot/texk/bibtex-x/tests
 TEXFONTS = .;$srcroot/texk/dvipsk/testdata
 
-# for web2c
+% for web2c
 CWEBINPUTS = $srcroot/texk/web2c/ctiedir;$srcroot/texk/web2c/cwebdir//
 WEBINPUTS = $srcroot/texk/web2c/tiedir
 
-# for dvips
+% for dvips
 TEXFONTMAPS.dvips = $srcroot/texk/dvipsk/testdata
 VFFONTS.dvips = .;$srcroot/texk/dvipsk/testdata
 TEXPSHEADERS.dvips = .;$srcroot/texk/dvipsk/testdata
@@ -20,7 +20,7 @@ TEXFONTS.dvips = .;$srcroot/texk/{web2c/tests,dvipsk/testdata}//
 T1FONTS.dvips = .;$srcroot/texk/{web2c/tests,dvipsk/testdata}//
 AFMFONTS.afm2tfm = $srcroot/texk/tests/texmf
 
-# for dvipdfm-x
+% for dvipdfm-x
 TFMFONTS.dvipdfmx = .;$srcroot/texk/dvipdfm-x/tests;$srcroot/texk/dvipdfm-x/data
 T1FONTS.dvipdfmx = .;$srcroot/texk/dvipdfm-x/tests;$srcroot/texk/dvipdfm-x/data
 TTFONTS.dvipdfmx = .;$srcroot/texk/dvipdfm-x/tests;$srcroot/texk/dvipdfm-x/data
@@ -30,7 +30,7 @@ DVIPDFMXINPUTS.dvipdfmx = .;$srcroot/texk/dvipdfm-x/tests;$srcroot/texk/dvipdfm-
 TEXPICTS.dvipdfmx = $srcroot/texk/dvipdfm-x/tests
 TEXFONTS.dvipdfmx = .;$srcroot/texk/dvipdfm-x/tests
 
-# for bibtex-x
+% for bibtex-x
 BIBINPUTS.bibtex8 = .;$srcroot/texk/web2c/tests;$srcroot/texk/bibtex-x/tests
 BSTINPUTS.bibtex8 = .;$srcroot/texk/tests/texmf;$srcroot/texk/web2c/tests;$srcroot/texk/bibtex-x/{tests,csf}
 BIBINPUTS.bibtexu = .;$srcroot/texk/web2c/tests;$srcroot/texk/bibtex-x/tests

diff --git a/source/texk/makejvf/ChangeLog b/source/texk/makejvf/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* makejvf.test:
+	Make easier to test on Windows.
+
 2023-02-01  TANAKA Takuji  <[email protected]>
 
 	* uniblock.c: Tweak Unicode blocks.

diff --git a/source/texk/mendexk/ChangeLog b/source/texk/mendexk/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* tests/mendex.test:
+	Make easier to test on Windows.
+
 2023-03-09  Karl Berry  <[email protected]>
 
 	* TL'23 release.

diff --git a/source/texk/seetexk/ChangeLog b/source/texk/seetexk/ChangeLog
@@ -1,3 +1,10 @@
+2023-08-11  TANAKA Takuji  <[email protected]>
+
+	* dvibook.c, dviconcat.c:
+	Better handling of STDIN/STDOUT on Windows.
+	* seetexk.test:
+	Make easier to test on Windows.
+
 2023-07-05  TANAKA Takuji  <[email protected]>
 
 	* dvibook.c, dviconcat.c, dviselect.c, dvitodvi.c: