diff options
author | Karl Berry <karl@freefriends.org> | 2017-08-07 21:09:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-08-07 21:09:26 +0000 |
commit | 55af698ad13da62b3a0ae681c4bce01da52312a1 (patch) | |
tree | edaad797940461e016e373953b5b8d1876955167 /Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty | |
parent | 53fbec492a3c2c5abfb4a1cb183e2df23f8a928a (diff) |
xecjk (7aug17)
git-svn-id: svn://tug.org/texlive/trunk@44978 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty')
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty index a41f8e2d322..22ced35096f 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty @@ -29,10 +29,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee@gmail.com> $ {xeCJK patch file for listings} \ProvidesExplPackage{xeCJK-listings} - {\ExplFileDate}{3.4.8}{\ExplFileDescription} + {\ExplFileDate}{3.5.0}{\ExplFileDescription} \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } } \ProcessOptions \scan_stop: \RequirePackage { xeCJK } @@ -168,6 +168,7 @@ } \__xeCJK_listings_append:nN } +\bool_new:N \l__xeCJK_listings_letter_bool \cs_new_protected_nopar:Npn \__xeCJK_listings_process_other:nN #1#2 { \lst@whitespacefalse @@ -200,11 +201,12 @@ \lst@whitespacefalse \bool_if:NTF \l__xeCJK_listings_letter_bool { - \bool_if:nF + \bool_lazy_or:nnF + { \int_compare_p:nNn \l__xeCJK_listings_flag_int = \c_two } { - \int_compare_p:nNn \l__xeCJK_listings_flag_int = \c_two || - ( \int_compare_p:nNn \l__xeCJK_listings_flag_int = \c_three && - ! \l__xeCJK_punct_breakable_bool ) + \bool_lazy_and_p:nn + { \int_compare_p:nNn \l__xeCJK_listings_flag_int = \c_three } + { ! \l__xeCJK_punct_breakable_bool } } { \lst@Output } \lst@lettertrue @@ -221,11 +223,9 @@ \lst@whitespacefalse \bool_if:NTF \l__xeCJK_listings_letter_bool { - \bool_if:nT - { - \int_compare_p:nNn \l__xeCJK_listings_flag_int < \c_two && - \__xeCJK_punct_if_long_p:N #2 - } + \bool_lazy_and:nnT + { \int_compare_p:nNn \l__xeCJK_listings_flag_int < \c_two } + { \__xeCJK_punct_if_long_p:N #2 } { \lst@Output } \lst@lettertrue } |