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

source/README.md

@@ -0,0 +1,20 @@
+$Id$
+This README.md file exists for people browsing on github.
+
+The TeX-Live project on github (https://github.com/TeX-Live) is a mirror
+of the upstream Subversion repository (https://tug.org/texlive/svn). We
+use it primarily for automatic building of the sources on several platforms.
+
+We prefer using mailing lists to github: [email protected] for general
+bugs and discussion, [email protected] for bugs and patches for the compiled
+programs, and so on. List of TL lists: https://tug.org/texlive/lists.html.
+
+However, if you prefer to open issues or submit PRs on github, that's
+ok. We will see them and will reply as soon as we can.
+
+One common problem: Package bug reports should go to the package
+maintainer, however they wish to receive reports, not to any general
+TeX Live list. TL redistributes what is uploaded to CTAN without changes.
+
+For information about the source tree here, see the ./README file here,
+not this README.md.

source/libs/mpfi/Makefile.in

@@ -692,7 +692,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
-	../../build-aux/texinfo.tex ../../build-aux/ylwrap
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

source/texk/dvipdfm-x/ChangeLog

@@ -1,3 +1,24 @@
+2024-02-10  Yukimasa Morimi  <[email protected]>
+
+	* cidtype2.c, sfnt.h, tt_cmap.{c,h}:
+	Look up the TrueType cmap format 14 subtable when mapping CID to
+	Unicode Variation Sequence in new Adobe-Japan1-UCS2 CMap.
+	https://github.com/texjporg/tex-jp-build/issues/155
+
+2024-02-10  TANAKA Takuji  <[email protected]>
+
+	* cidtype2.c: Fix an issue on glyph conversion of
+	characters over BMP.
+	Add conversion between "FULLWIDTH YEN SIGN" and "YEN SIGN".
+	https://github.com/texjporg/tex-jp-build/issues/165
+	* configure.ac: version 20240210.
+
+2024-02-05  Karl Berry  <[email protected]>
+
+	* configure.ac,
+	* xbb.c (show_version),
+	* dvipdfmx.c (show_version): copyright 2024, version 20240205.
+
 2023-11-24  Akira Kakuto  <[email protected]>
 	* dpxutil.c: Calculate time zone offset in the same way as
 	in pdftex.

source/texk/dvipdfm-x/cidtype2.c

@@ -418,6 +418,7 @@ fix_CJK_symbols (unsigned short code)
     {0xFFE0, 0x00A2}, /* FULLWIDTH CENT SIGN <-> CENT SIGN */
     {0xFFE1, 0x00A3}, /* FULLWIDTH POUND SIGN <-> POUND SIGN */
     {0xFFE2, 0x00AC}, /* FULLWIDTH NOT SIGN <-> NOT SIGN */
+    {0xFFE5, 0x00A5}, /* FULLWIDTH YEN SIGN <-> YEN SIGN */
     {0xFFFF, 0xFFFF}, /* EOD */
   };
 #define NUM_CJK_SYMBOLS (sizeof(CJK_Uni_symbols)/sizeof(CJK_Uni_symbols[0]))
@@ -438,13 +439,15 @@ fix_CJK_symbols (unsigned short code)
 }
 
 static int32_t
-cid_to_code (CMap *cmap, CID cid, int unicode_cmap)
+cid_to_code (CMap *cmap, CID cid, int unicode_cmap, int32_t *puvs)
 {
   unsigned char        inbuf[2], outbuf[32];
   int                  inbytesleft = 2, outbytesleft = 32;
   const unsigned char *p;
   unsigned char       *q;
 
+  *puvs = -1;
+
   if (!cmap)
     return cid;
 
@@ -474,13 +477,9 @@ cid_to_code (CMap *cmap, CID cid, int unicode_cmap)
       /* Check following Variation Selectors */
       uvs = UC_UTF16BE_decode_char(&p, endptr);
       if (p == endptr && uvs >= 0xfe00 && uvs <= 0xfe0f) {
-          /* Combine CJK compatibility ideograph */
-          int32_t cci = UC_Combine_CJK_compatibility_ideograph(uc, uvs);
-          if (cci > 0)
-            return cci;
-          /* Ignore Standardized Variation Sequence */
-          WARN("Ignored Variation Selector: CID=%u mapped to U+%04X U+%04X", cid, uc, uvs);
-          return uc;
+        /* Standardized Variation Sequence */
+        *puvs = uvs;
+        return uc;
       }
       WARN("CID=%u mapped to non-single Unicode characters...", cid);
       return -1;
@@ -499,16 +498,12 @@ cid_to_code (CMap *cmap, CID cid, int unicode_cmap)
       uvs = UC_UTF16BE_decode_char(&p, endptr);
       if (p == endptr) {
         if (uvs >= 0xfe00 && uvs <= 0xfe0f) {
-          /* Combine CJK compatibility ideograph */
-          int32_t cci = UC_Combine_CJK_compatibility_ideograph(uc, uvs);
-          if (cci > 0)
-            return cci;
-          /* Ignore Standardized Variation Sequence */
-          WARN("Ignored Variation Selector: CID=%u mapped to U+%04X U+%04X", cid, uc, uvs);
+          /* Standardized Variation Sequence */
+          *puvs = uvs;
           return uc;
         } else if (uvs >= 0xe0100 && uvs <= 0xe01ef) {
-          /* Ignore Ideographic Variation Sequence */
-          WARN("Ignored Variation Selector: CID=%u mapped to U+%04X U+%04X", cid, uc, uvs);
+          /* Ideographic Variation Sequence */
+          *puvs = uvs;
           return uc;
         }
       }
@@ -527,8 +522,8 @@ cid_to_code (CMap *cmap, CID cid, int unicode_cmap)
       uvs = UC_UTF16BE_decode_char(&p, endptr);
       if (p == endptr) {
         if (uvs >= 0xe0100 && uvs <= 0xe01ef) {
-          /* Ignore Ideographic Variation Sequence */
-          WARN("Ignored Variation Selector: CID=%u mapped to U+%04X U+%04X", cid, uc, uvs);
+          /* Ideographic Variation Sequence */
+          *puvs = uvs;
           return uc;
         }
       }
@@ -574,6 +569,7 @@ CIDFont_type2_dofont (pdf_font *font)
   struct tt_glyphs *glyphs;
   CMap             *cmap = NULL;
   tt_cmap          *ttcmap = NULL;
+  tt_cmap          *ttcmap_uvs = NULL;
   ULONG             offset = 0;
   CID               cid, last_cid;
   unsigned char    *cidtogidmap;
@@ -727,6 +723,8 @@ CIDFont_type2_dofont (pdf_font *font)
         return -1;
       } else if (i <= WIN_UCS_INDEX_MAX) {
         unicode_cmap = 1;
+        /* Unicode Variation Sequences */
+        ttcmap_uvs = tt_cmap_read(sfont, 0, 5);
       } else {
         unicode_cmap = 0;
       }
@@ -805,7 +803,7 @@ CIDFont_type2_dofont (pdf_font *font)
   if (h_used_chars) {
     used_chars = h_used_chars;
     for (cid = 1; cid <= last_cid; cid++) {
-      int32_t  code;
+      int32_t  code, uvs = 0;
       uint16_t gid = 0;
 
       if (!is_used_char2(h_used_chars, cid))
@@ -821,13 +819,28 @@ CIDFont_type2_dofont (pdf_font *font)
         code = cid;
         break;
       case via_cid_to_code:
-        code = cid_to_code(cmap, cid, unicode_cmap);
+        code = cid_to_code(cmap, cid, unicode_cmap, &uvs);
         if (code < 0) {
           WARN("Unable to map CID to code: CID=%u", cid);
         } else {
-          gid  = tt_cmap_lookup(ttcmap, code);
+          if (ttcmap_uvs && uvs > 0) {
+            gid = tt_cmap_uvs_lookup(ttcmap_uvs, ttcmap, code, uvs);
+          }
+          if (gid == 0 && uvs >= 0xfe00 && uvs <= 0xfe0f) {
+            /* Standardized Variation Sequence */
+            /* Combine CJK compatibility ideograph */
+            int32_t code2 = UC_Combine_CJK_compatibility_ideograph(code, uvs);
+            if (code2 > 0)
+              gid = tt_cmap_lookup(ttcmap, code2);
+          }
+          if (gid == 0) {
+            gid = tt_cmap_lookup(ttcmap, code);
+            if (gid > 0 && uvs > 0) {
+              WARN("Ignored Variation Selector: CID=%u mapped to U+%04X U+%04X", cid, code, uvs);
+            }
+          }
 #ifdef FIX_CJK_UNIOCDE_SYMBOLS
-          if (gid == 0 && unicode_cmap) {
+          if (gid == 0 && unicode_cmap && code <= 0xFFFF) {
             int alt_code;
 
             alt_code = fix_CJK_symbols((unsigned short)code);
@@ -887,7 +900,7 @@ CIDFont_type2_dofont (pdf_font *font)
     }
 
     for (cid = 1; cid <= last_cid; cid++) {
-      int32_t  code;
+      int32_t  code, uvs = 0;
       uint16_t gid = 0;
 
       if (!is_used_char2(v_used_chars, cid))
@@ -911,13 +924,28 @@ CIDFont_type2_dofont (pdf_font *font)
         code = cid;
         break;
       case via_cid_to_code:
-        code = cid_to_code(cmap, cid, unicode_cmap);
+        code = cid_to_code(cmap, cid, unicode_cmap, &uvs);
         if (code < 0) {
           WARN("Unable to map CID to code: CID=%u", cid);
         } else {
-          gid  = tt_cmap_lookup(ttcmap, code);
+          if (ttcmap_uvs && uvs > 0) {
+            gid = tt_cmap_uvs_lookup(ttcmap_uvs, ttcmap, code, uvs);
+          }
+          if (gid == 0 && uvs >= 0xfe00 && uvs <= 0xfe0f) {
+            /* Standardized Variation Sequence */
+            /* Combine CJK compatibility ideograph */
+            int32_t code2 = UC_Combine_CJK_compatibility_ideograph(code, uvs);
+            if (code2 > 0)
+              gid = tt_cmap_lookup(ttcmap, code2);
+          }
+          if (gid == 0) {
+            gid = tt_cmap_lookup(ttcmap, code);
+            if (gid > 0 && uvs > 0) {
+              WARN("Ignored Variation Selector: CID=%u mapped to U+%04X U+%04X", cid, code, uvs);
+            }
+          }
 #ifdef FIX_CJK_UNIOCDE_SYMBOLS
-          if (gid == 0 && unicode_cmap) {
+          if (gid == 0 && unicode_cmap && code <= 0xFFFF) {
             int alt_code;
 
             alt_code = fix_CJK_symbols((unsigned short)code);
@@ -963,6 +991,7 @@ CIDFont_type2_dofont (pdf_font *font)
   ASSERT(used_chars);
 
   tt_cmap_release(ttcmap);
+  tt_cmap_release(ttcmap_uvs);
 
   if (font->cid.options.embed) {
     if (tt_build_tables(sfont, glyphs) < 0) {

source/texk/dvipdfm-x/configure

@@ -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) 20231124.
+# Generated by GNU Autoconf 2.72 for dvipdfm-x (TeX Live) 20240210.
 #
 # 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='20231124'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20231124'
+PACKAGE_VERSION='20240210'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20240210'
 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) 20231124 to adapt to many kinds of systems.
+'configure' configures dvipdfm-x (TeX Live) 20240210 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) 20231124:";;
+     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20240210:";;
    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 20231124
+dvipdfm-x (TeX Live) configure 20240210
 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 20231124, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20240210, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -8928,7 +8928,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20231124'
+ VERSION='20240210'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -15995,7 +15995,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <[email protected]>."
 
 lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20231124
+dvipdfm-x (TeX Live) config.lt 20240210
 configured by $0, generated by GNU Autoconf 2.72.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -17938,7 +17938,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 20231124, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20240210, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18010,7 +18010,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 20231124
+dvipdfm-x (TeX Live) config.status 20240210
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

source/texk/dvipdfm-x/configure.ac

@@ -1,14 +1,14 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright 2016-2023 Karl Berry <[email protected]>
+dnl   Copyright 2016-2024 Karl Berry <[email protected]>
 dnl   Copyright 2009-2015 Peter Breitenlohner <[email protected]>
 dnl
 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)], [20231124], [[email protected]])
+AC_INIT([dvipdfm-x (TeX Live)], [20240210], [[email protected]])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([agl.c])
 AC_CONFIG_AUX_DIR([../../build-aux])

source/texk/dvipdfm-x/dvipdfmx.c

@@ -2,7 +2,7 @@
 
     DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks.
 
-    Copyright (C) 2002-2023 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
+    Copyright (C) 2002-2024 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata,
     the DVIPDFMx project team.
     
     Copyright (c) 2006 SIL. (xdvipdfmx extensions for XeTeX support)
@@ -175,8 +175,8 @@ show_version (void)
   if (*my_name == 'x')
     printf ("an extended version of DVIPDFMx, which in turn was\n");
   printf ("an extended version of dvipdfm-0.13.2c developed by Mark A. Wicks.\n");
-  printf ("\nCopyright (C) 2002-2023 the DVIPDFMx project team\n");
-  printf ("Copyright (C) 2006-2023 SIL International.\n");
+  printf ("\nCopyright (C) 2002-2024 the DVIPDFMx project team\n");
+  printf ("Copyright (C) 2006-2024 SIL International.\n");
   printf ("\nThis is free software; you can redistribute it and/or modify\n");
   printf ("it under the terms of the GNU General Public License as published by\n");
   printf ("the Free Software Foundation; either version 2 of the License, or\n");
@@ -1182,7 +1182,7 @@ main (int argc, char *argv[])
   /* PDF trailer ID. */
   if (!has_id) {
 #define PRODUCER \
-"%s-%s, Copyright 2002-2023 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata"
+"%s-%s, Copyright 2002-2024 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata"
     char producer[256];
 
     sprintf(producer, PRODUCER, my_name, VERSION);

source/texk/dvipdfm-x/sfnt.h

@@ -92,6 +92,8 @@ typedef struct
 #define sfnt_get_ulong(s)  ((ULONG)  get_unsigned_quad((s)->stream))
 #define sfnt_get_long(s)   ((LONG)   get_signed_quad  ((s)->stream))
 
+#define sfnt_get_uint24(s) ((ULONG)  get_unsigned_triple((s)->stream))
+
 #define sfnt_seek_set(s,o)   seek_absolute((s)->stream, (o))
 #define sfnt_read(b,l,s)     fread((b), 1, (l), (s)->stream)