From fc7eee8c175b307abf9396aed71c1d49bd1c0fe4 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 7 Apr 2019 21:22:23 +0000
Subject: ctex (7apr19)

git-svn-id: svn://tug.org/texlive/trunk@50843 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/ctex/ctexsize.sty | 28 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/ctex/ctexsize.sty')

diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
index f4193842bab..469bd91da9a 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `style,ctexsize')
 %% 
-%%     Copyright (C) 2003--2018
+%%     Copyright (C) 2003--2019
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,20 +28,20 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese font size definition (CTEX)}
 \ProvidesExplPackage{ctexsize}
-  {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.15}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
-\int_new:N \g__ctex_font_size_flag
-\int_set:Nn \g__ctex_font_size_flag { -1 }
+\int_new:N \g__ctex_font_size_int
+\int_set:Nn \g__ctex_font_size_int { -1 }
 \keys_define:nn { ctex / option }
   {
     zihao .choice: ,
     zihao .value_required:n = true ,
-    zihao /     5  .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } ,
-    zihao /    -4  .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } ,
-    zihao / false  .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+    zihao /     5  .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } ,
+    zihao /    -4  .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } ,
+    zihao / false  .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
   }
 \tl_clear_new:N \l__ctex_tmp_tl
 \clist_map_inline:nn
@@ -53,7 +53,7 @@
     \tl_put_right:Nn \l__ctex_tmp_tl
       {
         #1 .code:n =
-          { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } ,
+          { \int_gset:Nn \g__ctex_font_size_int { 2 } } ,
         #1 .value_forbidden:n = true ,
       }
   }
@@ -84,7 +84,7 @@
         \prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1}
           {
             { \dim_to_decimal:n {#2} }
-            { \dim_to_decimal:n { (#2) * \c_six / \c_five } }
+            { \dim_to_decimal:n { (#2) * 6 / 5 } }
           }
       }
     \seq_gput_right:Nn \c__ctex_font_size_seq {#1}
@@ -152,7 +152,7 @@
   }
 \cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4
   { \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
-\if_case:w \g__ctex_font_size_flag
+\if_case:w \g__ctex_font_size_int
   \ctex_file_input:n { ctex-c5size.clo }
 \or:
   \ctex_file_input:n { ctex-cs4size.clo }
@@ -204,6 +204,12 @@
 %%                                        c70rm.fd,
 %%                                        c70sf.fd,
 %%                                        c70tt.fd,
+%%                                        jy2zhrm.fd,
+%%                                        jy2zhsf.fd,
+%%                                        jy2zhtt.fd,
+%%                                        jt2zhrm.fd,
+%%                                        jt2zhsf.fd,
+%%                                        jt2zhtt.fd,
 %%                                        ctex-fontset-windows.def,
 %%                                        ctex-fontset-windowsnew.def,
 %%                                        ctex-fontset-windowsold.def,
-- 
cgit v1.2.3

