From bc3f8ae7a070c0635a7f6aa2febefcc6bd639677 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 16 May 2020 21:26:14 +0000
Subject: ctex (16may20)

git-svn-id: svn://tug.org/texlive/trunk@55162 c570f23f-e606-0410-a88d-b1316a301751
---
 .../tex/latex/ctex/fontset/ctex-fontset-ubuntu.def  | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def')

diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
index 0493c6ee8e0..0991aab9e84 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
   {Ubuntu fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-ubuntu.def}
-  {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.2}{\ExplFileDescription}
 \ctex_fontset_case:nnnn
   { \ctex_fontset_error:n { ubuntu } }
   {
@@ -44,15 +44,18 @@
         \setCJKfamilyfont { zhhei  } { :2:NotoSansCJK-Regular.ttc  }
           [ BoldFont = :2:NotoSansCJK-Bold.ttc  ]
         \setCJKfamilyfont { zhkai  } { gkai00mp.ttf  }
-        \ctex_punct_set:n { fandol }
-        \ctex_punct_map_family:nn   { \CJKrmdefault         } { zhsong  }
-        \ctex_punct_map_family:nn   { \CJKsfdefault         } { zhhei   }
-        \ctex_punct_map_bfseries:nn { \CJKrmdefault, zhsong } { zhsongb }
-        \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhhei  } { zhheib  }
-        \ctex_punct_map_itshape:nn  { \CJKrmdefault         } { zhkai   }
+        \ctex_punct_set:n { ubuntu }
+        \ctex_punct_map_family:nn   { \CJKrmdefault        } { zhsong  }
+        \ctex_punct_map_family:nn   { \CJKsfdefault        } { zhhei   }
+        \ctex_punct_map_family:nn   { \CJKttdefault        } { zhsong  }
+        \ctex_punct_map_itshape:nn  { \CJKrmdefault        } { zhkai   }
+        \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhhei } { zhheib  }
+        \ctex_punct_map_bfseries:nn
+          { \CJKrmdefault, \CJKttdefault, zhsong }
+          { zhsongb }
       }
       {
-        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { zhubuntufonts }
+        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { ubuntu }
         \ctex_punct_set:n { ubuntu }
         \ctex_punct_map_family:nn   { \CJKrmdefault } { zhsong }
         \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei  }
-- 
cgit v1.2.3

