summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-03 21:03:15 +0000
committerKarl Berry <karl@freefriends.org>2018-05-03 21:03:15 +0000
commit14d1c94af4e8acce4d5d6854b6988834d8ab4dac (patch)
tree0cbe9f1c85bbddfdca4c05f21e3ea224cea9eefa
parent3bdba37dd5619bcbc46b0e684507cbb0f661eb8b (diff)
zxjatype (3may18)
git-svn-id: svn://tug.org/texlive/trunk@47597 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/zxjatype/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/zxjatype/README-ja.md3
-rw-r--r--Master/texmf-dist/doc/latex/zxjatype/README.md1
-rw-r--r--Master/texmf-dist/tex/latex/zxjatype/zxjatype.sty45
4 files changed, 17 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/zxjatype/LICENSE b/Master/texmf-dist/doc/latex/zxjatype/LICENSE
index 8ada757fbc8..fbe40a0146b 100644
--- a/Master/texmf-dist/doc/latex/zxjatype/LICENSE
+++ b/Master/texmf-dist/doc/latex/zxjatype/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+Copyright (c) 2018 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/latex/zxjatype/README-ja.md b/Master/texmf-dist/doc/latex/zxjatype/README-ja.md
index 238317f33bf..9574b7b40cb 100644
--- a/Master/texmf-dist/doc/latex/zxjatype/README-ja.md
+++ b/Master/texmf-dist/doc/latex/zxjatype/README-ja.md
@@ -33,6 +33,9 @@ zxjatype パッケージ ― 本体
更新履歴
--------
+ * Version 0.6c ‹2018/05/03›
+ - バグ修正。
+
* Version 0.6b ‹2017/08/03›
- (試験的) `(no)useinhibitglue` オプション。
- (試験的) `(no)kanakinsoku` オプション。
diff --git a/Master/texmf-dist/doc/latex/zxjatype/README.md b/Master/texmf-dist/doc/latex/zxjatype/README.md
index 245e3285b7f..2c5dda651da 100644
--- a/Master/texmf-dist/doc/latex/zxjatype/README.md
+++ b/Master/texmf-dist/doc/latex/zxjatype/README.md
@@ -44,6 +44,7 @@ All other options are passed to xeCJK.
Revision History
----------------
+ * Version 0.6c ‹2018/05/03›
* Version 0.6b ‹2017/08/03›
* Version 0.6a ‹2017/08/02›
* Version 0.6 ‹2012/09/09›
diff --git a/Master/texmf-dist/tex/latex/zxjatype/zxjatype.sty b/Master/texmf-dist/tex/latex/zxjatype/zxjatype.sty
index 5b5c7a77ae9..dba68ee443a 100644
--- a/Master/texmf-dist/tex/latex/zxjatype/zxjatype.sty
+++ b/Master/texmf-dist/tex/latex/zxjatype/zxjatype.sty
@@ -1,9 +1,16 @@
-%
-% zxjatype.sty
-%
+%%
+%% This is file 'zxjatype.sty'.
+%%
+%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+%% GitHub: https://github.com/zr-tex8r
+%% Twitter: @zr_tex8r
+%%
+%% This package is distributed under the MIT License.
+%%
+
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zxjatype}[2017/08/03 v0.6b ZX Japanese typeset]
+\ProvidesPackage{zxjatype}[2018/05/03 v0.6c ZX Japanese typeset]
\RequirePackage{ifxetex}\RequireXeTeX
%% code guards
@@ -384,6 +391,7 @@
% by this package.
{ ( \cs_if_free_p:N \inhibitglue )
|| ( \cs_if_eq_p:NN \inhibitglue \scan_stop: )
+ || ( \cs_if_eq_p:NN \inhibitglue \c_empty_tl )
|| ( \cs_if_eq_p:NN \inhibitglue \prg_do_nothing: ) }
{
\cs_undefine:N \inhibitglue
@@ -1030,33 +1038,4 @@
%%------ all done
\endlinechar `\^^M
\endinput
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\iffalse%%
-
-\cs_new:Nn \zxjt_get_CJKfont_info:
- {
- \tl_clear:N \l_CJKfont_info_tl
- \int_compare:nNnT { \XeTeXcharclass "5B57 } = { \c_zxjt_CJK_class_int }
- {
- \group_begin:
- \int_set:Nn \XeTeXinterchartokenstate { 1 }
- \XeTeXcharclass `\? = \c_zxjt_Default_class_int
- \XeTeXinterchartoks \c_zxjt_CJK_class_int
- \c_zxjt_Default_class_int = { \scan_stop: }
- \XeTeXinterchartoks \c_zxjt_Default_class_int
- \c_zxjt_CJK_class_int = { \scan_stop: }
- \cs_show:c { xeCJK@rm/m/n/10 }
- \hbox_set:Nn \l_tmpa_box
- {
- ^^^^5b57 ?\bxDebug{\the\font/\f@family}
- \cs_gset:Npn \g_zxjt_tmpa_tl
- { { \f@encoding } { \f@family } }
- ? ^^^^5b57
- }\box_show:N \l_tmpa_box
- \group_end:
- \cs_set_eq:NN \l_zxjt_CJKfont_info_tl \g_zxjt_tmpa_tl
- }
- }
-
-\fi%%
%% EOF